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 2cd1b6c40ac02c00572ac151db5431348513e44a..d3e29c184e8e90ec5899b7b7241bd9fb34385cc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ bin/
cmake-build-debug/
run/
buildGCC
+buildWSL
# Python
_skbuild/
@@ -27,6 +28,7 @@ pythonbindings/pymuparser/bindings*
output/
logs/
reference_data/
+generated/
# grid
.grid/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e13137639fa39c8db26c5a6ab13c261e1a3ea699..2cf3e6a6497efc437fee5a3281fa72c75ee59eae 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,13 +117,13 @@ 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
@@ -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,13 +199,13 @@ 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"
@@ -214,9 +216,8 @@ gcc_9_python_bindings_test:
script:
- python3 -m unittest discover -s Python -v
-
###############################################################################
-gcc_9_python_hpc_test:
+gcc_12_python_hpc_test:
image: python:latest
stage: test
@@ -225,8 +226,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
@@ -236,6 +235,42 @@ gcc_9_python_hpc_test:
script:
- hpc-rocket launch --watch Python/SlurmTests/poiseuille/rocket.yml
+###############################################################################
+build-regression-tests-ci:
+ image: python:3.10
+ stage: test
+
+ before_script:
+ - pip install -r utilities/ci-regression-tests/requirements.txt
+
+ script:
+ - python3 utilities/ci-regression-tests/generate-ci.py
+
+ artifacts:
+ expire_in: 1 week
+ paths:
+ - generated/
+
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "schedule"
+ when: always
+ - when: manual
+ allow_failure: true
+
+ needs: []
+
+trigger-regression-tests:
+ stage: test
+ needs:
+ - build-regression-tests-ci
+ trigger:
+ include:
+ - artifact: generated/regression-tests-ci.yml
+ job: build-regression-tests-ci
+ strategy: depend
+ variables:
+ PARENT_PIPELINE_ID: $CI_PIPELINE_ID
+
###############################################################################
regression_test_4gpu:
image: python:latest
@@ -244,8 +279,6 @@ regression_test_4gpu:
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
@@ -270,8 +303,6 @@ regression_test_8gpu:
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
@@ -287,14 +318,13 @@ regression_test_8gpu:
- 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"
-
###############################################################################
## Benchmark ##
###############################################################################
nvidia_test:
stage: benchmark
- image: nvidia/cuda:11.1.1-devel-ubuntu20.04
+ image: nvidia/cuda:12.1.1-devel-ubuntu22.04
needs: []
@@ -313,8 +343,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
@@ -350,21 +378,14 @@ gpu_numerical_tests:
- $CI_PROJECT_DIR/cache
artifacts:
- expire_in: 1 hrs
paths:
- $CI_PROJECT_DIR/numerical_tests_gpu_results.txt
###############################################################################
-run-regression-tests:
- stage: test
-
- rules:
- - if: $CI_PIPELINE_SOURCE == "schedule"
- when: always
- - if: $CI_PIPELINE_SOURCE == "merge_request_event"
- when: never
- - when: manual
- allow_failure: true
+## Code analysis ##
+###############################################################################
+.analyze_template:
+ stage: analyze
needs: []
@@ -372,22 +393,16 @@ run-regression-tests:
- gpu
- linux
- before_script:
- - apt-get update && apt-get -y install python3.8-venv
- - chmod +x ./regression-tests/*
-
- script:
- - ./regression-tests/regression-tests.sh
-
-###############################################################################
-## Code analysis ##
-###############################################################################
-clang_build_analyzer_clang_10:
- stage: analyze
+ rules:
+ - if: '$CI_PROJECT_NAMESPACE == "irmb" && $CI_COMMIT_BRANCH == "develop"'
+ when: always
+ - if: '$CI_PROJECT_NAMESPACE != "irmb"'
+ when: manual
+ allow_failure: true
- only: ["schedules"]
- needs: []
+clang_build_analyzer:
+ extends: .analyze_template
before_script:
- export CC=clang
@@ -413,22 +428,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
@@ -442,24 +454,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:
@@ -475,17 +476,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:
@@ -499,25 +492,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
@@ -540,16 +533,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
@@ -559,7 +546,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
@@ -569,6 +556,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:
@@ -598,8 +612,6 @@ pages:
.deploy_template:
stage: deploy
-
-
before_script:
- 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
- apt-get install -y rsync
@@ -619,7 +631,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
@@ -643,7 +655,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"
@@ -671,7 +683,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.10.3/.appveyor.yml b/3rdParty/pybind11/pybind11-2.10.3/.appveyor.yml
deleted file mode 100644
index 360760ac8db71a68cd2f874723e1e2bbb80545fb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.appveyor.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: 1.0.{build}
-image:
-- Visual Studio 2017
-test: off
-skip_branch_with_pr: true
-build:
- parallel: true
-platform:
-- x86
-environment:
- matrix:
- - PYTHON: 36
- CONFIG: Debug
-install:
-- ps: |
- $env:CMAKE_GENERATOR = "Visual Studio 15 2017"
- 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 pytest-timeout
-- 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.10.3/.clang-format b/3rdParty/pybind11/pybind11-2.10.3/.clang-format
deleted file mode 100644
index b477a16037bc70dabe91e0bf7f8dae057124c653..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.clang-format
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# See all possible options and defaults with:
-# clang-format --style=llvm --dump-config
-BasedOnStyle: LLVM
-AccessModifierOffset: -4
-AllowShortLambdasOnASingleLine: true
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: false
-BinPackParameters: false
-BreakBeforeBinaryOperators: All
-BreakConstructorInitializers: BeforeColon
-ColumnLimit: 99
-CommentPragmas: 'NOLINT:.*|^ IWYU pragma:'
-IncludeBlocks: Regroup
-IndentCaseLabels: true
-IndentPPDirectives: AfterHash
-IndentWidth: 4
-Language: Cpp
-SpaceAfterCStyleCast: true
-Standard: Cpp11
-StatementMacros: ['PyObject_HEAD']
-TabWidth: 4
-IncludeCategories:
- - Regex: '<pybind11/.*'
- Priority: -1
- - Regex: 'pybind11.h"$'
- Priority: 1
- - Regex: '^".*/?detail/'
- Priority: 1
- SortPriority: 2
- - Regex: '^"'
- Priority: 1
- SortPriority: 3
- - Regex: '<[[:alnum:]._]+>'
- Priority: 4
- - Regex: '.*'
- Priority: 5
-...
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.clang-tidy b/3rdParty/pybind11/pybind11-2.10.3/.clang-tidy
deleted file mode 100644
index 23018386c1079cbc82d62e44aac840bd825396eb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.clang-tidy
+++ /dev/null
@@ -1,77 +0,0 @@
-FormatStyle: file
-
-Checks: |
- *bugprone*,
- *performance*,
- clang-analyzer-optin.cplusplus.VirtualCall,
- clang-analyzer-optin.performance.Padding,
- cppcoreguidelines-init-variables,
- cppcoreguidelines-prefer-member-initializer,
- cppcoreguidelines-pro-type-static-cast-downcast,
- cppcoreguidelines-slicing,
- google-explicit-constructor,
- llvm-namespace-comment,
- misc-definitions-in-headers,
- misc-misplaced-const,
- misc-non-copyable-objects,
- misc-static-assert,
- misc-throw-by-value-catch-by-reference,
- misc-uniqueptr-reset-release,
- misc-unused-parameters,
- modernize-avoid-bind,
- modernize-loop-convert,
- modernize-make-shared,
- modernize-redundant-void-arg,
- modernize-replace-auto-ptr,
- modernize-replace-disallow-copy-and-assign-macro,
- modernize-replace-random-shuffle,
- modernize-shrink-to-fit,
- modernize-use-auto,
- modernize-use-bool-literals,
- modernize-use-default-member-init,
- modernize-use-emplace,
- modernize-use-equals-default,
- modernize-use-equals-delete,
- modernize-use-noexcept,
- modernize-use-nullptr,
- modernize-use-override,
- modernize-use-using,
- readability-avoid-const-params-in-decls,
- readability-braces-around-statements,
- readability-const-return-type,
- readability-container-size-empty,
- readability-delete-null-pointer,
- readability-else-after-return,
- readability-implicit-bool-conversion,
- readability-inconsistent-declaration-parameter-name,
- readability-make-member-function-const,
- readability-misplaced-array-index,
- readability-non-const-parameter,
- readability-qualified-auto,
- readability-redundant-function-ptr-dereference,
- readability-redundant-smartptr-get,
- readability-redundant-string-cstr,
- readability-simplify-subscript-expr,
- readability-static-accessed-through-instance,
- readability-static-definition-in-anonymous-namespace,
- readability-string-compare,
- readability-suspicious-call-argument,
- readability-uniqueptr-delete-release,
- -bugprone-easily-swappable-parameters,
- -bugprone-exception-escape,
- -bugprone-reserved-identifier,
- -bugprone-unused-raii,
-
-CheckOptions:
-- key: modernize-use-equals-default.IgnoreMacros
- value: false
-- key: performance-for-range-copy.WarnOnAllAutoCopies
- value: true
-- key: performance-inefficient-string-concatenation.StrictMode
- value: true
-- key: performance-unnecessary-value-param.AllowedTypes
- value: 'exception_ptr$;'
-- key: readability-implicit-bool-conversion.AllowPointerConditions
- value: true
-
-HeaderFilterRegex: 'pybind11/.*h'
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.cmake-format.yaml b/3rdParty/pybind11/pybind11-2.10.3/.cmake-format.yaml
deleted file mode 100644
index a2a69f3f897da990a4255b593dc3fcdf4b89a764..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.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.10.3/.codespell-ignore-lines b/3rdParty/pybind11/pybind11-2.10.3/.codespell-ignore-lines
deleted file mode 100644
index 2a01d63ebb35287ef7e95ddf5c856ca272872b6b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.codespell-ignore-lines
+++ /dev/null
@@ -1,24 +0,0 @@
-template <op_id id, op_type ot, typename L = undefined_t, typename R = undefined_t>
- template <typename ThisT>
- auto &this_ = static_cast<ThisT &>(*this);
- if (load_impl<ThisT>(temp, false)) {
- ssize_t nd = 0;
- auto trivial = broadcast(buffers, nd, shape);
- auto ndim = (size_t) nd;
- int nd;
- ssize_t ndim() const { return detail::array_proxy(m_ptr)->nd; }
- using op = op_impl<id, ot, Base, L_type, R_type>;
-template <op_id id, op_type ot, typename L, typename R>
- 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) {
- class_ &def_cast(const detail::op_<id, ot, L, R> &op, const Extra &...extra) {
-@pytest.mark.parametrize("access", ["ro", "rw", "static_ro", "static_rw"])
-struct IntStruct {
- explicit IntStruct(int v) : value(v){};
- ~IntStruct() { value = -value; }
- IntStruct(const IntStruct &) = default;
- IntStruct &operator=(const IntStruct &) = default;
- py::class_<IntStruct>(m, "IntStruct").def(py::init([](const int i) { return IntStruct(i); }));
- py::implicitly_convertible<int, IntStruct>();
- m.def("test", [](int expected, const IntStruct &in) {
- [](int expected, const IntStruct &in) {
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.gitattributes b/3rdParty/pybind11/pybind11-2.10.3/.gitattributes
deleted file mode 100644
index d611e1496de00063120fad2ef1e7891eca20f7b3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-docs/*.svg binary
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/CODEOWNERS b/3rdParty/pybind11/pybind11-2.10.3/.github/CODEOWNERS
deleted file mode 100644
index 4e2c66902e5946dfd0eb8fc49d4d4190a620eee6..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/CODEOWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-*.cmake @henryiii
-CMakeLists.txt @henryiii
-*.yml @henryiii
-*.yaml @henryiii
-/tools/ @henryiii
-/pybind11/ @henryiii
-noxfile.py @henryiii
-.clang-format @henryiii
-.clang-tidy @henryiii
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/CONTRIBUTING.md b/3rdParty/pybind11/pybind11-2.10.3/.github/CONTRIBUTING.md
deleted file mode 100644
index 00b1fea4cfea50f3dc3c9b77a1de9bbca80fc108..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,388 +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
-
-### Quick setup
-
-To setup a quick development environment, use [`nox`](https://nox.thea.codes).
-This will allow you to do some common tasks with minimal setup effort, but will
-take more time to run and be less flexible than a full development environment.
-If you use [`pipx run nox`](https://pipx.pypa.io), you don't even need to
-install `nox`. Examples:
-
-```bash
-# List all available sessions
-nox -l
-
-# Run linters
-nox -s lint
-
-# Run tests on Python 3.9
-nox -s tests-3.9
-
-# Build and preview docs
-nox -s docs -- serve
-
-# Build SDists and wheels
-nox -s build
-```
-
-### Full setup
-
-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` (faster, from PyPI) instead of `venv`.
-* 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
-* `-DDOWNLOAD_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, using the
-[pytest](https://docs.pytest.org/en/stable/) framework
-* `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;test_pickling"`. If this is
-empty, all tests will be built. Tests are specified without an extension if they need both a .py and
-.cpp file.
-
-You may also pass flags to the `pytest` target by editing `tests/pytest.ini` or
-by using the `PYTEST_ADDOPTS` environment variable
-(see [`pytest` docs](https://docs.pytest.org/en/2.7.3/customize.html#adding-default-options)). As an example:
-
-```bash
-env PYTEST_ADDOPTS="--capture=no --exitfirst" \
- cmake --build build --target pytest
-# Or using abbreviated flags
-env PYTEST_ADDOPTS="-s -x" cmake --build build --target pytest
-```
-
-### 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-Format
-
-As of v2.6.2, pybind11 ships with a [`clang-format`][clang-format]
-configuration file at the top level of the repo (the filename is
-`.clang-format`). Currently, formatting is NOT applied automatically, but
-manually using `clang-format` for newly developed files is highly encouraged.
-To check if a file needs formatting:
-
-```bash
-clang-format -style=file --dry-run some.cpp
-```
-
-The output will show things to be fixed, if any. To actually format the file:
-
-```bash
-clang-format -style=file -i some.cpp
-```
-
-Note that the `-style-file` option searches the parent directories for the
-`.clang-format` file, i.e. the commands above can be run in any subdirectory
-of the pybind11 repo.
-
-### Clang-Tidy
-
-[`clang-tidy`][clang-tidy] performs deeper static code analyses and is
-more complex to run, compared to `clang-format`, but support for `clang-tidy`
-is built into the pybind11 CMake configuration. To run `clang-tidy`, the
-following recipe should work. Run the `docker` command from the top-level
-directory inside your pybind11 git clone. Files will be modified in place,
-so you can use git to monitor the changes.
-
-```bash
-docker run --rm -v $PWD:/mounted_pybind11 -it silkeh/clang:13
-apt-get update && apt-get install -y python3-dev python3-pytest
-cmake -S /mounted_pybind11/ -B build -DCMAKE_CXX_CLANG_TIDY="$(which clang-tidy);--use-color" -DDOWNLOAD_EIGEN=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=17
-cmake --build build -j 2
-```
-
-You can add `--fix` to the options list if you want.
-
-### 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 pipe 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):
-
-```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
-[clang-format]: https://clang.llvm.org/docs/ClangFormat.html
-[clang-tidy]: https://clang.llvm.org/extra/clang-tidy/
-[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.10.3/.github/ISSUE_TEMPLATE/bug-report.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/ISSUE_TEMPLATE/bug-report.yml
deleted file mode 100644
index 4f1e78f33c6242d3159801ec988d4a4297d41d20..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/ISSUE_TEMPLATE/bug-report.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-name: Bug Report
-description: File an issue about a bug
-title: "[BUG]: "
-labels: [triage]
-body:
- - type: markdown
- attributes:
- value: |
- Please do your best to make the issue as easy to act on as possible, and only submit here if there is clearly a problem with pybind11 (ask first if unsure). **Note that a reproducer in a PR is much more likely to get immediate attention.**
-
- - type: checkboxes
- id: steps
- attributes:
- label: Required prerequisites
- description: Make sure you've completed the following steps before submitting your issue -- thank you!
- options:
- - label: Make sure you've read the [documentation](https://pybind11.readthedocs.io). Your issue may be addressed there.
- required: true
- - label: Search the [issue tracker](https://github.com/pybind/pybind11/issues) and [Discussions](https:/pybind/pybind11/discussions) to verify that this hasn't already been reported. +1 or comment there if it has.
- required: true
- - label: Consider asking first in the [Gitter chat room](https://gitter.im/pybind/Lobby) or in a [Discussion](https:/pybind/pybind11/discussions/new).
- required: false
-
- - type: input
- id: version
- attributes:
- label: What version (or hash if on master) of pybind11 are you using?
- validations:
- required: true
-
- - type: textarea
- id: description
- attributes:
- label: Problem description
- placeholder: >-
- Provide a short description, state the expected behavior and what
- actually happens. Include relevant information like what version of
- pybind11 you are using, what system you are on, and any useful commands
- / output.
- validations:
- required: true
-
- - type: textarea
- id: code
- attributes:
- label: Reproducible example code
- placeholder: >-
- 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. — Note that a reproducer in a PR is much more likely to get
- immediate attention: failing tests in the pybind11 CI are the best
- starting point for working out fixes.
- render: text
-
- - type: input
- id: regression
- attributes:
- label: Is this a regression? Put the last known working version here if it is.
- description: Put the last known working version here if this is a regression.
- value: Not a regression
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/ISSUE_TEMPLATE/config.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 27f9a804415e88ada9c59a338a125df37069dd42..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
- - name: Ask a question
- url: https://github.com/pybind/pybind11/discussions/new
- about: Please ask and answer questions here, or propose new ideas.
- - 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.10.3/.github/dependabot.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/dependabot.yml
deleted file mode 100644
index 2c7d1708395e202b3b3316391f35bf4183ebd045..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/dependabot.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: 2
-updates:
- # Maintain dependencies for GitHub Actions
- - package-ecosystem: "github-actions"
- directory: "/"
- schedule:
- interval: "daily"
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/labeler.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/labeler.yml
deleted file mode 100644
index abb0d05aaa3f1ce86f027249b47ce2bc5f7f2e7b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.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.10.3/.github/labeler_merged.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/labeler_merged.yml
deleted file mode 100644
index 2374ad42e4597965da5a0aecb2afeb213da10445..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/labeler_merged.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-needs changelog:
-- all:
- - '!docs/changelog.rst'
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/matchers/pylint.json b/3rdParty/pybind11/pybind11-2.10.3/.github/matchers/pylint.json
deleted file mode 100644
index e3a6bd16b0a02ead0bab71953de79cad3a7b2c71..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/matchers/pylint.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "problemMatcher": [
- {
- "severity": "warning",
- "pattern": [
- {
- "regexp": "^([^:]+):(\\d+):(\\d+): ([A-DF-Z]\\d+): \\033\\[[\\d;]+m([^\\033]+).*$",
- "file": 1,
- "line": 2,
- "column": 3,
- "code": 4,
- "message": 5
- }
- ],
- "owner": "pylint-warning"
- },
- {
- "severity": "error",
- "pattern": [
- {
- "regexp": "^([^:]+):(\\d+):(\\d+): (E\\d+): \\033\\[[\\d;]+m([^\\033]+).*$",
- "file": 1,
- "line": 2,
- "column": 3,
- "code": 4,
- "message": 5
- }
- ],
- "owner": "pylint-error"
- }
- ]
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/pull_request_template.md b/3rdParty/pybind11/pybind11-2.10.3/.github/pull_request_template.md
deleted file mode 100644
index 54b7f5100d3bdfbf58a825347745ae24462c1a3c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/pull_request_template.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-Title (above): please place [branch_name] at the beginning if you are targeting a branch other than master. *Do not target stable*.
-It is recommended to use conventional commit format, see conventionalcommits.org, but not required.
--->
-## 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;
- but do not delete header or rst block if an entry is needed! Will be collected via a script. -->
-
-```rst
-
-```
-
-<!-- If the upgrade guide needs updating, note that here too -->
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/ci.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/ci.yml
deleted file mode 100644
index b36bbfe1b97069e03ce50f0f4f450e38e58267f1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/ci.yml
+++ /dev/null
@@ -1,1104 +0,0 @@
-name: CI
-
-on:
- workflow_dispatch:
- pull_request:
- push:
- branches:
- - master
- - stable
- - v*
-
-concurrency:
- group: test-${{ github.ref }}
- cancel-in-progress: true
-
-env:
- PIP_ONLY_BINARY: numpy
- FORCE_COLOR: 3
- PYTEST_TIMEOUT: 300
- # For cmake:
- VERBOSE: 1
-
-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-20.04, windows-2022, macos-latest]
- python:
- - '3.6'
- - '3.9'
- - '3.10'
- - '3.11'
- - 'pypy-3.7'
- - 'pypy-3.8'
- - 'pypy-3.9'
-
- # 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 an optional key: args, for cmake args
- include:
- # Just add a key
- - runs-on: ubuntu-20.04
- python: '3.6'
- args: >
- -DPYBIND11_FINDPYTHON=ON
- -DCMAKE_CXX_FLAGS="-D_=1"
- - runs-on: ubuntu-20.04
- python: 'pypy-3.8'
- args: >
- -DPYBIND11_FINDPYTHON=ON
- - runs-on: windows-2019
- python: '3.6'
- args: >
- -DPYBIND11_FINDPYTHON=ON
- # Inject a couple Windows 2019 runs
- - runs-on: windows-2019
- python: '3.9'
-
- name: "ðŸ ${{ matrix.python }} • ${{ matrix.runs-on }} • x64 ${{ matrix.args }}"
- runs-on: ${{ matrix.runs-on }}
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v4
- with:
- python-version: ${{ matrix.python }}
-
- - name: Setup Boost (Linux)
- # Can't use boost + define _
- if: runner.os == 'Linux' && matrix.python != '3.6'
- run: sudo apt-get install libboost-dev
-
- - name: Setup Boost (macOS)
- if: runner.os == 'macOS'
- run: brew install boost
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - name: Cache wheels
- if: runner.os == 'macOS'
- uses: actions/cache@v3
- 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
-
- - 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
- # More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON here.
- - name: Configure C++11 ${{ matrix.args }}
- run: >
- cmake -S . -B .
- -DPYBIND11_WERROR=ON
- -DPYBIND11_SIMPLE_GIL_MANAGEMENT=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 || matrix.python == '3.10' || matrix.python == '3.11' || matrix.python == 'pypy-3.8'))"
- 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
- # More-or-less randomly adding -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF here.
- - name: Configure C++17
- run: >
- cmake -S . -B build2
- -DPYBIND11_WERROR=ON
- -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=17
- ${{ matrix.args }}
-
- - 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 || matrix.python == '3.10' || matrix.python == '3.11' || matrix.python == 'pypy-3.8'))"
- run: cmake --build build2 --target cpptest
-
- # Third build - C++17 mode with unstable ABI
- - name: Configure (unstable ABI)
- run: >
- cmake -S . -B build3
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=17
- -DPYBIND11_INTERNALS_VERSION=10000000
- "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
- ${{ matrix.args }}
-
- - name: Build (unstable ABI)
- run: cmake --build build3 -j 2
-
- - name: Python tests (unstable ABI)
- run: cmake --build build3 --target pytest
-
- - name: Interface test
- run: cmake --build build2 --target test_cmake_build
-
- # This makes sure the setup_helpers module can build packages using
- # setuptools
- - name: Setuptools helpers test
- run: pytest tests/extra_setuptools
- if: "!(matrix.runs-on == 'windows-2022')"
-
-
- deadsnakes:
- strategy:
- fail-fast: false
- matrix:
- include:
- # TODO: Fails on 3.10, investigate
- - python-version: "3.9"
- python-debug: true
- valgrind: true
- - python-version: "3.11"
- python-debug: false
-
- name: "ðŸ ${{ matrix.python-version }}${{ matrix.python-debug && '-dbg' || '' }} (deadsnakes)${{ matrix.valgrind && ' • Valgrind' || '' }} • x64"
- runs-on: ubuntu-20.04
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Setup Python ${{ matrix.python-version }} (deadsnakes)
- uses: deadsnakes/action@v3.0.0
- with:
- python-version: ${{ matrix.python-version }}
- debug: ${{ matrix.python-debug }}
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - name: Valgrind cache
- if: matrix.valgrind
- uses: actions/cache@v3
- id: cache-valgrind
- with:
- path: valgrind
- key: 3.16.1 # Valgrind version
-
- - name: Compile Valgrind
- if: matrix.valgrind && steps.cache-valgrind.outputs.cache-hit != 'true'
- run: |
- VALGRIND_VERSION=3.16.1
- curl https://sourceware.org/pub/valgrind/valgrind-$VALGRIND_VERSION.tar.bz2 -o - | tar xj
- mv valgrind-$VALGRIND_VERSION valgrind
- cd valgrind
- ./configure
- make -j 2 > /dev/null
-
- - name: Install Valgrind
- if: matrix.valgrind
- working-directory: valgrind
- run: |
- sudo make install
- sudo apt-get update
- sudo apt-get install libc6-dbg # Needed by Valgrind
-
- - name: Prepare env
- run: |
- python -m pip install -r tests/requirements.txt
-
- - name: Configure
- env:
- SETUPTOOLS_USE_DISTUTILS: stdlib
- run: >
- cmake -S . -B build
- -DCMAKE_BUILD_TYPE=Debug
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=17
-
- - 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: Run Valgrind on Python tests
- if: matrix.valgrind
- run: cmake --build build --target memcheck
-
-
- # 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
- - 9
- - dev
- std:
- - 11
- include:
- - clang: 5
- std: 14
- - clang: 10
- std: 17
- - clang: 11
- std: 20
- - clang: 12
- std: 20
- - clang: 13
- std: 20
- - clang: 14
- std: 20
-
- name: "ðŸ 3 • Clang ${{ matrix.clang }} • C++${{ matrix.std }} • x64"
- container: "silkeh/clang:${{ matrix.clang }}"
-
- steps:
- - uses: actions/checkout@v3
-
- - 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.10 • CUDA 11.7 • Ubuntu 22.04"
- container: nvidia/cuda:11.7.0-devel-ubuntu22.04
-
- steps:
- - uses: actions/checkout@v3
-
- # 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
-
-
-# TODO: Internal compiler error - report to NVidia
-# # Testing CentOS 8 + PGI compilers
-# centos-nvhpc8:
-# runs-on: ubuntu-latest
-# name: "ðŸ 3 • CentOS8 / PGI 20.11 • x64"
-# container: centos:8
-#
-# steps:
-# - uses: actions/checkout@v3
-#
-# - 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/20.11/nvhpc-20-11-20.11-1.x86_64.rpm
-# https://developer.download.nvidia.com/hpc-sdk/20.11/nvhpc-2020-20.11-1.x86_64.rpm
-#
-# - name: Configure
-# shell: bash
-# run: |
-# source /etc/profile.d/modules.sh
-# module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.11
-# 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 22.9 • x64"
- container: centos:7
-
- steps:
- - uses: actions/checkout@v3
-
- - 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 yum-utils
-
- - name: Install NVidia HPC SDK
- run: yum-config-manager --add-repo https://developer.download.nvidia.com/hpc-sdk/rhel/nvhpc.repo && yum -y install nvhpc-22.9
-
- # On CentOS 7, we have to filter a few tests (compiler internal error)
- # and allow deeper template 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/22.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"
-
- # 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:
- include:
- - { gcc: 7, std: 11 }
- - { gcc: 7, std: 17 }
- - { gcc: 8, std: 14 }
- - { gcc: 8, std: 17 }
- - { gcc: 10, std: 17 }
- - { gcc: 11, std: 20 }
- - { gcc: 12, std: 20 }
-
- name: "ðŸ 3 • GCC ${{ matrix.gcc }} • C++${{ matrix.std }}• x64"
- container: "gcc:${{ matrix.gcc }}"
-
- steps:
- - uses: actions/checkout@v3
-
- - 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: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - 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 ICC using the oneAPI apt repo
- icc:
- runs-on: ubuntu-20.04
- strategy:
- fail-fast: false
-
- name: "ðŸ 3 • ICC latest • x64"
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Add apt repo
- run: |
- sudo apt-get update
- sudo apt-get install -y wget build-essential pkg-config cmake ca-certificates gnupg
- wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
- sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
- echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
-
- - name: Add ICC & Python 3
- run: sudo apt-get update; sudo apt-get install -y intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic cmake python3-dev python3-numpy python3-pytest python3-pip
-
- - name: Update pip
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- python3 -m pip install --upgrade pip
-
- - name: Install dependencies
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- python3 -m pip install -r tests/requirements.txt
-
- - name: Configure C++11
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- cmake -S . -B build-11 \
- -DPYBIND11_WERROR=ON \
- -DDOWNLOAD_CATCH=ON \
- -DDOWNLOAD_EIGEN=OFF \
- -DCMAKE_CXX_STANDARD=11 \
- -DCMAKE_CXX_COMPILER=$(which icpc) \
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Build C++11
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- cmake --build build-11 -j 2 -v
-
- - name: Python tests C++11
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- sudo service apport stop
- cmake --build build-11 --target check
-
- - name: C++ tests C++11
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- cmake --build build-11 --target cpptest
-
- - name: Interface test C++11
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- cmake --build build-11 --target test_cmake_build
-
- - name: Configure C++17
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- cmake -S . -B build-17 \
- -DPYBIND11_WERROR=ON \
- -DDOWNLOAD_CATCH=ON \
- -DDOWNLOAD_EIGEN=OFF \
- -DCMAKE_CXX_STANDARD=17 \
- -DCMAKE_CXX_COMPILER=$(which icpc) \
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Build C++17
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- cmake --build build-17 -j 2 -v
-
- - name: Python tests C++17
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- sudo service apport stop
- cmake --build build-17 --target check
-
- - name: C++ tests C++17
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- cmake --build build-17 --target cpptest
-
- - name: Interface test C++17
- run: |
- set +e; source /opt/intel/oneapi/setvars.sh; set -e
- cmake --build build-17 --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:
- container:
- - "centos:7" # GCC 4.8
- - "almalinux:8"
- - "almalinux:9"
-
- name: "ðŸ 3 • ${{ matrix.container }} • x64"
- container: "${{ matrix.container }}"
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Add Python 3 (RHEL 7)
- if: matrix.container == 'centos:7'
- run: yum update -y && yum install -y python3-devel gcc-c++ make git
-
- - name: Add Python 3 (RHEL 8+)
- if: matrix.container != 'centos:7'
- run: dnf update -y && dnf 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
-
- - name: Configure
- shell: bash
- run: >
- cmake -S . -B build
- -DCMAKE_BUILD_TYPE=MinSizeRel
- -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.7 • Debian • x86 • Install"
- runs-on: ubuntu-latest
- container: i386/debian:buster
-
- steps:
- - uses: actions/checkout@v1 # Required to run inside docker
-
- - name: Install requirements
- run: |
- apt-get update
- apt-get install -y git make cmake g++ libeigen3-dev python3-dev python3-pip
- pip3 install "pytest==6.*"
-
- - 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: Python tests
- run: make pytest -j 2
- working-directory: /build-tests
-
-
- # This verifies that the documentation is not horribly broken, and does a
- # basic validation check on the SDist.
- doxygen:
- name: "Documentation build test"
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v3
-
- - uses: actions/setup-python@v4
- with:
- python-version: "3.x"
-
- - name: Install Doxygen
- run: sudo apt-get install -y doxygen librsvg2-bin # Changed to rsvg-convert in 20.04
-
- - name: Build docs
- run: pipx run nox -s docs
-
- - name: Make SDist
- run: pipx run nox -s build -- --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/*.tar.gz
- installed=$(python3 -c "import pybind11; print(pybind11.get_include() + '/pybind11')")
- diff -rq $installed ./pybind11
-
- win32:
- strategy:
- fail-fast: false
- matrix:
- python:
- - 3.6
- - 3.7
- - 3.8
- - 3.9
-
- include:
- - python: 3.9
- args: -DCMAKE_CXX_STANDARD=20
- - python: 3.8
- args: -DCMAKE_CXX_STANDARD=17
- - python: 3.7
- args: -DCMAKE_CXX_STANDARD=14
-
-
- name: "ðŸ ${{ matrix.python }} • MSVC 2019 • x86 ${{ matrix.args }}"
- runs-on: windows-2019
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v4
- with:
- python-version: ${{ matrix.python }}
- architecture: x86
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - name: Prepare MSVC
- uses: ilammy/msvc-dev-cmd@v1.12.0
- with:
- arch: x86
-
- - name: Prepare env
- run: |
- python -m pip install -r tests/requirements.txt
-
- # 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: Python tests
- run: cmake --build build -t pytest
-
- win32-debug:
- strategy:
- fail-fast: false
- matrix:
- python:
- - 3.8
- - 3.9
-
- include:
- - python: 3.9
- args: -DCMAKE_CXX_STANDARD=20
- - python: 3.8
- args: -DCMAKE_CXX_STANDARD=17
-
- name: "ðŸ ${{ matrix.python }} • MSVC 2019 (Debug) • x86 ${{ matrix.args }}"
- runs-on: windows-2019
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v4
- with:
- python-version: ${{ matrix.python }}
- architecture: x86
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - name: Prepare MSVC
- uses: ilammy/msvc-dev-cmd@v1.12.0
- with:
- arch: x86
-
- - name: Prepare env
- run: |
- python -m pip install -r tests/requirements.txt
-
- # First build - C++11 mode and inplace
- - name: Configure ${{ matrix.args }}
- run: >
- cmake -S . -B build
- -G "Visual Studio 16 2019" -A Win32
- -DCMAKE_BUILD_TYPE=Debug
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- ${{ matrix.args }}
- - name: Build C++11
- run: cmake --build build --config Debug -j 2
-
- - name: Python tests
- run: cmake --build build --config Debug -t pytest
-
-
- windows-2022:
- strategy:
- fail-fast: false
- matrix:
- python:
- - 3.9
-
- name: "ðŸ ${{ matrix.python }} • MSVC 2022 C++20 • x64"
- runs-on: windows-2022
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v4
- with:
- python-version: ${{ matrix.python }}
-
- - name: Prepare env
- run: |
- python3 -m pip install -r tests/requirements.txt
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - name: Configure C++20
- run: >
- cmake -S . -B build
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=20
-
- - name: Build C++20
- run: cmake --build build -j 2
-
- - name: Python tests
- run: cmake --build build --target pytest
-
- - name: C++20 tests
- run: cmake --build build --target cpptest -j 2
-
- - name: Interface test C++20
- run: cmake --build build --target test_cmake_build
-
- mingw:
- name: "ðŸ 3 • windows-latest • ${{ matrix.sys }}"
- runs-on: windows-latest
- defaults:
- run:
- shell: msys2 {0}
- strategy:
- fail-fast: false
- matrix:
- include:
- - { sys: mingw64, env: x86_64 }
- - { sys: mingw32, env: i686 }
- steps:
- - uses: msys2/setup-msys2@v2
- with:
- msystem: ${{matrix.sys}}
- install: >-
- git
- mingw-w64-${{matrix.env}}-gcc
- mingw-w64-${{matrix.env}}-python-pip
- mingw-w64-${{matrix.env}}-python-numpy
- mingw-w64-${{matrix.env}}-python-scipy
- mingw-w64-${{matrix.env}}-cmake
- mingw-w64-${{matrix.env}}-make
- mingw-w64-${{matrix.env}}-python-pytest
- mingw-w64-${{matrix.env}}-eigen3
- mingw-w64-${{matrix.env}}-boost
- mingw-w64-${{matrix.env}}-catch
-
- - uses: actions/checkout@v3
-
- - name: Configure C++11
- # LTO leads to many undefined reference like
- # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build
-
- - name: Build C++11
- run: cmake --build build -j 2
-
- - name: Python tests C++11
- run: cmake --build build --target pytest -j 2
-
- - name: C++11 tests
- run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build --target cpptest -j 2
-
- - name: Interface test C++11
- run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build --target test_cmake_build
-
- - name: Clean directory
- run: git clean -fdx
-
- - name: Configure C++14
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build2
-
- - name: Build C++14
- run: cmake --build build2 -j 2
-
- - name: Python tests C++14
- run: cmake --build build2 --target pytest -j 2
-
- - name: C++14 tests
- run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build2 --target cpptest -j 2
-
- - name: Interface test C++14
- run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build2 --target test_cmake_build
-
- - name: Clean directory
- run: git clean -fdx
-
- - name: Configure C++17
- run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build3
-
- - name: Build C++17
- run: cmake --build build3 -j 2
-
- - name: Python tests C++17
- run: cmake --build build3 --target pytest -j 2
-
- - name: C++17 tests
- run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target cpptest -j 2
-
- - name: Interface test C++17
- run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target test_cmake_build
-
- windows_clang:
-
- strategy:
- matrix:
- os: [windows-latest]
- python: ['3.10']
-
- runs-on: "${{ matrix.os }}"
-
- name: "ðŸ ${{ matrix.python }} • ${{ matrix.os }} • clang-latest"
-
- steps:
- - name: Show env
- run: env
-
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Set up Clang
- uses: egor-tensin/setup-clang@v1
-
- - name: Setup Python ${{ matrix.python }}
- uses: actions/setup-python@v4
- with:
- python-version: ${{ matrix.python }}
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - name: Install ninja-build tool
- uses: seanmiddleditch/gha-setup-ninja@v3
-
- - name: Run pip installs
- run: |
- python -m pip install --upgrade pip
- python -m pip install -r tests/requirements.txt
-
- - name: Show Clang++ version
- run: clang++ --version
-
- - name: Show CMake version
- run: cmake --version
-
- # TODO: WERROR=ON
- - name: Configure Clang
- run: >
- cmake -G Ninja -S . -B .
- -DPYBIND11_WERROR=OFF
- -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_COMPILER=clang++
- -DCMAKE_CXX_STANDARD=17
-
- - name: Build
- run: cmake --build . -j 2
-
- - name: Python tests
- run: cmake --build . --target pytest -j 2
-
- - name: C++ tests
- run: cmake --build . --target cpptest -j 2
-
- - name: Interface test
- run: cmake --build . --target test_cmake_build -j 2
-
- - name: Clean directory
- run: git clean -fdx
-
- macos_brew_install_llvm:
- name: "macos-latest • brew install llvm"
- runs-on: macos-latest
-
- env:
- # https://apple.stackexchange.com/questions/227026/how-to-install-recent-clang-with-homebrew
- LDFLAGS: '-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib'
-
- steps:
- - name: Update PATH
- run: echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
-
- - name: Show env
- run: env
-
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Show Clang++ version before brew install llvm
- run: clang++ --version
-
- - name: brew install llvm
- run: brew install llvm
-
- - name: Show Clang++ version after brew install llvm
- run: clang++ --version
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - name: Run pip installs
- run: |
- python3 -m pip install --upgrade pip
- python3 -m pip install -r tests/requirements.txt
- python3 -m pip install numpy
- python3 -m pip install scipy
-
- - name: Show CMake version
- run: cmake --version
-
- - name: CMake Configure
- run: >
- cmake -S . -B .
- -DPYBIND11_WERROR=ON
- -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_COMPILER=clang++
- -DCMAKE_CXX_STANDARD=17
- -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
-
- - name: Build
- run: cmake --build . -j 2
-
- - name: Python tests
- run: cmake --build . --target pytest -j 2
-
- - name: C++ tests
- run: cmake --build . --target cpptest -j 2
-
- - name: Interface test
- run: cmake --build . --target test_cmake_build -j 2
-
- - name: Clean directory
- run: git clean -fdx
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/configure.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/configure.yml
deleted file mode 100644
index 29b041168e96c67aa058721c84c93c3b034a8f67..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/configure.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-name: Config
-
-on:
- workflow_dispatch:
- pull_request:
- push:
- branches:
- - master
- - stable
- - v*
-
-env:
- # For cmake:
- VERBOSE: 1
-
-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-20.04, macos-latest, windows-latest]
- arch: [x64]
- cmake: ["3.23"]
-
- include:
- - runs-on: ubuntu-20.04
- arch: x64
- cmake: 3.4
-
- - runs-on: macos-latest
- arch: x64
- cmake: 3.7
-
- - runs-on: windows-2019
- arch: x64 # x86 compilers seem to be missing on 2019 image
- cmake: 3.18
-
- name: ðŸ 3.7 • CMake ${{ matrix.cmake }} • ${{ matrix.runs-on }}
- runs-on: ${{ matrix.runs-on }}
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Setup Python 3.7
- uses: actions/setup-python@v4
- 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.13
- 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.10.3/.github/workflows/format.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/format.yml
deleted file mode 100644
index b18474bc3dc274fc4cd2738ace4807a612582e25..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/format.yml
+++ /dev/null
@@ -1,57 +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*"
-
-env:
- FORCE_COLOR: 3
- # For cmake:
- VERBOSE: 1
-
-jobs:
- pre-commit:
- name: Format
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- - uses: actions/setup-python@v4
- with:
- python-version: "3.x"
- - name: Add matchers
- run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/matchers/pylint.json"
- - uses: pre-commit/action@v3.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:
- # When making changes here, please also review the "Clang-Tidy" section
- # in .github/CONTRIBUTING.md and update as needed.
- name: Clang-Tidy
- runs-on: ubuntu-latest
- container: silkeh/clang:13
- steps:
- - uses: actions/checkout@v3
-
- - 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);--use-color;--warnings-as-errors=*"
- -DDOWNLOAD_EIGEN=ON
- -DDOWNLOAD_CATCH=ON
- -DCMAKE_CXX_STANDARD=17
-
- - name: Build
- run: cmake --build build -j 2 -- --keep-going
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/labeler.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/labeler.yml
deleted file mode 100644
index 165a2fd87bf218e85b948fff1bd10219ddca58e3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/labeler.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Labeler
-on:
- pull_request_target:
- types: [closed]
-
-jobs:
- label:
- name: Labeler
- runs-on: ubuntu-latest
- steps:
-
- - uses: actions/labeler@main
- if: >
- github.event.pull_request.merged == true &&
- !startsWith(github.event.pull_request.title, 'chore(deps):') &&
- !startsWith(github.event.pull_request.title, 'ci(fix):') &&
- !startsWith(github.event.pull_request.title, 'docs(changelog):')
- with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- configuration-path: .github/labeler_merged.yml
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/pip.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/pip.yml
deleted file mode 100644
index 7c6fc67a3e32b46198c7e84f19593c6f87276bb7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/pip.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-name: Pip
-
-on:
- workflow_dispatch:
- pull_request:
- push:
- branches:
- - master
- - stable
- - v*
- release:
- types:
- - published
-
-env:
- PIP_ONLY_BINARY: numpy
-
-jobs:
- # This builds the sdists and wheels and makes sure the files are exactly as
- # expected. Using Windows and Python 3.6, since that is often the most
- # challenging matrix element.
- test-packaging:
- name: ðŸ 3.6 • 📦 tests • windows-latest
- runs-on: windows-latest
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Setup ðŸ 3.6
- uses: actions/setup-python@v4
- with:
- python-version: 3.6
-
- - name: Prepare env
- run: |
- python -m pip install -r tests/requirements.txt
-
- - 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@v3
-
- - name: Setup ðŸ 3.8
- uses: actions/setup-python@v4
- with:
- python-version: 3.8
-
- - name: Prepare env
- run: |
- python -m pip install -r tests/requirements.txt build twine
-
- - 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@v3
- with:
- name: standard
- path: dist/pybind11-*
-
- - name: Save global package
- uses: actions/upload-artifact@v3
- 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@v4
- with:
- python-version: "3.x"
-
- # Downloads all to directories matching the artifact names
- - uses: actions/download-artifact@v3
-
- - name: Publish standard package
- uses: pypa/gh-action-pypi-publish@v1.6.4
- with:
- password: ${{ secrets.pypi_password }}
- packages_dir: standard/
-
- - name: Publish global package
- uses: pypa/gh-action-pypi-publish@v1.6.4
- with:
- password: ${{ secrets.pypi_password_global }}
- packages_dir: global/
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/upstream.yml b/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/upstream.yml
deleted file mode 100644
index a15861ee474603b8420551b584adf7c7dd632988..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.github/workflows/upstream.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-name: Upstream
-
-on:
- workflow_dispatch:
- pull_request:
-
-concurrency:
- group: upstream-${{ github.ref }}
- cancel-in-progress: true
-
-env:
- PIP_ONLY_BINARY: numpy
- # For cmake:
- VERBOSE: 1
-
-jobs:
- standard:
- name: "ðŸ 3.11 latest internals • ubuntu-latest • x64"
- runs-on: ubuntu-latest
- if: "contains(github.event.pull_request.labels.*.name, 'python dev')"
-
- steps:
- - uses: actions/checkout@v3
-
- - name: Setup Python 3.11
- uses: actions/setup-python@v4
- with:
- python-version: "3.11-dev"
-
- - name: Setup Boost (Linux)
- if: runner.os == 'Linux'
- run: sudo apt-get install libboost-dev
-
- - name: Update CMake
- uses: jwlawson/actions-setup-cmake@v1.13
-
- - name: Prepare env
- run: |
- python -m pip install -r tests/requirements.txt
-
- - 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
- run: >
- cmake -S . -B .
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=11
-
- - 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
- 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 C++17
- 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
- run: cmake --build build2 --target cpptest
-
- # Third build - C++17 mode with unstable ABI
- - name: Configure (unstable ABI)
- run: >
- cmake -S . -B build3
- -DPYBIND11_WERROR=ON
- -DDOWNLOAD_CATCH=ON
- -DDOWNLOAD_EIGEN=ON
- -DCMAKE_CXX_STANDARD=17
- -DPYBIND11_INTERNALS_VERSION=10000000
- "-DPYBIND11_TEST_OVERRIDE=test_call_policies.cpp;test_gil_scoped.cpp;test_thread.cpp"
- ${{ matrix.args }}
-
- - name: Build (unstable ABI)
- run: cmake --build build3 -j 2
-
- - name: Python tests (unstable ABI)
- run: cmake --build build3 --target pytest
-
- - name: Interface test
- run: cmake --build build3 --target test_cmake_build
-
- # This makes sure the setup_helpers module can build packages using
- # setuptools
- - name: Setuptools helpers test
- run: pytest tests/extra_setuptools
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.gitignore b/3rdParty/pybind11/pybind11-2.10.3/.gitignore
deleted file mode 100644
index 43d5094c967f4f839be18e71cc398f6af50722ae..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.gitignore
+++ /dev/null
@@ -1,46 +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/*
-/docs/_build/*
-.ipynb_checkpoints/
-tests/main.cpp
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.pre-commit-config.yaml b/3rdParty/pybind11/pybind11-2.10.3/.pre-commit-config.yaml
deleted file mode 100644
index d625d5726b7e2b88863bc55e285c665ddb5c590a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.pre-commit-config.yaml
+++ /dev/null
@@ -1,181 +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
-
-
-ci:
- autoupdate_commit_msg: "chore(deps): update pre-commit hooks"
- autofix_commit_msg: "style: pre-commit fixes"
- autoupdate_schedule: monthly
-
-# third-party content
-exclude: ^tools/JoinPaths.cmake$
-
-repos:
-# Standard hooks
-- repo: https://github.com/pre-commit/pre-commit-hooks
- rev: "v4.4.0"
- hooks:
- - id: check-added-large-files
- - id: check-case-conflict
- - id: check-docstring-first
- - id: check-merge-conflict
- - id: check-symlinks
- - id: check-toml
- - id: check-yaml
- - id: debug-statements
- - id: end-of-file-fixer
- - id: mixed-line-ending
- - id: requirements-txt-fixer
- - id: trailing-whitespace
-
-# Upgrade old Python syntax
-- repo: https://github.com/asottile/pyupgrade
- rev: "v3.3.1"
- hooks:
- - id: pyupgrade
- args: [--py36-plus]
-
-# Nicely sort includes
-- repo: https://github.com/PyCQA/isort
- rev: "5.11.4"
- hooks:
- - id: isort
-
-# Black, the code formatter, natively supports pre-commit
-- repo: https://github.com/psf/black
- rev: "22.12.0" # Keep in sync with blacken-docs
- hooks:
- - id: black
-
-# Also code format the docs
-- repo: https://github.com/asottile/blacken-docs
- rev: "v1.12.1"
- hooks:
- - id: blacken-docs
- additional_dependencies:
- - black==22.10.0 # keep in sync with black hook
-
-# Changes tabs to spaces
-- repo: https://github.com/Lucas-C/pre-commit-hooks
- rev: "v1.3.1"
- hooks:
- - id: remove-tabs
-
-- repo: https://github.com/sirosen/texthooks
- rev: "0.4.0"
- hooks:
- - id: fix-ligatures
- - id: fix-smartquotes
-
-# Autoremoves unused imports
-- repo: https://github.com/hadialqattan/pycln
- rev: "v2.1.2"
- hooks:
- - id: pycln
- stages: [manual]
-
-# Checking for common mistakes
-- repo: https://github.com/pre-commit/pygrep-hooks
- rev: "v1.9.0"
- hooks:
- - id: python-check-blanket-noqa
- - id: python-check-blanket-type-ignore
- - id: python-no-log-warn
- - id: python-use-type-annotations
- - id: rst-backticks
- - id: rst-directive-colons
- - id: rst-inline-touching-normal
-
-# Automatically remove noqa that are not used
-- repo: https://github.com/asottile/yesqa
- rev: "v1.4.0"
- hooks:
- - id: yesqa
- additional_dependencies: &flake8_dependencies
- - flake8-bugbear
- - pep8-naming
-
-# Flake8 also supports pre-commit natively (same author)
-- repo: https://github.com/PyCQA/flake8
- rev: "6.0.0"
- hooks:
- - id: flake8
- exclude: ^(docs/.*|tools/.*)$
- additional_dependencies: *flake8_dependencies
-
-# PyLint has native support - not always usable, but works for us
-- repo: https://github.com/PyCQA/pylint
- rev: "v2.15.9"
- hooks:
- - id: pylint
- files: ^pybind11
-
-# 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.991"
- hooks:
- - id: mypy
- args: []
- exclude: ^(tests|docs)/
- additional_dependencies: [nox, rich]
-
-# Checks the manifest for missing files (native support)
-- repo: https://github.com/mgedmin/check-manifest
- rev: "0.49"
- 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]
-
-# Check for spelling
-# Use tools/codespell_ignore_lines_from_errors.py
-# to rebuild .codespell-ignore-lines
-- repo: https://github.com/codespell-project/codespell
- rev: "v2.2.2"
- hooks:
- - id: codespell
- exclude: ".supp$"
- args: ["-x", ".codespell-ignore-lines"]
-
-# Check for common shell mistakes
-- repo: https://github.com/shellcheck-py/shellcheck-py
- rev: "v0.9.0.2"
- hooks:
- - id: shellcheck
-
-# Disallow some common capitalization mistakes
-- repo: local
- hooks:
- - id: disallow-caps
- name: Disallow improper capitalization
- language: pygrep
- entry: PyBind|Numpy|Cmake|CCache|PyTest
- exclude: ^\.pre-commit-config.yaml$
-
-# Clang format the codebase automatically
-- repo: https://github.com/pre-commit/mirrors-clang-format
- rev: "v15.0.6"
- hooks:
- - id: clang-format
- types_or: [c++, c, cuda]
diff --git a/3rdParty/pybind11/pybind11-2.10.3/.readthedocs.yml b/3rdParty/pybind11/pybind11-2.10.3/.readthedocs.yml
deleted file mode 100644
index c9c61617ca9b13a3e31d33226c52ba9529872a0d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/.readthedocs.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-python:
- version: 3
-requirements_file: docs/requirements.txt
diff --git a/3rdParty/pybind11/pybind11-2.10.3/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/CMakeLists.txt
deleted file mode 100644
index 0d93203881e6376b9e316af68bd4e78d3b0c7dbb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/CMakeLists.txt
+++ /dev/null
@@ -1,320 +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.22)` 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.22)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.22)
-endif()
-
-# Avoid infinite recursion if tests include this as a subdirectory
-if(DEFINED PYBIND11_MASTER_PROJECT)
- return()
-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()
-
- set(pybind11_system "")
-
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-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)
-option(PYBIND11_SIMPLE_GIL_MANAGEMENT
- "Use simpler GIL management logic that does not support disassociation" OFF)
-set(PYBIND11_INTERNALS_VERSION
- ""
- CACHE STRING "Override the ABI version, may be used to enable the unstable ABI.")
-
-if(PYBIND11_SIMPLE_GIL_MANAGEMENT)
- add_compile_definitions(PYBIND11_SIMPLE_GIL_MANAGEMENT)
-endif()
-
-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/type_caster_base.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/eigen/matrix.h
- include/pybind11/eigen/tensor.h
- include/pybind11/embed.h
- include/pybind11/eval.h
- include/pybind11/gil.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
- include/pybind11/stl/filesystem.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 variable so this can be used in parent projects
-set(pybind11_INCLUDE_DIR
- "${CMAKE_CURRENT_LIST_DIR}/include"
- CACHE INTERNAL "Directory where pybind11 headers are located")
-
-# Backward compatible variable for add_subdirectory mode
-if(NOT PYBIND11_MASTER_PROJECT)
- set(PYBIND11_INCLUDE_DIR
- "${pybind11_INCLUDE_DIR}"
- CACHE INTERNAL "")
-endif()
-
-# 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
-# Non-IMPORT targets cannot be defined twice
-if(NOT TARGET pybind11_headers)
- # 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
-
- 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(NOT "${PYBIND11_INTERNALS_VERSION}" STREQUAL "")
- target_compile_definitions(
- pybind11_headers INTERFACE "PYBIND11_INTERNALS_VERSION=${PYBIND11_INTERNALS_VERSION}")
- endif()
-else()
- # It is invalid to install a target twice, too.
- set(PYBIND11_INSTALL OFF)
-endif()
-
-include("${CMAKE_CURRENT_SOURCE_DIR}/tools/pybind11Common.cmake")
-# https://github.com/jtojnar/cmake-snips/#concatenating-paths-when-building-pkg-config-files
-# TODO: cmake 3.20 adds the cmake_path() function, which obsoletes this snippet
-include("${CMAKE_CURRENT_SOURCE_DIR}/tools/JoinPaths.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()
-
-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")
-
- if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
- set(pybind11_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
- else()
- set(pybind11_INCLUDEDIR "\$\{PACKAGE_PREFIX_DIR\}/${CMAKE_INSTALL_INCLUDEDIR}")
- endif()
-
- 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})
-
- # pkg-config support
- if(NOT prefix_for_pc_file)
- set(prefix_for_pc_file "${CMAKE_INSTALL_PREFIX}")
- endif()
- join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tools/pybind11.pc.in"
- "${CMAKE_CURRENT_BINARY_DIR}/pybind11.pc" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pybind11.pc"
- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig/")
-
- # 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")
-endif()
diff --git a/3rdParty/pybind11/pybind11-2.10.3/LICENSE b/3rdParty/pybind11/pybind11-2.10.3/LICENSE
deleted file mode 100644
index e466b0dfda14f3a7c8ece512937eb99c8b7b6d68..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/MANIFEST.in b/3rdParty/pybind11/pybind11-2.10.3/MANIFEST.in
deleted file mode 100644
index 033303a74a66febb8508a43d3567a4e47c89ad24..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/MANIFEST.in
+++ /dev/null
@@ -1,5 +0,0 @@
-recursive-include pybind11/include/pybind11 *.h
-recursive-include pybind11 *.py
-recursive-include pybind11 py.typed
-include pybind11/share/cmake/pybind11/*.cmake
-include LICENSE README.rst pyproject.toml setup.py setup.cfg
diff --git a/3rdParty/pybind11/pybind11-2.10.3/README.rst b/3rdParty/pybind11/pybind11-2.10.3/README.rst
deleted file mode 100644
index 3c75edb5753b48b6b6ee2114378ce0fa6a3890d9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/README.rst
+++ /dev/null
@@ -1,180 +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| |GitHub Discussions| |CI| |Build status|
-
-|Repology| |PyPI package| |Conda-forge| |Python Versions|
-
-`Setuptools example <https://github.com/pybind/python_example>`_
-• `Scikit-build example <https://github.com/pybind/scikit_build_example>`_
-• `CMake example <https://github.com/pybind/cmake_example>`_
-
-.. start
-
-
-**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 (3.6+, 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 3.6+, and PyPy3 7.3 are supported with an implementation-agnostic
- interface (pybind11 2.9 was the last version to support Python 2 and 3.5).
-
-- 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 <https://graylab.jhu.edu/Sergey/2016.RosettaCon/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 2017 or newer
-4. Intel classic C++ compiler 18 or newer (ICC 20.2 tested in CI)
-5. Cygwin/GCC (previously tested on 2.5.1)
-6. NVCC (CUDA 11.0 tested in CI)
-7. NVIDIA PGI (20.9 tested in CI)
-
-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, Aaron Gokaslan, 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.svg
- :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
-.. |PyPI package| image:: https://img.shields.io/pypi/v/pybind11.svg
- :target: https://pypi.org/project/pybind11/
-.. |Conda-forge| image:: https://img.shields.io/conda/vn/conda-forge/pybind11.svg
- :target: https://github.com/conda-forge/pybind11-feedstock
-.. |Repology| image:: https://repology.org/badge/latest-versions/python:pybind11.svg
- :target: https://repology.org/project/python:pybind11/versions
-.. |Python Versions| image:: https://img.shields.io/pypi/pyversions/pybind11.svg
- :target: https://pypi.org/project/pybind11/
-.. |GitHub Discussions| image:: https://img.shields.io/static/v1?label=Discussions&message=Ask&color=blue&logo=github
- :target: https://github.com/pybind/pybind11/discussions
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/Doxyfile b/3rdParty/pybind11/pybind11-2.10.3/docs/Doxyfile
deleted file mode 100644
index 09138db364a83888b793dafd7bcc680458e6570f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/Doxyfile
+++ /dev/null
@@ -1,21 +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 = PYBIND11_NOINLINE
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/_static/css/custom.css b/3rdParty/pybind11/pybind11-2.10.3/docs/_static/css/custom.css
deleted file mode 100644
index 7a49a6ac4ff10b15083f12e819854e293e44cb20..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/_static/css/custom.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.highlight .go {
- color: #707070;
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/chrono.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/chrono.rst
deleted file mode 100644
index fbd46057aa392c86ae3747c2b21768367205ea49..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/advanced/cast/custom.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/custom.rst
deleted file mode 100644
index 8138cac61996d3cc008b4d7c582d553dbd0cc5dd..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/custom.rst
+++ /dev/null
@@ -1,93 +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 { 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, const_name("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_NAMESPACE::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.10.3/docs/advanced/cast/eigen.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/eigen.rst
deleted file mode 100644
index a5c11a3f149347213362e9691c1572b852b4eb4d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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 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.10.3/docs/advanced/cast/functional.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/functional.rst
deleted file mode 100644
index d9b46057598f0d182422accd088fbff9785b0b53..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/advanced/cast/index.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/index.rst
deleted file mode 100644
index 3ce9ea0286e9dbd5fc795e60ae77a3c9afa356b8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/advanced/cast/overview.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/overview.rst
deleted file mode 100644
index 011bd4c7a3345b00d0115ddda66cdd46de2a2bbf..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/overview.rst
+++ /dev/null
@@ -1,170 +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::filesystem::path<T>`` | STL path (C++17) [#]_ | :file:`pybind11/stl/filesystem.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` |
-+------------------------------------+---------------------------+-----------------------------------+
-
-.. [#] ``std::filesystem::path`` is converted to ``pathlib.Path`` and
- ``os.PathLike`` is converted to ``std::filesystem::path``.
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/stl.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/stl.rst
deleted file mode 100644
index 03d49b2950488305a2f9c2749f756c9fa1d7e34a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/stl.rst
+++ /dev/null
@@ -1,249 +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 { 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 { 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_NAMESPACE::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.
-
-.. warning::
-
- When converting a ``variant`` type, pybind11 follows the same rules as when
- determining which function overload to call (:ref:`overload_resolution`), and
- so the same caveats hold. In particular, the order in which the ``variant``'s
- alternatives are listed is important, since pybind11 will try conversions in
- this order. This means that, for example, when converting ``variant<int, bool>``,
- the ``bool`` variant will never be selected, as any Python ``bool`` is already
- an ``int`` and is convertible to a C++ ``int``. Changing the order of alternatives
- (and using ``variant<bool, int>``, in this example) provides a solution.
-
-.. note::
-
- pybind11 only supports the modern implementation of ``boost::variant``
- which makes use of variadic templates. This requires Boost 1.56 or newer.
-
-.. _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.10.3/docs/advanced/cast/strings.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/strings.rst
deleted file mode 100644
index e246c5219a6746f20c17cac26fc760abf90a7e0d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/cast/strings.rst
+++ /dev/null
@@ -1,292 +0,0 @@
-Strings, bytes and Unicode conversions
-######################################
-
-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:: pycon
-
- >>> 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. 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:: pycon
-
- >>> 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:: pycon
-
- >>> 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:: pycon
-
- >>> 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:: pycon
-
- >>> 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;
- }
- );
-
-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:: pycon
-
- >>> 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:: pycon
-
- >>> 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:: pycon
-
- >>> 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:: pycon
-
- >>> 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.10.3/docs/advanced/classes.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/classes.rst
deleted file mode 100644
index 01a490b7219e8a7d5ebbbf8c9c5101ef5ae16f79..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/classes.rst
+++ /dev/null
@@ -1,1335 +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 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)
- 'woof! woof! woof! '
- >>> class Cat(Animal):
- ... def go(self, n_times):
- ... return "meow! " * n_times
- ...
- >>> c = Cat()
- >>> call_go(c)
- '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_OVERRIDE`` 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::pickle()`` 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
-
- import pickle
-
- p = Pickleable("test_value")
- p.setExtra(15)
- data = pickle.dumps(p)
-
-
-.. note::
- If given, the second argument to ``dumps`` must be 2 or larger - 0 and 1 are
- 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. Python defaults to version 3 (Python 3-3.7) and
- version 4 for Python 3.8+.
-
-.. 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.
-
-A class with pickle support is automatically also (deep)copy
-compatible. However, performance can be improved by adding custom
-``__copy__`` and ``__deepcopy__`` methods.
-
-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`!
-
-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
-
-Binding classes with template parameters
-========================================
-
-pybind11 can also wrap classes that have template parameters. Consider these classes:
-
-.. code-block:: cpp
-
- struct Cat {};
- struct Dog {};
-
- template <typename PetType>
- struct Cage {
- Cage(PetType& pet);
- PetType& get();
- };
-
-C++ templates may only be instantiated at compile time, so pybind11 can only
-wrap instantiated templated classes. You cannot wrap a non-instantiated template:
-
-.. code-block:: cpp
-
- // BROKEN (this will not compile)
- py::class_<Cage>(m, "Cage");
- .def("get", &Cage::get);
-
-You must explicitly specify each template/type combination that you want to
-wrap separately.
-
-.. code-block:: cpp
-
- // ok
- py::class_<Cage<Cat>>(m, "CatCage")
- .def("get", &Cage<Cat>::get);
-
- // ok
- py::class_<Cage<Dog>>(m, "DogCage")
- .def("get", &Cage<Dog>::get);
-
-If your class methods have template parameters you can wrap those as well,
-but once again each instantiation must be explicitly specified:
-
-.. code-block:: cpp
-
- typename <typename T>
- struct MyClass {
- template <typename V>
- T fn(V v);
- };
-
- py::class<MyClass<int>>(m, "MyClassT")
- .def("fn", &MyClass<int>::fn<std::string>);
-
-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_NAMESPACE {
- 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_NAMESPACE
-
-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:: cpp
-
- 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
-
-Custom type setup
-=================
-
-For advanced use cases, such as enabling garbage collection support, you may
-wish to directly manipulate the ``PyHeapTypeObject`` corresponding to a
-``py::class_`` definition.
-
-You can do that using ``py::custom_type_setup``:
-
-.. code-block:: cpp
-
- struct OwnsPythonObjects {
- py::object value = py::none();
- };
- py::class_<OwnsPythonObjects> cls(
- m, "OwnsPythonObjects", py::custom_type_setup([](PyHeapTypeObject *heap_type) {
- auto *type = &heap_type->ht_type;
- type->tp_flags |= Py_TPFLAGS_HAVE_GC;
- type->tp_traverse = [](PyObject *self_base, visitproc visit, void *arg) {
- auto &self = py::cast<OwnsPythonObjects&>(py::handle(self_base));
- Py_VISIT(self.value.ptr());
- return 0;
- };
- type->tp_clear = [](PyObject *self_base) {
- auto &self = py::cast<OwnsPythonObjects&>(py::handle(self_base));
- self.value = py::none();
- return 0;
- };
- }));
- cls.def(py::init<>());
- cls.def_readwrite("value", &OwnsPythonObjects::value);
-
-.. versionadded:: 2.8
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/embedding.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/embedding.rst
deleted file mode 100644
index dd980d483a5c5e8a5f6778fe887012b32c487bd3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/embedding.rst
+++ /dev/null
@@ -1,262 +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.10.3/docs/advanced/exceptions.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/exceptions.rst
deleted file mode 100644
index 53981dc08f145f6bfe770719da22fc865b68f318..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/exceptions.rst
+++ /dev/null
@@ -1,401 +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::key_error` | ``KeyError`` (used to indicate out |
-| | of bounds access in ``__getitem__``, |
-| | ``__setitem__`` in dict-like |
-| | objects, etc.) |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::value_error` | ``ValueError`` (used to indicate |
-| | wrong value passed in |
-| | ``container.remove(...)``) |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::type_error` | ``TypeError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::buffer_error` | ``BufferError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::import_error` | ``ImportError`` |
-+--------------------------------------+--------------------------------------+
-| :class:`pybind11::attribute_error` | ``AttributeError`` |
-+--------------------------------------+--------------------------------------+
-| Any other exception | ``RuntimeError`` |
-+--------------------------------------+--------------------------------------+
-
-Exception translation is not bidirectional. That is, *catching* the C++
-exceptions defined 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.
-Similar to pybind11 classes, exception translators can be local to the module
-they are defined in or global to the entire python session. 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``.
-
-A matching function is available for registering a local exception translator:
-
-.. code-block:: cpp
-
- py::register_local_exception<CppExp>(module, "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);
- py::register_local_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 functions
-``py::register_exception_translator(translator)`` and
-``py::register_local_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 functions 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). All local translators will be tried
-before a global translator is tried.
-
-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.
-
- Note that ``libc++`` and ``libstdc++`` `behave differently under macOS
- <https://stackoverflow.com/questions/19496643/using-clang-fvisibility-hidden-and-typeinfo-and-type-erasure/28827430>`_
- with ``-fvisibility=hidden``. Therefore exceptions that are used across ABI
- boundaries need to be explicitly exported, as exercised in
- ``tests/test_exceptions.h``. See also:
- "Problems with C++ exceptions" under `GCC Wiki <https://gcc.gnu.org/wiki/Visibility>`_.
-
-
-Local vs Global Exception Translators
-=====================================
-
-When a global exception translator is registered, it will be applied across all
-modules in the reverse order of registration. This can create behavior where the
-order of module import influences how exceptions are translated.
-
-If module1 has the following translator:
-
-.. code-block:: cpp
-
- py::register_exception_translator([](std::exception_ptr p) {
- try {
- if (p) std::rethrow_exception(p);
- } catch (const std::invalid_argument &e) {
- PyErr_SetString("module1 handled this")
- }
- }
-
-and module2 has the following similar translator:
-
-.. code-block:: cpp
-
- py::register_exception_translator([](std::exception_ptr p) {
- try {
- if (p) std::rethrow_exception(p);
- } catch (const std::invalid_argument &e) {
- PyErr_SetString("module2 handled this")
- }
- }
-
-then which translator handles the invalid_argument will be determined by the
-order that module1 and module2 are imported. Since exception translators are
-applied in the reverse order of registration, which ever module was imported
-last will "win" and that translator will be applied.
-
-If there are multiple pybind11 modules that share exception types (either
-standard built-in or custom) loaded into a single python instance and
-consistent error handling behavior is needed, then local translators should be
-used.
-
-Changing the previous example to use ``register_local_exception_translator``
-would mean that when invalid_argument is thrown in the module2 code, the
-module2 translator will always handle it, while in module1, the module1
-translator will do the same.
-
-.. _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.matches(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.
-
-Chaining exceptions ('raise from')
-==================================
-
-Python has a mechanism for indicating that exceptions were caused by other
-exceptions:
-
-.. code-block:: py
-
- try:
- print(1 / 0)
- except Exception as exc:
- raise RuntimeError("could not divide by zero") from exc
-
-To do a similar thing in pybind11, you can use the ``py::raise_from`` function. It
-sets the current python error indicator, so to continue propagating the exception
-you should ``throw py::error_already_set()``.
-
-.. code-block:: cpp
-
- try {
- py::eval("print(1 / 0"));
- } catch (py::error_already_set &e) {
- py::raise_from(e, PyExc_RuntimeError, "could not divide by zero");
- throw py::error_already_set();
- }
-
-.. versionadded:: 2.8
-
-.. _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.10.3/docs/advanced/functions.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/functions.rst
deleted file mode 100644
index 69e3d8a1dfedccba3a3efddfea4db1d949010845..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/functions.rst
+++ /dev/null
@@ -1,614 +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, py::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` | 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. This is the default policy for ``py::class_``-wrapped types. |
-+--------------------------------------------------+----------------------------------------------------------------------------+
-| :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()``) and the casters in ``pybind11/stl.h``. |
-| | You probably won't need to use this explicitly. |
-+--------------------------------------------------+----------------------------------------------------------------------------+
-
-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.
-
-If you use an incorrect argument index, you will get a ``RuntimeError`` saying
-``Could not activate keep_alive!``. You should review the indices you're using.
-
-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(const 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, const 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. Note, however, that ``py::kwargs`` must always be the last argument
-of the function, and ``py::args`` implies that any further arguments are
-keyword-only (see :ref:`keyword_only_arguments`).
-
-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:
-
-Keyword-only arguments
-======================
-
-Python implements 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"));
-
-.. versionadded:: 2.6
-
-A ``py::args`` argument implies that any following arguments are keyword-only,
-as if ``py::kw_only()`` had been specified in the same relative location of the
-argument list as the ``py::args`` argument. The ``py::kw_only()`` may be
-included to be explicit about this, but is not required.
-
-.. versionchanged:: 2.9
- This can now be combined with ``py::args``. Before, ``py::args`` could only
- occur at the end of the argument list, or immediately before a ``py::kwargs``
- argument at the end.
-
-
-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:
-
-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.
-
-Binding functions with template parameters
-==========================================
-
-You can bind functions that have template parameters. Here's a function:
-
-.. code-block:: cpp
-
- template <typename T>
- void set(T t);
-
-C++ templates cannot be instantiated at runtime, so you cannot bind the
-non-instantiated function:
-
-.. code-block:: cpp
-
- // BROKEN (this will not compile)
- m.def("set", &set);
-
-You must bind each instantiated function template separately. You may bind
-each instantiation with the same name, which will be treated the same as
-an overloaded function:
-
-.. code-block:: cpp
-
- m.def("set", &set<int>);
- m.def("set", &set<std::string>);
-
-Sometimes it's more clear to bind them with separate names, which is also
-an option:
-
-.. code-block:: cpp
-
- m.def("setInt", &set<int>);
- m.def("setString", &set<std::string>);
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/misc.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/misc.rst
deleted file mode 100644
index 805ec838fc3cc0919314409a55b1f773f5e80746..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/misc.rst
+++ /dev/null
@@ -1,400 +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)
-=============================
-
-The Python C API dictates that the Global Interpreter Lock (GIL) must always
-be held by the current thread to safely access Python objects. As a result,
-when Python calls into C++ via pybind11 the GIL must be held, and pybind11
-will never implicitly release the GIL.
-
-.. code-block:: cpp
-
- void my_function() {
- /* GIL is held when this function is called from Python */
- }
-
- PYBIND11_MODULE(example, m) {
- m.def("my_function", &my_function);
- }
-
-pybind11 will ensure that the GIL is held when it knows that it is calling
-Python code. For example, if a Python callback is passed to C++ code via
-``std::function``, when C++ code calls the function the built-in wrapper
-will acquire the GIL before calling the Python callback. Similarly, the
-``PYBIND11_OVERRIDE`` family of macros will acquire the GIL before calling
-back into Python.
-
-When writing C++ code that is called from other C++ code, if that code accesses
-Python state, it must explicitly acquire and release the GIL.
-
-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, **but great care must be taken** when any
-:class:`gil_scoped_release` appear: if there is any way that the C++ code
-can access Python objects, :class:`gil_scoped_acquire` should be used to
-reacquire the GIL. Taking :ref:`overriding_virtuals` as an example, this
-could be realized as follows (important changes highlighted):
-
-.. code-block:: cpp
- :emphasize-lines: 8,30,31
-
- class PyAnimal : public Animal {
- public:
- /* Inherit the constructors */
- using Animal::Animal;
-
- /* Trampoline (need one for each virtual function) */
- std::string go(int n_times) {
- /* PYBIND11_OVERRIDE_PURE will acquire the GIL before accessing Python state */
- 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 {
- // GIL is held when called from Python code. 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>());
-
-
-Common Sources Of Global Interpreter Lock Errors
-==================================================================
-
-Failing to properly hold the Global Interpreter Lock (GIL) is one of the
-more common sources of bugs within code that uses pybind11. If you are
-running into GIL related errors, we highly recommend you consult the
-following checklist.
-
-- Do you have any global variables that are pybind11 objects or invoke
- pybind11 functions in either their constructor or destructor? You are generally
- not allowed to invoke any Python function in a global static context. We recommend
- using lazy initialization and then intentionally leaking at the end of the program.
-
-- Do you have any pybind11 objects that are members of other C++ structures? One
- commonly overlooked requirement is that pybind11 objects have to increase their reference count
- whenever their copy constructor is called. Thus, you need to be holding the GIL to invoke
- the copy constructor of any C++ class that has a pybind11 member. This can sometimes be very
- tricky to track for complicated programs Think carefully when you make a pybind11 object
- a member in another struct.
-
-- C++ destructors that invoke Python functions can be particularly troublesome as
- destructors can sometimes get invoked in weird and unexpected circumstances as a result
- of exceptions.
-
-- You should try running your code in a debug build. That will enable additional assertions
- within pybind11 that will throw exceptions on certain GIL handling errors
- (reference counting operations).
-
-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");
- }
-
-pybind11 also appends all members of an enum to the resulting enum docstring.
-This default behavior can be disabled by using the ``disable_enum_members_docstring()``
-function of the ``options`` class.
-
-With ``disable_user_defined_docstrings()`` all user defined docstrings of
-``module_::def()``, ``class_::def()`` and ``enum_()`` are disabled, but the
-function signatures and enum members are included in the docstring, unless they
-are disabled separately.
-
-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.10.3/docs/advanced/pycpp/index.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/pycpp/index.rst
deleted file mode 100644
index 6885bdcff1b56bbab5605873ccb1e0676864bb03..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/advanced/pycpp/numpy.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/pycpp/numpy.rst
deleted file mode 100644
index 07c969305d23accc63109adab4367ec016b93a75..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/pycpp/numpy.rst
+++ /dev/null
@@ -1,455 +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 basic validation 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. This feature requires the :file:`pybind11/numpy.h`
-header to be included. Note that :file:`pybind11/numpy.h` does not depend on
-the NumPy headers, and thus can be used without declaring a build-time
-dependency on NumPy; NumPy>=1.7.0 is a runtime dependency.
-
-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.
-
-There are several methods on arrays; the methods listed below under references
-work, as well as the following functions based on the NumPy API:
-
-- ``.dtype()`` returns the type of the contained values.
-
-- ``.strides()`` returns a pointer to the strides of the array (optionally pass
- an integer axis to get a number).
-
-- ``.flags()`` returns the flag settings. ``.writable()`` and ``.owndata()``
- are directly available.
-
-- ``.offset_at()`` returns the offset (optionally pass indices).
-
-- ``.squeeze()`` returns a view with length-1 axes removed.
-
-- ``.view(dtype)`` returns a view of the array with a different dtype.
-
-- ``.reshape({i, j, ...})`` returns a view of the array with a different shape.
- ``.resize({...})`` is also available.
-
-- ``.index_at(i, j, ...)`` gets the count from the beginning to a given index.
-
-
-There are also several methods for getting references (described below).
-
-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``:
-
-- ``.ndim()`` returns the number of dimensions
-
-- ``.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 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.
-
-.. 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)];
-
-
-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
- );
- });
-
-.. versionchanged:: 2.6
- ``memoryview::from_memory`` added.
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/pycpp/object.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/pycpp/object.rst
deleted file mode 100644
index 93e1a94d8fbb987d15558d71c919fa1b3d033345..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/pycpp/object.rst
+++ /dev/null
@@ -1,286 +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.
-
-.. _instantiating_compound_types:
-
-Instantiating compound Python types from C++
-============================================
-
-Dictionaries can be initialized in the :class:`dict` constructor:
-
-.. code-block:: cpp
-
- using namespace pybind11::literals; // to bring in the `_a` literal
- py::dict d("spam"_a=py::none(), "eggs"_a=42);
-
-A tuple of python objects can be instantiated using :func:`py::make_tuple`:
-
-.. code-block:: cpp
-
- py::tuple tup = py::make_tuple(42, py::none(), "spam");
-
-Each element is converted to a supported Python type.
-
-A `simple namespace`_ can be instantiated using
-
-.. code-block:: cpp
-
- using namespace pybind11::literals; // to bring in the `_a` literal
- py::object SimpleNamespace = py::module_::import("types").attr("SimpleNamespace");
- py::object ns = SimpleNamespace("spam"_a=py::none(), "eggs"_a=42);
-
-Attributes on a namespace can be modified with the :func:`py::delattr`,
-:func:`py::getattr`, and :func:`py::setattr` functions. Simple namespaces can
-be useful as lightweight stand-ins for class instances.
-
-.. _simple namespace: https://docs.python.org/3/library/types.html#types.SimpleNamespace
-
-.. _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.10.3/docs/advanced/pycpp/utilities.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/pycpp/utilities.rst
deleted file mode 100644
index af0f9cb2b0c1a96aaec43a7570ee9636056b258e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/pycpp/utilities.rst
+++ /dev/null
@@ -1,155 +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();
- });
-
-.. warning::
-
- The implementation in ``pybind11/iostream.h`` is NOT thread safe. Multiple
- threads writing to a redirected ostream concurrently cause data races
- and potentially buffer overflows. Therefore it is currently a requirement
- that all (possibly) concurrent redirected ostream writes are protected by
- a mutex. #HelpAppreciated: Work on iostream.h thread safety. For more
- background see the discussions under
- `PR #2982 <https://github.com/pybind/pybind11/pull/2982>`_ and
- `PR #2995 <https://github.com/pybind/pybind11/pull/2995>`_.
-
-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:: cpp
-
- // 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.10.3/docs/advanced/smart_ptrs.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/smart_ptrs.rst
deleted file mode 100644
index 3c40ce12379b7fbe5bee0f92305bcbbd748832cd..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/advanced/smart_ptrs.rst
+++ /dev/null
@@ -1,174 +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 { 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.10.3/docs/basics.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/basics.rst
deleted file mode 100644
index e9b24c7fa72bf51de10d991e988e12632038a3a2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/basics.rst
+++ /dev/null
@@ -1,307 +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 2017** and newer are supported.
-
-.. 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 advised.
-
-.. _`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 that 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)
-
-.. note::
-
- If you used :ref:`include_as_a_submodule` to get the pybind11 source, then
- use ``$(python3-config --includes) -Iextern/pybind11/include`` instead of
- ``$(python3 -m pybind11 --includes)`` in the above compilation, as
- explained in :ref:`building_manually`.
-
-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 3.9.10 (main, Jan 15 2022, 11:48:04)
- [Clang 13.0.0 (clang-1300.0.29.3)] on darwin
- Type "help", "copyright", "credits" or "license" for more information.
- >>> import example
- >>> example.add(1, 2)
- 3
- >>>
-
-.. _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.10.3/docs/benchmark.py b/3rdParty/pybind11/pybind11-2.10.3/docs/benchmark.py
deleted file mode 100644
index 2150b6ca788a7c94164162d841063cafc13a0dec..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/benchmark.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import datetime as dt
-import os
-import random
-
-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 += f"class cl{cl:03};\n"
- decl += "\n"
-
- for cl in range(nclasses):
- decl += f"class {cl:03} {{\n"
- decl += "public:\n"
- bindings += f' py::class_<cl{cl:03}>(m, "cl{cl:03}")\n'
- for fn in range(nfns):
- ret = random.randint(0, nclasses - 1)
- params = [random.randint(0, nclasses - 1) for i in range(nargs)]
- decl += f" cl{ret:03} *fn_{fn:03}("
- decl += ", ".join(f"cl{p:03} *" for p in params)
- decl += ");\n"
- bindings += f' .def("fn_{fn:03}", &cl{cl:03}::fn_{fn:03})\n'
- 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 += f"class cl{cl:03};\n"
- decl += "\n"
-
- for cl in range(nclasses):
- decl += "class cl%03i {\n" % cl
- decl += "public:\n"
- bindings += f' py::class_<cl{cl:03}>("cl{cl:03}")\n'
- for fn in range(nfns):
- ret = random.randint(0, nclasses - 1)
- params = [random.randint(0, nclasses - 1) for i in range(nargs)]
- decl += f" cl{ret:03} *fn_{fn:03}("
- decl += ", ".join(f"cl{p:03} *" for p in params)
- decl += ");\n"
- bindings += f' .def("fn_{fn:03}", &cl{cl:03}::fn_{fn:03}, py::return_value_policy<py::manage_new_object>())\n'
- 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.10.3/docs/benchmark.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/benchmark.rst
deleted file mode 100644
index 02c2ccde7dc00db1e57b73a7523521f9c39a5639..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/changelog.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/changelog.rst
deleted file mode 100644
index bb111c5f2679ee32521f21cf4ab51402ba496eae..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/changelog.rst
+++ /dev/null
@@ -1,2696 +0,0 @@
-.. _changelog:
-
-Changelog
-#########
-
-Starting with version 1.8.0, pybind11 releases use a `semantic versioning
-<http://semver.org>`_ policy.
-
-Changes will be added here periodically from the "Suggested changelog entry"
-block in pull request descriptions.
-
-
-IN DEVELOPMENT
---------------
-
-Changes will be summarized here periodically.
-
-Changes:
-
-* ``PyGILState_Check()``'s in ``pybind11::handle``'s ``inc_ref()`` &
- ``dec_ref()`` are now enabled by default again.
- `#4246 <https://github.com/pybind/pybind11/pull/4246>`_
-
-Build system improvements:
-
-* Update clang-tidy to 15 in CI.
- `#4387 <https://github.com/pybind/pybind11/pull/4387>`_
-
-
-Version 2.10.3 (Jan 3, 2023)
-----------------------------
-
-Changes:
-
-* Temporarily made our GIL status assertions (added in 2.10.2) disabled by
- default (re-enable manually by defining
- ``PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF``, will be enabled in 2.11).
- `#4432 <https://github.com/pybind/pybind11/pull/4432>`_
-
-* Improved error messages when ``inc_ref``/``dec_ref`` are called with an
- invalid GIL state.
- `#4427 <https://github.com/pybind/pybind11/pull/4427>`_
- `#4436 <https://github.com/pybind/pybind11/pull/4436>`_
-
-Bug Fixes:
-
-* Some minor touchups found by static analyzers.
- `#4440 <https://github.com/pybind/pybind11/pull/4440>`_
-
-
-Version 2.10.2 (Dec 20, 2022)
------------------------------
-
-Changes:
-
-* ``scoped_interpreter`` constructor taking ``PyConfig``.
- `#4330 <https://github.com/pybind/pybind11/pull/4330>`_
-
-* ``pybind11/eigen/tensor.h`` adds converters to and from ``Eigen::Tensor`` and
- ``Eigen::TensorMap``.
- `#4201 <https://github.com/pybind/pybind11/pull/4201>`_
-
-* ``PyGILState_Check()``'s were integrated to ``pybind11::handle``
- ``inc_ref()`` & ``dec_ref()``. The added GIL checks are guarded by
- ``PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF``, which is the default only if
- ``NDEBUG`` is not defined. (Made non-default in 2.10.3, will be active in 2.11)
- `#4246 <https://github.com/pybind/pybind11/pull/4246>`_
-
-* Add option for enable/disable enum members in docstring.
- `#2768 <https://github.com/pybind/pybind11/pull/2768>`_
-
-* Fixed typing of ``KeysView``, ``ValuesView`` and ``ItemsView`` in ``bind_map``.
- `#4353 <https://github.com/pybind/pybind11/pull/4353>`_
-
-Bug fixes:
-
-* Bug fix affecting only Python 3.6 under very specific, uncommon conditions:
- move ``PyEval_InitThreads()`` call to the correct location.
- `#4350 <https://github.com/pybind/pybind11/pull/4350>`_
-
-* Fix segfault bug when passing foreign native functions to functional.h.
- `#4254 <https://github.com/pybind/pybind11/pull/4254>`_
-
-Build system improvements:
-
-* Support setting PYTHON_LIBRARIES manually for Windows ARM cross-compilation
- (classic mode).
- `#4406 <https://github.com/pybind/pybind11/pull/4406>`_
-
-* Extend IPO/LTO detection for ICX (a.k.a IntelLLVM) compiler.
- `#4402 <https://github.com/pybind/pybind11/pull/4402>`_
-
-* Allow calling ``find_package(pybind11 CONFIG)`` multiple times from separate
- directories in the same CMake project and properly link Python (new mode).
- `#4401 <https://github.com/pybind/pybind11/pull/4401>`_
-
-* ``multiprocessing_set_spawn`` in pytest fixture for added safety.
- `#4377 <https://github.com/pybind/pybind11/pull/4377>`_
-
-* Fixed a bug in two pybind11/tools cmake scripts causing "Unknown arguments specified" errors.
- `#4327 <https://github.com/pybind/pybind11/pull/4327>`_
-
-
-
-Version 2.10.1 (Oct 31, 2022)
------------------------------
-
-This is the first version to fully support embedding the newly released Python 3.11.
-
-Changes:
-
-* Allow ``pybind11::capsule`` constructor to take null destructor pointers.
- `#4221 <https://github.com/pybind/pybind11/pull/4221>`_
-
-* ``embed.h`` was changed so that ``PYTHONPATH`` is used also with Python 3.11
- (established behavior).
- `#4119 <https://github.com/pybind/pybind11/pull/4119>`_
-
-* A ``PYBIND11_SIMPLE_GIL_MANAGEMENT`` option was added (cmake, C++ define),
- along with many additional tests in ``test_gil_scoped.py``. The option may be
- useful to try when debugging GIL-related issues, to determine if the more
- complex default implementation is or is not to blame. See #4216 for
- background. WARNING: Please be careful to not create ODR violations when
- using the option: everything that is linked together with mutual symbol
- visibility needs to be rebuilt.
- `#4216 <https://github.com/pybind/pybind11/pull/4216>`_
-
-* ``PYBIND11_EXPORT_EXCEPTION`` was made non-empty only under macOS. This makes
- Linux builds safer, and enables the removal of warning suppression pragmas for
- Windows.
- `#4298 <https://github.com/pybind/pybind11/pull/4298>`_
-
-Bug fixes:
-
-* Fixed a bug where ``UnicodeDecodeError`` was not propagated from various
- ``py::str`` ctors when decoding surrogate utf characters.
- `#4294 <https://github.com/pybind/pybind11/pull/4294>`_
-
-* Revert perfect forwarding for ``make_iterator``. This broke at least one
- valid use case. May revisit later.
- `#4234 <https://github.com/pybind/pybind11/pull/4234>`_
-
-* Fix support for safe casts to ``void*`` (regression in 2.10.0).
- `#4275 <https://github.com/pybind/pybind11/pull/4275>`_
-
-* Fix ``char8_t`` support (regression in 2.9).
- `#4278 <https://github.com/pybind/pybind11/pull/4278>`_
-
-* Unicode surrogate character in Python exception message leads to process
- termination in ``error_already_set::what()``.
- `#4297 <https://github.com/pybind/pybind11/pull/4297>`_
-
-* Fix MSVC 2019 v.1924 & C++14 mode error for ``overload_cast``.
- `#4188 <https://github.com/pybind/pybind11/pull/4188>`_
-
-* Make augmented assignment operators non-const for the object-api. Behavior
- was previously broken for augmented assignment operators.
- `#4065 <https://github.com/pybind/pybind11/pull/4065>`_
-
-* Add proper error checking to C++ bindings for Python list append and insert.
- `#4208 <https://github.com/pybind/pybind11/pull/4208>`_
-
-* Work-around for Nvidia's CUDA nvcc compiler in versions 11.4.0 - 11.8.0.
- `#4220 <https://github.com/pybind/pybind11/pull/4220>`_
-
-* A workaround for PyPy was added in the ``py::error_already_set``
- implementation, related to PR `#1895 <https://github.com/pybind/pybind11/pull/1895>`_
- released with v2.10.0.
- `#4079 <https://github.com/pybind/pybind11/pull/4079>`_
-
-* Fixed compiler errors when C++23 ``std::forward_like`` is available.
- `#4136 <https://github.com/pybind/pybind11/pull/4136>`_
-
-* Properly raise exceptions in contains methods (like when an object in unhashable).
- `#4209 <https://github.com/pybind/pybind11/pull/4209>`_
-
-* Further improve another error in exception handling.
- `#4232 <https://github.com/pybind/pybind11/pull/4232>`_
-
-* ``get_local_internals()`` was made compatible with
- ``finalize_interpreter()``, fixing potential freezes during interpreter
- finalization.
- `#4192 <https://github.com/pybind/pybind11/pull/4192>`_
-
-Performance and style:
-
-* Reserve space in set and STL map casters if possible. This will prevent
- unnecessary rehashing / resizing by knowing the number of keys ahead of time
- for Python to C++ casting. This improvement will greatly speed up the casting
- of large unordered maps and sets.
- `#4194 <https://github.com/pybind/pybind11/pull/4194>`_
-
-* GIL RAII scopes are non-copyable to avoid potential bugs.
- `#4183 <https://github.com/pybind/pybind11/pull/4183>`_
-
-* Explicitly default all relevant ctors for pytypes in the ``PYBIND11_OBJECT``
- macros and enforce the clang-tidy checks ``modernize-use-equals-default`` in
- macros as well.
- `#4017 <https://github.com/pybind/pybind11/pull/4017>`_
-
-* Optimize iterator advancement in C++ bindings.
- `#4237 <https://github.com/pybind/pybind11/pull/4237>`_
-
-* Use the modern ``PyObject_GenericGetDict`` and ``PyObject_GenericSetDict``
- for handling dynamic attribute dictionaries.
- `#4106 <https://github.com/pybind/pybind11/pull/4106>`_
-
-* Document that users should use ``PYBIND11_NAMESPACE`` instead of using ``pybind11`` when
- opening namespaces. Using namespace declarations and namespace qualification
- remain the same as ``pybind11``. This is done to ensure consistent symbol
- visibility.
- `#4098 <https://github.com/pybind/pybind11/pull/4098>`_
-
-* Mark ``detail::forward_like`` as constexpr.
- `#4147 <https://github.com/pybind/pybind11/pull/4147>`_
-
-* Optimize unpacking_collector when processing ``arg_v`` arguments.
- `#4219 <https://github.com/pybind/pybind11/pull/4219>`_
-
-* Optimize casting C++ object to ``None``.
- `#4269 <https://github.com/pybind/pybind11/pull/4269>`_
-
-
-Build system improvements:
-
-* CMake: revert overwrite behavior, now opt-in with ``PYBIND11_PYTHONLIBS_OVERRWRITE OFF``.
- `#4195 <https://github.com/pybind/pybind11/pull/4195>`_
-
-* Include a pkg-config file when installing pybind11, such as in the Python
- package.
- `#4077 <https://github.com/pybind/pybind11/pull/4077>`_
-
-* Avoid stripping debug symbols when ``CMAKE_BUILD_TYPE`` is set to ``DEBUG``
- instead of ``Debug``.
- `#4078 <https://github.com/pybind/pybind11/pull/4078>`_
-
-* Followup to `#3948 <https://github.com/pybind/pybind11/pull/3948>`_, fixing vcpkg again.
- `#4123 <https://github.com/pybind/pybind11/pull/4123>`_
-
-Version 2.10.0 (Jul 15, 2022)
------------------------------
-
-Removed support for Python 2.7, Python 3.5, and MSVC 2015. Support for MSVC
-2017 is limited due to availability of CI runners; we highly recommend MSVC
-2019 or 2022 be used. Initial support added for Python 3.11.
-
-New features:
-
-* ``py::anyset`` & ``py::frozenset`` were added, with copying (cast) to
- ``std::set`` (similar to ``set``).
- `#3901 <https://github.com/pybind/pybind11/pull/3901>`_
-
-* Support bytearray casting to string.
- `#3707 <https://github.com/pybind/pybind11/pull/3707>`_
-
-* ``type_caster<std::monostate>`` was added. ``std::monostate`` is a tag type
- that allows ``std::variant`` to act as an optional, or allows default
- construction of a ``std::variant`` holding a non-default constructible type.
- `#3818 <https://github.com/pybind/pybind11/pull/3818>`_
-
-* ``pybind11::capsule::set_name`` added to mutate the name of the capsule instance.
- `#3866 <https://github.com/pybind/pybind11/pull/3866>`_
-
-* NumPy: dtype constructor from type number added, accessors corresponding to
- Python API ``dtype.num``, ``dtype.byteorder``, ``dtype.flags`` and
- ``dtype.alignment`` added.
- `#3868 <https://github.com/pybind/pybind11/pull/3868>`_
-
-
-Changes:
-
-* Python 3.6 is now the minimum supported version.
- `#3688 <https://github.com/pybind/pybind11/pull/3688>`_
- `#3719 <https://github.com/pybind/pybind11/pull/3719>`_
-
-* The minimum version for MSVC is now 2017.
- `#3722 <https://github.com/pybind/pybind11/pull/3722>`_
-
-* Fix issues with CPython 3.11 betas and add to supported test matrix.
- `#3923 <https://github.com/pybind/pybind11/pull/3923>`_
-
-* ``error_already_set`` is now safer and more performant, especially for
- exceptions with long tracebacks, by delaying computation.
- `#1895 <https://github.com/pybind/pybind11/pull/1895>`_
-
-* Improve exception handling in python ``str`` bindings.
- `#3826 <https://github.com/pybind/pybind11/pull/3826>`_
-
-* The bindings for capsules now have more consistent exception handling.
- `#3825 <https://github.com/pybind/pybind11/pull/3825>`_
-
-* ``PYBIND11_OBJECT_CVT`` and ``PYBIND11_OBJECT_CVT_DEFAULT`` macro can now be
- used to define classes in namespaces other than pybind11.
- `#3797 <https://github.com/pybind/pybind11/pull/3797>`_
-
-* Error printing code now uses ``PYBIND11_DETAILED_ERROR_MESSAGES`` instead of
- requiring ``NDEBUG``, allowing use with release builds if desired.
- `#3913 <https://github.com/pybind/pybind11/pull/3913>`_
-
-* Implicit conversion of the literal ``0`` to ``pybind11::handle`` is now disabled.
- `#4008 <https://github.com/pybind/pybind11/pull/4008>`_
-
-
-Bug fixes:
-
-* Fix exception handling when ``pybind11::weakref()`` fails.
- `#3739 <https://github.com/pybind/pybind11/pull/3739>`_
-
-* ``module_::def_submodule`` was missing proper error handling. This is fixed now.
- `#3973 <https://github.com/pybind/pybind11/pull/3973>`_
-
-* The behavior or ``error_already_set`` was made safer and the highly opaque
- "Unknown internal error occurred" message was replaced with a more helpful
- message.
- `#3982 <https://github.com/pybind/pybind11/pull/3982>`_
-
-* ``error_already_set::what()`` now handles non-normalized exceptions correctly.
- `#3971 <https://github.com/pybind/pybind11/pull/3971>`_
-
-* Support older C++ compilers where filesystem is not yet part of the standard
- library and is instead included in ``std::experimental::filesystem``.
- `#3840 <https://github.com/pybind/pybind11/pull/3840>`_
-
-* Fix ``-Wfree-nonheap-object`` warnings produced by GCC by avoiding returning
- pointers to static objects with ``return_value_policy::take_ownership``.
- `#3946 <https://github.com/pybind/pybind11/pull/3946>`_
-
-* Fix cast from pytype rvalue to another pytype.
- `#3949 <https://github.com/pybind/pybind11/pull/3949>`_
-
-* Ensure proper behavior when garbage collecting classes with dynamic attributes in Python >=3.9.
- `#4051 <https://github.com/pybind/pybind11/pull/4051>`_
-
-* A couple long-standing ``PYBIND11_NAMESPACE``
- ``__attribute__((visibility("hidden")))`` inconsistencies are now fixed
- (affects only unusual environments).
- `#4043 <https://github.com/pybind/pybind11/pull/4043>`_
-
-* ``pybind11::detail::get_internals()`` is now resilient to in-flight Python
- exceptions.
- `#3981 <https://github.com/pybind/pybind11/pull/3981>`_
-
-* Arrays with a dimension of size 0 are now properly converted to dynamic Eigen
- matrices (more common in NumPy 1.23).
- `#4038 <https://github.com/pybind/pybind11/pull/4038>`_
-
-* Avoid catching unrelated errors when importing NumPy.
- `#3974 <https://github.com/pybind/pybind11/pull/3974>`_
-
-Performance and style:
-
-* Added an accessor overload of ``(object &&key)`` to reference steal the
- object when using python types as keys. This prevents unnecessary reference
- count overhead for attr, dictionary, tuple, and sequence look ups. Added
- additional regression tests. Fixed a performance bug the caused accessor
- assignments to potentially perform unnecessary copies.
- `#3970 <https://github.com/pybind/pybind11/pull/3970>`_
-
-* Perfect forward all args of ``make_iterator``.
- `#3980 <https://github.com/pybind/pybind11/pull/3980>`_
-
-* Avoid potential bug in pycapsule destructor by adding an ``error_guard`` to
- one of the dtors.
- `#3958 <https://github.com/pybind/pybind11/pull/3958>`_
-
-* Optimize dictionary access in ``strip_padding`` for numpy.
- `#3994 <https://github.com/pybind/pybind11/pull/3994>`_
-
-* ``stl_bind.h`` bindings now take slice args as a const-ref.
- `#3852 <https://github.com/pybind/pybind11/pull/3852>`_
-
-* Made slice constructor more consistent, and improve performance of some
- casters by allowing reference stealing.
- `#3845 <https://github.com/pybind/pybind11/pull/3845>`_
-
-* Change numpy dtype from_args method to use const ref.
- `#3878 <https://github.com/pybind/pybind11/pull/3878>`_
-
-* Follow rule of three to ensure ``PyErr_Restore`` is called only once.
- `#3872 <https://github.com/pybind/pybind11/pull/3872>`_
-
-* Added missing perfect forwarding for ``make_iterator`` functions.
- `#3860 <https://github.com/pybind/pybind11/pull/3860>`_
-
-* Optimize c++ to python function casting by using the rvalue caster.
- `#3966 <https://github.com/pybind/pybind11/pull/3966>`_
-
-* Optimize Eigen sparse matrix casting by removing unnecessary temporary.
- `#4064 <https://github.com/pybind/pybind11/pull/4064>`_
-
-* Avoid potential implicit copy/assignment constructors causing double free in
- ``strdup_gaurd``.
- `#3905 <https://github.com/pybind/pybind11/pull/3905>`_
-
-* Enable clang-tidy checks ``misc-definitions-in-headers``,
- ``modernize-loop-convert``, and ``modernize-use-nullptr``.
- `#3881 <https://github.com/pybind/pybind11/pull/3881>`_
- `#3988 <https://github.com/pybind/pybind11/pull/3988>`_
-
-
-Build system improvements:
-
-* CMake: Fix file extension on Windows with cp36 and cp37 using FindPython.
- `#3919 <https://github.com/pybind/pybind11/pull/3919>`_
-
-* CMake: Support multiple Python targets (such as on vcpkg).
- `#3948 <https://github.com/pybind/pybind11/pull/3948>`_
-
-* CMake: Fix issue with NVCC on Windows.
- `#3947 <https://github.com/pybind/pybind11/pull/3947>`_
-
-* CMake: Drop the bitness check on cross compiles (like targeting WebAssembly
- via Emscripten).
- `#3959 <https://github.com/pybind/pybind11/pull/3959>`_
-
-* Add MSVC builds in debug mode to CI.
- `#3784 <https://github.com/pybind/pybind11/pull/3784>`_
-
-* MSVC 2022 C++20 coverage was added to GitHub Actions, including Eigen.
- `#3732 <https://github.com/pybind/pybind11/pull/3732>`_,
- `#3741 <https://github.com/pybind/pybind11/pull/3741>`_
-
-
-Backend and tidying up:
-
-* New theme for the documentation.
- `#3109 <https://github.com/pybind/pybind11/pull/3109>`_
-
-* Remove idioms in code comments. Use more inclusive language.
- `#3809 <https://github.com/pybind/pybind11/pull/3809>`_
-
-* ``#include <iostream>`` was removed from the ``pybind11/stl.h`` header. Your
- project may break if it has a transitive dependency on this include. The fix
- is to "Include What You Use".
- `#3928 <https://github.com/pybind/pybind11/pull/3928>`_
-
-* Avoid ``setup.py <command>`` usage in internal tests.
- `#3734 <https://github.com/pybind/pybind11/pull/3734>`_
-
-
-Version 2.9.2 (Mar 29, 2022)
-----------------------------
-
-Changes:
-
-* Enum now has an ``__index__`` method on Python <3.8 too.
- `#3700 <https://github.com/pybind/pybind11/pull/3700>`_
-
-* Local internals are now cleared after finalizing the interpreter.
- `#3744 <https://github.com/pybind/pybind11/pull/3744>`_
-
-Bug fixes:
-
-* Better support for Python 3.11 alphas.
- `#3694 <https://github.com/pybind/pybind11/pull/3694>`_
-
-* ``PYBIND11_TYPE_CASTER`` now uses fully qualified symbols, so it can be used
- outside of ``pybind11::detail``.
- `#3758 <https://github.com/pybind/pybind11/pull/3758>`_
-
-* Some fixes for PyPy 3.9.
- `#3768 <https://github.com/pybind/pybind11/pull/3768>`_
-
-* Fixed a potential memleak in PyPy in ``get_type_override``.
- `#3774 <https://github.com/pybind/pybind11/pull/3774>`_
-
-* Fix usage of ``VISIBILITY_INLINES_HIDDEN``.
- `#3721 <https://github.com/pybind/pybind11/pull/3721>`_
-
-
-Build system improvements:
-
-* Uses ``sysconfig`` module to determine installation locations on Python >=
- 3.10, instead of ``distutils`` which has been deprecated.
- `#3764 <https://github.com/pybind/pybind11/pull/3764>`_
-
-* Support Catch 2.13.5+ (supporting GLIBC 2.34+).
- `#3679 <https://github.com/pybind/pybind11/pull/3679>`_
-
-* Fix test failures with numpy 1.22 by ignoring whitespace when comparing
- ``str()`` of dtypes.
- `#3682 <https://github.com/pybind/pybind11/pull/3682>`_
-
-
-Backend and tidying up:
-
-* clang-tidy: added ``readability-qualified-auto``,
- ``readability-braces-around-statements``,
- ``cppcoreguidelines-prefer-member-initializer``,
- ``clang-analyzer-optin.performance.Padding``,
- ``cppcoreguidelines-pro-type-static-cast-downcast``, and
- ``readability-inconsistent-declaration-parameter-name``.
- `#3702 <https://github.com/pybind/pybind11/pull/3702>`_,
- `#3699 <https://github.com/pybind/pybind11/pull/3699>`_,
- `#3716 <https://github.com/pybind/pybind11/pull/3716>`_,
- `#3709 <https://github.com/pybind/pybind11/pull/3709>`_
-
-* clang-format was added to the pre-commit actions, and the entire code base
- automatically reformatted (after several iterations preparing for this leap).
- `#3713 <https://github.com/pybind/pybind11/pull/3713>`_
-
-
-Version 2.9.1 (Feb 2, 2022)
----------------------------
-
-Changes:
-
-* If possible, attach Python exception with ``py::raise_from`` to ``TypeError``
- when casting from C++ to Python. This will give additional info if Python
- exceptions occur in the caster. Adds a test case of trying to convert a set
- from C++ to Python when the hash function is not defined in Python.
- `#3605 <https://github.com/pybind/pybind11/pull/3605>`_
-
-* Add a mapping of C++11 nested exceptions to their Python exception
- equivalent using ``py::raise_from``. This attaches the nested exceptions in
- Python using the ``__cause__`` field.
- `#3608 <https://github.com/pybind/pybind11/pull/3608>`_
-
-* Propagate Python exception traceback using ``raise_from`` if a pybind11
- function runs out of overloads.
- `#3671 <https://github.com/pybind/pybind11/pull/3671>`_
-
-* ``py::multiple_inheritance`` is now only needed when C++ bases are hidden
- from pybind11.
- `#3650 <https://github.com/pybind/pybind11/pull/3650>`_ and
- `#3659 <https://github.com/pybind/pybind11/pull/3659>`_
-
-
-Bug fixes:
-
-* Remove a boolean cast in ``numpy.h`` that causes MSVC C4800 warnings when
- compiling against Python 3.10 or newer.
- `#3669 <https://github.com/pybind/pybind11/pull/3669>`_
-
-* Render ``py::bool_`` and ``py::float_`` as ``bool`` and ``float``
- respectively.
- `#3622 <https://github.com/pybind/pybind11/pull/3622>`_
-
-Build system improvements:
-
-* Fix CMake extension suffix computation on Python 3.10+.
- `#3663 <https://github.com/pybind/pybind11/pull/3663>`_
-
-* Allow ``CMAKE_ARGS`` to override CMake args in pybind11's own ``setup.py``.
- `#3577 <https://github.com/pybind/pybind11/pull/3577>`_
-
-* Remove a few deprecated c-headers.
- `#3610 <https://github.com/pybind/pybind11/pull/3610>`_
-
-* More uniform handling of test targets.
- `#3590 <https://github.com/pybind/pybind11/pull/3590>`_
-
-* Add clang-tidy readability check to catch potentially swapped function args.
- `#3611 <https://github.com/pybind/pybind11/pull/3611>`_
-
-
-Version 2.9.0 (Dec 28, 2021)
-----------------------------
-
-This is the last version to support Python 2.7 and 3.5.
-
-New Features:
-
-* Allow ``py::args`` to be followed by other arguments; the remaining arguments
- are implicitly keyword-only, as if a ``py::kw_only{}`` annotation had been
- used.
- `#3402 <https://github.com/pybind/pybind11/pull/3402>`_
-
-Changes:
-
-* Make str/bytes/memoryview more interoperable with ``std::string_view``.
- `#3521 <https://github.com/pybind/pybind11/pull/3521>`_
-
-* Replace ``_`` with ``const_name`` in internals, avoid defining ``pybind::_``
- if ``_`` defined as macro (common gettext usage)
- `#3423 <https://github.com/pybind/pybind11/pull/3423>`_
-
-
-Bug fixes:
-
-* Fix a rare warning about extra copy in an Eigen constructor.
- `#3486 <https://github.com/pybind/pybind11/pull/3486>`_
-
-* Fix caching of the C++ overrides.
- `#3465 <https://github.com/pybind/pybind11/pull/3465>`_
-
-* Add missing ``std::forward`` calls to some ``cpp_function`` overloads.
- `#3443 <https://github.com/pybind/pybind11/pull/3443>`_
-
-* Support PyPy 7.3.7 and the PyPy3.8 beta. Test python-3.11 on PRs with the
- ``python dev`` label.
- `#3419 <https://github.com/pybind/pybind11/pull/3419>`_
-
-* Replace usage of deprecated ``Eigen::MappedSparseMatrix`` with
- ``Eigen::Map<Eigen::SparseMatrix<...>>`` for Eigen 3.3+.
- `#3499 <https://github.com/pybind/pybind11/pull/3499>`_
-
-* Tweaks to support Microsoft Visual Studio 2022.
- `#3497 <https://github.com/pybind/pybind11/pull/3497>`_
-
-Build system improvements:
-
-* Nicer CMake printout and IDE organisation for pybind11's own tests.
- `#3479 <https://github.com/pybind/pybind11/pull/3479>`_
-
-* CMake: report version type as part of the version string to avoid a spurious
- space in the package status message.
- `#3472 <https://github.com/pybind/pybind11/pull/3472>`_
-
-* Flags starting with ``-g`` in ``$CFLAGS`` and ``$CPPFLAGS`` are no longer
- overridden by ``.Pybind11Extension``.
- `#3436 <https://github.com/pybind/pybind11/pull/3436>`_
-
-* Ensure ThreadPool is closed in ``setup_helpers``.
- `#3548 <https://github.com/pybind/pybind11/pull/3548>`_
-
-* Avoid LTS on ``mips64`` and ``ppc64le`` (reported broken).
- `#3557 <https://github.com/pybind/pybind11/pull/3557>`_
-
-
-v2.8.1 (Oct 27, 2021)
----------------------
-
-Changes and additions:
-
-* The simple namespace creation shortcut added in 2.8.0 was deprecated due to
- usage of CPython internal API, and will be removed soon. Use
- ``py::module_::import("types").attr("SimpleNamespace")``.
- `#3374 <https://github.com/pybinyyd/pybind11/pull/3374>`_
-
-* Add C++ Exception type to throw and catch ``AttributeError``. Useful for
- defining custom ``__setattr__`` and ``__getattr__`` methods.
- `#3387 <https://github.com/pybind/pybind11/pull/3387>`_
-
-Fixes:
-
-* Fixed the potential for dangling references when using properties with
- ``std::optional`` types.
- `#3376 <https://github.com/pybind/pybind11/pull/3376>`_
-
-* Modernize usage of ``PyCodeObject`` on Python 3.9+ (moving toward support for
- Python 3.11a1)
- `#3368 <https://github.com/pybind/pybind11/pull/3368>`_
-
-* A long-standing bug in ``eigen.h`` was fixed (originally PR #3343). The bug
- was unmasked by newly added ``static_assert``'s in the Eigen 3.4.0 release.
- `#3352 <https://github.com/pybind/pybind11/pull/3352>`_
-
-* Support multiple raw inclusion of CMake helper files (Conan.io does this for
- multi-config generators).
- `#3420 <https://github.com/pybind/pybind11/pull/3420>`_
-
-* Fix harmless warning on upcoming CMake 3.22.
- `#3368 <https://github.com/pybind/pybind11/pull/3368>`_
-
-* Fix 2.8.0 regression with MSVC 2017 + C++17 mode + Python 3.
- `#3407 <https://github.com/pybind/pybind11/pull/3407>`_
-
-* Fix 2.8.0 regression that caused undefined behavior (typically
- segfaults) in ``make_key_iterator``/``make_value_iterator`` if dereferencing
- the iterator returned a temporary value instead of a reference.
- `#3348 <https://github.com/pybind/pybind11/pull/3348>`_
-
-
-v2.8.0 (Oct 4, 2021)
---------------------
-
-New features:
-
-* Added ``py::raise_from`` to enable chaining exceptions.
- `#3215 <https://github.com/pybind/pybind11/pull/3215>`_
-
-* Allow exception translators to be optionally registered local to a module
- instead of applying globally across all pybind11 modules. Use
- ``register_local_exception_translator(ExceptionTranslator&& translator)``
- instead of ``register_exception_translator(ExceptionTranslator&&
- translator)`` to keep your exception remapping code local to the module.
- `#2650 <https://github.com/pybinyyd/pybind11/pull/2650>`_
-
-* Add ``make_simple_namespace`` function for instantiating Python
- ``SimpleNamespace`` objects. **Deprecated in 2.8.1.**
- `#2840 <https://github.com/pybind/pybind11/pull/2840>`_
-
-* ``pybind11::scoped_interpreter`` and ``initialize_interpreter`` have new
- arguments to allow ``sys.argv`` initialization.
- `#2341 <https://github.com/pybind/pybind11/pull/2341>`_
-
-* Allow Python builtins to be used as callbacks in CPython.
- `#1413 <https://github.com/pybind/pybind11/pull/1413>`_
-
-* Added ``view`` to view arrays with a different datatype.
- `#987 <https://github.com/pybind/pybind11/pull/987>`_
-
-* Implemented ``reshape`` on arrays.
- `#984 <https://github.com/pybind/pybind11/pull/984>`_
-
-* Enable defining custom ``__new__`` methods on classes by fixing bug
- preventing overriding methods if they have non-pybind11 siblings.
- `#3265 <https://github.com/pybind/pybind11/pull/3265>`_
-
-* Add ``make_value_iterator()``, and fix ``make_key_iterator()`` to return
- references instead of copies.
- `#3293 <https://github.com/pybind/pybind11/pull/3293>`_
-
-* Improve the classes generated by ``bind_map``: `#3310 <https://github.com/pybind/pybind11/pull/3310>`_
-
- * Change ``.items`` from an iterator to a dictionary view.
- * Add ``.keys`` and ``.values`` (both dictionary views).
- * Allow ``__contains__`` to take any object.
-
-* ``pybind11::custom_type_setup`` was added, for customizing the
- ``PyHeapTypeObject`` corresponding to a class, which may be useful for
- enabling garbage collection support, among other things.
- `#3287 <https://github.com/pybind/pybind11/pull/3287>`_
-
-
-Changes:
-
-* Set ``__file__`` constant when running ``eval_file`` in an embedded interpreter.
- `#3233 <https://github.com/pybind/pybind11/pull/3233>`_
-
-* Python objects and (C++17) ``std::optional`` now accepted in ``py::slice``
- constructor.
- `#1101 <https://github.com/pybind/pybind11/pull/1101>`_
-
-* The pybind11 proxy types ``str``, ``bytes``, ``bytearray``, ``tuple``,
- ``list`` now consistently support passing ``ssize_t`` values for sizes and
- indexes. Previously, only ``size_t`` was accepted in several interfaces.
- `#3219 <https://github.com/pybind/pybind11/pull/3219>`_
-
-* Avoid evaluating ``PYBIND11_TLS_REPLACE_VALUE`` arguments more than once.
- `#3290 <https://github.com/pybind/pybind11/pull/3290>`_
-
-Fixes:
-
-* Bug fix: enum value's ``__int__`` returning non-int when underlying type is
- bool or of char type.
- `#1334 <https://github.com/pybind/pybind11/pull/1334>`_
-
-* Fixes bug in setting error state in Capsule's pointer methods.
- `#3261 <https://github.com/pybind/pybind11/pull/3261>`_
-
-* A long-standing memory leak in ``py::cpp_function::initialize`` was fixed.
- `#3229 <https://github.com/pybind/pybind11/pull/3229>`_
-
-* Fixes thread safety for some ``pybind11::type_caster`` which require lifetime
- extension, such as for ``std::string_view``.
- `#3237 <https://github.com/pybind/pybind11/pull/3237>`_
-
-* Restore compatibility with gcc 4.8.4 as distributed by ubuntu-trusty, linuxmint-17.
- `#3270 <https://github.com/pybind/pybind11/pull/3270>`_
-
-
-Build system improvements:
-
-* Fix regression in CMake Python package config: improper use of absolute path.
- `#3144 <https://github.com/pybind/pybind11/pull/3144>`_
-
-* Cached Python version information could become stale when CMake was re-run
- with a different Python version. The build system now detects this and
- updates this information.
- `#3299 <https://github.com/pybind/pybind11/pull/3299>`_
-
-* Specified UTF8-encoding in setup.py calls of open().
- `#3137 <https://github.com/pybind/pybind11/pull/3137>`_
-
-* Fix a harmless warning from CMake 3.21 with the classic Python discovery.
- `#3220 <https://github.com/pybind/pybind11/pull/3220>`_
-
-* Eigen repo and version can now be specified as cmake options.
- `#3324 <https://github.com/pybind/pybind11/pull/3324>`_
-
-
-Backend and tidying up:
-
-* Reduced thread-local storage required for keeping alive temporary data for
- type conversion to one key per ABI version, rather than one key per extension
- module. This makes the total thread-local storage required by pybind11 2
- keys per ABI version.
- `#3275 <https://github.com/pybind/pybind11/pull/3275>`_
-
-* Optimize NumPy array construction with additional moves.
- `#3183 <https://github.com/pybind/pybind11/pull/3183>`_
-
-* Conversion to ``std::string`` and ``std::string_view`` now avoids making an
- extra copy of the data on Python >= 3.3.
- `#3257 <https://github.com/pybind/pybind11/pull/3257>`_
-
-* Remove const modifier from certain C++ methods on Python collections
- (``list``, ``set``, ``dict``) such as (``clear()``, ``append()``,
- ``insert()``, etc...) and annotated them with ``py-non-const``.
-
-* Enable readability ``clang-tidy-const-return`` and remove useless consts.
- `#3254 <https://github.com/pybind/pybind11/pull/3254>`_
- `#3194 <https://github.com/pybind/pybind11/pull/3194>`_
-
-* The clang-tidy ``google-explicit-constructor`` option was enabled.
- `#3250 <https://github.com/pybind/pybind11/pull/3250>`_
-
-* Mark a pytype move constructor as noexcept (perf).
- `#3236 <https://github.com/pybind/pybind11/pull/3236>`_
-
-* Enable clang-tidy check to guard against inheritance slicing.
- `#3210 <https://github.com/pybind/pybind11/pull/3210>`_
-
-* Legacy warning suppression pragma were removed from eigen.h. On Unix
- platforms, please use -isystem for Eigen include directories, to suppress
- compiler warnings originating from Eigen headers. Note that CMake does this
- by default. No adjustments are needed for Windows.
- `#3198 <https://github.com/pybind/pybind11/pull/3198>`_
-
-* Format pybind11 with isort consistent ordering of imports
- `#3195 <https://github.com/pybind/pybind11/pull/3195>`_
-
-* The warnings-suppression "pragma clamp" at the top/bottom of pybind11 was
- removed, clearing the path to refactoring and IWYU cleanup.
- `#3186 <https://github.com/pybind/pybind11/pull/3186>`_
-
-* Enable most bugprone checks in clang-tidy and fix the found potential bugs
- and poor coding styles.
- `#3166 <https://github.com/pybind/pybind11/pull/3166>`_
-
-* Add ``clang-tidy-readability`` rules to make boolean casts explicit improving
- code readability. Also enabled other misc and readability clang-tidy checks.
- `#3148 <https://github.com/pybind/pybind11/pull/3148>`_
-
-* Move object in ``.pop()`` for list.
- `#3116 <https://github.com/pybind/pybind11/pull/3116>`_
-
-
-
-
-v2.7.1 (Aug 3, 2021)
----------------------
-
-Minor missing functionality added:
-
-* Allow Python builtins to be used as callbacks in CPython.
- `#1413 <https://github.com/pybind/pybind11/pull/1413>`_
-
-Bug fixes:
-
-* Fix regression in CMake Python package config: improper use of absolute path.
- `#3144 <https://github.com/pybind/pybind11/pull/3144>`_
-
-* Fix Mingw64 and add to the CI testing matrix.
- `#3132 <https://github.com/pybind/pybind11/pull/3132>`_
-
-* Specified UTF8-encoding in setup.py calls of open().
- `#3137 <https://github.com/pybind/pybind11/pull/3137>`_
-
-* Add clang-tidy-readability rules to make boolean casts explicit improving
- code readability. Also enabled other misc and readability clang-tidy checks.
- `#3148 <https://github.com/pybind/pybind11/pull/3148>`_
-
-* Move object in ``.pop()`` for list.
- `#3116 <https://github.com/pybind/pybind11/pull/3116>`_
-
-Backend and tidying up:
-
-* Removed and fixed warning suppressions.
- `#3127 <https://github.com/pybind/pybind11/pull/3127>`_
- `#3129 <https://github.com/pybind/pybind11/pull/3129>`_
- `#3135 <https://github.com/pybind/pybind11/pull/3135>`_
- `#3141 <https://github.com/pybind/pybind11/pull/3141>`_
- `#3142 <https://github.com/pybind/pybind11/pull/3142>`_
- `#3150 <https://github.com/pybind/pybind11/pull/3150>`_
- `#3152 <https://github.com/pybind/pybind11/pull/3152>`_
- `#3160 <https://github.com/pybind/pybind11/pull/3160>`_
- `#3161 <https://github.com/pybind/pybind11/pull/3161>`_
-
-
-v2.7.0 (Jul 16, 2021)
----------------------
-
-New features:
-
-* Enable ``py::implicitly_convertible<py::none, ...>`` for
- ``py::class_``-wrapped types.
- `#3059 <https://github.com/pybind/pybind11/pull/3059>`_
-
-* Allow function pointer extraction from overloaded functions.
- `#2944 <https://github.com/pybind/pybind11/pull/2944>`_
-
-* NumPy: added ``.char_()`` to type which gives the NumPy public ``char``
- result, which also distinguishes types by bit length (unlike ``.kind()``).
- `#2864 <https://github.com/pybind/pybind11/pull/2864>`_
-
-* Add ``pybind11::bytearray`` to manipulate ``bytearray`` similar to ``bytes``.
- `#2799 <https://github.com/pybind/pybind11/pull/2799>`_
-
-* ``pybind11/stl/filesystem.h`` registers a type caster that, on C++17/Python
- 3.6+, converts ``std::filesystem::path`` to ``pathlib.Path`` and any
- ``os.PathLike`` to ``std::filesystem::path``.
- `#2730 <https://github.com/pybind/pybind11/pull/2730>`_
-
-* A ``PYBIND11_VERSION_HEX`` define was added, similar to ``PY_VERSION_HEX``.
- `#3120 <https://github.com/pybind/pybind11/pull/3120>`_
-
-
-
-Changes:
-
-* ``py::str`` changed to exclusively hold ``PyUnicodeObject``. Previously
- ``py::str`` could also hold ``bytes``, which is probably surprising, was
- never documented, and can mask bugs (e.g. accidental use of ``py::str``
- instead of ``py::bytes``).
- `#2409 <https://github.com/pybind/pybind11/pull/2409>`_
-
-* Add a safety guard to ensure that the Python GIL is held when C++ calls back
- into Python via ``object_api<>::operator()`` (e.g. ``py::function``
- ``__call__``). (This feature is available for Python 3.6+ only.)
- `#2919 <https://github.com/pybind/pybind11/pull/2919>`_
-
-* Catch a missing ``self`` argument in calls to ``__init__()``.
- `#2914 <https://github.com/pybind/pybind11/pull/2914>`_
-
-* Use ``std::string_view`` if available to avoid a copy when passing an object
- to a ``std::ostream``.
- `#3042 <https://github.com/pybind/pybind11/pull/3042>`_
-
-* An important warning about thread safety was added to the ``iostream.h``
- documentation; attempts to make ``py::scoped_ostream_redirect`` thread safe
- have been removed, as it was only partially effective.
- `#2995 <https://github.com/pybind/pybind11/pull/2995>`_
-
-
-Fixes:
-
-* Performance: avoid unnecessary strlen calls.
- `#3058 <https://github.com/pybind/pybind11/pull/3058>`_
-
-* Fix auto-generated documentation string when using ``const T`` in
- ``pyarray_t``.
- `#3020 <https://github.com/pybind/pybind11/pull/3020>`_
-
-* Unify error messages thrown by ``simple_collector``/``unpacking_collector``.
- `#3013 <https://github.com/pybind/pybind11/pull/3013>`_
-
-* ``pybind11::builtin_exception`` is now explicitly exported, which means the
- types included/defined in different modules are identical, and exceptions
- raised in different modules can be caught correctly. The documentation was
- updated to explain that custom exceptions that are used across module
- boundaries need to be explicitly exported as well.
- `#2999 <https://github.com/pybind/pybind11/pull/2999>`_
-
-* Fixed exception when printing UTF-8 to a ``scoped_ostream_redirect``.
- `#2982 <https://github.com/pybind/pybind11/pull/2982>`_
-
-* Pickle support enhancement: ``setstate`` implementation will attempt to
- ``setattr`` ``__dict__`` only if the unpickled ``dict`` object is not empty,
- to not force use of ``py::dynamic_attr()`` unnecessarily.
- `#2972 <https://github.com/pybind/pybind11/pull/2972>`_
-
-* Allow negative timedelta values to roundtrip.
- `#2870 <https://github.com/pybind/pybind11/pull/2870>`_
-
-* Fix unchecked errors could potentially swallow signals/other exceptions.
- `#2863 <https://github.com/pybind/pybind11/pull/2863>`_
-
-* Add null pointer check with ``std::localtime``.
- `#2846 <https://github.com/pybind/pybind11/pull/2846>`_
-
-* Fix the ``weakref`` constructor from ``py::object`` to create a new
- ``weakref`` on conversion.
- `#2832 <https://github.com/pybind/pybind11/pull/2832>`_
-
-* Avoid relying on exceptions in C++17 when getting a ``shared_ptr`` holder
- from a ``shared_from_this`` class.
- `#2819 <https://github.com/pybind/pybind11/pull/2819>`_
-
-* Allow the codec's exception to be raised instead of :code:`RuntimeError` when
- casting from :code:`py::str` to :code:`std::string`.
- `#2903 <https://github.com/pybind/pybind11/pull/2903>`_
-
-
-Build system improvements:
-
-* In ``setup_helpers.py``, test for platforms that have some multiprocessing
- features but lack semaphores, which ``ParallelCompile`` requires.
- `#3043 <https://github.com/pybind/pybind11/pull/3043>`_
-
-* Fix ``pybind11_INCLUDE_DIR`` in case ``CMAKE_INSTALL_INCLUDEDIR`` is
- absolute.
- `#3005 <https://github.com/pybind/pybind11/pull/3005>`_
-
-* Fix bug not respecting ``WITH_SOABI`` or ``WITHOUT_SOABI`` to CMake.
- `#2938 <https://github.com/pybind/pybind11/pull/2938>`_
-
-* Fix the default ``Pybind11Extension`` compilation flags with a Mingw64 python.
- `#2921 <https://github.com/pybind/pybind11/pull/2921>`_
-
-* Clang on Windows: do not pass ``/MP`` (ignored flag).
- `#2824 <https://github.com/pybind/pybind11/pull/2824>`_
-
-* ``pybind11.setup_helpers.intree_extensions`` can be used to generate
- ``Pybind11Extension`` instances from cpp files placed in the Python package
- source tree.
- `#2831 <https://github.com/pybind/pybind11/pull/2831>`_
-
-Backend and tidying up:
-
-* Enable clang-tidy performance, readability, and modernization checks
- throughout the codebase to enforce best coding practices.
- `#3046 <https://github.com/pybind/pybind11/pull/3046>`_,
- `#3049 <https://github.com/pybind/pybind11/pull/3049>`_,
- `#3051 <https://github.com/pybind/pybind11/pull/3051>`_,
- `#3052 <https://github.com/pybind/pybind11/pull/3052>`_,
- `#3080 <https://github.com/pybind/pybind11/pull/3080>`_, and
- `#3094 <https://github.com/pybind/pybind11/pull/3094>`_
-
-
-* Checks for common misspellings were added to the pre-commit hooks.
- `#3076 <https://github.com/pybind/pybind11/pull/3076>`_
-
-* Changed ``Werror`` to stricter ``Werror-all`` for Intel compiler and fixed
- minor issues.
- `#2948 <https://github.com/pybind/pybind11/pull/2948>`_
-
-* Fixed compilation with GCC < 5 when the user defines ``_GLIBCXX_USE_CXX11_ABI``.
- `#2956 <https://github.com/pybind/pybind11/pull/2956>`_
-
-* Added nox support for easier local testing and linting of contributions.
- `#3101 <https://github.com/pybind/pybind11/pull/3101>`_ and
- `#3121 <https://github.com/pybind/pybind11/pull/3121>`_
-
-* Avoid RTD style issue with docutils 0.17+.
- `#3119 <https://github.com/pybind/pybind11/pull/3119>`_
-
-* Support pipx run, such as ``pipx run pybind11 --include`` for a quick compile.
- `#3117 <https://github.com/pybind/pybind11/pull/3117>`_
-
-
-
-v2.6.2 (Jan 26, 2021)
----------------------
-
-Minor missing functionality added:
-
-* enum: add missing Enum.value property.
- `#2739 <https://github.com/pybind/pybind11/pull/2739>`_
-
-* Allow thread termination to be avoided during shutdown for CPython 3.7+ via
- ``.disarm`` for ``gil_scoped_acquire``/``gil_scoped_release``.
- `#2657 <https://github.com/pybind/pybind11/pull/2657>`_
-
-Fixed or improved behavior in a few special cases:
-
-* Fix bug where the constructor of ``object`` subclasses would not throw on
- being passed a Python object of the wrong type.
- `#2701 <https://github.com/pybind/pybind11/pull/2701>`_
-
-* The ``type_caster`` for integers does not convert Python objects with
- ``__int__`` anymore with ``noconvert`` or during the first round of trying
- overloads.
- `#2698 <https://github.com/pybind/pybind11/pull/2698>`_
-
-* When casting to a C++ integer, ``__index__`` is always called and not
- considered as conversion, consistent with Python 3.8+.
- `#2801 <https://github.com/pybind/pybind11/pull/2801>`_
-
-Build improvements:
-
-* Setup helpers: ``extra_compile_args`` and ``extra_link_args`` automatically set by
- Pybind11Extension are now prepended, which allows them to be overridden
- by user-set ``extra_compile_args`` and ``extra_link_args``.
- `#2808 <https://github.com/pybind/pybind11/pull/2808>`_
-
-* Setup helpers: Don't trigger unused parameter warning.
- `#2735 <https://github.com/pybind/pybind11/pull/2735>`_
-
-* CMake: Support running with ``--warn-uninitialized`` active.
- `#2806 <https://github.com/pybind/pybind11/pull/2806>`_
-
-* CMake: Avoid error if included from two submodule directories.
- `#2804 <https://github.com/pybind/pybind11/pull/2804>`_
-
-* CMake: Fix ``STATIC`` / ``SHARED`` being ignored in FindPython mode.
- `#2796 <https://github.com/pybind/pybind11/pull/2796>`_
-
-* CMake: Respect the setting for ``CMAKE_CXX_VISIBILITY_PRESET`` if defined.
- `#2793 <https://github.com/pybind/pybind11/pull/2793>`_
-
-* CMake: Fix issue with FindPython2/FindPython3 not working with ``pybind11::embed``.
- `#2662 <https://github.com/pybind/pybind11/pull/2662>`_
-
-* CMake: mixing local and installed pybind11's would prioritize the installed
- one over the local one (regression in 2.6.0).
- `#2716 <https://github.com/pybind/pybind11/pull/2716>`_
-
-
-Bug fixes:
-
-* Fixed segfault in multithreaded environments when using
- ``scoped_ostream_redirect``.
- `#2675 <https://github.com/pybind/pybind11/pull/2675>`_
-
-* Leave docstring unset when all docstring-related options are disabled, rather
- than set an empty string.
- `#2745 <https://github.com/pybind/pybind11/pull/2745>`_
-
-* The module key in builtins that pybind11 uses to store its internals changed
- from std::string to a python str type (more natural on Python 2, no change on
- Python 3).
- `#2814 <https://github.com/pybind/pybind11/pull/2814>`_
-
-* Fixed assertion error related to unhandled (later overwritten) exception in
- CPython 3.8 and 3.9 debug builds.
- `#2685 <https://github.com/pybind/pybind11/pull/2685>`_
-
-* Fix ``py::gil_scoped_acquire`` assert with CPython 3.9 debug build.
- `#2683 <https://github.com/pybind/pybind11/pull/2683>`_
-
-* Fix issue with a test failing on pytest 6.2.
- `#2741 <https://github.com/pybind/pybind11/pull/2741>`_
-
-Warning fixes:
-
-* Fix warning modifying constructor parameter 'flag' that shadows a field of
- 'set_flag' ``[-Wshadow-field-in-constructor-modified]``.
- `#2780 <https://github.com/pybind/pybind11/pull/2780>`_
-
-* Suppressed some deprecation warnings about old-style
- ``__init__``/``__setstate__`` in the tests.
- `#2759 <https://github.com/pybind/pybind11/pull/2759>`_
-
-Valgrind work:
-
-* Fix invalid access when calling a pybind11 ``__init__`` on a non-pybind11
- class instance.
- `#2755 <https://github.com/pybind/pybind11/pull/2755>`_
-
-* Fixed various minor memory leaks in pybind11's test suite.
- `#2758 <https://github.com/pybind/pybind11/pull/2758>`_
-
-* Resolved memory leak in cpp_function initialization when exceptions occurred.
- `#2756 <https://github.com/pybind/pybind11/pull/2756>`_
-
-* Added a Valgrind build, checking for leaks and memory-related UB, to CI.
- `#2746 <https://github.com/pybind/pybind11/pull/2746>`_
-
-Compiler support:
-
-* Intel compiler was not activating C++14 support due to a broken define.
- `#2679 <https://github.com/pybind/pybind11/pull/2679>`_
-
-* Support ICC and NVIDIA HPC SDK in C++17 mode.
- `#2729 <https://github.com/pybind/pybind11/pull/2729>`_
-
-* Support Intel OneAPI compiler (ICC 20.2) and add to CI.
- `#2573 <https://github.com/pybind/pybind11/pull/2573>`_
-
-
-
-v2.6.1 (Nov 11, 2020)
----------------------
-
-* ``py::exec``, ``py::eval``, and ``py::eval_file`` now add the builtins module
- as ``"__builtins__"`` to their ``globals`` argument, better matching ``exec``
- and ``eval`` in pure Python.
- `#2616 <https://github.com/pybind/pybind11/pull/2616>`_
-
-* ``setup_helpers`` will no longer set a minimum macOS version higher than the
- current version.
- `#2622 <https://github.com/pybind/pybind11/pull/2622>`_
-
-* Allow deleting static properties.
- `#2629 <https://github.com/pybind/pybind11/pull/2629>`_
-
-* Seal a leak in ``def_buffer``, cleaning up the ``capture`` object after the
- ``class_`` object goes out of scope.
- `#2634 <https://github.com/pybind/pybind11/pull/2634>`_
-
-* ``pybind11_INCLUDE_DIRS`` was incorrect, potentially causing a regression if
- it was expected to include ``PYTHON_INCLUDE_DIRS`` (please use targets
- instead).
- `#2636 <https://github.com/pybind/pybind11/pull/2636>`_
-
-* Added parameter names to the ``py::enum_`` constructor and methods, avoiding
- ``arg0`` in the generated docstrings.
- `#2637 <https://github.com/pybind/pybind11/pull/2637>`_
-
-* Added ``needs_recompile`` optional function to the ``ParallelCompiler``
- helper, to allow a recompile to be skipped based on a user-defined function.
- `#2643 <https://github.com/pybind/pybind11/pull/2643>`_
-
-
-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 parentheses.
- `#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.10.3/docs/classes.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/classes.rst
deleted file mode 100644
index c0c53135b8da64bc561a4a58b379124ff6744c84..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/classes.rst
+++ /dev/null
@@ -1,541 +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()
- 'Molly'
- >>> p.setName("Charly")
- >>> p.getName()
- '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
- 'Molly'
- >>> p.name = "Charly"
- >>> p.name
- '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
- 'Molly'
- >>> p.bark()
- '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()
- '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.
-
-.. 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 internal types like enumerations, e.g.:
-
-.. code-block:: cpp
-
- struct Pet {
- enum Kind {
- Dog = 0,
- Cat
- };
-
- struct Attributes {
- float age = 0;
- };
-
- Pet(const std::string &name, Kind type) : name(name), type(type) { }
-
- std::string name;
- Kind type;
- Attributes attr;
- };
-
-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)
- .def_readwrite("attr", &Pet::attr);
-
- py::enum_<Pet::Kind>(pet, "Kind")
- .value("Dog", Pet::Kind::Dog)
- .value("Cat", Pet::Kind::Cat)
- .export_values();
-
- py::class_<Pet::Attributes>(pet, "Attributes")
- .def(py::init<>())
- .def_readwrite("age", &Pet::Attributes::age);
-
-
-To ensure that the nested types ``Kind`` and ``Attributes`` are created within the scope of ``Pet``, the
-``pet`` :class:`class_` instance must be supplied to the :class:`enum_` and :class:`class_`
-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.10.3/docs/cmake/index.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/cmake/index.rst
deleted file mode 100644
index eaf66d70f31fadc25bc6810aa458854893b9db6e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/compiling.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/compiling.rst
deleted file mode 100644
index 2b543be0be45f38b08d69978dd0f9788eb32791e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/compiling.rst
+++ /dev/null
@@ -1,638 +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)
-
-If you have single-file extension modules that are directly stored in the
-Python source tree (``foo.cpp`` in the same directory as where a ``foo.py``
-would be located), you can also generate ``Pybind11Extensions`` using
-``setup_helpers.intree_extensions``: ``intree_extensions(["path/to/foo.cpp",
-...])`` returns a list of ``Pybind11Extensions`` which can be passed to
-``ext_modules``, possibly after further customizing their attributes
-(``libraries``, ``include_dirs``, etc.). By doing so, a ``foo.*.so`` extension
-module will be generated and made available upon installation.
-
-``intree_extension`` will automatically detect if you are using a ``src``-style
-layout (as long as no namespace packages are involved), but you can also
-explicitly pass ``package_dir`` to it (as in ``setuptools.setup``).
-
-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; ``CMAKE_BUILD_PARALLEL_LEVEL`` is another choice
-a user might expect. 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.
-
-If you are developing rapidly and have a lot of C++ files, you may want to
-avoid rebuilding files that have not changed. For simple cases were you are
-using ``pip install -e .`` and do not have local headers, you can skip the
-rebuild if an object file is newer than its source (headers are not checked!)
-with the following:
-
-.. code-block:: python
-
- from pybind11.setup_helpers import ParallelCompile, naive_recompile
-
- ParallelCompile("NPY_NUM_BUILD_JOBS", needs_recompile=naive_recompile).install()
-
-
-If you have a more complex build, you can implement a smarter function and pass
-it to ``needs_recompile``, or you can use [Ccache]_ instead. ``CXX="cache g++"
-pip install -e .`` would be the way to use it with GCC, for example. Unlike the
-simple solution, this even works even when not compiling in editable mode, but
-it does require Ccache to be installed.
-
-Keep in mind that Pip will not even attempt to rebuild if it thinks it has
-already built a copy of your code, which it deduces from the version number.
-One way to avoid this is to use [setuptools_scm]_, which will generate a
-version number that includes the number of commits since your last tag and a
-hash for a dirty directory. Another way to force a rebuild is purge your cache
-or use Pip's ``--no-cache-dir`` option.
-
-.. [Ccache] https://ccache.dev
-
-.. [setuptools_scm] https://github.com/pypa/setuptools_scm
-
-.. _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>=42", "wheel", "pybind11~=2.6.1"]
- 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. If you are building SDists and wheels, then
- `pypa-build`_ is the recommended official tool.
-
-.. _PEP 517: https://www.python.org/dev/peps/pep-0517/
-.. _cibuildwheel: https://cibuildwheel.readthedocs.io
-.. _pypa-build: https://pypa-build.readthedocs.io/en/latest/
-
-.. _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 extensions 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, 3.18.2+ ideal) 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_minimum_required(VERSION 3.15...3.22)
- project(example LANGUAGES CXX)
-
- find_package(Python 3.6 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 FindPython to multi-target Python versions, 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).
-
-.. warning::
-
- When the Python libraries (i.e. ``libpythonXX.a`` and ``libpythonXX.so``
- on Unix) are not available, as is the case on a manylinux image, the
- ``Development`` component will not be resolved by ``FindPython``. When not
- using the embedding functionality, CMake 3.18+ allows you to specify
- ``Development.Module`` instead of ``Development`` to resolve this issue.
-
-.. 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::pybind11``
- Python headers + ``pybind11::headers``
-
- ``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::Python`` (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)
- if(NOT MSVC AND NOT ${CMAKE_BUILD_TYPE} MATCHES Debug|RelWithDebInfo)
- # Strip unnecessary sections of the binary on Linux/macOS
- pybind11_strip(example)
- endif()
-
- 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 especially 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 ``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``.
-
-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.10.3/docs/conf.py b/3rdParty/pybind11/pybind11-2.10.3/docs/conf.py
deleted file mode 100644
index 2da6773f4f6c81891f2c5f1fc27783e21d6babd2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/conf.py
+++ /dev/null
@@ -1,369 +0,0 @@
-#!/usr/bin/env python3
-#
-# 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 os
-import re
-import subprocess
-import sys
-from pathlib import Path
-
-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",
- "sphinx_copybutton",
- "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.
-
-html_theme = "furo"
-
-# 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"]
-
-html_css_files = [
- "css/custom.css",
-]
-
-# 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_engine = "pdflatex"
-
-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(f"doxygen error code: {-retcode}\n")
- except OSError as e:
- sys.stderr.write(f"doxygen execution failed: {e}\n")
-
-
-def prepare(app):
- with open(DIR.parent / "README.rst") as f:
- contents = f.read()
-
- if app.builder.name == "latex":
- # Remove badges and stuff from start
- contents = contents[contents.find(r".. start") :]
-
- # Filter out section titles for index.rst for 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.10.3/docs/faq.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/faq.rst
deleted file mode 100644
index 28498e7dfcb56059b1698cd2b3cd6635e3467c9d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/faq.rst
+++ /dev/null
@@ -1,307 +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 that does not match what you compiled with.
-
-"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, ``-fvisibility=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 metaprogramming 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.
-
-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.
-
-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.10.3/docs/index.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/index.rst
deleted file mode 100644
index 4e2e8ca3a04a072d9adfdfa4bb98f5c221be10ea..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/installing.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/installing.rst
deleted file mode 100644
index 30b9f1853d7edf9b90f88ff347be63648056f99f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/installing.rst
+++ /dev/null
@@ -1,105 +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:
-
-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 -b stable ../../pybind/pybind11 extern/pybind11
- 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.10.3/docs/limitations.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/limitations.rst
deleted file mode 100644
index def5ad659c98c6d7b04dc5af49f084e90dc65a76..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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 exactly 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 was `fixed in Python <https://github.com/python/cpython/pull/22670>`_.
-As a mitigation for this bug, pybind11 2.6.0 or newer includes a 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 (even if built with Python 3.9.0)
-will correctly avoid the leak when run in Python 3.9.1, and this does not
-affect other 3.X versions.
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11-logo.png b/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11-logo.png
deleted file mode 100644
index 2d633a4d0c129d6bdd94b4134c9516fdc92bb192..0000000000000000000000000000000000000000
Binary files a/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11-logo.png and /dev/null differ
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python1.png b/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python1.png
deleted file mode 100644
index 833231f240809884fb6eb4079db528b9b3c0a9ac..0000000000000000000000000000000000000000
Binary files a/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python1.png and /dev/null differ
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python1.svg b/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python1.svg
deleted file mode 100644
index 5bf950e6fdc81676d9a9774926a623b4f6a2e2a8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/pybind11_vs_boost_python2.png b/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python2.png
deleted file mode 100644
index 9f17272c50663957d6ae6d8e23fdd5a15757e71f..0000000000000000000000000000000000000000
Binary files a/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python2.png and /dev/null differ
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python2.svg b/3rdParty/pybind11/pybind11-2.10.3/docs/pybind11_vs_boost_python2.svg
deleted file mode 100644
index 5ed6530ca112cbe643d5dd6d6fde385c4edea6b5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/docs/reference.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/reference.rst
deleted file mode 100644
index e64a03519da2461e5cea7109b569b72fbcd2bfac..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/reference.rst
+++ /dev/null
@@ -1,130 +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:
-
-Convenience functions converting to Python types
-================================================
-
-.. doxygenfunction:: make_tuple(Args&&...)
-
-.. doxygenfunction:: make_iterator(Iterator, Sentinel, Extra &&...)
-.. doxygenfunction:: make_iterator(Type &, Extra&&...)
-
-.. doxygenfunction:: make_key_iterator(Iterator, Sentinel, Extra &&...)
-.. doxygenfunction:: make_key_iterator(Type &, Extra&&...)
-
-.. doxygenfunction:: make_value_iterator(Iterator, Sentinel, Extra &&...)
-.. doxygenfunction:: make_value_iterator(Type &, Extra&&...)
-
-.. _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.10.3/docs/release.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/release.rst
deleted file mode 100644
index e761cdf7a60f7b5587fb358e05e1e4f652427190..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/release.rst
+++ /dev/null
@@ -1,97 +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. There is also a HEX version of
-the version just below.
-
-
-To release a new version of pybind11:
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If you don't have nox, you should either use ``pipx run nox`` instead, or use
-``pipx install nox`` or ``brew install nox`` (Unix).
-
-- Update the version number
- - Update ``PYBIND11_VERSION_MAJOR`` etc. in
- ``include/pybind11/detail/common.h``. PATCH should be a simple integer.
- - Update the version HEX just below, as well.
- - Update ``pybind11/_version.py`` (match above)
- - Run ``nox -s tests_packaging`` to ensure this was done correctly.
- - Ensure that all the information in ``setup.cfg`` is up-to-date, like
- supported Python versions.
- - Add release date in ``docs/changelog.rst``.
- - Check to make sure
- `needs-changelog <https://github.com/pybind/pybind11/pulls?q=is%3Apr+is%3Aclosed+label%3A%22needs+changelog%22>`_
- issues are entered in the changelog (clear the label when done).
- - ``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, or update the existing release branch if it is a patch version
- - New branch: ``git checkout -b vX.Y``, ``git push -u origin vX.Y``
- - Update branch: ``git checkout vX.Y``, ``git merge <release branch>``, ``git push``
-- 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: Under `releases <https://github.com/pybind/pybind11/releases>`_
- click "Draft 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 copy-and-paste the markdown-formatted (!) changelog
- into the description (usually ``cat docs/changelog.rst | pandoc -f rst -t gfm``).
- 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/detail/common.h`` (set PATCH to
- ``0.dev1`` and increment MINOR).
- - Update ``_version.py`` to match
- - Run ``nox -s tests_packaging`` to ensure this was done correctly.
- - Add a spot 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``.
-
-If you'd like to bump homebrew, run:
-
-.. code-block:: console
-
- brew bump-formula-pr --url https://github.com/pybind/pybind11/archive/vX.Y.Z.tar.gz
-
-Conda-forge should automatically make a PR in a few hours, and automatically
-merge it if there are no issues.
-
-
-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
-
- nox -s build
- twine upload dist/*
-
-This makes SDists and wheels, and the final line uploads them.
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/requirements.txt b/3rdParty/pybind11/pybind11-2.10.3/docs/requirements.txt
deleted file mode 100644
index d2a9ae1645be110a5db5405d454176082d3f9296..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-breathe==4.34.0
-furo==2022.6.21
-sphinx==5.0.2
-sphinx-copybutton==0.5.0
-sphinxcontrib-moderncmakedomain==3.21.4
-sphinxcontrib-svg2pdfconverter==1.2.0
diff --git a/3rdParty/pybind11/pybind11-2.10.3/docs/upgrade.rst b/3rdParty/pybind11/pybind11-2.10.3/docs/upgrade.rst
deleted file mode 100644
index 6a9db2d08f52e48c2ea90d1a1b4ae5083c567703..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/docs/upgrade.rst
+++ /dev/null
@@ -1,552 +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.9:
-
-v2.9
-====
-
-* Any usage of the recently added ``py::make_simple_namespace`` should be
- converted to using ``py::module_::import("types").attr("SimpleNamespace")``
- instead.
-
-* The use of ``_`` in custom type casters can now be replaced with the more
- readable ``const_name`` instead. The old ``_`` shortcut has been retained
- unless it is being used as a macro (like for gettext).
-
-
-.. _upgrade-guide-2.7:
-
-v2.7
-====
-
-*Before* v2.7, ``py::str`` can hold ``PyUnicodeObject`` or ``PyBytesObject``,
-and ``py::isinstance<str>()`` is ``true`` for both ``py::str`` and
-``py::bytes``. Starting with v2.7, ``py::str`` exclusively holds
-``PyUnicodeObject`` (`#2409 <https://github.com/pybind/pybind11/pull/2409>`_),
-and ``py::isinstance<str>()`` is ``true`` only for ``py::str``. To help in
-the transition of user code, the ``PYBIND11_STR_LEGACY_PERMISSIVE`` macro
-is provided as an escape hatch to go back to the legacy behavior. This macro
-will be removed in future releases. Two types of required fixes are expected
-to be common:
-
-* Accidental use of ``py::str`` instead of ``py::bytes``, masked by the legacy
- behavior. These are probably very easy to fix, by changing from
- ``py::str`` to ``py::bytes``.
-
-* Reliance on py::isinstance<str>(obj) being ``true`` for
- ``py::bytes``. This is likely to be easy to fix in most cases by adding
- ``|| py::isinstance<bytes>(obj)``, but a fix may be more involved, e.g. if
- ``py::isinstance<T>`` appears in a template. Such situations will require
- careful review and custom fixes.
-
-
-.. _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(self.value1(), self.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 its 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.10.3/include/pybind11/attr.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/attr.h
deleted file mode 100644
index b5e3b7b22c994c63154dc23f51a7d138fcbf2e7d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/attr.h
+++ /dev/null
@@ -1,678 +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 "detail/common.h"
-#include "cast.h"
-
-#include <functional>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-/// \addtogroup annotations
-/// @{
-
-/// Annotation for methods
-struct is_method {
- handle class_;
- explicit 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;
- explicit scope(const handle &s) : value(s) {}
-};
-
-/// Annotation for documentation
-struct doc {
- const char *value;
- explicit doc(const char *value) : value(value) {}
-};
-
-/// Annotation for function names
-struct name {
- const char *value;
- explicit name(const char *value) : value(value) {}
-};
-
-/// Annotation indicating that a function is an overload associated with a given "sibling"
-struct sibling {
- handle value;
- explicit 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() = default;
-};
-
-/// 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() = default;
-
- /// Override pybind11's default metaclass
- explicit metaclass(handle value) : value(value) {}
-};
-
-/// Specifies a custom callback with signature `void (PyHeapTypeObject*)` that
-/// may be used to customize the Python type.
-///
-/// The callback is invoked immediately before `PyType_Ready`.
-///
-/// Note: This is an advanced interface, and uses of it may require changes to
-/// work with later versions of pybind11. You may wish to consult the
-/// implementation of `make_new_python_type` in `detail/classes.h` to understand
-/// the context in which the callback will be run.
-struct custom_type_setup {
- using callback = std::function<void(PyHeapTypeObject *heap_type)>;
-
- explicit custom_type_setup(callback value) : value(std::move(value)) {}
-
- callback value;
-};
-
-/// Annotation that marks a class as local to the module:
-struct module_local {
- const bool value;
- constexpr explicit 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_;
-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),
- 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 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 leading positional arguments, which are terminated by a py::args or py::kwargs
- /// argument or by a py::kw_only annotation.
- std::uint16_t nargs_pos = 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;
-
- /// Custom type setup.
- custom_type_setup::callback custom_type_setup_callback;
-
- /// 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 PY_VERSION_HEX < 0x030B0000
- dynamic_attr |= base_info->type->tp_dictoffset != 0;
-#else
- dynamic_attr |= (base_info->type->tp_flags & Py_TPFLAGS_MANAGED_DICT) != 0;
-#endif
-
- 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 = 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 check_kw_only_arg(const arg &a, function_record *r) {
- if (r->args.size() > r->nargs_pos && (!a.name || a.name[0] == '\0')) {
- pybind11_fail("arg(): cannot specify an unnamed argument after a kw_only() annotation or "
- "args() argument");
- }
-}
-
-inline void append_self_arg_if_needed(function_record *r) {
- if (r->is_method && r->args.empty()) {
- r->args.emplace_back("self", nullptr, handle(), /*convert=*/true, /*none=*/false);
- }
-}
-
-/// 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) {
- append_self_arg_if_needed(r);
- r->args.emplace_back(a.name, nullptr, handle(), !a.flag_noconvert, a.flag_none);
-
- check_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", /*descr=*/nullptr, /*parent=*/handle(), /*convert=*/true, /*none=*/false);
- }
-
- if (!a.value) {
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
- 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?). "
- "#define PYBIND11_DETAILED_ERROR_MESSAGES or 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);
-
- check_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) {
- append_self_arg_if_needed(r);
- if (r->has_args && r->nargs_pos != static_cast<std::uint16_t>(r->args.size())) {
- pybind11_fail("Mismatched args() and kw_only(): they must occur at the same relative "
- "argument location (or omit kw_only() entirely)");
- }
- r->nargs_pos = static_cast<std::uint16_t>(r->args.size());
- }
-};
-
-/// 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) {
- append_self_arg_if_needed(r);
- r->nargs_pos_only = static_cast<std::uint16_t>(r->args.size());
- if (r->nargs_pos_only > r->nargs_pos) {
- pybind11_fail("pos_only(): cannot follow a py::args() argument");
- }
- // It also can't follow a kw_only, but a static_assert in pybind11.h checks that
- }
-};
-
-/// 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<custom_type_setup> {
- static void init(const custom_type_setup &value, type_record *r) {
- r->custom_type_setup_callback = value.value;
- }
-};
-
-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) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(r);
- PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(r);
- using expander = int[];
- (void) expander{
- 0, ((void) process_attribute<typename std::decay<Args>::type>::init(args, r), 0)...};
- }
- static void init(const Args &...args, type_record *r) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(r);
- PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(r);
- using expander = int[];
- (void) expander{0,
- (process_attribute<typename std::decay<Args>::type>::init(args, r), 0)...};
- }
- static void precall(function_call &call) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(call);
- using expander = int[];
- (void) expander{0,
- (process_attribute<typename std::decay<Args>::type>::precall(call), 0)...};
- }
- static void postcall(function_call &call, handle fn_ret) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(call, fn_ret);
- PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(fn_ret);
- using expander = int[];
- (void) expander{
- 0, (process_attribute<typename std::decay<Args>::type>::postcall(call, fn_ret), 0)...};
- }
-};
-
-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) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(nargs, has_args, has_kwargs);
- return named == 0 || (self + named + size_t(has_args) + size_t(has_kwargs)) == nargs;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/buffer_info.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/buffer_info.h
deleted file mode 100644
index 06120d5563f5d00f46b091d3d6a34b49ac5ff57c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/buffer_info.h
+++ /dev/null
@@ -1,193 +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 != 0)) {
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- this->m_view = view;
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- this->ownview = ownview;
- }
-
- buffer_info(const buffer_info &) = delete;
- buffer_info &operator=(const buffer_info &) = delete;
-
- buffer_info(buffer_info &&other) noexcept { (*this) = std::move(other); }
-
- buffer_info &operator=(buffer_info &&rhs) noexcept {
- 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.10.3/include/pybind11/cast.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/cast.h
deleted file mode 100644
index 3a404602767258902b6eff6c2fe9503379fb2ab1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/cast.h
+++ /dev/null
@@ -1,1667 +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 "detail/common.h"
-#include "detail/descr.h"
-#include "detail/type_caster_base.h"
-#include "detail/typeid.h"
-#include "pytypes.h"
-
-#include <array>
-#include <cstring>
-#include <functional>
-#include <iosfwd>
-#include <iterator>
-#include <memory>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_WARNING_DISABLE_MSVC(4127)
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-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 reference_t = type &;
- using subcaster_cast_op_type = typename caster_t::template cast_op_type<reference_t>;
-
- static_assert(
- std::is_same<typename std::remove_const<type>::type &, subcaster_cast_op_type>::value
- || std::is_same<reference_t, subcaster_cast_op_type>::value,
- "std::reference_wrapper<T> caster requires T to have a caster with an "
- "`operator T &()` or `operator const T &()`");
-
-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>;
- explicit operator std::reference_wrapper<type>() { return cast_op<type &>(subcaster); }
-};
-
-#define PYBIND11_TYPE_CASTER(type, py_name) \
-protected: \
- type value; \
- \
-public: \
- static constexpr auto name = py_name; \
- template <typename T_, \
- ::pybind11::detail::enable_if_t< \
- std::is_same<type, ::pybind11::detail::remove_cv_t<T_>>::value, \
- int> \
- = 0> \
- static ::pybind11::handle cast( \
- T_ *src, ::pybind11::return_value_policy policy, ::pybind11::handle parent) { \
- if (!src) \
- return ::pybind11::none().release(); \
- if (policy == ::pybind11::return_value_policy::take_ownership) { \
- auto h = cast(std::move(*src), policy, parent); \
- delete src; \
- return h; \
- } \
- return cast(*src, policy, parent); \
- } \
- operator type *() { return &value; } /* NOLINT(bugprone-macro-parentheses) */ \
- operator type &() { return value; } /* NOLINT(bugprone-macro-parentheses) */ \
- operator type &&() && { return std::move(value); } /* NOLINT(bugprone-macro-parentheses) */ \
- 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 !defined(PYPY_VERSION)
- auto index_check = [](PyObject *o) { return PyIndex_Check(o); };
-#else
- // In PyPy 7.3.3, `PyIndex_Check` is implemented by calling `__index__`,
- // while CPython only considers the existence of `nb_index`/`__index__`.
- auto index_check = [](PyObject *o) { return hasattr(o, "__index__"); };
-#endif
-
- 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())
- || (!convert && !PYBIND11_LONG_CHECK(src.ptr()) && !index_check(src.ptr()))) {
- return false;
- } else {
- handle src_or_index = src;
- // PyPy: 7.3.7's 3.8 does not implement PyLong_*'s __index__ calls.
-#if PY_VERSION_HEX < 0x03080000 || defined(PYPY_VERSION)
- object index;
- if (!PYBIND11_LONG_CHECK(src.ptr())) { // So: index_check(src.ptr())
- index = reinterpret_steal<object>(PyNumber_Index(src.ptr()));
- if (!index) {
- PyErr_Clear();
- if (!convert)
- return false;
- } else {
- src_or_index = index;
- }
- }
-#endif
- if (std::is_unsigned<py_type>::value) {
- py_value = as_unsigned<py_type>(src_or_index.ptr());
- } else { // signed integer:
- py_value = sizeof(T) <= sizeof(long)
- ? (py_type) PyLong_AsLong(src_or_index.ptr())
- : (py_type) PYBIND11_LONG_AS_LONGLONG(src_or_index.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)) {
- PyErr_Clear();
- if (py_err && convert && (PyNumber_Check(src.ptr()) != 0)) {
- 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, const_name<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().release();
- }
- PYBIND11_TYPE_CASTER(T, const_name("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;
- }
- 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 */
- const 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();
- }
- return none().release();
- }
-
- template <typename T>
- using cast_op_type = void *&;
- explicit operator void *&() { return value; }
- static constexpr auto name = const_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;
- }
- if (src.ptr() == Py_True) {
- value = true;
- return true;
- }
- if (src.ptr() == Py_False) {
- value = false;
- return true;
- }
- if (convert || (std::strcmp("numpy.bool_", Py_TYPE(src.ptr())->tp_name) == 0)) {
- // (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__" 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 = (res != 0);
- return true;
- }
- 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, const_name("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) {
- handle load_src = src;
- if (!src) {
- return false;
- }
- if (!PyUnicode_Check(load_src.ptr())) {
- return load_raw(load_src);
- }
-
- // For UTF-8 we avoid the need for a temporary `bytes` object by using
- // `PyUnicode_AsUTF8AndSize`.
- if (UTF_N == 8) {
- Py_ssize_t size = -1;
- const auto *buffer
- = reinterpret_cast<const CharT *>(PyUnicode_AsUTF8AndSize(load_src.ptr(), &size));
- if (!buffer) {
- PyErr_Clear();
- return false;
- }
- value = StringType(buffer, static_cast<size_t>(size));
- return true;
- }
-
- auto 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);
- // Skip BOM for UTF-16/32
- if (UTF_N > 8) {
- buffer++;
- length--;
- }
- 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, const_name(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/bytearray 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_raw(enable_if_t<std::is_same<C, char>::value, handle> src) {
- if (PYBIND11_BYTES_CHECK(src.ptr())) {
- // We were passed 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) {
- pybind11_fail("Unexpected PYBIND11_BYTES_AS_STRING() failure.");
- }
- value = StringType(bytes, (size_t) PYBIND11_BYTES_SIZE(src.ptr()));
- return true;
- }
- if (PyByteArray_Check(src.ptr())) {
- // We were passed a bytearray; accept it into a std::string or char*
- // without any encoding attempt.
- const char *bytearray = PyByteArray_AsString(src.ptr());
- if (!bytearray) {
- pybind11_fail("Unexpected PyByteArray_AsString() failure.");
- }
- value = StringType(bytearray, (size_t) PyByteArray_Size(src.ptr()));
- return true;
- }
-
- return false;
- }
-
- template <typename C = CharT>
- bool load_raw(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 = make_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().release();
- }
- 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);
- }
-
- explicit operator CharT *() {
- return none ? nullptr : const_cast<CharT *>(static_cast<StringType &>(str_caster).c_str());
- }
- explicit 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]);
- // low bits only: 0-127
- // 0b110xxxxx - start of 2-byte sequence
- // 0b1110xxxx - start of 3-byte sequence
- // 0b11110xxx - start of 4-byte sequence
- size_t char0_bytes = (v0 & 0x80) == 0 ? 1
- : (v0 & 0xE0) == 0xC0 ? 2
- : (v0 & 0xF0) == 0xE0 ? 3
- : 4;
-
- 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 = const_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;
- }
- return cast(*src, policy, parent);
- }
-
- static constexpr auto name
- = const_name("Tuple[") + concat(make_caster<Ts>::name...) + const_name("]");
-
- template <typename T>
- using cast_op_type = type;
-
- explicit operator type() & { return implicit_cast(indices{}); }
- explicit 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...>) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(src, policy, parent);
- PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(policy, parent);
- 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.
-/// The SFINAE hook is provided to help work around the current lack of support
-/// for smart-pointer interoperability. Please consider it an implementation
-/// detail that may change in the future, as formal support for smart-pointer
-/// interoperability is added into pybind11.
-template <typename type, typename holder_type, typename SFINAE = void>
-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;
- }
- throw cast_error("Unable to cast from non-held to held instance (T& to Holder<T>) "
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
- "(#define PYBIND11_DETAILED_ERROR_MESSAGES or 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>> {};
-
-/// Type caster for holder types like std::unique_ptr.
-/// Please consider the SFINAE hook an implementation detail, as explained
-/// in the comment for the copyable_holder_caster.
-template <typename type, typename holder_type, typename SFINAE = void>
-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, ...) \
- PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE) \
- 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_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-// 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 = const_name<T>();
-};
-template <>
-struct handle_type_name<bool_> {
- static constexpr auto name = const_name("bool");
-};
-template <>
-struct handle_type_name<bytes> {
- static constexpr auto name = const_name(PYBIND11_BYTES_NAME);
-};
-template <>
-struct handle_type_name<int_> {
- static constexpr auto name = const_name("int");
-};
-template <>
-struct handle_type_name<iterable> {
- static constexpr auto name = const_name("Iterable");
-};
-template <>
-struct handle_type_name<iterator> {
- static constexpr auto name = const_name("Iterator");
-};
-template <>
-struct handle_type_name<float_> {
- static constexpr auto name = const_name("float");
-};
-template <>
-struct handle_type_name<none> {
- static constexpr auto name = const_name("None");
-};
-template <>
-struct handle_type_name<args> {
- static constexpr auto name = const_name("*args");
-};
-template <>
-struct handle_type_name<kwargs> {
- static constexpr auto name = const_name("**kwargs");
-};
-
-template <typename type>
-struct pyobject_caster {
- template <typename T = type, enable_if_t<std::is_same<T, handle>::value, int> = 0>
- pyobject_caster() : value() {}
-
- // `type` may not be default constructible (e.g. frozenset, anyset). Initializing `value`
- // to a nil handle is safe since it will only be accessed if `load` succeeds.
- template <typename T = type, enable_if_t<std::is_base_of<object, T>::value, int> = 0>
- pyobject_caster() : value(reinterpret_steal<type>(handle())) {}
-
- 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) {
- static_assert(!detail::is_pyobject<T>::value,
- "Internal error: type_caster should only be used for C++ types");
- if (!conv.load(handle, true)) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
- throw cast_error("Unable to cast Python instance to C++ type (#define "
- "PYBIND11_DETAILED_ERROR_MESSAGES or 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(PYBIND11_DETAILED_ERROR_MESSAGES)
- throw cast_error(
- "Unable to cast Python instance to C++ rvalue: instance has multiple references"
- " (#define PYBIND11_DETAILED_ERROR_MESSAGES or 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::is_pyobject<T>::value && detail::move_always<T>::value, T>
-cast(object &&object) {
- return move<T>(std::move(object));
-}
-template <typename T>
-detail::enable_if_t<!detail::is_pyobject<T>::value && detail::move_if_unreferenced<T>::value, T>
-cast(object &&object) {
- if (object.ref_count() > 1) {
- return cast<T>(object);
- }
- return move<T>(std::move(object));
-}
-template <typename T>
-detail::enable_if_t<!detail::is_pyobject<T>::value && detail::move_never<T>::value, T>
-cast(object &&object) {
- return cast<T>(object);
-}
-
-// pytype rvalue -> pytype (calls converting constructor)
-template <typename T>
-detail::enable_if_t<detail::is_pyobject<T>::value, T> cast(object &&object) {
- return T(std::move(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));
-}
-
-// Placeholder type for the unneeded (and dead code) static variable in the
-// PYBIND11_OVERRIDE_OVERRIDE macro
-struct override_unused {};
-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 &&) {
- pybind11_fail("Internal error: cast_safe fallback invoked");
-}
-template <typename T>
-enable_if_t<std::is_void<T>::value, void> cast_safe(object &&) {}
-template <typename T>
-enable_if_t<detail::none_of<cast_is_temporary_value_reference<T>, std::is_void<T>>::value, T>
-cast_safe(object &&o) {
- return pybind11::cast<T>(std::move(o));
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-// The overloads could coexist, i.e. the #if is not strictly speaking needed,
-// but it is an easy minor optimization.
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
-inline cast_error cast_error_unable_to_convert_call_arg() {
- return cast_error("Unable to convert call argument to Python object (#define "
- "PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)");
-}
-#else
-inline cast_error cast_error_unable_to_convert_call_arg(const std::string &name,
- const std::string &type) {
- return cast_error("Unable to convert call argument '" + name + "' of type '" + type
- + "' to Python object");
-}
-#endif
-
-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(PYBIND11_DETAILED_ERROR_MESSAGES)
- throw cast_error_unable_to_convert_call_arg();
-#else
- std::array<std::string, size> argtypes{{type_id<Args>()...}};
- throw cast_error_unable_to_convert_call_arg(std::to_string(i), argtypes[i]);
-#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(
- std::forward<T>(x), return_value_policy::automatic, {}))),
- descr(descr)
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
- ,
- type(type_id<T>())
-#endif
- {
- // Workaround! See:
- // https://github.com/pybind/pybind11/issues/2336
- // https://github.com/pybind/pybind11/pull/2685#issuecomment-731286700
- if (PyErr_Occurred()) {
- PyErr_Clear();
- }
- }
-
-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(PYBIND11_DETAILED_ERROR_MESSAGES)
- /// 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
-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 {*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)
-
-template <typename T>
-using is_kw_only = std::is_same<intrinsic_t<T>, kw_only>;
-template <typename T>
-using is_pos_only = std::is_same<intrinsic_t<T>, pos_only>;
-
-// 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 kwargs argument position, or -1 if not present:
- static constexpr auto kwargs_pos = constexpr_last<argument_is_kwargs, Args...>();
-
- static_assert(kwargs_pos == -1 || kwargs_pos == (int) sizeof...(Args) - 1,
- "py::kwargs is only permitted as the last argument of a function");
-
-public:
- static constexpr bool has_kwargs = kwargs_pos != -1;
-
- // py::args argument position; -1 if not present.
- static constexpr int args_pos = constexpr_last<argument_is_args, Args...>();
-
- static_assert(args_pos == -1 || args_pos == constexpr_first<argument_is_args, Args...>(),
- "py::args cannot be specified more than once");
-
- 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>
- // NOLINTNEXTLINE(readability-const-return-type)
- enable_if_t<!std::is_void<Return>::value, Return> call(Func &&f) && {
- return std::move(*this).template call_impl<remove_cv_t<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<remove_cv_t<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();
- using expander = int[];
- (void) expander{0, (process(args_list, std::forward<Ts>(values)), 0)...};
-
- 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(PYBIND11_DETAILED_ERROR_MESSAGES)
- throw cast_error_unable_to_convert_call_arg();
-#else
- throw cast_error_unable_to_convert_call_arg(std::to_string(args_list.size()),
- type_id<T>());
-#endif
- }
- args_list.append(std::move(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(PYBIND11_DETAILED_ERROR_MESSAGES)
- nameless_argument_error();
-#else
- nameless_argument_error(a.type);
-#endif
- }
- if (m_kwargs.contains(a.name)) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
- multiple_values_error();
-#else
- multiple_values_error(a.name);
-#endif
- }
- if (!a.value) {
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES)
- throw cast_error_unable_to_convert_call_arg();
-#else
- throw cast_error_unable_to_convert_call_arg(a.name, a.type);
-#endif
- }
- m_kwargs[a.name] = std::move(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(PYBIND11_DETAILED_ERROR_MESSAGES)
- 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. "
- "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)");
- }
- [[noreturn]] static void nameless_argument_error(const 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 "
- "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)");
- }
-
- [[noreturn]] static void multiple_values_error(const std::string &name) {
- throw type_error("Got multiple values for keyword argument '" + name + "'");
- }
-
-private:
- tuple m_args;
- dict m_kwargs;
-};
-
-// [workaround(intel)] Separate function required here
-// We need to put this into a separate function because the Intel compiler
-// fails to compile enable_if_t<!all_of<is_positional<Args>...>::value>
-// (tested with ICC 2021.1 Beta 20200827).
-template <typename... Args>
-constexpr bool args_are_all_positional() {
- return all_of<is_positional<Args>...>::value;
-}
-
-/// Collect only positional arguments for a Python function call
-template <return_value_policy policy,
- typename... Args,
- typename = enable_if_t<args_are_all_positional<Args...>()>>
-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<!args_are_all_positional<Args...>()>>
-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 {
-#ifndef NDEBUG
- if (!PyGILState_Check()) {
- pybind11_fail("pybind11::object_api<>::operator() PyGILState_Check() failure.");
- }
-#endif
- 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(...) \
- PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE) \
- namespace detail { \
- template <> \
- class type_caster<__VA_ARGS__> : public type_caster_base<__VA_ARGS__> {}; \
- } \
- PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
-
-/// 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.10.3/include/pybind11/chrono.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/chrono.h
deleted file mode 100644
index 167ea0e3d1057c54a469c8ecd656d49eec495fe7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/chrono.h
+++ /dev/null
@@ -1,225 +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 <chrono>
-#include <cmath>
-#include <ctime>
-#include <datetime.h>
-#include <mutex>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <typename type>
-class duration_caster {
-public:
- using rep = typename type::rep;
- using period = typename type::period;
-
- // signed 25 bits required by the standard.
- using days = std::chrono::duration<int_least32_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
- if (PyFloat_Check(src.ptr())) {
- value = type(duration_cast<duration<rep, period>>(
- duration<double>(PyFloat_AsDouble(src.ptr()))));
- return true;
- }
- 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, const_name("datetime.timedelta"));
-};
-
-inline std::tm *localtime_thread_safe(const std::time_t *time, std::tm *buf) {
-#if (defined(__STDC_LIB_EXT1__) && defined(__STDC_WANT_LIB_EXT1__)) || defined(_MSC_VER)
- if (localtime_s(buf, time))
- return nullptr;
- return buf;
-#else
- static std::mutex mtx;
- std::lock_guard<std::mutex> lock(mtx);
- std::tm *tm_ptr = std::localtime(time);
- if (tm_ptr != nullptr) {
- *buf = *tm_ptr;
- }
- return tm_ptr;
-#endif
-}
-
-// 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));
-
- std::tm localtime;
- std::tm *localtime_ptr = localtime_thread_safe(&tt, &localtime);
- if (!localtime_ptr) {
- throw cast_error("Unable to represent system_clock in local time");
- }
- 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, const_name("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.10.3/include/pybind11/common.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/common.h
deleted file mode 100644
index 6c8a4f1e88e493ee08d24e668639c8d495fd49b1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/include/pybind11/complex.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/complex.h
deleted file mode 100644
index 8a831c12ce4307fa8f371caa4137ad3f278e81f7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/complex.h
+++ /dev/null
@@ -1,74 +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>, const_name("complex"));
-};
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/class.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/class.h
deleted file mode 100644
index 528e716f784e6e332a62826ed0a3fd827d649b76..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/class.h
+++ /dev/null
@@ -1,735 +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 !defined(PYPY_VERSION)
-# define PYBIND11_BUILTIN_QUALNAME
-# define PYBIND11_SET_OLDPY_QUALNAME(obj, nameobj)
-#else
-// In PyPy, we still set __qualname__ so that we can produce reliable function type
-// signatures; in CPython 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);
-}
-
-// Forward declaration to use in `make_static_property_type()`
-inline void enable_dynamic_attributes(PyHeapTypeObject *heap_type);
-
-/** 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()!");
- }
-
-# if PY_VERSION_HEX >= 0x030C0000
- // PRE 3.12 FEATURE FREEZE. PLEASE REVIEW AFTER FREEZE.
- // Since Python-3.12 property-derived types are required to
- // have dynamic attributes (to set `__doc__`)
- enable_dynamic_attributes(heap_type);
-# endif
-
- 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
- auto *const static_prop = (PyObject *) get_internals().static_property_type;
- const auto call_descr_set = (descr != nullptr) && (value != nullptr)
- && (PyObject_IsInstance(descr, static_prop) != 0)
- && (PyObject_IsInstance(value, static_prop) == 0);
- 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);
- }
-}
-
-/**
- * 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;
- }
- return PyType_Type.tp_getattro(obj, name);
-}
-
-/// 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) {
- get_local_internals().registered_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;
- type->tp_getattro = pybind11_meta_getattro;
-
- 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 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();
-
- 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
-}
-
-std::string error_string();
-
-/** 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: 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);
-// https://docs.python.org/3/c-api/typeobj.html#c.PyTypeObject.tp_traverse
-#if PY_VERSION_HEX >= 0x03090000
- Py_VISIT(Py_TYPE(self));
-#endif
- 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;
-#if PY_VERSION_HEX < 0x030B0000
- type->tp_dictoffset = type->tp_basicsize; // place dict at the end
- type->tp_basicsize += (ssize_t) sizeof(PyObject *); // and allocate enough space for it
-#else
- type->tp_flags |= Py_TPFLAGS_MANAGED_DICT;
-#endif
- type->tp_traverse = pybind11_traverse;
- type->tp_clear = pybind11_clear;
-
- static PyGetSetDef getset[] = {{
-#if PY_VERSION_HEX < 0x03070000
- const_cast<char *>("__dict__"),
-#else
- "__dict__",
-#endif
- PyObject_GenericGetDict,
- PyObject_GenericSetDict,
- 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);
- if ((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE && info->readonly) {
- delete info;
- // view->obj = nullptr; // Was just memset to 0, so not necessary
- PyErr_SetString(PyExc_BufferError, "Writable buffer requested for readonly storage");
- return -1;
- }
- 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 = static_cast<int>(info->readonly);
- 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.data();
- view->shape = info->shape.data();
- }
- 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;
-
- 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__")) {
- qualname = reinterpret_steal<object>(
- PyUnicode_FromFormat("%U.%U", rec.scope.attr("__qualname__").ptr(), name.ptr()));
- }
-
- 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__");
- }
- }
-
- const 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 = std::strlen(rec.doc) + 1;
- tp_doc = (char *) PyObject_MALLOC(size);
- std::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;
- type->tp_as_async = &heap_type->as_async;
-
- /* Flags */
- type->tp_flags |= Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HEAPTYPE;
- 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 (rec.custom_type_setup_callback) {
- rec.custom_type_setup_callback(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));
-
- /* 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.10.3/include/pybind11/detail/common.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/common.h
deleted file mode 100644
index 12bb173ad14144a0238adc55c06e94f17683f66a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/common.h
+++ /dev/null
@@ -1,1236 +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 10
-#define PYBIND11_VERSION_PATCH 3
-
-// Similar to Python's convention: https://docs.python.org/3/c-api/apiabiversion.html
-// Additional convention: 0xD = dev
-#define PYBIND11_VERSION_HEX 0x020A0300
-
-// Define some generic pybind11 helper macros for warning management.
-//
-// Note that compiler-specific push/pop pairs are baked into the
-// PYBIND11_NAMESPACE_BEGIN/PYBIND11_NAMESPACE_END pair of macros. Therefore manual
-// PYBIND11_WARNING_PUSH/PYBIND11_WARNING_POP are usually only needed in `#include` sections.
-//
-// If you find you need to suppress a warning, please try to make the suppression as local as
-// possible using these macros. Please also be sure to push/pop with the pybind11 macros. Please
-// only use compiler specifics if you need to check specific versions, e.g. Apple Clang vs. vanilla
-// Clang.
-#if defined(_MSC_VER)
-# define PYBIND11_COMPILER_MSVC
-# define PYBIND11_PRAGMA(...) __pragma(__VA_ARGS__)
-# define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(warning(push))
-# define PYBIND11_WARNING_POP PYBIND11_PRAGMA(warning(pop))
-#elif defined(__INTEL_COMPILER)
-# define PYBIND11_COMPILER_INTEL
-# define PYBIND11_PRAGMA(...) _Pragma(#__VA_ARGS__)
-# define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(warning push)
-# define PYBIND11_WARNING_POP PYBIND11_PRAGMA(warning pop)
-#elif defined(__clang__)
-# define PYBIND11_COMPILER_CLANG
-# define PYBIND11_PRAGMA(...) _Pragma(#__VA_ARGS__)
-# define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(clang diagnostic push)
-# define PYBIND11_WARNING_POP PYBIND11_PRAGMA(clang diagnostic push)
-#elif defined(__GNUC__)
-# define PYBIND11_COMPILER_GCC
-# define PYBIND11_PRAGMA(...) _Pragma(#__VA_ARGS__)
-# define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(GCC diagnostic push)
-# define PYBIND11_WARNING_POP PYBIND11_PRAGMA(GCC diagnostic pop)
-#endif
-
-#ifdef PYBIND11_COMPILER_MSVC
-# define PYBIND11_WARNING_DISABLE_MSVC(name) PYBIND11_PRAGMA(warning(disable : name))
-#else
-# define PYBIND11_WARNING_DISABLE_MSVC(name)
-#endif
-
-#ifdef PYBIND11_COMPILER_CLANG
-# define PYBIND11_WARNING_DISABLE_CLANG(name) PYBIND11_PRAGMA(clang diagnostic ignored name)
-#else
-# define PYBIND11_WARNING_DISABLE_CLANG(name)
-#endif
-
-#ifdef PYBIND11_COMPILER_GCC
-# define PYBIND11_WARNING_DISABLE_GCC(name) PYBIND11_PRAGMA(GCC diagnostic ignored name)
-#else
-# define PYBIND11_WARNING_DISABLE_GCC(name)
-#endif
-
-#ifdef PYBIND11_COMPILER_INTEL
-# define PYBIND11_WARNING_DISABLE_INTEL(name) PYBIND11_PRAGMA(warning disable name)
-#else
-# define PYBIND11_WARNING_DISABLE_INTEL(name)
-#endif
-
-#define PYBIND11_NAMESPACE_BEGIN(name) \
- namespace name { \
- PYBIND11_WARNING_PUSH
-
-#define PYBIND11_NAMESPACE_END(name) \
- PYBIND11_WARNING_POP \
- }
-
-// 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)
-# if __cplusplus >= 201402L
-# define PYBIND11_CPP14
-# if __cplusplus >= 201703L
-# define PYBIND11_CPP17
-# if __cplusplus >= 202002L
-# define PYBIND11_CPP20
-// Please update tests/pybind11_tests.cpp `cpp_std()` when adding a macro here.
-# endif
-# 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
-# define PYBIND11_CPP17
-# if _MSVC_LANG >= 202002L
-# define PYBIND11_CPP20
-# endif
-# endif
-# endif
-#endif
-
-// Compiler version assertions
-#if defined(__INTEL_COMPILER)
-# if __INTEL_COMPILER < 1800
-# error pybind11 requires Intel C++ compiler v18 or newer
-# elif __INTEL_COMPILER < 1900 && defined(PYBIND11_CPP14)
-# error pybind11 supports only C++11 with Intel C++ compiler v18. Use v19 or newer for C++14.
-# endif
-/* The following pragma cannot be pop'ed:
- https://community.intel.com/t5/Intel-C-Compiler/Inline-and-no-inline-warning/td-p/1216764 */
-# pragma warning disable 2196 // warning #2196: routine is both "inline" and "noinline"
-#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)
-# if _MSC_VER < 1910
-# error pybind11 2.10+ requires MSVC 2017 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(PYBIND11_EXPORT_EXCEPTION)
-# if defined(__apple_build_version__)
-# define PYBIND11_EXPORT_EXCEPTION PYBIND11_EXPORT
-# else
-# define PYBIND11_EXPORT_EXCEPTION
-# endif
-#endif
-
-// For CUDA, GCC7, GCC8:
-// PYBIND11_NOINLINE_FORCED is incompatible with `-Wattributes -Werror`.
-// When defining PYBIND11_NOINLINE_FORCED, it is best to also use `-Wno-attributes`.
-// However, the measured shared-library size saving when using noinline are only
-// 1.7% for CUDA, -0.2% for GCC7, and 0.0% for GCC8 (using -DCMAKE_BUILD_TYPE=MinSizeRel,
-// the default under pybind11/tests).
-#if !defined(PYBIND11_NOINLINE_FORCED) \
- && (defined(__CUDACC__) || (defined(__GNUC__) && (__GNUC__ == 7 || __GNUC__ == 8)))
-# define PYBIND11_NOINLINE_DISABLED
-#endif
-
-// The PYBIND11_NOINLINE macro is for function DEFINITIONS.
-// In contrast, FORWARD DECLARATIONS should never use this macro:
-// https://stackoverflow.com/questions/9317473/forward-declaration-of-inline-functions
-#if defined(PYBIND11_NOINLINE_DISABLED) // Option for maximum portability and experimentation.
-# define PYBIND11_NOINLINE inline
-#elif defined(_MSC_VER)
-# define PYBIND11_NOINLINE __declspec(noinline) inline
-#else
-# define PYBIND11_NOINLINE __attribute__((noinline)) inline
-#endif
-
-#if defined(__MINGW32__)
-// For unknown reasons all PYBIND11_DEPRECATED member trigger a warning when declared
-// whether it is used or not
-# define PYBIND11_DEPRECATED(reason)
-#elif 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)
-# define HAVE_SNPRINTF 1
-#endif
-
-/// Include Python header, disable linking to pythonX_d.lib on Windows in debug mode
-#if defined(_MSC_VER)
-PYBIND11_WARNING_PUSH
-PYBIND11_WARNING_DISABLE_MSVC(4505)
-// C4505: 'PySlice_GetIndicesEx': unreferenced local function has been removed (PyPy only)
-# if defined(_DEBUG) && !defined(Py_DEBUG)
-// Workaround for a VS 2022 issue.
-// NOTE: This workaround knowingly violates the Python.h include order requirement:
-// https://docs.python.org/3/c-api/intro.html#include-files
-// See https://github.com/pybind/pybind11/pull/3497 for full context.
-# include <yvals.h>
-# if _MSVC_STL_VERSION >= 143
-# include <crtdefs.h>
-# endif
-# define PYBIND11_DEBUG_MARKER
-# undef _DEBUG
-# endif
-#endif
-
-// https://en.cppreference.com/w/c/chrono/localtime
-#if defined(__STDC_LIB_EXT1__) && !defined(__STDC_WANT_LIB_EXT1__)
-# define __STDC_WANT_LIB_EXT1__
-#endif
-
-#ifdef __has_include
-// std::optional (but including it in c++14 mode isn't allowed)
-# if defined(PYBIND11_CPP17) && __has_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>))
-# define PYBIND11_HAS_EXP_OPTIONAL 1
-# endif
-// std::variant
-# if defined(PYBIND11_CPP17) && __has_include(<variant>)
-# define PYBIND11_HAS_VARIANT 1
-# endif
-#elif defined(_MSC_VER) && defined(PYBIND11_CPP17)
-# define PYBIND11_HAS_OPTIONAL 1
-# define PYBIND11_HAS_VARIANT 1
-#endif
-
-#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
-
-#include <Python.h>
-// Reminder: WITH_THREAD is always defined if PY_VERSION_HEX >= 0x03070000
-#if PY_VERSION_HEX < 0x03060000
-# error "PYTHON < 3.6 IS UNSUPPORTED. pybind11 v2.9 was the last to support Python 2 and 3.5."
-#endif
-#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(PYPY_VERSION) && !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
-# define PYBIND11_SIMPLE_GIL_MANAGEMENT
-#endif
-
-#if defined(_MSC_VER)
-# if defined(PYBIND11_DEBUG_MARKER)
-# define _DEBUG
-# undef PYBIND11_DEBUG_MARKER
-# endif
-PYBIND11_WARNING_POP
-#endif
-
-#include <cstddef>
-#include <cstring>
-#include <exception>
-#include <forward_list>
-#include <memory>
-#include <stdexcept>
-#include <string>
-#include <type_traits>
-#include <typeindex>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-#if defined(__has_include)
-# if __has_include(<version>)
-# include <version>
-# endif
-#endif
-
-// Must be after including <version> or one of the other headers specified by the standard
-#if defined(__cpp_lib_char8_t) && __cpp_lib_char8_t >= 201811L
-# define PYBIND11_HAS_U8STRING
-#endif
-
-// See description of PR #4246:
-#if !defined(NDEBUG) && !defined(PY_ASSERT_GIL_HELD_INCREF_DECREF) \
- && !(defined(PYPY_VERSION) \
- && defined(_MSC_VER)) /* PyPy Windows: pytest hangs indefinitely at the end of the \
- process (see PR #4268) */ \
- && !defined(PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF)
-// The following define will be enabled by default in the 2.11 release
-// define PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF
-#endif
-
-// #define PYBIND11_STR_LEGACY_PERMISSIVE
-// If DEFINED, pybind11::str can hold PyUnicodeObject or PyBytesObject
-// (probably surprising and never documented, but this was the
-// legacy behavior until and including v2.6.x). As a side-effect,
-// pybind11::isinstance<str>() is true for both pybind11::str and
-// pybind11::bytes.
-// If UNDEFINED, pybind11::str can only hold PyUnicodeObject, and
-// pybind11::isinstance<str>() is true only for pybind11::str.
-// However, for Python 2 only (!), the pybind11::str caster
-// implicitly decoded bytes to PyUnicodeObject. This was to ease
-// the transition from the legacy behavior to the non-permissive
-// behavior.
-
-/// Compatibility macros for Python 2 / Python 3 versions TODO: remove
-#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()
-
-#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) { \
- pybind11::raise_from(e, PyExc_ImportError, "initialization failed"); \
- 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; \
- 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;
-
-template <typename IntType>
-inline ssize_t ssize_t_cast(const IntType &val) {
- static_assert(sizeof(IntType) <= sizeof(ssize_t), "Implicit narrowing is not permitted.");
- return static_cast<ssize_t>(val);
-}
-
-/// 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)
-using std::conditional_t;
-using std::enable_if_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
-
-#if defined(PYBIND11_CPP20)
-using std::remove_cvref;
-using std::remove_cvref_t;
-#else
-template <class T>
-struct remove_cvref {
- using type = remove_cv_t<remove_reference_t<T>>;
-};
-template <class T>
-using remove_cvref_t = typename remove_cvref<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...> {
- using type = index_sequence<S...>;
-};
-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>
-// Sadly, all MSVC versions incl. 2022 need the workaround, even in C++20 mode.
-// See also: https://github.com/pybind/pybind11/pull/3741
-#if !defined(_MSC_VER)
-using is_template_base_of
- = decltype(is_template_base_of_impl<Base>::check((intrinsic_t<T> *) nullptr));
-#else
-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 {
- // If you are encountering an
- // 'error: name followed by "::" must be a class or namespace name'
- // with the Intel compiler and a noexcept function here,
- // try to use noexcept(true) instead of plain noexcept.
- 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>;
-
-// [workaround(intel)] Internal error on fold expression
-/// Apply a function over each element of a parameter pack
-#if defined(__cpp_fold_expressions) && !defined(__INTEL_COMPILER)
-// Intel compiler produces an internal error on this fold expression (tested with ICC 19.0.2)
-# 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 PYBIND11_EXPORT_EXCEPTION 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 PYBIND11_EXPORT_EXCEPTION 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(attribute_error, PyExc_AttributeError)
-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 void pybind11_fail(const char *reason) {
- assert(!PyErr_Occurred());
- throw std::runtime_error(reason);
-}
-[[noreturn]] PYBIND11_NOINLINE void pybind11_fail(const std::string &reason) {
- assert(!PyErr_Occurred());
- 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(const error_scope &) = delete;
- error_scope &operator=(const error_scope &) = delete;
- ~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 {
- 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{};
-#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>>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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.
- // NOLINTNEXTLINE(google-explicit-constructor)
- any_container(std::vector<T> &&v) : v(std::move(v)) {}
-
- // Moves the vector out of an rvalue any_container
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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 *);
-
-template <typename T>
-inline static std::shared_ptr<T>
-try_get_shared_from_this(std::enable_shared_from_this<T> *holder_value_ptr) {
-// Pre C++17, this code path exploits undefined behavior, but is known to work on many platforms.
-// Use at your own risk!
-// See also https://en.cppreference.com/w/cpp/memory/enable_shared_from_this, and in particular
-// the `std::shared_ptr<Good> gp1 = not_so_good.getptr();` and `try`-`catch` parts of the example.
-#if defined(__cpp_lib_enable_shared_from_this) && (!defined(_MSC_VER) || _MSC_VER >= 1912)
- return holder_value_ptr->weak_from_this().lock();
-#else
- try {
- return holder_value_ptr->shared_from_this();
- } catch (const std::bad_weak_ptr &) {
- return nullptr;
- }
-#endif
-}
-
-// For silencing "unused" compiler warnings in special situations.
-template <typename... Args>
-#if defined(_MSC_VER) && _MSC_VER < 1920 // MSVC 2017
-constexpr
-#endif
- inline void
- silence_unused_warnings(Args &&...) {
-}
-
-// MSVC warning C4100: Unreferenced formal parameter
-#if defined(_MSC_VER) && _MSC_VER <= 1916
-# define PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(...) \
- detail::silence_unused_warnings(__VA_ARGS__)
-#else
-# define PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(...)
-#endif
-
-// GCC -Wunused-but-set-parameter All GCC versions (as of July 2021).
-#if defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
-# define PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(...) \
- detail::silence_unused_warnings(__VA_ARGS__)
-#else
-# define PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(...)
-#endif
-
-#if defined(__clang__) \
- && (defined(__apple_build_version__) /* AppleClang 13.0.0.13000029 was the only data point \
- available. */ \
- || (__clang_major__ >= 7 \
- && __clang_major__ <= 12) /* Clang 3, 5, 13, 14, 15 do not generate the warning. */ \
- )
-# define PYBIND11_DETECTED_CLANG_WITH_MISLEADING_CALL_STD_MOVE_EXPLICITLY_WARNING
-// Example:
-// tests/test_kwargs_and_defaults.cpp:46:68: error: local variable 'args' will be copied despite
-// being returned by name [-Werror,-Wreturn-std-move]
-// m.def("args_function", [](py::args args) -> py::tuple { return args; });
-// ^~~~
-// test_kwargs_and_defaults.cpp:46:68: note: call 'std::move' explicitly to avoid copying
-// m.def("args_function", [](py::args args) -> py::tuple { return args; });
-// ^~~~
-// std::move(args)
-#endif
-
-// Pybind offers detailed error messages by default for all builts that are debug (through the
-// negation of ndebug). This can also be manually enabled by users, for any builds, through
-// defining PYBIND11_DETAILED_ERROR_MESSAGES.
-#if !defined(PYBIND11_DETAILED_ERROR_MESSAGES) && !defined(NDEBUG)
-# define PYBIND11_DETAILED_ERROR_MESSAGES
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/descr.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/descr.h
deleted file mode 100644
index e7a5e2c14564f3bc7a413c15fc8fdff38ef4abf1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/descr.h
+++ /dev/null
@@ -1,158 +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]{'\0'};
-
- constexpr descr() = default;
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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...>) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(b);
- 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> const_name(char const (&text)[N]) {
- return descr<N - 1>(text);
-}
-constexpr descr<0> const_name(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...> {
- // WARNING: This only works with C++17 or higher.
- 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>> const_name(char const (&text1)[N1], char const (&)[N2]) {
- return const_name(text1);
-}
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<!B, descr<N2 - 1>> const_name(char const (&)[N1], char const (&text2)[N2]) {
- return const_name(text2);
-}
-
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<B, T1> const_name(const T1 &d, const T2 &) {
- return d;
-}
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<!B, T2> const_name(const T1 &, const T2 &d) {
- return d;
-}
-
-template <size_t Size>
-auto constexpr const_name() -> remove_cv_t<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> const_name() {
- return {'%'};
-}
-
-// If "_" is defined as a macro, py::detail::_ cannot be provided.
-// It is therefore best to use py::detail::const_name universally.
-// This block is for backward compatibility only.
-// (The const_name code is repeated to avoid introducing a "_" #define ourselves.)
-#ifndef _
-# define PYBIND11_DETAIL_UNDERSCORE_BACKWARD_COMPATIBILITY
-template <size_t N>
-constexpr descr<N - 1> _(char const (&text)[N]) {
- return const_name<N>(text);
-}
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<B, descr<N1 - 1>> _(char const (&text1)[N1], char const (&text2)[N2]) {
- return const_name<B, N1, N2>(text1, text2);
-}
-template <bool B, size_t N1, size_t N2>
-constexpr enable_if_t<!B, descr<N2 - 1>> _(char const (&text1)[N1], char const (&text2)[N2]) {
- return const_name<B, N1, N2>(text1, text2);
-}
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<B, T1> _(const T1 &d1, const T2 &d2) {
- return const_name<B, T1, T2>(d1, d2);
-}
-template <bool B, typename T1, typename T2>
-constexpr enable_if_t<!B, T2> _(const T1 &d1, const T2 &d2) {
- return const_name<B, T1, T2>(d1, d2);
-}
-
-template <size_t Size>
-auto constexpr _() -> remove_cv_t<decltype(int_to_str<Size / 10, Size % 10>::digits)> {
- return const_name<Size>();
-}
-template <typename Type>
-constexpr descr<1, Type> _() {
- return const_name<Type>();
-}
-#endif // #ifndef _
-
-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 + const_name(", ") + concat(args...);
-}
-
-template <size_t N, typename... Ts>
-constexpr descr<N + 2, Ts...> type_descr(const descr<N, Ts...> &descr) {
- return const_name("{") + descr + const_name("}");
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/init.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/init.h
deleted file mode 100644
index 9f71278c2609c2dddf260d7d25f292af33b2811c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/init.h
+++ /dev/null
@@ -1,434 +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_WARNING_DISABLE_MSVC(4127)
-
-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 &;
- explicit operator value_and_holder &() { return *value; }
- static constexpr auto name = const_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) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(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) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(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) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(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;
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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);
- auto d = handle(result.second);
- if (PyDict_Check(d.ptr()) && PyDict_Size(d.ptr()) == 0) {
- // Skipping setattr below, to not force use of py::dynamic_attr() for Class unnecessarily.
- // See PR #2972 for details.
- return;
- }
- setattr((PyObject *) v_h.inst, "__dict__", d);
-}
-
-/// 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_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/internals.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/internals.h
deleted file mode 100644
index ef1849fbea4e1481579d2591557d6aa8ba9c9194..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/internals.h
+++ /dev/null
@@ -1,611 +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 "common.h"
-
-#if defined(WITH_THREAD) && defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
-# include "../gil.h"
-#endif
-
-#include "../pytypes.h"
-
-#include <exception>
-
-/// Tracks the `internals` and `type_info` ABI version independent of the main library version.
-///
-/// Some portions of the code use an ABI that is conditional depending on this
-/// version number. That allows ABI-breaking changes to be "pre-implemented".
-/// Once the default version number is incremented, the conditional logic that
-/// no longer applies can be removed. Additionally, users that need not
-/// maintain ABI compatibility can increase the version number in order to take
-/// advantage of any functionality/efficiency improvements that depend on the
-/// newer ABI.
-///
-/// WARNING: If you choose to manually increase the ABI version, note that
-/// pybind11 may not be tested as thoroughly with a non-default ABI version, and
-/// further ABI-incompatible changes may be made before the ABI is officially
-/// changed to the new version.
-#ifndef PYBIND11_INTERNALS_VERSION
-# define PYBIND11_INTERNALS_VERSION 4
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-using ExceptionTranslator = void (*)(std::exception_ptr);
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-constexpr const char *internals_function_record_capsule_name = "pybind11_function_record_capsule";
-
-// 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
-// Avoid unnecessary allocation of `Py_tss_t`, since we cannot use
-// `Py_LIMITED_API` anyway.
-# if PYBIND11_INTERNALS_VERSION > 4
-# define PYBIND11_TLS_KEY_REF Py_tss_t &
-# if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-// Clang on macOS warns due to `Py_tss_NEEDS_INIT` not specifying an initializer
-// for every field.
-# define PYBIND11_TLS_KEY_INIT(var) \
- _Pragma("GCC diagnostic push") /**/ \
- _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") /**/ \
- Py_tss_t var \
- = Py_tss_NEEDS_INIT; \
- _Pragma("GCC diagnostic pop")
-# else
-# define PYBIND11_TLS_KEY_INIT(var) Py_tss_t var = Py_tss_NEEDS_INIT;
-# endif
-# define PYBIND11_TLS_KEY_CREATE(var) (PyThread_tss_create(&(var)) == 0)
-# 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_delete(&(key))
-# else
-# define PYBIND11_TLS_KEY_REF Py_tss_t *
-# define PYBIND11_TLS_KEY_INIT(var) Py_tss_t *var = nullptr;
-# define PYBIND11_TLS_KEY_CREATE(var) \
- (((var) = PyThread_tss_alloc()) != nullptr && (PyThread_tss_create((var)) == 0))
-# 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)
-# endif
-#else
-// Usually an int but a long on Cygwin64 with Python 3.x
-# define PYBIND11_TLS_KEY_REF decltype(PyThread_create_key())
-# define PYBIND11_TLS_KEY_INIT(var) PYBIND11_TLS_KEY_REF var = 0;
-# define PYBIND11_TLS_KEY_CREATE(var) (((var) = PyThread_create_key()) != -1)
-# define PYBIND11_TLS_GET_VALUE(key) PyThread_get_key_value((key))
-# if defined(PYPY_VERSION)
-// On CPython < 3.4 and on PyPy, `PyThread_set_key_value` strangely does not set
-// the value if it has already been set. Instead, it must first be deleted and
-// then set again.
-inline void tls_replace_value(PYBIND11_TLS_KEY_REF key, void *value) {
- PyThread_delete_key_value(key);
- PyThread_set_key_value(key, value);
-}
-# define PYBIND11_TLS_DELETE_VALUE(key) PyThread_delete_key_value(key)
-# define PYBIND11_TLS_REPLACE_VALUE(key, value) \
- ::pybind11::detail::tls_replace_value((key), (value))
-# 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 {
- // std::type_index -> pybind11's type information
- type_map<type_info *> registered_types_cpp;
- // PyTypeObject* -> base type_info(s)
- std::unordered_map<PyTypeObject *, std::vector<type_info *>> registered_types_py;
- 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<ExceptionTranslator> registered_exception_translators;
- std::unordered_map<std::string, void *> shared_data; // Custom data to be shared across
- // extensions
-#if PYBIND11_INTERNALS_VERSION == 4
- std::vector<PyObject *> unused_loader_patient_stack_remove_at_v5;
-#endif
- 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)
- // Unused if PYBIND11_SIMPLE_GIL_MANAGEMENT is defined:
- PYBIND11_TLS_KEY_INIT(tstate)
-# if PYBIND11_INTERNALS_VERSION > 4
- PYBIND11_TLS_KEY_INIT(loader_life_support_tls_key)
-# endif // PYBIND11_INTERNALS_VERSION > 4
- // Unused if PYBIND11_SIMPLE_GIL_MANAGEMENT is defined:
- PyInterpreterState *istate = nullptr;
-
-# if PYBIND11_INTERNALS_VERSION > 4
- // Note that we have to use a std::string to allocate memory to ensure a unique address
- // We want unique addresses since we use pointer equality to compare function records
- std::string function_record_capsule_name = internals_function_record_capsule_name;
-# endif
-
- internals() = default;
- internals(const internals &other) = delete;
- internals &operator=(const internals &other) = delete;
- ~internals() {
-# if PYBIND11_INTERNALS_VERSION > 4
- PYBIND11_TLS_FREE(loader_life_support_tls_key);
-# endif // PYBIND11_INTERNALS_VERSION > 4
-
- // This destructor is called *after* Py_Finalize() in finalize_interpreter().
- // That *SHOULD BE* fine. The following details what happens when 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.
- * A type can be simple even if it has non-simple ancestors as long as it has no descendants.
- */
- 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;
-};
-
-/// 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;
-}
-
-// forward decl
-inline void translate_exception(std::exception_ptr);
-
-template <class T,
- enable_if_t<std::is_same<std::nested_exception, remove_cvref_t<T>>::value, int> = 0>
-bool handle_nested_exception(const T &exc, const std::exception_ptr &p) {
- std::exception_ptr nested = exc.nested_ptr();
- if (nested != nullptr && nested != p) {
- translate_exception(nested);
- return true;
- }
- return false;
-}
-
-template <class T,
- enable_if_t<!std::is_same<std::nested_exception, remove_cvref_t<T>>::value, int> = 0>
-bool handle_nested_exception(const T &exc, const std::exception_ptr &p) {
- if (const auto *nep = dynamic_cast<const std::nested_exception *>(std::addressof(exc))) {
- return handle_nested_exception(*nep, p);
- }
- return false;
-}
-
-inline bool raise_err(PyObject *exc_type, const char *msg) {
- if (PyErr_Occurred()) {
- raise_from(exc_type, msg);
- return true;
- }
- PyErr_SetString(exc_type, msg);
- return false;
-}
-
-inline void translate_exception(std::exception_ptr p) {
- if (!p) {
- return;
- }
- try {
- std::rethrow_exception(p);
- } catch (error_already_set &e) {
- handle_nested_exception(e, p);
- e.restore();
- return;
- } catch (const builtin_exception &e) {
- // Could not use template since it's an abstract class.
- if (const auto *nep = dynamic_cast<const std::nested_exception *>(std::addressof(e))) {
- handle_nested_exception(*nep, p);
- }
- e.set_error();
- return;
- } catch (const std::bad_alloc &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_MemoryError, e.what());
- return;
- } catch (const std::domain_error &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_ValueError, e.what());
- return;
- } catch (const std::invalid_argument &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_ValueError, e.what());
- return;
- } catch (const std::length_error &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_ValueError, e.what());
- return;
- } catch (const std::out_of_range &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_IndexError, e.what());
- return;
- } catch (const std::range_error &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_ValueError, e.what());
- return;
- } catch (const std::overflow_error &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_OverflowError, e.what());
- return;
- } catch (const std::exception &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_RuntimeError, e.what());
- return;
- } catch (const std::nested_exception &e) {
- handle_nested_exception(e, p);
- raise_err(PyExc_RuntimeError, "Caught an unknown nested exception!");
- return;
- } catch (...) {
- raise_err(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 internals &get_internals() {
- auto **&internals_pp = get_internals_pp();
- if (internals_pp && *internals_pp) {
- return **internals_pp;
- }
-
-#if defined(WITH_THREAD)
-# if defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
- gil_scoped_acquire gil;
-# else
- // 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(const gil_scoped_acquire_local &) = delete;
- gil_scoped_acquire_local &operator=(const gil_scoped_acquire_local &) = delete;
- ~gil_scoped_acquire_local() { PyGILState_Release(state); }
- const PyGILState_STATE state;
- } gil;
-# endif
-#endif
- error_scope err_scope;
-
- PYBIND11_STR_TYPE 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)
- // libc++ with CPython doesn't require this (types are explicitly exported)
- // libc++ with PyPy still need it, awaiting further investigation
-#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)
-
- PyThreadState *tstate = PyThreadState_Get();
- if (!PYBIND11_TLS_KEY_CREATE(internals_ptr->tstate)) {
- pybind11_fail("get_internals: could not successfully initialize the tstate TSS key!");
- }
- PYBIND11_TLS_REPLACE_VALUE(internals_ptr->tstate, tstate);
-
-# if PYBIND11_INTERNALS_VERSION > 4
- if (!PYBIND11_TLS_KEY_CREATE(internals_ptr->loader_life_support_tls_key)) {
- pybind11_fail("get_internals: could not successfully initialize the "
- "loader_life_support TSS key!");
- }
-# 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;
-}
-
-// the internals struct (above) is shared between all the modules. local_internals are only
-// for a single module. Any changes made to internals may require an update to
-// PYBIND11_INTERNALS_VERSION, breaking backwards compatibility. local_internals is, by design,
-// restricted to a single module. Whether a module has local internals or not should not
-// impact any other modules, because the only things accessing the local internals is the
-// module that contains them.
-struct local_internals {
- type_map<type_info *> registered_types_cpp;
- std::forward_list<ExceptionTranslator> registered_exception_translators;
-#if defined(WITH_THREAD) && PYBIND11_INTERNALS_VERSION == 4
-
- // For ABI compatibility, we can't store the loader_life_support TLS key in
- // the `internals` struct directly. Instead, we store it in `shared_data` and
- // cache a copy in `local_internals`. If we allocated a separate TLS key for
- // each instance of `local_internals`, we could end up allocating hundreds of
- // TLS keys if hundreds of different pybind11 modules are loaded (which is a
- // plausible number).
- PYBIND11_TLS_KEY_INIT(loader_life_support_tls_key)
-
- // Holds the shared TLS key for the loader_life_support stack.
- struct shared_loader_life_support_data {
- PYBIND11_TLS_KEY_INIT(loader_life_support_tls_key)
- shared_loader_life_support_data() {
- if (!PYBIND11_TLS_KEY_CREATE(loader_life_support_tls_key)) {
- pybind11_fail("local_internals: could not successfully initialize the "
- "loader_life_support TLS key!");
- }
- }
- // We can't help but leak the TLS key, because Python never unloads extension modules.
- };
-
- local_internals() {
- auto &internals = get_internals();
- // Get or create the `loader_life_support_stack_key`.
- auto &ptr = internals.shared_data["_life_support"];
- if (!ptr) {
- ptr = new shared_loader_life_support_data;
- }
- loader_life_support_tls_key
- = static_cast<shared_loader_life_support_data *>(ptr)->loader_life_support_tls_key;
- }
-#endif // defined(WITH_THREAD) && PYBIND11_INTERNALS_VERSION == 4
-};
-
-/// Works like `get_internals`, but for things which are locally registered.
-inline local_internals &get_local_internals() {
- // Current static can be created in the interpreter finalization routine. If the later will be
- // destroyed in another static variable destructor, creation of this static there will cause
- // static deinitialization fiasco. In order to avoid it we avoid destruction of the
- // local_internals static. One can read more about the problem and current solution here:
- // https://google.github.io/styleguide/cppguide.html#Static_and_Global_Variables
- static auto *locals = new local_internals();
- 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();
-}
-
-inline const char *get_function_record_capsule_name() {
-#if PYBIND11_INTERNALS_VERSION > 4
- return get_internals().function_record_capsule_name.c_str();
-#else
- return nullptr;
-#endif
-}
-
-// Determine whether or not the following capsule contains a pybind11 function record.
-// Note that we use `internals` to make sure that only ABI compatible records are touched.
-//
-// This check is currently used in two places:
-// - An important optimization in functional.h to avoid overhead in C++ -> Python -> C++
-// - The sibling feature of cpp_function to allow overloads
-inline bool is_function_record_capsule(const capsule &cap) {
- // Pointer equality as we rely on internals() to ensure unique pointers
- return cap.name() == get_function_record_capsule_name();
-}
-
-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.
-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()`.
-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.10.3/include/pybind11/detail/type_caster_base.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/type_caster_base.h
deleted file mode 100644
index 0b710d7e4c43e466f6db94faaa79edc129fb1d88..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/type_caster_base.h
+++ /dev/null
@@ -1,1019 +0,0 @@
-/*
- pybind11/detail/type_caster_base.h (originally first part of pybind11/cast.h)
-
- 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 "common.h"
-#include "descr.h"
-#include "internals.h"
-#include "typeid.h"
-
-#include <cstdint>
-#include <iterator>
-#include <new>
-#include <string>
-#include <type_traits>
-#include <typeindex>
-#include <typeinfo>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-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 {
-private:
- loader_life_support *parent = nullptr;
- std::unordered_set<PyObject *> keep_alive;
-
-#if defined(WITH_THREAD)
- // Store stack pointer in thread-local storage.
- static PYBIND11_TLS_KEY_REF get_stack_tls_key() {
-# if PYBIND11_INTERNALS_VERSION == 4
- return get_local_internals().loader_life_support_tls_key;
-# else
- return get_internals().loader_life_support_tls_key;
-# endif
- }
- static loader_life_support *get_stack_top() {
- return static_cast<loader_life_support *>(PYBIND11_TLS_GET_VALUE(get_stack_tls_key()));
- }
- static void set_stack_top(loader_life_support *value) {
- PYBIND11_TLS_REPLACE_VALUE(get_stack_tls_key(), value);
- }
-#else
- // Use single global variable for stack.
- static loader_life_support **get_stack_pp() {
- static loader_life_support *global_stack = nullptr;
- return global_stack;
- }
- static loader_life_support *get_stack_top() { return *get_stack_pp(); }
- static void set_stack_top(loader_life_support *value) { *get_stack_pp() = value; }
-#endif
-
-public:
- /// A new patient frame is created when a function is entered
- loader_life_support() : parent{get_stack_top()} { set_stack_top(this); }
-
- /// ... and destroyed after it returns
- ~loader_life_support() {
- if (get_stack_top() != this) {
- pybind11_fail("loader_life_support: internal error");
- }
- set_stack_top(parent);
- for (auto *item : keep_alive) {
- Py_DECREF(item);
- }
- }
-
- /// 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) {
- loader_life_support *frame = get_stack_top();
- if (!frame) {
- // NOTE: It would be nice to include the stack frames here, as this indicates
- // use of pybind11::cast<> outside the normal call framework, finding such
- // a location is challenging. Developers could consider printing out
- // stack frame addresses here using something like __builtin_frame_address(0)
- throw cast_error("When called outside a bound function, py::cast() cannot "
- "do Python -> C++ conversions which require the creation "
- "of temporary values");
- }
-
- if (frame->keep_alive.insert(h.ptr()).second) {
- Py_INCREF(h.ptr());
- }
- }
-};
-
-// 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 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 detail::type_info *get_type_info(PyTypeObject *type) {
- const 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 = get_local_internals().registered_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 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 \""
- + std::move(tname) + '"');
- }
- return nullptr;
-}
-
-PYBIND11_NOINLINE 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);
-}
-
-// Searches the inheritance graph for a registered Python instance, using all_type_info().
-PYBIND11_NOINLINE handle find_registered_python_instance(void *src,
- const detail::type_info *tinfo) {
- 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();
- }
- }
- }
- return handle();
-}
-
-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
- explicit 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() != nullptr; }
-
- 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) != 0u;
- }
- // NOLINTNEXTLINE(readability-make-member-function-const)
- 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] &= (std::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) != 0);
- }
- // NOLINTNEXTLINE(readability-make-member-function-const)
- 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] &= (std::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:
- explicit 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:
- explicit 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 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(PYBIND11_DETAILED_ERROR_MESSAGES)
- 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");
-#else
- pybind11_fail(
- "pybind11::detail::instance::get_value_and_holder: "
- "type is not a pybind11 base of the given instance "
- "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for type details)");
-#endif
-}
-
-PYBIND11_NOINLINE void instance::allocate_layout() {
- const 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: Python is using pymalloc, which is designed to be
- // efficient for small allocations like the one we're doing here;
- // for larger allocations they are just wrappers around malloc.
- // TODO: is this still true for pure Python 3.6?
- nonsimple.values_and_holders = (void **) PyMem_Calloc(space, sizeof(void *));
- if (!nonsimple.values_and_holders) {
- throw std::bad_alloc();
- }
- nonsimple.status
- = reinterpret_cast<std::uint8_t *>(&nonsimple.values_and_holders[flags_at]);
- }
- owned = true;
-}
-
-// NOLINTNEXTLINE(readability-make-member-function-const)
-PYBIND11_NOINLINE void instance::deallocate_layout() {
- if (!simple_layout) {
- PyMem_Free(nonsimple.values_and_holders);
- }
-}
-
-PYBIND11_NOINLINE 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 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();
-#else
- return _PyThreadState_UncheckedGet();
-#endif
-}
-
-// Forward declarations
-void keep_alive_impl(handle nurse, handle patient);
-inline PyObject *make_new_instance(PyTypeObject *type);
-
-class type_caster_generic {
-public:
- PYBIND11_NOINLINE explicit type_caster_generic(const std::type_info &type_info)
- : typeinfo(get_type_info(type_info)), cpptype(&type_info) {}
-
- explicit 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();
- }
-
- if (handle registered_inst = find_registered_python_instance(src, tinfo)) {
- return registered_inst;
- }
-
- 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(PYBIND11_DETAILED_ERROR_MESSAGES)
- 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!");
-#else
- throw cast_error("return_value_policy = copy, but type is "
- "non-copyable! (#define PYBIND11_DETAILED_ERROR_MESSAGES or "
- "compile in debug mode for details)");
-#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(PYBIND11_DETAILED_ERROR_MESSAGES)
- 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!");
-#else
- throw cast_error("return_value_policy = move, but type is neither "
- "movable nor copyable! "
- "(#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in "
- "debug mode for details)");
-#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) {
- const 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 {
- vptr = ::operator new(type->type_size);
- }
-#else
- vptr = ::operator new(type->type_size);
-#endif
- }
- }
- value = vptr;
- }
- bool try_implicit_casts(handle src, bool convert) {
- for (const 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);
- }
-
- 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
- if (PyType_IsSubtype(srctype, typeinfo->type)) {
- const 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.
- 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 (const 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
- if (try_load_foreign_module_local(src)) {
- return true;
- }
-
- // Custom converters didn't take None, now we convert None to nullptr.
- 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;
- }
-
- return false;
- }
-
- // 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 = const_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) {
- const 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>;
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator itype *() { return (type *) value; }
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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. A comma operator is used in the
- decltype argument to apply SFINAE to the public copy/move constructors.*/
- template <typename T, typename = enable_if_t<is_copy_constructible<T>::value>>
- static auto make_copy_constructor(const T *)
- -> decltype(new T(std::declval<const T>()), 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 *)
- -> decltype(new T(std::declval<T &&>()), 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; }
-};
-
-PYBIND11_NOINLINE std::string type_info_description(const std::type_info &ti) {
- if (auto *type_data = get_type_info(ti)) {
- handle th((PyObject *) type_data->type);
- return th.attr("__module__").cast<std::string>() + '.'
- + th.attr("__qualname__").cast<std::string>();
- }
- return clean_type_id(ti.name());
-}
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/typeid.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/typeid.h
deleted file mode 100644
index a67b52135bd15020426dfefccf4a211b141f7482..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/detail/typeid.h
+++ /dev/null
@@ -1,65 +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 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::");
-}
-
-inline std::string clean_type_id(const char *typeid_name) {
- std::string name(typeid_name);
- detail::clean_type_id(name);
- return name;
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Return a string representation of a C++ type
-template <typename T>
-static std::string type_id() {
- return detail::clean_type_id(typeid(T).name());
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen.h
deleted file mode 100644
index 273b9c9308d9de40d13abfe16256ace273c71761..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen.h
+++ /dev/null
@@ -1,12 +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 "eigen/matrix.h"
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen/matrix.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen/matrix.h
deleted file mode 100644
index 34fe329a821ad7969d2aa9183aa274782eeaa285..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen/matrix.h
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- pybind11/eigen/matrix.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"
-
-/* HINT: To suppress warnings originating from the Eigen headers, use -isystem.
- See also:
- https://stackoverflow.com/questions/2579576/i-dir-vs-isystem-dir
- https://stackoverflow.com/questions/1741816/isystem-for-ms-visual-studio-c-compiler
-*/
-PYBIND11_WARNING_PUSH
-PYBIND11_WARNING_DISABLE_MSVC(5054) // https://github.com/pybind/pybind11/pull/3741
-// C5054: operator '&': deprecated between enumerations of different types
-PYBIND11_WARNING_DISABLE_GCC("-Wmaybe-uninitialized")
-
-#include <Eigen/Core>
-#include <Eigen/SparseCore>
-
-PYBIND11_WARNING_POP
-
-// 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 matrix support in pybind11 requires Eigen >= 3.2.7");
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_WARNING_DISABLE_MSVC(4127)
-
-// 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;
-template <typename Scalar, int Flags, typename StorageIndex>
-using EigenMapSparseMatrix = Eigen::Map<Eigen::SparseMatrix<Scalar, Flags, StorageIndex>>;
-#else
-using EigenIndex = EIGEN_DEFAULT_DENSE_INDEX_TYPE;
-template <typename Scalar, int Flags, typename StorageIndex>
-using EigenMapSparseMatrix = Eigen::MappedSparseMatrix<Scalar, Flags, StorageIndex>;
-#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!
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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
- stride{EigenRowMajor ? (rstride > 0 ? rstride : 0)
- : (cstride > 0 ? cstride : 0) /* outer stride */,
- EigenRowMajor ? (cstride > 0 ? cstride : 0)
- : (rstride > 0 ? rstride : 0) /* inner stride */},
- negativestrides{rstride < 0 || cstride < 0} {}
- // 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). Alternatively, if any dimension size is 0, the strides are not relevant
- // (and numpy ≥ 1.23 sets the strides to 0 in that case, so we need to check explicitly).
- if (negativestrides) {
- return false;
- }
- if (rows == 0 || cols == 0) {
- return true;
- }
- return (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);
- }
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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};
- }
- if (fixed) {
- // The type has a fixed size, but is not a vector: abort
- return false;
- }
- 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};
- } // 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
- = const_name("numpy.ndarray[") + npy_format_descriptor<Scalar>::name + const_name("[")
- + const_name<fixed_rows>(const_name<(size_t) rows>(), const_name("m")) + const_name(", ")
- + const_name<fixed_cols>(const_name<(size_t) cols>(), const_name("n")) + const_name("]")
- +
- // 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.
- const_name<show_writeable>(", flags.writeable", "")
- + const_name<show_c_contiguous>(", flags.c_contiguous", "")
- + const_name<show_f_contiguous>(", flags.f_contiguous", "") + const_name("]");
-};
-
-// 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;
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator Type *() { return &value; }
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator Type &() { return value; }
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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
- auto 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;
- }
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator Type *() { return ref.get(); }
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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>> {
- using Scalar = typename Type::Scalar;
- using StorageIndex = remove_reference_t<decltype(*std::declval<Type>().outerIndexPtr())>;
- using Index = typename Type::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 = EigenMapSparseMatrix<Scalar,
- Type::Flags &(Eigen::RowMajor | Eigen::ColMajor),
- StorageIndex>(shape[0].cast<Index>(),
- shape[1].cast<Index>(),
- std::move(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(pybind11::make_tuple(
- std::move(data), std::move(innerIndices), std::move(outerIndices)),
- pybind11::make_tuple(src.rows(), src.cols()))
- .release();
- }
-
- PYBIND11_TYPE_CASTER(Type,
- const_name<(Type::IsRowMajor) != 0>("scipy.sparse.csr_matrix[",
- "scipy.sparse.csc_matrix[")
- + npy_format_descriptor<Scalar>::name + const_name("]"));
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen/tensor.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen/tensor.h
deleted file mode 100644
index 0877da895326baedde9015b762fbffc309f71b7e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eigen/tensor.h
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- pybind11/eigen/tensor.h: Transparent conversion for Eigen tensors
-
- 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(__GNUC__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
-static_assert(__GNUC__ > 5, "Eigen Tensor support in pybind11 requires GCC > 5.0");
-#endif
-
-// Disable warnings for Eigen
-PYBIND11_WARNING_PUSH
-PYBIND11_WARNING_DISABLE_MSVC(4554)
-PYBIND11_WARNING_DISABLE_MSVC(4127)
-PYBIND11_WARNING_DISABLE_GCC("-Wmaybe-uninitialized")
-
-#include <unsupported/Eigen/CXX11/Tensor>
-
-PYBIND11_WARNING_POP
-
-static_assert(EIGEN_VERSION_AT_LEAST(3, 3, 0),
- "Eigen Tensor support in pybind11 requires Eigen >= 3.3.0");
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_WARNING_DISABLE_MSVC(4127)
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-inline bool is_tensor_aligned(const void *data) {
- return (reinterpret_cast<std::size_t>(data) % EIGEN_DEFAULT_ALIGN_BYTES) == 0;
-}
-
-template <typename T>
-constexpr int compute_array_flag_from_tensor() {
- static_assert((static_cast<int>(T::Layout) == static_cast<int>(Eigen::RowMajor))
- || (static_cast<int>(T::Layout) == static_cast<int>(Eigen::ColMajor)),
- "Layout must be row or column major");
- return (static_cast<int>(T::Layout) == static_cast<int>(Eigen::RowMajor)) ? array::c_style
- : array::f_style;
-}
-
-template <typename T>
-struct eigen_tensor_helper {};
-
-template <typename Scalar_, int NumIndices_, int Options_, typename IndexType>
-struct eigen_tensor_helper<Eigen::Tensor<Scalar_, NumIndices_, Options_, IndexType>> {
- using Type = Eigen::Tensor<Scalar_, NumIndices_, Options_, IndexType>;
- using ValidType = void;
-
- static Eigen::DSizes<typename Type::Index, Type::NumIndices> get_shape(const Type &f) {
- return f.dimensions();
- }
-
- static constexpr bool
- is_correct_shape(const Eigen::DSizes<typename Type::Index, Type::NumIndices> & /*shape*/) {
- return true;
- }
-
- template <typename T>
- struct helper {};
-
- template <size_t... Is>
- struct helper<index_sequence<Is...>> {
- static constexpr auto value = concat(const_name(((void) Is, "?"))...);
- };
-
- static constexpr auto dimensions_descriptor
- = helper<decltype(make_index_sequence<Type::NumIndices>())>::value;
-
- template <typename... Args>
- static Type *alloc(Args &&...args) {
- return new Type(std::forward<Args>(args)...);
- }
-
- static void free(Type *tensor) { delete tensor; }
-};
-
-template <typename Scalar_, typename std::ptrdiff_t... Indices, int Options_, typename IndexType>
-struct eigen_tensor_helper<
- Eigen::TensorFixedSize<Scalar_, Eigen::Sizes<Indices...>, Options_, IndexType>> {
- using Type = Eigen::TensorFixedSize<Scalar_, Eigen::Sizes<Indices...>, Options_, IndexType>;
- using ValidType = void;
-
- static constexpr Eigen::DSizes<typename Type::Index, Type::NumIndices>
- get_shape(const Type & /*f*/) {
- return get_shape();
- }
-
- static constexpr Eigen::DSizes<typename Type::Index, Type::NumIndices> get_shape() {
- return Eigen::DSizes<typename Type::Index, Type::NumIndices>(Indices...);
- }
-
- static bool
- is_correct_shape(const Eigen::DSizes<typename Type::Index, Type::NumIndices> &shape) {
- return get_shape() == shape;
- }
-
- static constexpr auto dimensions_descriptor = concat(const_name<Indices>()...);
-
- template <typename... Args>
- static Type *alloc(Args &&...args) {
- Eigen::aligned_allocator<Type> allocator;
- return ::new (allocator.allocate(1)) Type(std::forward<Args>(args)...);
- }
-
- static void free(Type *tensor) {
- Eigen::aligned_allocator<Type> allocator;
- tensor->~Type();
- allocator.deallocate(tensor, 1);
- }
-};
-
-template <typename Type, bool ShowDetails, bool NeedsWriteable = false>
-struct get_tensor_descriptor {
- static constexpr auto details
- = const_name<NeedsWriteable>(", flags.writeable", "")
- + const_name<static_cast<int>(Type::Layout) == static_cast<int>(Eigen::RowMajor)>(
- ", flags.c_contiguous", ", flags.f_contiguous");
- static constexpr auto value
- = const_name("numpy.ndarray[") + npy_format_descriptor<typename Type::Scalar>::name
- + const_name("[") + eigen_tensor_helper<remove_cv_t<Type>>::dimensions_descriptor
- + const_name("]") + const_name<ShowDetails>(details, const_name("")) + const_name("]");
-};
-
-// When EIGEN_AVOID_STL_ARRAY is defined, Eigen::DSizes<T, 0> does not have the begin() member
-// function. Falling back to a simple loop works around this issue.
-//
-// We need to disable the type-limits warning for the inner loop when size = 0.
-
-PYBIND11_WARNING_PUSH
-PYBIND11_WARNING_DISABLE_GCC("-Wtype-limits")
-
-template <typename T, int size>
-std::vector<T> convert_dsizes_to_vector(const Eigen::DSizes<T, size> &arr) {
- std::vector<T> result(size);
-
- for (size_t i = 0; i < size; i++) {
- result[i] = arr[i];
- }
-
- return result;
-}
-
-template <typename T, int size>
-Eigen::DSizes<T, size> get_shape_for_array(const array &arr) {
- Eigen::DSizes<T, size> result;
- const T *shape = arr.shape();
- for (size_t i = 0; i < size; i++) {
- result[i] = shape[i];
- }
-
- return result;
-}
-
-PYBIND11_WARNING_POP
-
-template <typename Type>
-struct type_caster<Type, typename eigen_tensor_helper<Type>::ValidType> {
- using Helper = eigen_tensor_helper<Type>;
- static constexpr auto temp_name = get_tensor_descriptor<Type, false>::value;
- PYBIND11_TYPE_CASTER(Type, temp_name);
-
- bool load(handle src, bool convert) {
- if (!convert) {
- if (!isinstance<array>(src)) {
- return false;
- }
- array temp = array::ensure(src);
- if (!temp) {
- return false;
- }
-
- if (!temp.dtype().is(dtype::of<typename Type::Scalar>())) {
- return false;
- }
- }
-
- array_t<typename Type::Scalar, compute_array_flag_from_tensor<Type>()> arr(
- reinterpret_borrow<object>(src));
-
- if (arr.ndim() != Type::NumIndices) {
- return false;
- }
- auto shape = get_shape_for_array<typename Type::Index, Type::NumIndices>(arr);
-
- if (!Helper::is_correct_shape(shape)) {
- return false;
- }
-
-#if EIGEN_VERSION_AT_LEAST(3, 4, 0)
- auto data_pointer = arr.data();
-#else
- // Handle Eigen bug
- auto data_pointer = const_cast<typename Type::Scalar *>(arr.data());
-#endif
-
- if (is_tensor_aligned(arr.data())) {
- value = Eigen::TensorMap<const Type, Eigen::Aligned>(data_pointer, shape);
- } else {
- value = Eigen::TensorMap<const Type>(data_pointer, shape);
- }
-
- return true;
- }
-
- static handle cast(Type &&src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::reference
- || policy == return_value_policy::reference_internal) {
- pybind11_fail("Cannot use a reference return value policy for an rvalue");
- }
- return cast_impl(&src, return_value_policy::move, parent);
- }
-
- static handle cast(const Type &&src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::reference
- || policy == return_value_policy::reference_internal) {
- pybind11_fail("Cannot use a reference return value policy for an rvalue");
- }
- return cast_impl(&src, return_value_policy::move, parent);
- }
-
- 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);
- }
-
- 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);
- }
-
- static handle cast(Type *src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::automatic) {
- policy = return_value_policy::take_ownership;
- } else if (policy == return_value_policy::automatic_reference) {
- policy = return_value_policy::reference;
- }
- return cast_impl(src, policy, parent);
- }
-
- static handle cast(const Type *src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::automatic) {
- policy = return_value_policy::take_ownership;
- } else if (policy == return_value_policy::automatic_reference) {
- policy = return_value_policy::reference;
- }
- return cast_impl(src, policy, parent);
- }
-
- template <typename C>
- static handle cast_impl(C *src, return_value_policy policy, handle parent) {
- object parent_object;
- bool writeable = false;
- switch (policy) {
- case return_value_policy::move:
- if (std::is_const<C>::value) {
- pybind11_fail("Cannot move from a constant reference");
- }
-
- src = Helper::alloc(std::move(*src));
-
- parent_object
- = capsule(src, [](void *ptr) { Helper::free(reinterpret_cast<Type *>(ptr)); });
- writeable = true;
- break;
-
- case return_value_policy::take_ownership:
- if (std::is_const<C>::value) {
- // This cast is ugly, and might be UB in some cases, but we don't have an
- // alternative here as we must free that memory
- Helper::free(const_cast<Type *>(src));
- pybind11_fail("Cannot take ownership of a const reference");
- }
-
- parent_object
- = capsule(src, [](void *ptr) { Helper::free(reinterpret_cast<Type *>(ptr)); });
- writeable = true;
- break;
-
- case return_value_policy::copy:
- writeable = true;
- break;
-
- case return_value_policy::reference:
- parent_object = none();
- writeable = !std::is_const<C>::value;
- break;
-
- case return_value_policy::reference_internal:
- // Default should do the right thing
- if (!parent) {
- pybind11_fail("Cannot use reference internal when there is no parent");
- }
- parent_object = reinterpret_borrow<object>(parent);
- writeable = !std::is_const<C>::value;
- break;
-
- default:
- pybind11_fail("pybind11 bug in eigen.h, please file a bug report");
- }
-
- auto result = array_t<typename Type::Scalar, compute_array_flag_from_tensor<Type>()>(
- convert_dsizes_to_vector(Helper::get_shape(*src)), src->data(), parent_object);
-
- if (!writeable) {
- array_proxy(result.ptr())->flags &= ~detail::npy_api::NPY_ARRAY_WRITEABLE_;
- }
-
- return result.release();
- }
-};
-
-template <typename StoragePointerType,
- bool needs_writeable,
- enable_if_t<!needs_writeable, bool> = true>
-StoragePointerType get_array_data_for_type(array &arr) {
-#if EIGEN_VERSION_AT_LEAST(3, 4, 0)
- return reinterpret_cast<StoragePointerType>(arr.data());
-#else
- // Handle Eigen bug
- return reinterpret_cast<StoragePointerType>(const_cast<void *>(arr.data()));
-#endif
-}
-
-template <typename StoragePointerType,
- bool needs_writeable,
- enable_if_t<needs_writeable, bool> = true>
-StoragePointerType get_array_data_for_type(array &arr) {
- return reinterpret_cast<StoragePointerType>(arr.mutable_data());
-}
-
-template <typename T, typename = void>
-struct get_storage_pointer_type;
-
-template <typename MapType>
-struct get_storage_pointer_type<MapType, void_t<typename MapType::StoragePointerType>> {
- using SPT = typename MapType::StoragePointerType;
-};
-
-template <typename MapType>
-struct get_storage_pointer_type<MapType, void_t<typename MapType::PointerArgType>> {
- using SPT = typename MapType::PointerArgType;
-};
-
-template <typename Type, int Options>
-struct type_caster<Eigen::TensorMap<Type, Options>,
- typename eigen_tensor_helper<remove_cv_t<Type>>::ValidType> {
- using MapType = Eigen::TensorMap<Type, Options>;
- using Helper = eigen_tensor_helper<remove_cv_t<Type>>;
-
- bool load(handle src, bool /*convert*/) {
- // Note that we have a lot more checks here as we want to make sure to avoid copies
- if (!isinstance<array>(src)) {
- return false;
- }
- auto arr = reinterpret_borrow<array>(src);
- if ((arr.flags() & compute_array_flag_from_tensor<Type>()) == 0) {
- return false;
- }
-
- if (!arr.dtype().is(dtype::of<typename Type::Scalar>())) {
- return false;
- }
-
- if (arr.ndim() != Type::NumIndices) {
- return false;
- }
-
- constexpr bool is_aligned = (Options & Eigen::Aligned) != 0;
-
- if (is_aligned && !is_tensor_aligned(arr.data())) {
- return false;
- }
-
- auto shape = get_shape_for_array<typename Type::Index, Type::NumIndices>(arr);
-
- if (!Helper::is_correct_shape(shape)) {
- return false;
- }
-
- if (needs_writeable && !arr.writeable()) {
- return false;
- }
-
- auto result = get_array_data_for_type<typename get_storage_pointer_type<MapType>::SPT,
- needs_writeable>(arr);
-
- value.reset(new MapType(std::move(result), std::move(shape)));
-
- return true;
- }
-
- static handle cast(MapType &&src, return_value_policy policy, handle parent) {
- return cast_impl(&src, policy, parent);
- }
-
- static handle cast(const MapType &&src, return_value_policy policy, handle parent) {
- return cast_impl(&src, policy, parent);
- }
-
- static handle cast(MapType &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);
- }
-
- static handle cast(const MapType &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(MapType *src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::automatic) {
- policy = return_value_policy::take_ownership;
- } else if (policy == return_value_policy::automatic_reference) {
- policy = return_value_policy::reference;
- }
- return cast_impl(src, policy, parent);
- }
-
- static handle cast(const MapType *src, return_value_policy policy, handle parent) {
- if (policy == return_value_policy::automatic) {
- policy = return_value_policy::take_ownership;
- } else if (policy == return_value_policy::automatic_reference) {
- policy = return_value_policy::reference;
- }
- return cast_impl(src, policy, parent);
- }
-
- template <typename C>
- static handle cast_impl(C *src, return_value_policy policy, handle parent) {
- object parent_object;
- constexpr bool writeable = !std::is_const<C>::value;
- switch (policy) {
- case return_value_policy::reference:
- parent_object = none();
- break;
-
- case return_value_policy::reference_internal:
- // Default should do the right thing
- if (!parent) {
- pybind11_fail("Cannot use reference internal when there is no parent");
- }
- parent_object = reinterpret_borrow<object>(parent);
- break;
-
- case return_value_policy::take_ownership:
- delete src;
- // fallthrough
- default:
- // move, take_ownership don't make any sense for a ref/map:
- pybind11_fail("Invalid return_value_policy for Eigen Map type, must be either "
- "reference or reference_internal");
- }
-
- auto result = array_t<typename Type::Scalar, compute_array_flag_from_tensor<Type>()>(
- convert_dsizes_to_vector(Helper::get_shape(*src)),
- src->data(),
- std::move(parent_object));
-
- if (!writeable) {
- array_proxy(result.ptr())->flags &= ~detail::npy_api::NPY_ARRAY_WRITEABLE_;
- }
-
- return result.release();
- }
-
-#if EIGEN_VERSION_AT_LEAST(3, 4, 0)
-
- static constexpr bool needs_writeable = !std::is_const<typename std::remove_pointer<
- typename get_storage_pointer_type<MapType>::SPT>::type>::value;
-#else
- // Handle Eigen bug
- static constexpr bool needs_writeable = !std::is_const<Type>::value;
-#endif
-
-protected:
- // TODO: Move to std::optional once std::optional has more support
- std::unique_ptr<MapType> value;
-
-public:
- static constexpr auto name = get_tensor_descriptor<Type, true, needs_writeable>::value;
- explicit operator MapType *() { return value.get(); }
- explicit operator MapType &() { return *value; }
- explicit operator MapType &&() && { return std::move(*value); }
-
- template <typename T_>
- using cast_op_type = ::pybind11::detail::movable_cast_op_type<T_>;
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/embed.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/embed.h
deleted file mode 100644
index 749c75beb6030429157fb3e14ed56479137bb5cc..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/embed.h
+++ /dev/null
@@ -1,317 +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"
-
-#include <memory>
-#include <vector>
-
-#if defined(PYPY_VERSION)
-# error Embedding the interpreter is not supported with PyPy
-#endif
-
-#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(); }
-
-/** \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) // NOLINT(bugprone-macro-parentheses)
-
-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 {
- using init_t = PyObject *(*) ();
- embedded_module(const char *name, init_t init) {
- if (Py_IsInitialized() != 0) {
- 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");
- }
- }
-};
-
-struct wide_char_arg_deleter {
- void operator()(wchar_t *ptr) const {
- // API docs: https://docs.python.org/3/c-api/sys.html#c.Py_DecodeLocale
- PyMem_RawFree(ptr);
- }
-};
-
-inline wchar_t *widen_chars(const char *safe_arg) {
- wchar_t *widened_arg = Py_DecodeLocale(safe_arg, nullptr);
- return widened_arg;
-}
-
-inline void precheck_interpreter() {
- if (Py_IsInitialized() != 0) {
- pybind11_fail("The interpreter is already running");
- }
-}
-
-#if !defined(PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX)
-# define PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX (0x03080000)
-#endif
-
-#if PY_VERSION_HEX < PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
-inline void initialize_interpreter_pre_pyconfig(bool init_signal_handlers,
- int argc,
- const char *const *argv,
- bool add_program_dir_to_path) {
- detail::precheck_interpreter();
- Py_InitializeEx(init_signal_handlers ? 1 : 0);
-# if defined(WITH_THREAD) && PY_VERSION_HEX < 0x03070000
- PyEval_InitThreads();
-# endif
-
- // Before it was special-cased in python 3.8, passing an empty or null argv
- // caused a segfault, so we have to reimplement the special case ourselves.
- bool special_case = (argv == nullptr || argc <= 0);
-
- const char *const empty_argv[]{"\0"};
- const char *const *safe_argv = special_case ? empty_argv : argv;
- if (special_case) {
- argc = 1;
- }
-
- auto argv_size = static_cast<size_t>(argc);
- // SetArgv* on python 3 takes wchar_t, so we have to convert.
- std::unique_ptr<wchar_t *[]> widened_argv(new wchar_t *[argv_size]);
- std::vector<std::unique_ptr<wchar_t[], detail::wide_char_arg_deleter>> widened_argv_entries;
- widened_argv_entries.reserve(argv_size);
- for (size_t ii = 0; ii < argv_size; ++ii) {
- widened_argv_entries.emplace_back(detail::widen_chars(safe_argv[ii]));
- if (!widened_argv_entries.back()) {
- // A null here indicates a character-encoding failure or the python
- // interpreter out of memory. Give up.
- return;
- }
- widened_argv[ii] = widened_argv_entries.back().get();
- }
-
- auto *pysys_argv = widened_argv.get();
-
- PySys_SetArgvEx(argc, pysys_argv, static_cast<int>(add_program_dir_to_path));
-}
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-
-#if PY_VERSION_HEX >= PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
-inline void initialize_interpreter(PyConfig *config,
- int argc = 0,
- const char *const *argv = nullptr,
- bool add_program_dir_to_path = true) {
- detail::precheck_interpreter();
- PyStatus status = PyConfig_SetBytesArgv(config, argc, const_cast<char *const *>(argv));
- if (PyStatus_Exception(status) != 0) {
- // A failure here indicates a character-encoding failure or the python
- // interpreter out of memory. Give up.
- PyConfig_Clear(config);
- throw std::runtime_error(PyStatus_IsError(status) != 0 ? status.err_msg
- : "Failed to prepare CPython");
- }
- status = Py_InitializeFromConfig(config);
- if (PyStatus_Exception(status) != 0) {
- PyConfig_Clear(config);
- throw std::runtime_error(PyStatus_IsError(status) != 0 ? status.err_msg
- : "Failed to init CPython");
- }
- if (add_program_dir_to_path) {
- PyRun_SimpleString("import sys, os.path; "
- "sys.path.insert(0, "
- "os.path.abspath(os.path.dirname(sys.argv[0])) "
- "if sys.argv and os.path.exists(sys.argv[0]) else '')");
- }
- PyConfig_Clear(config);
-}
-#endif
-
-/** \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 `init_signal_handlers` 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.)
-
- The remaining optional parameters, `argc`, `argv`, and `add_program_dir_to_path` are
- used to populate ``sys.argv`` and ``sys.path``.
- See the |PySys_SetArgvEx documentation|_ for details.
-
- .. _Python documentation: https://docs.python.org/3/c-api/init.html#c.Py_InitializeEx
- .. |PySys_SetArgvEx documentation| replace:: ``PySys_SetArgvEx`` documentation
- .. _PySys_SetArgvEx documentation: https://docs.python.org/3/c-api/init.html#c.PySys_SetArgvEx
- \endrst */
-inline void initialize_interpreter(bool init_signal_handlers = true,
- int argc = 0,
- const char *const *argv = nullptr,
- bool add_program_dir_to_path = true) {
-#if PY_VERSION_HEX < PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
- detail::initialize_interpreter_pre_pyconfig(
- init_signal_handlers, argc, argv, add_program_dir_to_path);
-#else
- PyConfig config;
- PyConfig_InitIsolatedConfig(&config);
- config.isolated = 0;
- config.use_environment = 1;
- config.install_signal_handlers = init_signal_handlers ? 1 : 0;
- initialize_interpreter(&config, argc, argv, add_program_dir_to_path);
-#endif
-}
-
-/** \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]);
- }
- // Local internals contains data managed by the current interpreter, so we must clear them to
- // avoid undefined behaviors when initializing another interpreter
- detail::get_local_internals().registered_types_cpp.clear();
- detail::get_local_internals().registered_exception_translators.clear();
-
- 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.
-
- See `initialize_interpreter` for a discussion of its constructor arguments.
-
- .. code-block:: cpp
-
- #include <pybind11/embed.h>
-
- int main() {
- py::scoped_interpreter guard{};
- py::print(Hello, World!);
- } // <-- interpreter shutdown
- \endrst */
-class scoped_interpreter {
-public:
- explicit scoped_interpreter(bool init_signal_handlers = true,
- int argc = 0,
- const char *const *argv = nullptr,
- bool add_program_dir_to_path = true) {
- initialize_interpreter(init_signal_handlers, argc, argv, add_program_dir_to_path);
- }
-
-#if PY_VERSION_HEX >= PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
- explicit scoped_interpreter(PyConfig *config,
- int argc = 0,
- const char *const *argv = nullptr,
- bool add_program_dir_to_path = true) {
- initialize_interpreter(config, argc, argv, add_program_dir_to_path);
- }
-#endif
-
- 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.10.3/include/pybind11/eval.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eval.h
deleted file mode 100644
index bd5f981f53b87dd8c378a20dcd8109a6b3172cfe..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/eval.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- pybind11/eval.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"
-
-#include <utility>
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-inline void ensure_builtins_in_globals(object &global) {
-#if defined(PYPY_VERSION) || PY_VERSION_HEX < 0x03080000
- // Running exec and eval adds `builtins` module under `__builtins__` key to
- // globals if not yet present. Python 3.8 made PyRun_String behave
- // similarly. Let's also do that for older versions, for consistency. This
- // was missing from PyPy3.8 7.3.7.
- if (!global.contains("__builtins__"))
- global["__builtins__"] = module_::import(PYBIND11_BUILTINS_MODULE);
-#else
- (void) global;
-#endif
-}
-
-PYBIND11_NAMESPACE_END(detail)
-
-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(const str &expr, object global = globals(), object local = object()) {
- if (!local) {
- local = global;
- }
-
- detail::ensure_builtins_in_globals(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 = 0;
- 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, std::move(global), std::move(local));
-}
-
-inline void exec(const str &expr, object global = globals(), object local = object()) {
- eval<eval_statements>(expr, std::move(global), std::move(local));
-}
-
-template <size_t N>
-void exec(const char (&s)[N], object global = globals(), object local = object()) {
- eval<eval_statements>(s, std::move(global), std::move(local));
-}
-
-#if defined(PYPY_VERSION)
-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;
- }
-
- detail::ensure_builtins_in_globals(global);
-
- int start = 0;
- 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;
- FILE *f = _Py_fopen_obj(fname.ptr(), "r");
- if (!f) {
- PyErr_Clear();
- pybind11_fail("File \"" + fname_str + "\" could not be opened!");
- }
-
- if (!global.contains("__file__")) {
- global["__file__"] = std::move(fname);
- }
-
- PyObject *result
- = PyRun_FileEx(f, fname_str.c_str(), start, global.ptr(), local.ptr(), closeFile);
-
- if (!result) {
- throw error_already_set();
- }
- return reinterpret_steal<object>(result);
-}
-#endif
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/functional.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/functional.h
deleted file mode 100644
index 87ec4d10cb1a8e5da7df41ad4c9ae67b59a9c04e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/functional.h
+++ /dev/null
@@ -1,137 +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 *cfunc_self = PyCFunction_GET_SELF(cfunc.ptr());
- if (cfunc_self == nullptr) {
- PyErr_Clear();
- } else if (isinstance<capsule>(cfunc_self)) {
- auto c = reinterpret_borrow<capsule>(cfunc_self);
-
- function_record *rec = nullptr;
- // Check that we can safely reinterpret the capsule into a function_record
- if (detail::is_function_record_capsule(c)) {
- rec = c.get_pointer<function_record>();
- }
-
- while (rec != nullptr) {
- if (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;
- }
- rec = rec->next;
- }
- }
- // PYPY segfaults here when passing builtin function like sum.
- // Raising an fail exception here works to prevent the segfault, but only on gcc.
- // See PR #1413 for full details
- }
-
- // ensure GIL is held during functor destruction
- struct func_handle {
- function f;
-#if !(defined(_MSC_VER) && _MSC_VER == 1916 && defined(PYBIND11_CPP17))
- // This triggers a syntax error under very special conditions (very weird indeed).
- explicit
-#endif
- func_handle(function &&f_) noexcept
- : f(std::move(f_)) {
- }
- func_handle(const func_handle &f_) { operator=(f_); }
- func_handle &operator=(const func_handle &f_) {
- gil_scoped_acquire acq;
- f = f_.f;
- return *this;
- }
- ~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;
- explicit func_wrapper(func_handle &&hf) noexcept : hfunc(std::move(hf)) {}
- Return operator()(Args... args) const {
- gil_scoped_acquire acq;
- // casts the returned object as a rvalue to the return type
- return hfunc.f(std::forward<Args>(args)...).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().release();
- }
-
- auto result = f_.template target<function_type>();
- if (result) {
- return cpp_function(*result, policy).release();
- }
- return cpp_function(std::forward<Func>(f_), policy).release();
- }
-
- PYBIND11_TYPE_CASTER(type,
- const_name("Callable[[") + concat(make_caster<Args>::name...)
- + const_name("], ") + make_caster<retval_type>::name
- + const_name("]"));
-};
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/gil.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/gil.h
deleted file mode 100644
index cb0028d5051e4fabd32efb633538eb7c3021841b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/gil.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- pybind11/gil.h: RAII helpers for managing the GIL
-
- 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"
-
-#if defined(WITH_THREAD) && !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
-# include "detail/internals.h"
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// forward declarations
-PyThreadState *get_thread_state_unchecked();
-
-PYBIND11_NAMESPACE_END(detail)
-
-#if defined(WITH_THREAD)
-
-# if !defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
-
-/* 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 &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(PYBIND11_DETAILED_ERROR_MESSAGES)
- 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) {
- PyEval_AcquireThread(tstate);
- }
-
- inc_ref();
- }
-
- gil_scoped_acquire(const gil_scoped_acquire &) = delete;
- gil_scoped_acquire &operator=(const gil_scoped_acquire &) = delete;
-
- void inc_ref() { ++tstate->gilstate_counter; }
-
- PYBIND11_NOINLINE void dec_ref() {
- --tstate->gilstate_counter;
-# if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
- 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(PYBIND11_DETAILED_ERROR_MESSAGES)
- if (!release) {
- pybind11_fail("scoped_acquire::dec_ref(): internal error!");
- }
-# endif
- PyThreadState_Clear(tstate);
- if (active) {
- PyThreadState_DeleteCurrent();
- }
- PYBIND11_TLS_DELETE_VALUE(detail::get_internals().tstate);
- release = false;
- }
- }
-
- /// This method will disable the PyThreadState_DeleteCurrent call and the
- /// GIL won't be acquired. This method should be used if the interpreter
- /// could be shutting down when this is called, as thread deletion is not
- /// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
- /// protect subsequent code.
- PYBIND11_NOINLINE void disarm() { active = false; }
-
- PYBIND11_NOINLINE ~gil_scoped_acquire() {
- dec_ref();
- if (release) {
- PyEval_SaveThread();
- }
- }
-
-private:
- PyThreadState *tstate = nullptr;
- bool release = true;
- bool active = 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`.
- auto &internals = detail::get_internals();
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- tstate = PyEval_SaveThread();
- if (disassoc) {
- // Python >= 3.7 can remove this, it's an int before 3.7
- // NOLINTNEXTLINE(readability-qualified-auto)
- auto key = internals.tstate;
- PYBIND11_TLS_DELETE_VALUE(key);
- }
- }
-
- gil_scoped_release(const gil_scoped_acquire &) = delete;
- gil_scoped_release &operator=(const gil_scoped_acquire &) = delete;
-
- /// This method will disable the PyThreadState_DeleteCurrent call and the
- /// GIL won't be acquired. This method should be used if the interpreter
- /// could be shutting down when this is called, as thread deletion is not
- /// allowed during shutdown. Check _Py_IsFinalizing() on Python 3.7+, and
- /// protect subsequent code.
- PYBIND11_NOINLINE void disarm() { active = false; }
-
- ~gil_scoped_release() {
- if (!tstate) {
- return;
- }
- // `PyEval_RestoreThread()` should not be called if runtime is finalizing
- if (active) {
- PyEval_RestoreThread(tstate);
- }
- if (disassoc) {
- // Python >= 3.7 can remove this, it's an int before 3.7
- // NOLINTNEXTLINE(readability-qualified-auto)
- auto key = detail::get_internals().tstate;
- PYBIND11_TLS_REPLACE_VALUE(key, tstate);
- }
- }
-
-private:
- PyThreadState *tstate;
- bool disassoc;
- bool active = true;
-};
-
-# else // PYBIND11_SIMPLE_GIL_MANAGEMENT
-
-class gil_scoped_acquire {
- PyGILState_STATE state;
-
-public:
- gil_scoped_acquire() : state{PyGILState_Ensure()} {}
- gil_scoped_acquire(const gil_scoped_acquire &) = delete;
- gil_scoped_acquire &operator=(const gil_scoped_acquire &) = delete;
- ~gil_scoped_acquire() { PyGILState_Release(state); }
- void disarm() {}
-};
-
-class gil_scoped_release {
- PyThreadState *state;
-
-public:
- gil_scoped_release() : state{PyEval_SaveThread()} {}
- gil_scoped_release(const gil_scoped_release &) = delete;
- gil_scoped_release &operator=(const gil_scoped_acquire &) = delete;
- ~gil_scoped_release() { PyEval_RestoreThread(state); }
- void disarm() {}
-};
-
-# endif // PYBIND11_SIMPLE_GIL_MANAGEMENT
-
-#else // WITH_THREAD
-
-class gil_scoped_acquire {
-public:
- gil_scoped_acquire() {
- // Trick to suppress `unused variable` error messages (at call sites).
- (void) (this != (this + 1));
- }
- gil_scoped_acquire(const gil_scoped_acquire &) = delete;
- gil_scoped_acquire &operator=(const gil_scoped_acquire &) = delete;
- void disarm() {}
-};
-
-class gil_scoped_release {
-public:
- gil_scoped_release() {
- // Trick to suppress `unused variable` error messages (at call sites).
- (void) (this != (this + 1));
- }
- gil_scoped_release(const gil_scoped_release &) = delete;
- gil_scoped_release &operator=(const gil_scoped_acquire &) = delete;
- void disarm() {}
-};
-
-#endif // WITH_THREAD
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/iostream.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/iostream.h
deleted file mode 100644
index 1878089e3171bcfbd575ff4d7f925f981489316c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/iostream.h
+++ /dev/null
@@ -1,265 +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.
-
- WARNING: The implementation in this file is NOT thread safe. Multiple
- threads writing to a redirected ostream concurrently cause data races
- and potentially buffer overflows. Therefore it is currently a requirement
- that all (possibly) concurrent redirected ostream writes are protected by
- a mutex.
- #HelpAppreciated: Work on iostream.h thread safety.
- For more background see the discussions under
- https://github.com/pybind/pybind11/pull/2982 and
- https://github.com/pybind/pybind11/pull/2995.
-*/
-
-#pragma once
-
-#include "pybind11.h"
-
-#include <algorithm>
-#include <cstring>
-#include <iostream>
-#include <iterator>
-#include <memory>
-#include <ostream>
-#include <streambuf>
-#include <string>
-#include <utility>
-
-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();
- }
-
- // Computes how many bytes at the end of the buffer are part of an
- // incomplete sequence of UTF-8 bytes.
- // Precondition: pbase() < pptr()
- size_t utf8_remainder() const {
- const auto rbase = std::reverse_iterator<char *>(pbase());
- const auto rpptr = std::reverse_iterator<char *>(pptr());
- auto is_ascii = [](char c) { return (static_cast<unsigned char>(c) & 0x80) == 0x00; };
- auto is_leading = [](char c) { return (static_cast<unsigned char>(c) & 0xC0) == 0xC0; };
- auto is_leading_2b = [](char c) { return static_cast<unsigned char>(c) <= 0xDF; };
- auto is_leading_3b = [](char c) { return static_cast<unsigned char>(c) <= 0xEF; };
- // If the last character is ASCII, there are no incomplete code points
- if (is_ascii(*rpptr)) {
- return 0;
- }
- // Otherwise, work back from the end of the buffer and find the first
- // UTF-8 leading byte
- const auto rpend = rbase - rpptr >= 3 ? rpptr + 3 : rbase;
- const auto leading = std::find_if(rpptr, rpend, is_leading);
- if (leading == rbase) {
- return 0;
- }
- const auto dist = static_cast<size_t>(leading - rpptr);
- size_t remainder = 0;
-
- if (dist == 0) {
- remainder = 1; // 1-byte code point is impossible
- } else if (dist == 1) {
- remainder = is_leading_2b(*leading) ? 0 : dist + 1;
- } else if (dist == 2) {
- remainder = is_leading_3b(*leading) ? 0 : dist + 1;
- }
- // else if (dist >= 3), at least 4 bytes before encountering an UTF-8
- // leading byte, either no remainder or invalid UTF-8.
- // Invalid UTF-8 will cause an exception later when converting
- // to a Python string, so that's not handled here.
- return remainder;
- }
-
- // This function must be non-virtual to be called in a destructor.
- int _sync() {
- if (pbase() != pptr()) { // If buffer is not empty
- gil_scoped_acquire tmp;
- // This subtraction cannot be negative, so dropping the sign.
- auto size = static_cast<size_t>(pptr() - pbase());
- size_t remainder = utf8_remainder();
-
- if (size > remainder) {
- str line(pbase(), size - remainder);
- pywrite(std::move(line));
- pyflush();
- }
-
- // Copy the remainder at the end of the buffer to the beginning:
- if (remainder > 0) {
- std::memmove(pbase(), pptr() - remainder, remainder);
- }
- setp(pbase(), epptr());
- pbump(static_cast<int>(remainder));
- }
- return 0;
- }
-
- int sync() override { return _sync(); }
-
-public:
- explicit pythonbuf(const 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::cout << "Hello, World!";
- }
- \endrst */
-class scoped_ostream_redirect {
-protected:
- std::streambuf *old;
- std::ostream &costream;
- detail::pythonbuf buffer;
-
-public:
- explicit scoped_ostream_redirect(std::ostream &costream = std::cout,
- const 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:
- explicit scoped_estream_redirect(std::ostream &costream = std::cerr,
- const 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:
- explicit 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, const std::string &name = "ostream_redirect") {
- return class_<detail::OstreamRedirect>(std::move(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_, const args &) { self_.exit(); });
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/numpy.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/numpy.h
deleted file mode 100644
index 8f072af26717765dc6d4e7c13d276c372cfe1af3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/numpy.h
+++ /dev/null
@@ -1,1992 +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 <algorithm>
-#include <array>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <functional>
-#include <numeric>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <typeindex>
-#include <utility>
-#include <vector>
-
-/* 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)
-
-PYBIND11_WARNING_DISABLE_MSVC(4127)
-
-class array; // Forward declaration
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-template <>
-struct handle_type_name<array> {
- static constexpr auto name = const_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);
- }
-};
-
-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_),
- };
-
- struct PyArray_Dims {
- Py_intptr_t *ptr;
- int len;
- };
-
- static npy_api &get() {
- static npy_api api = lookup();
- return api;
- }
-
- bool PyArray_Check_(PyObject *obj) const {
- return PyObject_TypeCheck(obj, PyArray_Type_) != 0;
- }
- bool PyArrayDescr_Check_(PyObject *obj) const {
- return PyObject_TypeCheck(obj, PyArrayDescr_Type_) != 0;
- }
-
- 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);
- PyObject *(*PyArray_Newshape_)(PyObject *, PyArray_Dims *, int);
- PyObject *(*PyArray_View_)(PyObject *, PyObject *, PyObject *);
-
-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_Newshape = 135,
- API_PyArray_Squeeze = 136,
- API_PyArray_View = 137,
- API_PyArray_DescrConverter = 174,
- API_PyArray_EquivTypes = 182,
- API_PyArray_GetArrayParamsFromObject = 278,
- API_PyArray_SetBaseObject = 282
- };
-
- static npy_api lookup() {
- module_ m = module_::import("numpy.core.multiarray");
- auto c = m.attr("_ARRAY_API");
- void **api_ptr = (void **) PyCapsule_GetPointer(c.ptr(), nullptr);
- 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_Newshape);
- DECL_NPY_API(PyArray_Squeeze);
- DECL_NPY_API(PyArray_View);
- DECL_NPY_API(PyArray_DescrConverter);
- DECL_NPY_API(PyArray_EquivTypes);
- DECL_NPY_API(PyArray_GetArrayParamsFromObject);
- 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 = const_name("");
- 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 = const_name<array_info<T>::is_array>(
- concat(const_name<N>(), array_info<T>::extents), const_name<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(__GLIBCXX__) \
- && (__GLIBCXX__ < 20150422 || __GLIBCXX__ == 20150426 || __GLIBCXX__ == 20150623 \
- || __GLIBCXX__ == 20150626 || __GLIBCXX__ == 20160803)
- // libstdc++ < 5 (including versions 4.8.5, 4.9.3 and 4.9.4 which were released after
- // 5) don'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>,
-#else
- std::is_trivially_copyable<T>,
-#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(info.format)));
- // If info.itemsize == 0, use the value calculated from the format string
- m_ptr = descr.strip_padding(info.itemsize != 0 ? info.itemsize : descr.itemsize())
- .release()
- .ptr();
- }
-
- explicit dtype(const pybind11::str &format) : dtype(from_args(format)) {}
-
- explicit dtype(const std::string &format) : dtype(pybind11::str(format)) {}
-
- explicit dtype(const char *format) : dtype(pybind11::str(format)) {}
-
- dtype(list names, list formats, list offsets, ssize_t itemsize) {
- dict args;
- args["names"] = std::move(names);
- args["formats"] = std::move(formats);
- args["offsets"] = std::move(offsets);
- args["itemsize"] = pybind11::int_(itemsize);
- m_ptr = from_args(args).release().ptr();
- }
-
- explicit dtype(int typenum)
- : object(detail::npy_api::get().PyArray_DescrFromType_(typenum), stolen_t{}) {
- if (m_ptr == nullptr) {
- throw error_already_set();
- }
- }
-
- /// This is essentially the same as calling numpy.dtype(args) in Python.
- static dtype from_args(const object &args) {
- PyObject *ptr = nullptr;
- if ((detail::npy_api::get().PyArray_DescrConverter_(args.ptr(), &ptr) == 0) || !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 code for dtype's kind.
- /// For example, floating point types are 'f' and integral types are 'i'.
- char kind() const { return detail::array_descriptor_proxy(m_ptr)->kind; }
-
- /// Single-character for dtype's type.
- /// For example, ``float`` is 'f', ``double`` 'd', ``int`` 'i', and ``long`` 'l'.
- char char_() const {
- // Note: The signature, `dtype::char_` follows the naming of NumPy's
- // public Python API (i.e., ``dtype.char``), rather than its internal
- // C API (``PyArray_Descr::type``).
- return detail::array_descriptor_proxy(m_ptr)->type;
- }
-
- /// type number of dtype.
- int num() const {
- // Note: The signature, `dtype::num` follows the naming of NumPy's public
- // Python API (i.e., ``dtype.num``), rather than its internal
- // C API (``PyArray_Descr::type_num``).
- return detail::array_descriptor_proxy(m_ptr)->type_num;
- }
-
- /// Single character for byteorder
- char byteorder() const { return detail::array_descriptor_proxy(m_ptr)->byteorder; }
-
- /// Alignment of the data type
- int alignment() const { return detail::array_descriptor_proxy(m_ptr)->alignment; }
-
- /// Flags for the array descriptor
- char flags() const { return detail::array_descriptor_proxy(m_ptr)->flags; }
-
-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 name;
- object format;
- pybind11::int_ offset;
- field_descr(pybind11::str &&name, object &&format, pybind11::int_ &&offset)
- : name{std::move(name)}, format{std::move(format)}, offset{std::move(offset)} {};
- };
- auto field_dict = attr("fields").cast<dict>();
- std::vector<field_descr> field_descriptors;
- field_descriptors.reserve(field_dict.size());
-
- for (auto field : field_dict.attr("items")()) {
- auto spec = field.cast<tuple>();
- auto name = spec[0].cast<pybind11::str>();
- auto spec_fo = spec[1].cast<tuple>();
- auto format = spec_fo[0].cast<dtype>();
- auto offset = spec_fo[1].cast<pybind11::int_>();
- if ((len(name) == 0u) && format.kind() == 'V') {
- continue;
- }
- field_descriptors.emplace_back(
- std::move(name), format.strip_padding(format.itemsize()), std::move(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(std::move(descr.name));
- formats.append(std::move(descr.format));
- offsets.append(std::move(descr.offset));
- }
- return dtype(std::move(names), std::move(formats), std::move(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
- auto 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);
- }
- }
-
- /// Optional `order` parameter omitted, to be added as needed.
- array reshape(ShapeContainer new_shape) {
- detail::npy_api::PyArray_Dims d
- = {reinterpret_cast<Py_intptr_t *>(new_shape->data()), int(new_shape->size())};
- auto new_array
- = reinterpret_steal<array>(detail::npy_api::get().PyArray_Newshape_(m_ptr, &d, 0));
- if (!new_array) {
- throw error_already_set();
- }
- return new_array;
- }
-
- /// Create a view of an array in a different data type.
- /// This function may fundamentally reinterpret the data in the array.
- /// It is the responsibility of the caller to ensure that this is safe.
- /// Only supports the `dtype` argument, the `type` argument is omitted,
- /// to be added as needed.
- array view(const std::string &dtype) {
- auto &api = detail::npy_api::get();
- auto new_view = reinterpret_steal<array>(api.PyArray_View_(
- m_ptr, dtype::from_args(pybind11::str(dtype)).release().ptr(), nullptr));
- if (!new_view) {
- throw error_already_set();
- }
- return new_view;
- }
-
- /// 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());
- }
- }
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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) != 0 ? 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 = const_name("(") + array_info<T>::extents + const_name(")");
- 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 = const_name<std::is_same<T, bool>::value>(
- const_name("bool"),
- const_name<std::is_signed<T>::value>("numpy.int", "numpy.uint")
- + const_name<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 = const_name < std::is_same<T, float>::value
- || std::is_same<T, const float>::value
- || std::is_same<T, double>::value
- || std::is_same<T, const double>::value
- > (const_name("numpy.float") + const_name<sizeof(T) * 8>(),
- const_name("numpy.longdouble"));
-};
-
-template <typename T>
-struct npy_format_descriptor_name<T, enable_if_t<is_complex<T>::value>> {
- static constexpr auto name = const_name < std::is_same<typename T::value_type, float>::value
- || std::is_same<typename T::value_type, const float>::value
- || std::is_same<typename T::value_type, double>::value
- || std::is_same<typename T::value_type, const double>::value
- > (const_name("numpy.complex")
- + const_name<sizeof(typename T::value_type) * 16>(),
- const_name("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 = const_name("S") + const_name<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
- = const_name("(") + array_info<T>::extents + const_name(")") + 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(), std::move(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;
-};
-
-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(field.name));
- formats.append(field.descr);
- offsets.append(pybind11::int_(field.offset));
- }
- auto *dtype_ptr
- = pybind11::dtype(std::move(names), std::move(formats), std::move(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();
-
- // Smoke test: 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, std::move(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() : 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{nullptr};
- 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;
- }
- 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);
- }
- 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,
- // SFINAE to prevent shadowing the copy constructor.
- typename = detail::enable_if_t<
- !std::is_same<vectorize_helper, typename std::decay<T>::type>::value>>
- 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);
-
- PYBIND11_WARNING_PUSH
-#ifdef PYBIND11_DETECTED_CLANG_WITH_MISLEADING_CALL_STD_MOVE_EXPLICITLY_WARNING
- PYBIND11_WARNING_DISABLE_CLANG("-Wreturn-std-move")
-#endif
-
- if (size == 0) {
- return 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 result;
- PYBIND11_WARNING_POP
- }
-
- 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
- = const_name("numpy.ndarray[") + npy_format_descriptor<T>::name + const_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)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/operators.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/operators.h
deleted file mode 100644
index 16a88ae171846844ddac28839e2150f11d287839..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/operators.h
+++ /dev/null
@@ -1,202 +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"
-
-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_ {
- static constexpr bool op_enable_if_hook = true;
- 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...);
- }
- 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...);
- }
-};
-
-#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)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/options.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/options.h
deleted file mode 100644
index 1b2122522d5b4043c9df57f2beb943682eb4b208..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/options.h
+++ /dev/null
@@ -1,92 +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;
- }
-
- options &disable_enum_members_docstring() & {
- global_state().show_enum_members_docstring = false;
- return *this;
- }
-
- options &enable_enum_members_docstring() & {
- global_state().show_enum_members_docstring = 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; }
-
- static bool show_enum_members_docstring() {
- return global_state().show_enum_members_docstring;
- }
-
- // 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.
- bool show_enum_members_docstring = true; //< Include auto-generated member list in enum
- // 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.10.3/include/pybind11/pybind11.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/pybind11.h
deleted file mode 100644
index 6205effd616ea709382a1be1f3f4cefe98d81bef..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/pybind11.h
+++ /dev/null
@@ -1,2882 +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
-
-#include "detail/class.h"
-#include "detail/init.h"
-#include "attr.h"
-#include "gil.h"
-#include "options.h"
-
-#include <cstdlib>
-#include <cstring>
-#include <memory>
-#include <new>
-#include <string>
-#include <utility>
-#include <vector>
-
-#if defined(__cpp_lib_launder) && !(defined(_MSC_VER) && (_MSC_VER < 1914))
-# define PYBIND11_STD_LAUNDER std::launder
-# define PYBIND11_HAS_STD_LAUNDER 1
-#else
-# define PYBIND11_STD_LAUNDER
-# define PYBIND11_HAS_STD_LAUNDER 0
-#endif
-#if defined(__GNUG__) && !defined(__clang__)
-# include <cxxabi.h>
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-/* https://stackoverflow.com/questions/46798456/handling-gccs-noexcept-type-warning
- This warning is about ABI compatibility, not code health.
- It is only actually needed in a couple places, but apparently GCC 7 "generates this warning if
- and only if the first template instantiation ... involves noexcept" [stackoverflow], therefore
- it could get triggered from seemingly random places, depending on user code.
- No other GCC version generates this warning.
- */
-#if defined(__GNUC__) && __GNUC__ == 7
-PYBIND11_WARNING_DISABLE_GCC("-Wnoexcept-type")
-#endif
-
-PYBIND11_WARNING_DISABLE_MSVC(4127)
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-
-// Apply all the extensions translators from a list
-// Return true if one of the translators completed without raising an exception
-// itself. Return of false indicates that if there are other translators
-// available, they should be tried.
-inline bool apply_exception_translators(std::forward_list<ExceptionTranslator> &translators) {
- auto last_exception = std::current_exception();
-
- for (auto &translator : translators) {
- try {
- translator(last_exception);
- return true;
- } catch (...) {
- last_exception = std::current_exception();
- }
- }
- return false;
-}
-
-#if defined(_MSC_VER)
-# define PYBIND11_COMPAT_STRDUP _strdup
-#else
-# define PYBIND11_COMPAT_STRDUP strdup
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-
-/// Wraps an arbitrary C++ function/method/lambda function/.. into a callable Python object
-class cpp_function : public function {
-public:
- cpp_function() = default;
- // NOLINTNEXTLINE(google-explicit-constructor)
- cpp_function(std::nullptr_t) {}
-
- /// Construct a cpp_function from a vanilla function pointer
- template <typename Return, typename... Args, typename... Extra>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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>>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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 (const, no ref-qualifier)
- template <typename Return, typename Class, typename... Arg, typename... Extra>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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...);
- }
-
- /// Return the function name
- object name() const { return attr("__name__"); }
-
-protected:
- struct InitializingFunctionRecordDeleter {
- // `destruct(function_record, false)`: `initialize_generic` copies strings and
- // takes care of cleaning up in case of exceptions. So pass `false` to `free_strings`.
- void operator()(detail::function_record *rec) { destruct(rec, false); }
- };
- using unique_function_record
- = std::unique_ptr<detail::function_record, InitializingFunctionRecordDeleter>;
-
- /// Space optimization: don't inline this frequently instantiated fragment
- PYBIND11_NOINLINE unique_function_record make_function_record() {
- return unique_function_record(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) */
- // The unique_ptr makes sure nothing is leaked in case of an exception.
- auto unique_rec = make_function_record();
- auto *rec = unique_rec.get();
-
- /* 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. */
- PYBIND11_WARNING_PUSH
-
-#if defined(__GNUG__) && __GNUC__ >= 6
- PYBIND11_WARNING_DISABLE_GCC("-Wplacement-new")
-#endif
-
- new ((capture *) &rec->data) capture{std::forward<Func>(f)};
-
-#if !PYBIND11_HAS_STD_LAUNDER
- PYBIND11_WARNING_DISABLE_GCC("-Wstrict-aliasing")
-#endif
-
- // UB without std::launder, but without breaking ABI and/or
- // a significant refactoring it's "impossible" to solve.
- if (!std::is_trivially_destructible<capture>::value) {
- rec->free_data = [](function_record *r) {
- auto data = PYBIND11_STD_LAUNDER((capture *) &r->data);
- (void) data;
- data->~capture();
- };
- }
- PYBIND11_WARNING_POP
- } 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::args_pos >= 0, 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 */
- const 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;
- };
-
- rec->nargs_pos = cast_in::args_pos >= 0
- ? static_cast<std::uint16_t>(cast_in::args_pos)
- : sizeof...(Args) - cast_in::has_kwargs; // Will get reduced more if
- // we have a kw_only
- rec->has_args = cast_in::args_pos >= 0;
- rec->has_kwargs = cast_in::has_kwargs;
-
- /* 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_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(constexpr_sum(is_kw_only<Extra>::value...) <= 1,
- "py::kw_only may be specified only once");
- static_assert(constexpr_sum(is_pos_only<Extra>::value...) <= 1,
- "py::pos_only may be specified only once");
- constexpr auto kw_only_pos = constexpr_first<is_kw_only, Extra...>();
- constexpr auto pos_only_pos = constexpr_first<is_pos_only, Extra...>();
- static_assert(!(has_kw_only_args && has_pos_only_args) || pos_only_pos < kw_only_pos,
- "py::pos_only must come before py::kw_only");
- }
-
- /* Generate a readable signature describing the function's arguments and return
- value types */
- static constexpr auto signature
- = const_name("(") + cast_in::arg_names + const_name(") -> ") + cast_out::name;
- PYBIND11_DESCR_CONSTEXPR auto types = decltype(signature)::types();
-
- /* Register the function with Python from generic (non-templated) code */
- // Pass on the ownership over the `unique_rec` to `initialize_generic`. `rec` stays valid.
- initialize_generic(std::move(unique_rec), signature.text, types.data(), sizeof...(Args));
-
- /* 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)));
- }
- }
-
- // Utility class that keeps track of all duplicated strings, and cleans them up in its
- // destructor, unless they are released. Basically a RAII-solution to deal with exceptions
- // along the way.
- class strdup_guard {
- public:
- strdup_guard() = default;
- strdup_guard(const strdup_guard &) = delete;
- strdup_guard &operator=(const strdup_guard &) = delete;
-
- ~strdup_guard() {
- for (auto *s : strings) {
- std::free(s);
- }
- }
- char *operator()(const char *s) {
- auto *t = PYBIND11_COMPAT_STRDUP(s);
- strings.push_back(t);
- return t;
- }
- void release() { strings.clear(); }
-
- private:
- std::vector<char *> strings;
- };
-
- /// Register a function call with Python (generic non-templated code goes here)
- void initialize_generic(unique_function_record &&unique_rec,
- const char *text,
- const std::type_info *const *types,
- size_t args) {
- // Do NOT receive `unique_rec` by value. If this function fails to move out the unique_ptr,
- // we do not want this to destruct the pointer. `initialize` (the caller) still relies on
- // the pointee being alive after this call. Only move out if a `capsule` is going to keep
- // it alive.
- auto *rec = unique_rec.get();
-
- // Keep track of strdup'ed strings, and clean them up as long as the function's capsule
- // has not taken ownership yet (when `unique_rec.release()` is called).
- // Note: This cannot easily be fixed by a `unique_ptr` with custom deleter, because the
- // strings are only referenced before strdup'ing. So only *after* the following block could
- // `destruct` safely be called, but even then, `repr` could still throw in the middle of
- // copying all strings.
- strdup_guard guarded_strdup;
-
- /* Create copies of all referenced C-style strings */
- rec->name = guarded_strdup(rec->name ? rec->name : "");
- if (rec->doc) {
- rec->doc = guarded_strdup(rec->doc);
- }
- for (auto &a : rec->args) {
- if (a.name) {
- a.name = guarded_strdup(a.name);
- }
- if (a.descr) {
- a.descr = guarded_strdup(a.descr);
- } else if (a.value) {
- a.descr = guarded_strdup(repr(a.value).cast<std::string>().c_str());
- }
- }
-
- rec->is_constructor = (std::strcmp(rec->name, "__init__") == 0)
- || (std::strcmp(rec->name, "__setstate__") == 0);
-
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES) && !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;
- bool is_starred = false;
- for (const auto *pc = text; *pc != '\0'; ++pc) {
- const auto c = *pc;
-
- if (c == '{') {
- // Write arg name for everything except *args and **kwargs.
- is_starred = *(pc + 1) == '*';
- if (is_starred) {
- continue;
- }
- // Separator for keyword-only arguments, placed before the kw
- // arguments start (unless we are already putting an *args)
- if (!rec->has_args && arg_index == rec->nargs_pos) {
- 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 (!is_starred && 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 += ", /";
- }
- if (!is_starred) {
- 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>();
- } 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 - rec->has_args - rec->has_kwargs || types[type_index] != nullptr) {
- pybind11_fail("Internal error while parsing type signature (2)");
- }
-
- rec->signature = guarded_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 *self = PyCFunction_GET_SELF(rec->sibling.ptr());
- if (!isinstance<capsule>(self)) {
- chain = nullptr;
- } else {
- auto rec_capsule = reinterpret_borrow<capsule>(self);
- if (detail::is_function_record_capsule(rec_capsule)) {
- chain = rec_capsule.get_pointer<detail::function_record>();
- /* 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;
- }
- } else {
- 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 (*)()>(dispatcher));
- rec->def->ml_flags = METH_VARARGS | METH_KEYWORDS;
-
- capsule rec_capsule(unique_rec.release(),
- [](void *ptr) { destruct((detail::function_record *) ptr); });
- rec_capsule.set_name(detail::get_function_record_capsule_name());
- guarded_strdup.release();
-
- 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(PYBIND11_DETAILED_ERROR_MESSAGES)
- "#define PYBIND11_DETAILED_ERROR_MESSAGES or 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(unique_rec.release());
- guarded_strdup.release();
- } else {
- // Or end of chain (normal behavior)
- chain_start = chain;
- while (chain->next) {
- chain = chain->next;
- }
- chain->next = unique_rec.release();
- guarded_strdup.release();
- }
- }
-
- 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 && it->doc[0] != '\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;
- std::free(const_cast<char *>(func->m_ml->ml_doc));
- // Install docstring if it's non-empty (when at least one option is enabled)
- func->m_ml->ml_doc
- = signatures.empty() ? nullptr : PYBIND11_COMPAT_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, bool free_strings = true) {
-// 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);
- }
- // During initialization, these strings might not have been copied yet,
- // so they cannot be freed. Once the function has been created, they can.
- // Check `make_function_record` for more details.
- if (free_strings) {
- 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));
- }
- }
- for (auto &arg : rec->args) {
- 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;
- assert(isinstance<capsule>(self));
-
- /* Iterator over the list of potentially admissible overloads */
- const function_record *overloads = reinterpret_cast<function_record *>(
- PyCapsule_GetPointer(self, get_function_record_capsule_name())),
- *it = overloads;
- assert(overloads != nullptr);
-
- /* 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) {
- if (!parent
- || !PyObject_TypeCheck(parent.ptr(), (PyTypeObject *) overloads->scope.ptr())) {
- PyErr_SetString(
- PyExc_TypeError,
- "__init__(self, ...) called with invalid or missing `self` argument");
- return nullptr;
- }
-
- auto *const tinfo = get_type_info((PyTypeObject *) overloads->scope.ptr());
- auto *const pi = reinterpret_cast<instance *>(parent.ptr());
- self_value_and_holder = pi->get_value_and_holder(tinfo, true);
-
- // 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 = func.nargs_pos;
-
- 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);
-
- // Protect std::min with parentheses
- size_t args_to_copy = (std::min)(pos_args, n_args_in);
- 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
- && dict_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)
- }
-
- // Keep track of how many position args we copied out in case we need to come back
- // to copy the rest into a py::args argument.
- size_t positional_args_copied = args_copied;
-
- // 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 = dict_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;
- }
- if (PyDict_DelItemString(kwargs.ptr(), arg_rec.name) == -1) {
- throw error_already_set();
- }
- } else if (arg_rec.value) {
- value = arg_rec.value;
- }
-
- if (!arg_rec.none && value.is_none()) {
- break;
- }
-
- if (value) {
- // If we're at the py::args index then first insert a stub for it to be
- // replaced later
- if (func.has_args && call.args.size() == func.nargs_pos) {
- call.args.push_back(none());
- }
-
- 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 (positional_args_copied >= n_args_in) {
- extra_args = tuple(0);
- } else {
- size_t args_size = n_args_in - positional_args_copied;
- extra_args = tuple(args_size);
- for (size_t i = 0; i < args_size; ++i) {
- extra_args[i] = PyTuple_GET_ITEM(args_in, positional_args_copied + i);
- }
- }
- if (call.args.size() <= func.nargs_pos) {
- call.args.push_back(extra_args);
- } else {
- call.args[func.nargs_pos] = 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(PYBIND11_DETAILED_ERROR_MESSAGES)
- 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. First
- all module-local translators will be tried in reverse order of
- registration. If none of the module-locale translators handle
- the exception (or there are no module-locale translators) then
- the global translators will be tried, also 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 &local_exception_translators
- = get_local_internals().registered_exception_translators;
- if (detail::apply_exception_translators(local_exception_translators)) {
- return nullptr;
- }
- auto &exception_translators = get_internals().registered_exception_translators;
- if (detail::apply_exception_translators(exception_translators)) {
- 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);
- // Attach additional error info to the exception if supported
- if (PyErr_Occurred()) {
- // #HelpAppreciated: unit test coverage for this branch.
- raise_from(PyExc_TypeError, msg.c_str());
- return nullptr;
- }
- PyErr_SetString(PyExc_TypeError, msg.c_str());
- return nullptr;
- }
- 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);
- // Attach additional error info to the exception if supported
- if (PyErr_Occurred()) {
- raise_from(PyExc_TypeError, msg.c_str());
- return nullptr;
- }
- PyErr_SetString(PyExc_TypeError, msg.c_str());
- return nullptr;
- }
- 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) {
- *this = create_extension_module(name, doc, new PyModuleDef());
- }
-
- /** \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) {
- const char *this_name = PyModule_GetName(m_ptr);
- if (this_name == nullptr) {
- throw error_already_set();
- }
- std::string full_name = std::string(this_name) + '.' + name;
- handle submodule = PyImport_AddModule(full_name.c_str());
- if (!submodule) {
- throw error_already_set();
- }
- auto result = reinterpret_borrow<module_>(submodule);
- 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 */);
- }
-
- using module_def = PyModuleDef; // TODO: Can this be removed (it was needed only for Python 2)?
-
- /** \rst
- Create a new top-level module that can be used as the main module of a C extension.
-
- ``def`` should point to a statically allocated module_def.
- \endrst */
- static module_ create_extension_module(const char *name, const char *doc, module_def *def) {
- // module_def is PyModuleDef
- // Placement new (not an allocation).
- def = new (def)
- PyModuleDef{/* 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);
- if (m == nullptr) {
- if (PyErr_Occurred()) {
- throw error_already_set();
- }
- pybind11_fail("Internal error in module_::create_extension_module()");
- }
- // TODO: Should be reinterpret_steal for Python 3, but Python also steals it again when
- // returned from PyInit_...
- // For Python 2, reinterpret_borrow was 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());
-}
-
-template <typename... Args, typename = detail::enable_if_t<args_are_all_keyword_or_ds<Args...>()>>
-PYBIND11_DEPRECATED("make_simple_namespace should be replaced with "
- "py::module_::import(\"types\").attr(\"SimpleNamespace\") ")
-object make_simple_namespace(Args &&...args_) {
- return module_::import("types").attr("SimpleNamespace")(std::forward<Args>(args_)...);
-}
-
-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))
- != nullptr) {
- 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) {
- get_local_internals().registered_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());
- assert(parent_tinfo != nullptr);
- bool parent_simple_ancestors = parent_tinfo->simple_ancestors;
- tinfo->simple_ancestors = parent_simple_ancestors;
- // The parent can no longer be a simple type if it has MI and has a child
- parent_tinfo->simple_type = parent_tinfo->simple_type && parent_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 != nullptr) && !(rec_func->is_method && rec_func->scope);
- const auto has_doc = (rec_func != nullptr) && (rec_func->doc != nullptr)
- && 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 (std::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
- // no multiple_inheritance attr
- none_of<std::is_same<multiple_inheritance, Extra>...>::value),
- "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 ? get_local_internals().registered_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...);
- auto cf_name = cf.name();
- attr(std::move(cf_name)) = staticmethod(std::move(cf));
- return *this;
- }
-
- template <typename T, typename... Extra, detail::enable_if_t<T::op_enable_if_hook, int> = 0>
- class_ &def(const T &op, const Extra &...extra) {
- op.execute(*this, extra...);
- return *this;
- }
-
- template <typename T, typename... Extra, detail::enable_if_t<T::op_enable_if_hook, int> = 0>
- class_ &def_cast(const T &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) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(init);
- init.execute(*this, extra...);
- return *this;
- }
-
- template <typename... Args, typename... Extra>
- class_ &def(const detail::initimpl::alias_constructor<Args...> &init, const Extra &...extra) {
- PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(init);
- 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(std::move(caster)));
- },
- ptr);
- weakref(m_ptr, cpp_function([ptr](handle wr) {
- delete ptr;
- wr.dec_ref();
- }))
- .release();
- 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](const object &) -> const D & { return *pm; }, scope(*this)),
- fset([pm](const 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](const 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) {
- std::free(doc_prev);
- rec_fget->doc = PYBIND11_COMPAT_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) {
- std::free(doc_prev);
- rec_fset->doc = PYBIND11_COMPAT_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 */) {
-
- auto sh = std::dynamic_pointer_cast<typename holder_type::element_type>(
- detail::try_get_shared_from_this(v_h.value_ptr<type>()));
- if (sh) {
- new (std::addressof(v_h.holder<holder_type>())) holder_type(std::move(sh));
- v_h.set_holder_constructed();
- }
-
- 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 (detail::always_construct_holder<holder_type>::value || inst->owned) {
- 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);
- if (!h) {
- return nullptr;
- }
-
- handle func_self = PyCFunction_GET_SELF(h.ptr());
- if (!func_self) {
- throw error_already_set();
- }
- if (!isinstance<capsule>(func_self)) {
- return nullptr;
- }
- auto cap = reinterpret_borrow<capsule>(func_self);
- if (!detail::is_function_record_capsule(cap)) {
- return nullptr;
- }
- return cap.get_pointer<detail::function_record>();
- }
-};
-
-/// 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(const handle &base, const 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(
- [](const object &arg) -> str {
- handle type = type::handle_of(arg);
- object type_name = type.attr("__name__");
- return pybind11::str("<{}.{}: {}>")
- .format(std::move(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(std::move(type_name), enum_name(arg));
- },
- name("name"),
- is_method(m_base));
-
- if (options::show_enum_members_docstring()) {
- 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(
- reinterpret_cast<PyTypeObject *>(arg.ptr())->tp_doc);
- docstring += "\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 ";
- docstring += key;
- if (!comment.is_none()) {
- docstring += " : ";
- docstring += pybind11::str(comment).cast<std::string>();
- }
- }
- 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( \
- [](const object &a, const object &b) { \
- if (!type::handle_of(a).is(type::handle_of(b))) \
- strict_behavior; /* NOLINT(bugprone-macro-parentheses) */ \
- return expr; \
- }, \
- name(op), \
- is_method(m_base), \
- arg("other"))
-
-#define PYBIND11_ENUM_OP_CONV(op, expr) \
- m_base.attr(op) = cpp_function( \
- [](const object &a_, const object &b_) { \
- int_ a(a_), b(b_); \
- return expr; \
- }, \
- name(op), \
- is_method(m_base), \
- arg("other"))
-
-#define PYBIND11_ENUM_OP_CONV_LHS(op, expr) \
- m_base.attr(op) = cpp_function( \
- [](const object &a_, const object &b) { \
- int_ a(a_); \
- return expr; \
- }, \
- name(op), \
- is_method(m_base), \
- arg("other"))
-
- 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([](const 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(
- [](const object &arg) { return int_(arg); }, name("__getstate__"), is_method(m_base));
-
- m_base.attr("__hash__") = cpp_function(
- [](const 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(std::move(type_name) + ": element \"" + std::string(name_)
- + "\" already exists!");
- }
-
- entries[name] = pybind11::make_tuple(value, doc);
- m_base.attr(std::move(name)) = std::move(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;
-};
-
-template <bool is_signed, size_t length>
-struct equivalent_integer {};
-template <>
-struct equivalent_integer<true, 1> {
- using type = int8_t;
-};
-template <>
-struct equivalent_integer<false, 1> {
- using type = uint8_t;
-};
-template <>
-struct equivalent_integer<true, 2> {
- using type = int16_t;
-};
-template <>
-struct equivalent_integer<false, 2> {
- using type = uint16_t;
-};
-template <>
-struct equivalent_integer<true, 4> {
- using type = int32_t;
-};
-template <>
-struct equivalent_integer<false, 4> {
- using type = uint32_t;
-};
-template <>
-struct equivalent_integer<true, 8> {
- using type = int64_t;
-};
-template <>
-struct equivalent_integer<false, 8> {
- using type = uint64_t;
-};
-
-template <typename IntLike>
-using equivalent_integer_t =
- typename equivalent_integer<std::is_signed<IntLike>::value, sizeof(IntLike)>::type;
-
-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::attr;
- using Base::def;
- using Base::def_property_readonly;
- using Base::def_property_readonly_static;
- using Underlying = typename std::underlying_type<Type>::type;
- // Scalar is the integer representation of underlying type
- using Scalar = detail::conditional_t<detail::any_of<detail::is_std_char_type<Underlying>,
- std::is_same<Underlying, bool>>::value,
- detail::equivalent_integer_t<Underlying>,
- Underlying>;
-
- 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, Underlying>::value;
- m_base.init(is_arithmetic, is_convertible);
-
- def(init([](Scalar i) { return static_cast<Type>(i); }), arg("value"));
- def_property_readonly("value", [](Type value) { return (Scalar) value; });
- def("__int__", [](Type value) { return (Scalar) value; });
- def("__index__", [](Type value) { return (Scalar) value; });
- 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),
- arg("state"));
- }
-
- /// 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)
-
-PYBIND11_NOINLINE 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 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;
- }
- if (n == 1 && call.init_self) {
- return call.init_self;
- }
- 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);
-
- // TODO consolidate the erasure code in pybind11_meta_dealloc() in class.h
- auto &cache = get_internals().inactive_override_cache;
- for (auto it = cache.begin(), last = cache.end(); it != last;) {
- if (it->first == reinterpret_cast<PyObject *>(type)) {
- it = cache.erase(it);
- } else {
- ++it;
- }
- }
-
- wr.dec_ref();
- }))
- .release();
- }
-
- return res;
-}
-
-/* There are a large number of apparently unused template arguments because
- * each combination requires a separate py::class_ registration.
- */
-template <typename Access,
- return_value_policy Policy,
- typename Iterator,
- typename Sentinel,
- typename ValueType,
- typename... Extra>
-struct iterator_state {
- Iterator it;
- Sentinel end;
- bool first_or_done;
-};
-
-// Note: these helpers take the iterator by non-const reference because some
-// iterators in the wild can't be dereferenced when const. The & after Iterator
-// is required for MSVC < 16.9. SFINAE cannot be reused for result_type due to
-// bugs in ICC, NVCC, and PGI compilers. See PR #3293.
-template <typename Iterator, typename SFINAE = decltype(*std::declval<Iterator &>())>
-struct iterator_access {
- using result_type = decltype(*std::declval<Iterator &>());
- // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
- result_type operator()(Iterator &it) const { return *it; }
-};
-
-template <typename Iterator, typename SFINAE = decltype((*std::declval<Iterator &>()).first)>
-class iterator_key_access {
-private:
- using pair_type = decltype(*std::declval<Iterator &>());
-
-public:
- /* If either the pair itself or the element of the pair is a reference, we
- * want to return a reference, otherwise a value. When the decltype
- * expression is parenthesized it is based on the value category of the
- * expression; otherwise it is the declared type of the pair member.
- * The use of declval<pair_type> in the second branch rather than directly
- * using *std::declval<Iterator &>() is a workaround for nvcc
- * (it's not used in the first branch because going via decltype and back
- * through declval does not perfectly preserve references).
- */
- using result_type
- = conditional_t<std::is_reference<decltype(*std::declval<Iterator &>())>::value,
- decltype(((*std::declval<Iterator &>()).first)),
- decltype(std::declval<pair_type>().first)>;
- result_type operator()(Iterator &it) const { return (*it).first; }
-};
-
-template <typename Iterator, typename SFINAE = decltype((*std::declval<Iterator &>()).second)>
-class iterator_value_access {
-private:
- using pair_type = decltype(*std::declval<Iterator &>());
-
-public:
- using result_type
- = conditional_t<std::is_reference<decltype(*std::declval<Iterator &>())>::value,
- decltype(((*std::declval<Iterator &>()).second)),
- decltype(std::declval<pair_type>().second)>;
- result_type operator()(Iterator &it) const { return (*it).second; }
-};
-
-template <typename Access,
- return_value_policy Policy,
- typename Iterator,
- typename Sentinel,
- typename ValueType,
- typename... Extra>
-iterator make_iterator_impl(Iterator first, Sentinel last, Extra &&...extra) {
- using state = detail::iterator_state<Access, Policy, Iterator, Sentinel, ValueType, Extra...>;
- // TODO: state captures only the types of Extra, not the values
-
- 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 Access()(s.it);
- // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
- },
- std::forward<Extra>(extra)...,
- Policy);
- }
-
- return cast(state{first, last, true});
-}
-
-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 = typename detail::iterator_access<Iterator>::result_type,
- typename... Extra>
-iterator make_iterator(Iterator first, Sentinel last, Extra &&...extra) {
- return detail::make_iterator_impl<detail::iterator_access<Iterator>,
- Policy,
- Iterator,
- Sentinel,
- ValueType,
- Extra...>(first, last, std::forward<Extra>(extra)...);
-}
-
-/// Makes a 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 = typename detail::iterator_key_access<Iterator>::result_type,
- typename... Extra>
-iterator make_key_iterator(Iterator first, Sentinel last, Extra &&...extra) {
- return detail::make_iterator_impl<detail::iterator_key_access<Iterator>,
- Policy,
- Iterator,
- Sentinel,
- KeyType,
- Extra...>(first, last, std::forward<Extra>(extra)...);
-}
-
-/// Makes a python iterator over the values (`.second`) 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 ValueType = typename detail::iterator_value_access<Iterator>::result_type,
- typename... Extra>
-iterator make_value_iterator(Iterator first, Sentinel last, Extra &&...extra) {
- return detail::make_iterator_impl<detail::iterator_value_access<Iterator>,
- Policy,
- Iterator,
- Sentinel,
- ValueType,
- Extra...>(first, last, std::forward<Extra>(extra)...);
-}
-
-/// 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), std::forward<Extra>(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), std::forward<Extra>(extra)...);
-}
-
-/// Makes an iterator over the values (`.second`) 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_value_iterator(Type &value, Extra &&...extra) {
- return make_value_iterator<Policy>(
- std::begin(value), std::end(value), std::forward<Extra>(extra)...);
-}
-
-template <typename InputType, typename OutputType>
-void implicitly_convertible() {
- struct set_flag {
- bool &flag;
- explicit 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.emplace_back(std::move(implicit_caster));
- } else {
- pybind11_fail("implicitly_convertible: Unable to find type " + type_id<OutputType>());
- }
-}
-
-inline void register_exception_translator(ExceptionTranslator &&translator) {
- detail::get_internals().registered_exception_translators.push_front(
- std::forward<ExceptionTranslator>(translator));
-}
-
-/**
- * Add a new module-local exception translator. Locally registered functions
- * will be tried before any globally registered exception translators, which
- * will only be invoked if the module-local handlers do not deal with
- * the exception.
- */
-inline void register_local_exception_translator(ExceptionTranslator &&translator) {
- detail::get_local_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(), nullptr);
- 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;
-}
-
-// Helper function for register_exception and register_local_exception
-template <typename CppException>
-exception<CppException> &
-register_exception_impl(handle scope, const char *name, handle base, bool isLocal) {
- auto &ex = detail::get_exception_object<CppException>();
- if (!ex) {
- ex = exception<CppException>(scope, name, base);
- }
-
- auto register_func
- = isLocal ? ®ister_local_exception_translator : ®ister_exception_translator;
-
- register_func([](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_END(detail)
-
-/**
- * Registers a Python exception in `m` of the given `name` and installs a translator to
- * translate the C++ exception to the created Python exception using the 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> &
-register_exception(handle scope, const char *name, handle base = PyExc_Exception) {
- return detail::register_exception_impl<CppException>(scope, name, base, false /* isLocal */);
-}
-
-/**
- * Registers a Python exception in `m` of the given `name` and installs a translator to
- * translate the C++ exception to the created Python exception using the what() method.
- * This translator will only be used for exceptions that are thrown in this module and will be
- * tried before global exception translators, including those registered with register_exception.
- * This is intended for simple exception translations; for more complex translation, register the
- * exception object and translator directly.
- */
-template <typename CppException>
-exception<CppException> &
-register_local_exception(handle scope, const char *name, handle base = PyExc_Exception) {
- return detail::register_exception_impl<CppException>(scope, name, base, true /* isLocal */);
-}
-
-PYBIND11_NAMESPACE_BEGIN(detail)
-PYBIND11_NOINLINE void print(const tuple &args, const 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"] : str(" ");
- auto line = sep.attr("join")(std::move(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(std::move(line));
- write(kwargs.contains("end") ? kwargs["end"] : str("\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());
-}
-
-inline void
-error_already_set::m_fetched_error_deleter(detail::error_fetch_and_normalize *raw_ptr) {
- gil_scoped_acquire gil;
- error_scope scope;
- delete raw_ptr;
-}
-
-inline const char *error_already_set::what() const noexcept {
- gil_scoped_acquire gil;
- error_scope scope;
- return m_fetched_error->error_string().c_str();
-}
-
-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(std::move(key));
- return function();
- }
-
- /* Don't call dispatch code if invoked from overridden function.
- Unfortunately this doesn't work on PyPy. */
-#if !defined(PYPY_VERSION)
-# if PY_VERSION_HEX >= 0x03090000
- PyFrameObject *frame = PyThreadState_GetFrame(PyThreadState_Get());
- if (frame != nullptr) {
- PyCodeObject *f_code = PyFrame_GetCode(frame);
- // f_code is guaranteed to not be NULL
- if ((std::string) str(f_code->co_name) == name && f_code->co_argcount > 0) {
- PyObject *locals = PyEval_GetLocals();
- if (locals != nullptr) {
- PyObject *co_varnames = PyObject_GetAttrString((PyObject *) f_code, "co_varnames");
- PyObject *self_arg = PyTuple_GET_ITEM(co_varnames, 0);
- Py_DECREF(co_varnames);
- PyObject *self_caller = dict_getitem(locals, self_arg);
- if (self_caller == self.ptr()) {
- Py_DECREF(f_code);
- Py_DECREF(frame);
- return function();
- }
- }
- }
- Py_DECREF(f_code);
- Py_DECREF(frame);
- }
-# else
- PyFrameObject *frame = PyThreadState_Get()->frame;
- if (frame != nullptr && (std::string) str(frame->f_code->co_name) == name
- && frame->f_code->co_argcount > 0) {
- PyFrame_FastToLocals(frame);
- PyObject *self_caller
- = dict_getitem(frame->f_locals, PyTuple_GET_ITEM(frame->f_code->co_varnames, 0));
- if (self_caller == self.ptr()) {
- return function();
- }
- }
-# endif
-
-#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();
- Py_DECREF(result);
- if (d["self"].is_none())
- return function();
-#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 overridden 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); \
- } \
- 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)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/pytypes.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/pytypes.h
deleted file mode 100644
index f11ed5da78a6070233232e8d0359b6c4a8458945..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/pytypes.h
+++ /dev/null
@@ -1,2487 +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 <assert.h>
-#include <cstddef>
-#include <exception>
-#include <frameobject.h>
-#include <iterator>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <typeinfo>
-#include <utility>
-
-#if defined(PYBIND11_HAS_OPTIONAL)
-# include <optional>
-#endif
-
-#ifdef PYBIND11_HAS_STRING_VIEW
-# include <string_view>
-#endif
-
-PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
-
-PYBIND11_WARNING_DISABLE_MSVC(4127)
-
-/* 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;
-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 the key's reference is stolen)
- item_accessor operator[](object &&key) const;
- /// See above (the only difference is that the 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 the key's reference is stolen)
- obj_attr_accessor attr(object &&key) const;
- /// See above (the only difference is that the 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);
- object operator-(object_api const &other) const;
- object operator-=(object_api const &other);
- object operator*(object_api const &other) const;
- object operator*=(object_api const &other);
- object operator/(object_api const &other) const;
- object operator/=(object_api const &other);
- object operator|(object_api const &other) const;
- object operator|=(object_api const &other);
- object operator&(object_api const &other) const;
- object operator&=(object_api const &other);
- object operator^(object_api const &other) const;
- object operator^=(object_api const &other);
- object operator<<(object_api const &other) const;
- object operator<<=(object_api const &other);
- object operator>>(object_api const &other) const;
- object operator>>=(object_api const &other);
-
- 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;
-};
-
-template <typename T>
-using is_pyobj_ptr_or_nullptr_t = detail::any_of<std::is_same<T, PyObject *>,
- std::is_same<T, PyObject *const>,
- std::is_same<T, std::nullptr_t>>;
-
-PYBIND11_NAMESPACE_END(detail)
-
-#if !defined(PYBIND11_HANDLE_REF_DEBUG) && !defined(NDEBUG)
-# define PYBIND11_HANDLE_REF_DEBUG
-#endif
-
-/** \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;
-
- /// Enable implicit conversion from ``PyObject *`` and ``nullptr``.
- /// Not using ``handle(PyObject *ptr)`` to avoid implicit conversion from ``0``.
- template <typename T,
- detail::enable_if_t<detail::is_pyobj_ptr_or_nullptr_t<T>::value, int> = 0>
- // NOLINTNEXTLINE(google-explicit-constructor)
- handle(T ptr) : m_ptr(ptr) {}
-
- /// Enable implicit conversion through ``T::operator PyObject *()``.
- template <
- typename T,
- detail::enable_if_t<detail::all_of<detail::none_of<std::is_base_of<handle, T>,
- detail::is_pyobj_ptr_or_nullptr_t<T>>,
- std::is_convertible<T, PyObject *>>::value,
- int>
- = 0>
- // NOLINTNEXTLINE(google-explicit-constructor)
- handle(T &obj) : m_ptr(obj) {}
-
- /// 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 & {
-#ifdef PYBIND11_HANDLE_REF_DEBUG
- inc_ref_counter(1);
-#endif
-#ifdef PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF
- if (m_ptr != nullptr && !PyGILState_Check()) {
- throw_gilstate_error("pybind11::handle::inc_ref()");
- }
-#endif
- 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 & {
-#ifdef PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF
- if (m_ptr != nullptr && !PyGILState_Check()) {
- throw_gilstate_error("pybind11::handle::dec_ref()");
- }
-#endif
- 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;
-
-private:
-#ifdef PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF
- void throw_gilstate_error(const std::string &function_name) const {
- fprintf(
- stderr,
- "%s is being called while the GIL is either not held or invalid. Please see "
- "https://pybind11.readthedocs.io/en/stable/advanced/"
- "misc.html#common-sources-of-global-interpreter-lock-errors for debugging advice.\n",
- function_name.c_str());
- fflush(stderr);
- if (Py_TYPE(m_ptr)->tp_name != nullptr) {
- fprintf(stderr,
- "The failing %s call was triggered on a %s object.\n",
- function_name.c_str(),
- Py_TYPE(m_ptr)->tp_name);
- fflush(stderr);
- }
- throw std::runtime_error(function_name + " PyGILState_Check() failure.");
- }
-#endif
-
-#ifdef PYBIND11_HANDLE_REF_DEBUG
- static std::size_t inc_ref_counter(std::size_t add) {
- thread_local std::size_t counter = 0;
- counter += add;
- return counter;
- }
-
-public:
- static std::size_t inc_ref_counter() { return inc_ref_counter(0); }
-#endif
-};
-
-/** \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 : handle(other) { 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) {
- // Skip inc_ref and dec_ref if both objects are the same
- if (!this->is(other)) {
- other.inc_ref();
- // Use temporary variable to ensure `*this` remains valid while
- // `Py_XDECREF` executes, in case `*this` is accessible from Python.
- handle temp(m_ptr);
- m_ptr = other.m_ptr;
- temp.dec_ref();
- }
- 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;
- }
-
-#define PYBIND11_INPLACE_OP(iop) \
- object iop(object_api const &other) { return operator=(handle::iop(other)); }
-
- PYBIND11_INPLACE_OP(operator+=)
- PYBIND11_INPLACE_OP(operator-=)
- PYBIND11_INPLACE_OP(operator*=)
- PYBIND11_INPLACE_OP(operator/=)
- PYBIND11_INPLACE_OP(operator|=)
- PYBIND11_INPLACE_OP(operator&=)
- PYBIND11_INPLACE_OP(operator^=)
- PYBIND11_INPLACE_OP(operator<<=)
- PYBIND11_INPLACE_OP(operator>>=)
-#undef PYBIND11_INPLACE_OP
-
- // 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 {};
-
- /// @cond BROKEN
- template <typename T>
- friend T reinterpret_borrow(handle);
- template <typename T>
- friend T reinterpret_steal(handle);
- /// @endcond
-
-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)
-
-// Equivalent to obj.__class__.__name__ (or obj.__name__ if obj is a class).
-inline const char *obj_class_name(PyObject *obj) {
- if (PyType_Check(obj)) {
- return reinterpret_cast<PyTypeObject *>(obj)->tp_name;
- }
- return Py_TYPE(obj)->tp_name;
-}
-
-std::string error_string();
-
-struct error_fetch_and_normalize {
- // Immediate normalization is long-established behavior (starting with
- // https://github.com/pybind/pybind11/commit/135ba8deafb8bf64a15b24d1513899eb600e2011
- // from Sep 2016) and safest. Normalization could be deferred, but this could mask
- // errors elsewhere, the performance gain is very minor in typical situations
- // (usually the dominant bottleneck is EH unwinding), and the implementation here
- // would be more complex.
- explicit error_fetch_and_normalize(const char *called) {
- PyErr_Fetch(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
- if (!m_type) {
- pybind11_fail("Internal error: " + std::string(called)
- + " called while "
- "Python error indicator not set.");
- }
- const char *exc_type_name_orig = detail::obj_class_name(m_type.ptr());
- if (exc_type_name_orig == nullptr) {
- pybind11_fail("Internal error: " + std::string(called)
- + " failed to obtain the name "
- "of the original active exception type.");
- }
- m_lazy_error_string = exc_type_name_orig;
- // PyErr_NormalizeException() may change the exception type if there are cascading
- // failures. This can potentially be extremely confusing.
- PyErr_NormalizeException(&m_type.ptr(), &m_value.ptr(), &m_trace.ptr());
- if (m_type.ptr() == nullptr) {
- pybind11_fail("Internal error: " + std::string(called)
- + " failed to normalize the "
- "active exception.");
- }
- const char *exc_type_name_norm = detail::obj_class_name(m_type.ptr());
- if (exc_type_name_norm == nullptr) {
- pybind11_fail("Internal error: " + std::string(called)
- + " failed to obtain the name "
- "of the normalized active exception type.");
- }
-#if defined(PYPY_VERSION_NUM) && PYPY_VERSION_NUM < 0x07030a00
- // This behavior runs the risk of masking errors in the error handling, but avoids a
- // conflict with PyPy, which relies on the normalization here to change OSError to
- // FileNotFoundError (https://github.com/pybind/pybind11/issues/4075).
- m_lazy_error_string = exc_type_name_norm;
-#else
- if (exc_type_name_norm != m_lazy_error_string) {
- std::string msg = std::string(called)
- + ": MISMATCH of original and normalized "
- "active exception types: ";
- msg += "ORIGINAL ";
- msg += m_lazy_error_string;
- msg += " REPLACED BY ";
- msg += exc_type_name_norm;
- msg += ": " + format_value_and_trace();
- pybind11_fail(msg);
- }
-#endif
- }
-
- error_fetch_and_normalize(const error_fetch_and_normalize &) = delete;
- error_fetch_and_normalize(error_fetch_and_normalize &&) = delete;
-
- std::string format_value_and_trace() const {
- std::string result;
- std::string message_error_string;
- if (m_value) {
- auto value_str = reinterpret_steal<object>(PyObject_Str(m_value.ptr()));
- constexpr const char *message_unavailable_exc
- = "<MESSAGE UNAVAILABLE DUE TO ANOTHER EXCEPTION>";
- if (!value_str) {
- message_error_string = detail::error_string();
- result = message_unavailable_exc;
- } else {
- // Not using `value_str.cast<std::string>()`, to not potentially throw a secondary
- // error_already_set that will then result in process termination (#4288).
- auto value_bytes = reinterpret_steal<object>(
- PyUnicode_AsEncodedString(value_str.ptr(), "utf-8", "backslashreplace"));
- if (!value_bytes) {
- message_error_string = detail::error_string();
- result = message_unavailable_exc;
- } else {
- char *buffer = nullptr;
- Py_ssize_t length = 0;
- if (PyBytes_AsStringAndSize(value_bytes.ptr(), &buffer, &length) == -1) {
- message_error_string = detail::error_string();
- result = message_unavailable_exc;
- } else {
- result = std::string(buffer, static_cast<std::size_t>(length));
- }
- }
- }
- } else {
- result = "<MESSAGE UNAVAILABLE>";
- }
- if (result.empty()) {
- result = "<EMPTY MESSAGE>";
- }
-
- bool have_trace = false;
- if (m_trace) {
-#if !defined(PYPY_VERSION)
- auto *tb = reinterpret_cast<PyTracebackObject *>(m_trace.ptr());
-
- // Get the deepest trace possible.
- while (tb->tb_next) {
- tb = tb->tb_next;
- }
-
- PyFrameObject *frame = tb->tb_frame;
- Py_XINCREF(frame);
- result += "\n\nAt:\n";
- while (frame) {
-# if PY_VERSION_HEX >= 0x030900B1
- PyCodeObject *f_code = PyFrame_GetCode(frame);
-# else
- PyCodeObject *f_code = frame->f_code;
- Py_INCREF(f_code);
-# endif
- int lineno = PyFrame_GetLineNumber(frame);
- result += " ";
- result += handle(f_code->co_filename).cast<std::string>();
- result += '(';
- result += std::to_string(lineno);
- result += "): ";
- result += handle(f_code->co_name).cast<std::string>();
- result += '\n';
- Py_DECREF(f_code);
-# if PY_VERSION_HEX >= 0x030900B1
- auto *b_frame = PyFrame_GetBack(frame);
-# else
- auto *b_frame = frame->f_back;
- Py_XINCREF(b_frame);
-# endif
- Py_DECREF(frame);
- frame = b_frame;
- }
-
- have_trace = true;
-#endif //! defined(PYPY_VERSION)
- }
-
- if (!message_error_string.empty()) {
- if (!have_trace) {
- result += '\n';
- }
- result += "\nMESSAGE UNAVAILABLE DUE TO EXCEPTION: " + message_error_string;
- }
-
- return result;
- }
-
- std::string const &error_string() const {
- if (!m_lazy_error_string_completed) {
- m_lazy_error_string += ": " + format_value_and_trace();
- m_lazy_error_string_completed = true;
- }
- return m_lazy_error_string;
- }
-
- void restore() {
- if (m_restore_called) {
- pybind11_fail("Internal error: pybind11::detail::error_fetch_and_normalize::restore() "
- "called a second time. ORIGINAL ERROR: "
- + error_string());
- }
- PyErr_Restore(m_type.inc_ref().ptr(), m_value.inc_ref().ptr(), m_trace.inc_ref().ptr());
- m_restore_called = true;
- }
-
- bool matches(handle exc) const {
- return (PyErr_GivenExceptionMatches(m_type.ptr(), exc.ptr()) != 0);
- }
-
- // Not protecting these for simplicity.
- object m_type, m_value, m_trace;
-
-private:
- // Only protecting invariants.
- mutable std::string m_lazy_error_string;
- mutable bool m_lazy_error_string_completed = false;
- mutable bool m_restore_called = false;
-};
-
-inline std::string error_string() {
- return error_fetch_and_normalize("pybind11::detail::error_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 PYBIND11_EXPORT_EXCEPTION error_already_set : public std::exception {
-public:
- /// Fetches the current Python exception (using PyErr_Fetch()), which will clear the
- /// current Python error indicator.
- error_already_set()
- : m_fetched_error{new detail::error_fetch_and_normalize("pybind11::error_already_set"),
- m_fetched_error_deleter} {}
-
- /// The what() result is built lazily on demand.
- /// WARNING: This member function needs to acquire the Python GIL. This can lead to
- /// crashes (undefined behavior) if the Python interpreter is finalizing.
- const char *what() const noexcept override;
-
- /// Restores the currently-held Python error (which will clear the Python error indicator first
- /// if already set).
- /// NOTE: This member function will always restore the normalized exception, which may or may
- /// not be the original Python exception.
- /// WARNING: The GIL must be held when this member function is called!
- void restore() { m_fetched_error->restore(); }
-
- /// If it is impossible to raise the currently-held error, such as in a 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.
- void discard_as_unraisable(object err_context) {
- restore();
- PyErr_WriteUnraisable(err_context.ptr());
- }
- /// An alternate version of `discard_as_unraisable()`, where a string provides information on
- /// the location of the error. For example, `__func__` could be helpful.
- /// WARNING: The GIL must be held when this member function is called!
- 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 m_fetched_error->matches(exc); }
-
- const object &type() const { return m_fetched_error->m_type; }
- const object &value() const { return m_fetched_error->m_value; }
- const object &trace() const { return m_fetched_error->m_trace; }
-
-private:
- std::shared_ptr<detail::error_fetch_and_normalize> m_fetched_error;
-
- /// WARNING: This custom deleter needs to acquire the Python GIL. This can lead to
- /// crashes (undefined behavior) if the Python interpreter is finalizing.
- static void m_fetched_error_deleter(detail::error_fetch_and_normalize *raw_ptr);
-};
-
-/// Replaces the current Python error indicator with the chosen error, performing a
-/// 'raise from' to indicate that the chosen error was caused by the original error.
-inline void raise_from(PyObject *type, const char *message) {
- // Based on _PyErr_FormatVFromCause:
- // https://github.com/python/cpython/blob/467ab194fc6189d9f7310c89937c51abeac56839/Python/errors.c#L405
- // See https://github.com/pybind/pybind11/pull/2112 for details.
- PyObject *exc = nullptr, *val = nullptr, *val2 = nullptr, *tb = nullptr;
-
- assert(PyErr_Occurred());
- PyErr_Fetch(&exc, &val, &tb);
- PyErr_NormalizeException(&exc, &val, &tb);
- if (tb != nullptr) {
- PyException_SetTraceback(val, tb);
- Py_DECREF(tb);
- }
- Py_DECREF(exc);
- assert(!PyErr_Occurred());
-
- PyErr_SetString(type, message);
-
- PyErr_Fetch(&exc, &val2, &tb);
- PyErr_NormalizeException(&exc, &val2, &tb);
- Py_INCREF(val);
- PyException_SetCause(val2, val);
- PyException_SetContext(val2, val);
- PyErr_Restore(exc, val2, tb);
-}
-
-/// Sets the current Python error indicator with the chosen error, performing a 'raise from'
-/// from the error contained in error_already_set to indicate that the chosen error was
-/// caused by the original error.
-inline void raise_from(error_already_set &err, PyObject *type, const char *message) {
- err.restore();
- raise_from(type, message);
-}
-
-/** \defgroup python_builtins const_name
- 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);
- }
- 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);
- }
- 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 (PyInstanceMethod_Check(value.ptr())) {
- value = PyInstanceMethod_GET_FUNCTION(value.ptr());
- } else if (PyMethod_Check(value.ptr())) {
- value = PyMethod_GET_FUNCTION(value.ptr());
- }
- }
- return value;
-}
-
-// Reimplementation of python's dict helper functions to ensure that exceptions
-// aren't swallowed (see #2862)
-
-// copied from cpython _PyDict_GetItemStringWithError
-inline PyObject *dict_getitemstring(PyObject *v, const char *key) {
- PyObject *kv = nullptr, *rv = nullptr;
- kv = PyUnicode_FromString(key);
- if (kv == nullptr) {
- throw error_already_set();
- }
-
- rv = PyDict_GetItemWithError(v, kv);
- Py_DECREF(kv);
- if (rv == nullptr && PyErr_Occurred()) {
- throw error_already_set();
- }
- return rv;
-}
-
-inline PyObject *dict_getitem(PyObject *v, PyObject *key) {
- PyObject *rv = PyDict_GetItemWithError(v, key);
- if (rv == nullptr && PyErr_Occurred()) {
- throw error_already_set();
- }
- return rv;
-}
-
-// 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; }
-
-PYBIND11_WARNING_PUSH
-PYBIND11_WARNING_DISABLE_MSVC(4522) // warning C4522: multiple assignment operators specified
-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 &&) noexcept = 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() = ensure_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);
- }
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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:
- static object ensure_object(object &&o) { return std::move(o); }
- static object ensure_object(handle h) { return reinterpret_borrow<object>(h); }
-
- object &get_cache() const {
- if (!cache) {
- cache = Policy::get(obj, key);
- }
- return cache;
- }
-
-private:
- handle obj;
- key_type key;
- mutable object cache;
-};
-PYBIND11_WARNING_POP
-
-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;
-
- template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
- static object get(handle obj, const IdxType &index) {
- PyObject *result = PySequence_GetItem(obj.ptr(), ssize_t_cast(index));
- if (!result) {
- throw error_already_set();
- }
- return reinterpret_steal<object>(result);
- }
-
- template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
- static void set(handle obj, const IdxType &index, handle val) {
- // PySequence_SetItem does not steal a reference to 'val'
- if (PySequence_SetItem(obj.ptr(), ssize_t_cast(index), val.ptr()) != 0) {
- throw error_already_set();
- }
- }
-};
-
-struct list_item {
- using key_type = size_t;
-
- template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
- static object get(handle obj, const IdxType &index) {
- PyObject *result = PyList_GetItem(obj.ptr(), ssize_t_cast(index));
- if (!result) {
- throw error_already_set();
- }
- return reinterpret_borrow<object>(result);
- }
-
- template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
- static void set(handle obj, const IdxType &index, handle val) {
- // PyList_SetItem steals a reference to 'val'
- if (PyList_SetItem(obj.ptr(), ssize_t_cast(index), val.inc_ref().ptr()) != 0) {
- throw error_already_set();
- }
- }
-};
-
-struct tuple_item {
- using key_type = size_t;
-
- template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
- static object get(handle obj, const IdxType &index) {
- PyObject *result = PyTuple_GetItem(obj.ptr(), ssize_t_cast(index));
- if (!result) {
- throw error_already_set();
- }
- return reinterpret_borrow<object>(result);
- }
-
- template <typename IdxType, detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
- static void set(handle obj, const IdxType &index, handle val) {
- // PyTuple_SetItem steals a reference to 'val'
- if (PyTuple_SetItem(obj.ptr(), ssize_t_cast(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) {}
-
- // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
- reference operator*() const { return Policy::dereference(); }
- // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
- 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;
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- arrow_proxy(T &&value) noexcept : 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; // PR #3263
- using pointer = arrow_proxy<const handle>;
-
- sequence_fast_readonly(handle obj, ssize_t n) : ptr(PySequence_Fast_ITEMS(obj.ptr()) + n) {}
-
- // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
- 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; // PR #3263
- using pointer = arrow_proxy<const value_type>;
-
- dict_readonly() = default;
- dict_readonly(handle obj, ssize_t pos) : obj(obj), pos(pos) { increment(); }
-
- // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
- reference dereference() const { return {key, value}; }
- void increment() {
- if (PyDict_Next(obj.ptr(), &pos, &key, &value) == 0) {
- 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;
- }
- PyErr_Clear();
- return false;
-}
-
-inline bool PyNone_Check(PyObject *o) { return o == Py_None; }
-inline bool PyEllipsis_Check(PyObject *o) { return o == Py_Ellipsis; }
-
-#ifdef PYBIND11_STR_LEGACY_PERMISSIVE
-inline bool PyUnicode_Check_Permissive(PyObject *o) {
- return PyUnicode_Check(o) || PYBIND11_BYTES_CHECK(o);
-}
-# define PYBIND11_STR_CHECK_FUN detail::PyUnicode_Check_Permissive
-#else
-# define PYBIND11_STR_CHECK_FUN PyUnicode_Check
-#endif
-
-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 && (CheckFun(m_ptr) != 0); } \
- static bool check_(handle h) { return h.ptr() != nullptr && CheckFun(h.ptr()); } \
- template <typename Policy_> /* NOLINTNEXTLINE(google-explicit-constructor) */ \
- 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: */ \
- /* NOLINTNEXTLINE(google-explicit-constructor) */ \
- Name(const object &o) \
- : Parent(check_(o) ? o.inc_ref().ptr() : ConvertFun(o.ptr()), stolen_t{}) { \
- if (!m_ptr) \
- throw ::pybind11::error_already_set(); \
- } \
- /* NOLINTNEXTLINE(google-explicit-constructor) */ \
- Name(object &&o) : Parent(check_(o) ? o.release().ptr() : ConvertFun(o.ptr()), stolen_t{}) { \
- if (!m_ptr) \
- throw ::pybind11::error_already_set(); \
- }
-
-#define PYBIND11_OBJECT_CVT_DEFAULT(Name, Parent, CheckFun, ConvertFun) \
- PYBIND11_OBJECT_CVT(Name, Parent, CheckFun, ConvertFun) \
- Name() = default;
-
-#define PYBIND11_OBJECT_CHECK_FAILED(Name, o_ptr) \
- ::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: */ \
- /* NOLINTNEXTLINE(google-explicit-constructor) */ \
- Name(const object &o) : Parent(o) { \
- if (m_ptr && !check_(m_ptr)) \
- throw PYBIND11_OBJECT_CHECK_FAILED(Name, m_ptr); \
- } \
- /* NOLINTNEXTLINE(google-explicit-constructor) */ \
- Name(object &&o) : Parent(std::move(o)) { \
- if (m_ptr && !check_(m_ptr)) \
- throw PYBIND11_OBJECT_CHECK_FAILED(Name, m_ptr); \
- }
-
-#define PYBIND11_OBJECT_DEFAULT(Name, Parent, CheckFun) \
- PYBIND11_OBJECT(Name, Parent, CheckFun) \
- Name() = default;
-
-/// \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; // PR #3263
- 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;
- }
-
- // NOLINTNEXTLINE(readability-const-return-type) // PR #3263
- 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 (value.ptr() == nullptr && 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, PYBIND11_STR_CHECK_FUN, raw_str)
-
- template <typename SzType, detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
- str(const char *c, const SzType &n)
- : object(PyUnicode_FromStringAndSize(c, ssize_t_cast(n)), stolen_t{}) {
- if (!m_ptr) {
- if (PyErr_Occurred()) {
- throw error_already_set();
- }
- 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
- // NOLINTNEXTLINE(google-explicit-constructor)
- str(const char *c = "") : object(PyUnicode_FromString(c), stolen_t{}) {
- if (!m_ptr) {
- if (PyErr_Occurred()) {
- throw error_already_set();
- }
- pybind11_fail("Could not allocate string object!");
- }
- }
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- str(const std::string &s) : str(s.data(), s.size()) {}
-
-#ifdef PYBIND11_HAS_STRING_VIEW
- // enable_if is needed to avoid "ambiguous conversion" errors (see PR #3521).
- template <typename T, detail::enable_if_t<std::is_same<T, std::string_view>::value, int> = 0>
- // NOLINTNEXTLINE(google-explicit-constructor)
- str(T s) : str(s.data(), s.size()) {}
-
-# ifdef PYBIND11_HAS_U8STRING
- // reinterpret_cast here is safe (C++20 guarantees char8_t has the same size/alignment as char)
- // NOLINTNEXTLINE(google-explicit-constructor)
- str(std::u8string_view s) : str(reinterpret_cast<const char *>(s.data()), s.size()) {}
-# endif
-
-#endif
-
- 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();
- }
- }
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator std::string() const {
- object temp = *this;
- if (PyUnicode_Check(m_ptr)) {
- temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(m_ptr));
- if (!temp) {
- throw error_already_set();
- }
- }
- char *buffer = nullptr;
- ssize_t length = 0;
- if (PyBytes_AsStringAndSize(temp.ptr(), &buffer, &length) != 0) {
- throw error_already_set();
- }
- 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);
- 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:
- // NOLINTNEXTLINE(google-explicit-constructor)
- bytes(const char *c = "") : object(PYBIND11_BYTES_FROM_STRING(c), stolen_t{}) {
- if (!m_ptr) {
- pybind11_fail("Could not allocate bytes object!");
- }
- }
-
- template <typename SzType, detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
- bytes(const char *c, const SzType &n)
- : object(PYBIND11_BYTES_FROM_STRING_AND_SIZE(c, ssize_t_cast(n)), stolen_t{}) {
- if (!m_ptr) {
- pybind11_fail("Could not allocate bytes object!");
- }
- }
-
- // Allow implicit conversion:
- // NOLINTNEXTLINE(google-explicit-constructor)
- bytes(const std::string &s) : bytes(s.data(), s.size()) {}
-
- explicit bytes(const pybind11::str &s);
-
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator std::string() const { return string_op<std::string>(); }
-
-#ifdef PYBIND11_HAS_STRING_VIEW
- // enable_if is needed to avoid "ambiguous conversion" errors (see PR #3521).
- template <typename T, detail::enable_if_t<std::is_same<T, std::string_view>::value, int> = 0>
- // NOLINTNEXTLINE(google-explicit-constructor)
- bytes(T s) : bytes(s.data(), s.size()) {}
-
- // Obtain a string view that views the current `bytes` buffer value. Note that this is only
- // valid so long as the `bytes` instance remains alive and so generally should not outlive the
- // lifetime of the `bytes` instance.
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator std::string_view() const { return string_op<std::string_view>(); }
-#endif
-private:
- template <typename T>
- T string_op() const {
- char *buffer = nullptr;
- ssize_t length = 0;
- if (PyBytes_AsStringAndSize(m_ptr, &buffer, &length) != 0) {
- throw error_already_set();
- }
- return {buffer, static_cast<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) {
- throw error_already_set();
- }
- }
- char *buffer = nullptr;
- ssize_t length = 0;
- if (PyBytes_AsStringAndSize(temp.ptr(), &buffer, &length) != 0) {
- throw error_already_set();
- }
- 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 = nullptr;
- ssize_t length = 0;
- if (PyBytes_AsStringAndSize(b.ptr(), &buffer, &length) != 0) {
- throw error_already_set();
- }
- auto obj = reinterpret_steal<object>(PyUnicode_FromStringAndSize(buffer, length));
- if (!obj) {
- if (PyErr_Occurred()) {
- throw error_already_set();
- }
- pybind11_fail("Could not allocate string object!");
- }
- m_ptr = obj.release().ptr();
-}
-
-/// \addtogroup pytypes
-/// @{
-class bytearray : public object {
-public:
- PYBIND11_OBJECT_CVT(bytearray, object, PyByteArray_Check, PyByteArray_FromObject)
-
- template <typename SzType, detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
- bytearray(const char *c, const SzType &n)
- : object(PyByteArray_FromStringAndSize(c, ssize_t_cast(n)), stolen_t{}) {
- if (!m_ptr) {
- pybind11_fail("Could not allocate bytearray object!");
- }
- }
-
- bytearray() : bytearray("", 0) {}
-
- explicit bytearray(const std::string &s) : bytearray(s.data(), s.size()) {}
-
- size_t size() const { return static_cast<size_t>(PyByteArray_Size(m_ptr)); }
-
- explicit operator std::string() const {
- char *buffer = PyByteArray_AS_STRING(m_ptr);
- ssize_t size = PyByteArray_GET_SIZE(m_ptr);
- return std::string(buffer, static_cast<size_t>(size));
- }
-};
-// 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
-
-/// \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`:
- // NOLINTNEXTLINE(google-explicit-constructor)
- bool_(bool value) : object(value ? Py_True : Py_False, borrowed_t{}) {}
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator bool() const { return (m_ptr != nullptr) && 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 != 0 ? 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)) {
- unsigned long v = PyLong_AsUnsignedLong(o);
- return v == (unsigned long) -1 && PyErr_Occurred() ? (Unsigned) -1 : (Unsigned) v;
- }
- 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>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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>
- // NOLINTNEXTLINE(google-explicit-constructor)
- 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:
- // NOLINTNEXTLINE(google-explicit-constructor)
- float_(float value) : object(PyFloat_FromDouble((double) value), stolen_t{}) {
- if (!m_ptr) {
- pybind11_fail("Could not allocate float object!");
- }
- }
- // NOLINTNEXTLINE(google-explicit-constructor)
- float_(double value = .0) : object(PyFloat_FromDouble((double) value), stolen_t{}) {
- if (!m_ptr) {
- pybind11_fail("Could not allocate float object!");
- }
- }
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator float() const { return (float) PyFloat_AsDouble(m_ptr); }
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator double() const { return (double) PyFloat_AsDouble(m_ptr); }
-};
-
-class weakref : public object {
-public:
- PYBIND11_OBJECT_CVT_DEFAULT(weakref, object, PyWeakref_Check, raw_weakref)
- explicit weakref(handle obj, handle callback = {})
- : object(PyWeakref_NewRef(obj.ptr(), callback.ptr()), stolen_t{}) {
- if (!m_ptr) {
- if (PyErr_Occurred()) {
- throw error_already_set();
- }
- pybind11_fail("Could not allocate weak reference!");
- }
- }
-
-private:
- static PyObject *raw_weakref(PyObject *o) { return PyWeakref_NewRef(o, nullptr); }
-};
-
-class slice : public object {
-public:
- PYBIND11_OBJECT_DEFAULT(slice, object, PySlice_Check)
- slice(handle start, handle stop, handle step)
- : object(PySlice_New(start.ptr(), stop.ptr(), step.ptr()), stolen_t{}) {
- if (!m_ptr) {
- pybind11_fail("Could not allocate slice object!");
- }
- }
-
-#ifdef PYBIND11_HAS_OPTIONAL
- slice(std::optional<ssize_t> start, std::optional<ssize_t> stop, std::optional<ssize_t> step)
- : slice(index_to_object(start), index_to_object(stop), index_to_object(step)) {}
-#else
- slice(ssize_t start_, ssize_t stop_, ssize_t step_)
- : slice(int_(start_), int_(stop_), int_(step_)) {}
-#endif
-
- 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;
- }
-
-private:
- template <typename T>
- static object index_to_object(T index) {
- return index ? object(int_(*index)) : object(none());
- }
-};
-
-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,
- PyCapsule_Destructor destructor = nullptr)
- : object(PyCapsule_New(const_cast<void *>(value), name, destructor), stolen_t{}) {
- if (!m_ptr) {
- throw error_already_set();
- }
- }
-
- PYBIND11_DEPRECATED("Please use the ctor with value, name, destructor args")
- capsule(const void *value, PyCapsule_Destructor destructor)
- : object(PyCapsule_New(const_cast<void *>(value), nullptr, destructor), stolen_t{}) {
- if (!m_ptr) {
- throw error_already_set();
- }
- }
-
- capsule(const void *value, void (*destructor)(void *)) {
- m_ptr = PyCapsule_New(const_cast<void *>(value), nullptr, [](PyObject *o) {
- // guard if destructor called while err indicator is set
- error_scope error_guard;
- auto destructor = reinterpret_cast<void (*)(void *)>(PyCapsule_GetContext(o));
- if (destructor == nullptr && PyErr_Occurred()) {
- throw error_already_set();
- }
- const char *name = get_name_in_error_scope(o);
- void *ptr = PyCapsule_GetPointer(o, name);
- if (ptr == nullptr) {
- throw error_already_set();
- }
-
- if (destructor != nullptr) {
- destructor(ptr);
- }
- });
-
- if (!m_ptr || PyCapsule_SetContext(m_ptr, reinterpret_cast<void *>(destructor)) != 0) {
- throw error_already_set();
- }
- }
-
- explicit capsule(void (*destructor)()) {
- m_ptr = PyCapsule_New(reinterpret_cast<void *>(destructor), nullptr, [](PyObject *o) {
- const char *name = get_name_in_error_scope(o);
- auto destructor = reinterpret_cast<void (*)()>(PyCapsule_GetPointer(o, name));
- if (destructor == nullptr) {
- throw error_already_set();
- }
- destructor();
- });
-
- if (!m_ptr) {
- throw error_already_set();
- }
- }
-
- template <typename T>
- operator T *() const { // NOLINT(google-explicit-constructor)
- return get_pointer<T>();
- }
-
- /// Get the pointer the capsule holds.
- template <typename T = void>
- T *get_pointer() const {
- const auto *name = this->name();
- T *result = static_cast<T *>(PyCapsule_GetPointer(m_ptr, name));
- if (!result) {
- throw error_already_set();
- }
- 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) {
- throw error_already_set();
- }
- }
-
- const char *name() const {
- const char *name = PyCapsule_GetName(m_ptr);
- if ((name == nullptr) && PyErr_Occurred()) {
- throw error_already_set();
- }
- return name;
- }
-
- /// Replaces a capsule's name *without* calling the destructor on the existing one.
- void set_name(const char *new_name) {
- if (PyCapsule_SetName(m_ptr, new_name) != 0) {
- throw error_already_set();
- }
- }
-
-private:
- static const char *get_name_in_error_scope(PyObject *o) {
- error_scope error_guard;
-
- const char *name = PyCapsule_GetName(o);
- if ((name == nullptr) && PyErr_Occurred()) {
- // write out and consume error raised by call to PyCapsule_GetName
- PyErr_WriteUnraisable(o);
- }
-
- return name;
- }
-};
-
-class tuple : public object {
-public:
- PYBIND11_OBJECT_CVT(tuple, object, PyTuple_Check, PySequence_Tuple)
- template <typename SzType = ssize_t,
- detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
- // Some compilers generate link errors when using `const SzType &` here:
- explicit tuple(SzType size = 0) : object(PyTuple_New(ssize_t_cast(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}; }
- template <typename T, detail::enable_if_t<detail::is_pyobject<T>::value, int> = 0>
- detail::item_accessor operator[](T &&o) const {
- return object::operator[](std::forward<T>(o));
- }
- detail::tuple_iterator begin() const { return {*this, 0}; }
- detail::tuple_iterator end() const { return {*this, PyTuple_GET_SIZE(m_ptr)}; }
-};
-
-// We need to put this into a separate function because the Intel compiler
-// fails to compile enable_if_t<all_of<is_keyword_or_ds<Args>...>::value> part below
-// (tested with ICC 2021.1 Beta 20200827).
-template <typename... Args>
-constexpr bool args_are_all_keyword_or_ds() {
- return detail::all_of<detail::is_keyword_or_ds<Args>...>::value;
-}
-
-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<args_are_all_keyword_or_ds<Args...>()>,
- // 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() /* py-non-const */ { PyDict_Clear(ptr()); }
- template <typename T>
- bool contains(T &&key) const {
- auto result = PyDict_Contains(m_ptr, detail::object_or_cast(std::forward<T>(key)).ptr());
- if (result == -1) {
- throw error_already_set();
- }
- return result == 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}; }
- template <typename T, detail::enable_if_t<detail::is_pyobject<T>::value, int> = 0>
- detail::item_accessor operator[](T &&o) const {
- return object::operator[](std::forward<T>(o));
- }
- 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)
- template <typename SzType = ssize_t,
- detail::enable_if_t<std::is_integral<SzType>::value, int> = 0>
- // Some compilers generate link errors when using `const SzType &` here:
- explicit list(SzType size = 0) : object(PyList_New(ssize_t_cast(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}; }
- template <typename T, detail::enable_if_t<detail::is_pyobject<T>::value, int> = 0>
- detail::item_accessor operator[](T &&o) const {
- return object::operator[](std::forward<T>(o));
- }
- 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) /* py-non-const */ {
- if (PyList_Append(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr()) != 0) {
- throw error_already_set();
- }
- }
- template <typename IdxType,
- typename ValType,
- detail::enable_if_t<std::is_integral<IdxType>::value, int> = 0>
- void insert(const IdxType &index, ValType &&val) /* py-non-const */ {
- if (PyList_Insert(m_ptr,
- ssize_t_cast(index),
- detail::object_or_cast(std::forward<ValType>(val)).ptr())
- != 0) {
- throw error_already_set();
- }
- }
-};
-
-class args : public tuple {
- PYBIND11_OBJECT_DEFAULT(args, tuple, PyTuple_Check)
-};
-class kwargs : public dict {
- PYBIND11_OBJECT_DEFAULT(kwargs, dict, PyDict_Check)
-};
-
-class anyset : public object {
-public:
- PYBIND11_OBJECT(anyset, object, PyAnySet_Check)
- size_t size() const { return static_cast<size_t>(PySet_Size(m_ptr)); }
- bool empty() const { return size() == 0; }
- template <typename T>
- bool contains(T &&val) const {
- auto result = PySet_Contains(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr());
- if (result == -1) {
- throw error_already_set();
- }
- return result == 1;
- }
-};
-
-class set : public anyset {
-public:
- PYBIND11_OBJECT_CVT(set, anyset, PySet_Check, PySet_New)
- set() : anyset(PySet_New(nullptr), stolen_t{}) {
- if (!m_ptr) {
- pybind11_fail("Could not allocate set object!");
- }
- }
- template <typename T>
- bool add(T &&val) /* py-non-const */ {
- return PySet_Add(m_ptr, detail::object_or_cast(std::forward<T>(val)).ptr()) == 0;
- }
- void clear() /* py-non-const */ { PySet_Clear(m_ptr); }
-};
-
-class frozenset : public anyset {
-public:
- PYBIND11_OBJECT_CVT(frozenset, anyset, PyFrozenSet_Check, PyFrozenSet_New)
-};
-
-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, std::move(shape), std::move(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,
- std::move(shape),
- std::move(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), std::move(shape), std::move(strides), true);
- }
-
- /** \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.
-
- 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);
- }
-
-#ifdef PYBIND11_HAS_STRING_VIEW
- static memoryview from_memory(std::string_view mem) {
- return from_memory(const_cast<char *>(mem.data()), static_cast<ssize_t>(mem.size()), true);
- }
-#endif
-};
-
-/// @cond DUPLICATE
-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 != 0u ? 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{}));
-}
-/// @endcond
-/// @} 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) {
- ssize_t result = PyObject_LengthHint(h.ptr(), 0);
- 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();
- }
- 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[](object &&key) const {
- return {derived(), std::move(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>
-obj_attr_accessor object_api<D>::attr(object &&key) const {
- return {derived(), std::move(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; \
- }
-
-#define PYBIND11_MATH_OPERATOR_BINARY_INPLACE(iop, fn) \
- template <typename D> \
- object object_api<D>::iop(object_api const &other) { \
- 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_INPLACE(operator+=, PyNumber_InPlaceAdd)
-PYBIND11_MATH_OPERATOR_BINARY(operator-, PyNumber_Subtract)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator-=, PyNumber_InPlaceSubtract)
-PYBIND11_MATH_OPERATOR_BINARY(operator*, PyNumber_Multiply)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator*=, PyNumber_InPlaceMultiply)
-PYBIND11_MATH_OPERATOR_BINARY(operator/, PyNumber_TrueDivide)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator/=, PyNumber_InPlaceTrueDivide)
-PYBIND11_MATH_OPERATOR_BINARY(operator|, PyNumber_Or)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator|=, PyNumber_InPlaceOr)
-PYBIND11_MATH_OPERATOR_BINARY(operator&, PyNumber_And)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator&=, PyNumber_InPlaceAnd)
-PYBIND11_MATH_OPERATOR_BINARY(operator^, PyNumber_Xor)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator^=, PyNumber_InPlaceXor)
-PYBIND11_MATH_OPERATOR_BINARY(operator<<, PyNumber_Lshift)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator<<=, PyNumber_InPlaceLshift)
-PYBIND11_MATH_OPERATOR_BINARY(operator>>, PyNumber_Rshift)
-PYBIND11_MATH_OPERATOR_BINARY_INPLACE(operator>>=, PyNumber_InPlaceRshift)
-
-#undef PYBIND11_MATH_OPERATOR_UNARY
-#undef PYBIND11_MATH_OPERATOR_BINARY
-#undef PYBIND11_MATH_OPERATOR_BINARY_INPLACE
-
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/stl.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/stl.h
deleted file mode 100644
index 2d144b598b3c033861d9bfc1da7d1898045ecbf2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/stl.h
+++ /dev/null
@@ -1,446 +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 "detail/common.h"
-
-#include <deque>
-#include <list>
-#include <map>
-#include <ostream>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <valarray>
-
-// See `detail/common.h` for implementation of these guards.
-#if defined(PYBIND11_HAS_OPTIONAL)
-# include <optional>
-#elif defined(PYBIND11_HAS_EXP_OPTIONAL)
-# include <experimental/optional>
-#endif
-
-#if defined(PYBIND11_HAS_VARIANT)
-# include <variant>
-#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>
-constexpr forwarded_type<T, U> forward_like(U &&u) {
- return std::forward<detail::forwarded_type<T, U>>(std::forward<U>(u));
-}
-
-// Checks if a container has a STL style reserve method.
-// This will only return true for a `reserve()` with a `void` return.
-template <typename C>
-using has_reserve_method = std::is_same<decltype(std::declval<C>().reserve(0)), void>;
-
-template <typename Type, typename Key>
-struct set_caster {
- using type = Type;
- using key_conv = make_caster<Key>;
-
-private:
- template <typename T = Type, enable_if_t<has_reserve_method<T>::value, int> = 0>
- void reserve_maybe(const anyset &s, Type *) {
- value.reserve(s.size());
- }
- void reserve_maybe(const anyset &, void *) {}
-
-public:
- bool load(handle src, bool convert) {
- if (!isinstance<anyset>(src)) {
- return false;
- }
- auto s = reinterpret_borrow<anyset>(src);
- value.clear();
- reserve_maybe(s, &value);
- 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(detail::forward_like<T>(value), policy, parent));
- if (!value_ || !s.add(std::move(value_))) {
- return handle();
- }
- }
- return s.release();
- }
-
- PYBIND11_TYPE_CASTER(type, const_name("Set[") + key_conv::name + const_name("]"));
-};
-
-template <typename Type, typename Key, typename Value>
-struct map_caster {
- using key_conv = make_caster<Key>;
- using value_conv = make_caster<Value>;
-
-private:
- template <typename T = Type, enable_if_t<has_reserve_method<T>::value, int> = 0>
- void reserve_maybe(const dict &d, Type *) {
- value.reserve(d.size());
- }
- void reserve_maybe(const dict &, void *) {}
-
-public:
- bool load(handle src, bool convert) {
- if (!isinstance<dict>(src)) {
- return false;
- }
- auto d = reinterpret_borrow<dict>(src);
- value.clear();
- reserve_maybe(d, &value);
- 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(detail::forward_like<T>(kv.first), policy_key, parent));
- auto value = reinterpret_steal<object>(
- value_conv::cast(detail::forward_like<T>(kv.second), policy_value, parent));
- if (!key || !value) {
- return handle();
- }
- d[std::move(key)] = std::move(value);
- }
- return d.release();
- }
-
- PYBIND11_TYPE_CASTER(Type,
- const_name("Dict[") + key_conv::name + const_name(", ") + value_conv::name
- + const_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<bytes>(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<has_reserve_method<T>::value, int> = 0>
- void reserve_maybe(const sequence &s, Type *) {
- value.reserve(s.size());
- }
- void reserve_maybe(const 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());
- ssize_t index = 0;
- for (auto &&value : src) {
- auto value_ = reinterpret_steal<object>(
- value_conv::cast(detail::forward_like<T>(value), policy, parent));
- if (!value_) {
- return handle();
- }
- PyList_SET_ITEM(l.ptr(), index++, value_.release().ptr()); // steals a reference
- }
- return l.release();
- }
-
- PYBIND11_TYPE_CASTER(Type, const_name("List[") + value_conv::name + const_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());
- ssize_t index = 0;
- for (auto &&value : src) {
- auto value_ = reinterpret_steal<object>(
- value_conv::cast(detail::forward_like<T>(value), policy, parent));
- if (!value_) {
- return handle();
- }
- PyList_SET_ITEM(l.ptr(), index++, value_.release().ptr()); // steals a reference
- }
- return l.release();
- }
-
- PYBIND11_TYPE_CASTER(ArrayType,
- const_name("List[") + value_conv::name
- + const_name<Resizable>(const_name(""),
- const_name("[") + const_name<Size>()
- + const_name("]"))
- + const_name("]"));
-};
-
-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 Type, typename Value = typename Type::value_type>
-struct optional_caster {
- using value_conv = make_caster<Value>;
-
- template <typename T>
- static handle cast(T &&src, return_value_policy policy, handle parent) {
- if (!src) {
- return none().release();
- }
- if (!std::is_lvalue_reference<T>::value) {
- policy = return_value_policy_override<Value>::policy(policy);
- }
- return value_conv::cast(*std::forward<T>(src), policy, parent);
- }
-
- bool load(handle src, bool convert) {
- if (!src) {
- return false;
- }
- 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<Value &&>(std::move(inner_caster)));
- return true;
- }
-
- PYBIND11_TYPE_CASTER(Type, const_name("Optional[") + value_conv::name + const_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>(std::move(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,
- const_name("Union[") + detail::concat(make_caster<Ts>::name...)
- + const_name("]"));
-};
-
-#if defined(PYBIND11_HAS_VARIANT)
-template <typename... Ts>
-struct type_caster<std::variant<Ts...>> : variant_caster<std::variant<Ts...>> {};
-
-template <>
-struct type_caster<std::monostate> : public void_caster<std::monostate> {};
-#endif
-
-PYBIND11_NAMESPACE_END(detail)
-
-inline std::ostream &operator<<(std::ostream &os, const handle &obj) {
-#ifdef PYBIND11_HAS_STRING_VIEW
- os << str(obj).cast<std::string_view>();
-#else
- os << (std::string) str(obj);
-#endif
- return os;
-}
-
-PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/stl_bind.h b/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/stl_bind.h
deleted file mode 100644
index 0c634597ec6aa3726645f44a1b76ed805be4fa05..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/include/pybind11/stl_bind.h
+++ /dev/null
@@ -1,845 +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 "detail/type_caster_base.h"
-#include "cast.h"
-#include "operators.h"
-
-#include <algorithm>
-#include <sstream>
-#include <type_traits>
-
-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([](const 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, const 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 = std::move(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 = std::move(v[(SizeType) i]);
- v.erase(std::next(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, const slice &slice) -> Vector * {
- size_t start = 0, stop = 0, step = 0, slicelength = 0;
-
- 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, const slice &slice, const Vector &value) {
- size_t start = 0, stop = 0, step = 0, slicelength = 0;
- 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, const slice &slice) {
- size_t start = 0, stop = 0, step = 0, slicelength = 0;
-
- 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 {};
-
-// [workaround(intel)] Separate function required here
-// Workaround as the Intel compiler does not compile the enable_if_t part below
-// (tested with icc (ICC) 2021.1 Beta 20200827)
-template <typename... Args>
-constexpr bool args_any_are_buffer() {
- return detail::any_of<std::is_same<Args, buffer_protocol>...>::value;
-}
-
-// [workaround(intel)] Separate function required here
-// [workaround(msvc)] Can't use constexpr bool in return type
-
-// Add the buffer interface to a vector
-template <typename Vector, typename Class_, typename... Args>
-void vector_buffer_impl(Class_ &cl, std::true_type) {
- 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([](const 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);
- }
- 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>
-void vector_buffer_impl(Class_ &, std::false_type) {}
-
-template <typename Vector, typename Class_, typename... Args>
-void vector_buffer(Class_ &cl) {
- vector_buffer_impl<Vector, Class_, Args...>(
- cl, detail::any_of<std::is_same<Args, buffer_protocol>...>{});
-}
-
-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.");
-}
-
-template <typename KeyType>
-struct keys_view {
- virtual size_t len() = 0;
- virtual iterator iter() = 0;
- virtual bool contains(const KeyType &k) = 0;
- virtual bool contains(const object &k) = 0;
- virtual ~keys_view() = default;
-};
-
-template <typename MappedType>
-struct values_view {
- virtual size_t len() = 0;
- virtual iterator iter() = 0;
- virtual ~values_view() = default;
-};
-
-template <typename KeyType, typename MappedType>
-struct items_view {
- virtual size_t len() = 0;
- virtual iterator iter() = 0;
- virtual ~items_view() = default;
-};
-
-template <typename Map, typename KeysView>
-struct KeysViewImpl : public KeysView {
- explicit KeysViewImpl(Map &map) : map(map) {}
- size_t len() override { return map.size(); }
- iterator iter() override { return make_key_iterator(map.begin(), map.end()); }
- bool contains(const typename Map::key_type &k) override { return map.find(k) != map.end(); }
- bool contains(const object &) override { return false; }
- Map ↦
-};
-
-template <typename Map, typename ValuesView>
-struct ValuesViewImpl : public ValuesView {
- explicit ValuesViewImpl(Map &map) : map(map) {}
- size_t len() override { return map.size(); }
- iterator iter() override { return make_value_iterator(map.begin(), map.end()); }
- Map ↦
-};
-
-template <typename Map, typename ItemsView>
-struct ItemsViewImpl : public ItemsView {
- explicit ItemsViewImpl(Map &map) : map(map) {}
- size_t len() override { return map.size(); }
- iterator iter() override { return make_iterator(map.begin(), map.end()); }
- 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 StrippedKeyType = detail::remove_cvref_t<KeyType>;
- using StrippedMappedType = detail::remove_cvref_t<MappedType>;
- using KeysView = detail::keys_view<StrippedKeyType>;
- using ValuesView = detail::values_view<StrippedMappedType>;
- using ItemsView = detail::items_view<StrippedKeyType, StrippedMappedType>;
- 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)...);
- static constexpr auto key_type_descr = detail::make_caster<KeyType>::name;
- static constexpr auto mapped_type_descr = detail::make_caster<MappedType>::name;
- std::string key_type_name(key_type_descr.text), mapped_type_name(mapped_type_descr.text);
-
- // If key type isn't properly wrapped, fall back to C++ names
- if (key_type_name == "%") {
- key_type_name = detail::type_info_description(typeid(KeyType));
- }
- // Similarly for value type:
- if (mapped_type_name == "%") {
- mapped_type_name = detail::type_info_description(typeid(MappedType));
- }
-
- // Wrap KeysView[KeyType] if it wasn't already wrapped
- if (!detail::get_type_info(typeid(KeysView))) {
- class_<KeysView> keys_view(
- scope, ("KeysView[" + key_type_name + "]").c_str(), pybind11::module_local(local));
- keys_view.def("__len__", &KeysView::len);
- keys_view.def("__iter__",
- &KeysView::iter,
- keep_alive<0, 1>() /* Essential: keep view alive while iterator exists */
- );
- keys_view.def("__contains__",
- static_cast<bool (KeysView::*)(const KeyType &)>(&KeysView::contains));
- // Fallback for when the object is not of the key type
- keys_view.def("__contains__",
- static_cast<bool (KeysView::*)(const object &)>(&KeysView::contains));
- }
- // Similarly for ValuesView:
- if (!detail::get_type_info(typeid(ValuesView))) {
- class_<ValuesView> values_view(scope,
- ("ValuesView[" + mapped_type_name + "]").c_str(),
- pybind11::module_local(local));
- values_view.def("__len__", &ValuesView::len);
- values_view.def("__iter__",
- &ValuesView::iter,
- keep_alive<0, 1>() /* Essential: keep view alive while iterator exists */
- );
- }
- // Similarly for ItemsView:
- if (!detail::get_type_info(typeid(ItemsView))) {
- class_<ItemsView> items_view(
- scope,
- ("ItemsView[" + key_type_name + ", ").append(mapped_type_name + "]").c_str(),
- pybind11::module_local(local));
- items_view.def("__len__", &ItemsView::len);
- items_view.def("__iter__",
- &ItemsView::iter,
- keep_alive<0, 1>() /* Essential: keep view alive while iterator exists */
- );
- }
-
- 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 map alive while iterator exists */
- );
-
- cl.def(
- "keys",
- [](Map &m) {
- return std::unique_ptr<KeysView>(new detail::KeysViewImpl<Map, KeysView>(m));
- },
- keep_alive<0, 1>() /* Essential: keep map alive while view exists */
- );
-
- cl.def(
- "values",
- [](Map &m) {
- return std::unique_ptr<ValuesView>(new detail::ValuesViewImpl<Map, ValuesView>(m));
- },
- keep_alive<0, 1>() /* Essential: keep map alive while view exists */
- );
-
- cl.def(
- "items",
- [](Map &m) {
- return std::unique_ptr<ItemsView>(new detail::ItemsViewImpl<Map, ItemsView>(m));
- },
- keep_alive<0, 1>() /* Essential: keep map alive while view 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;
- });
- // Fallback for when the object is not of the key type
- cl.def("__contains__", [](Map &, const object &) -> bool { return false; });
-
- // 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.10.3/noxfile.py b/3rdParty/pybind11/pybind11-2.10.3/noxfile.py
deleted file mode 100644
index 021ced24534f4ca31ba0ce9b68a231af5d4d7c20..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/noxfile.py
+++ /dev/null
@@ -1,107 +0,0 @@
-import os
-
-import nox
-
-nox.needs_version = ">=2022.1.7"
-nox.options.sessions = ["lint", "tests", "tests_packaging"]
-
-PYTHON_VERSIONS = [
- "3.6",
- "3.7",
- "3.8",
- "3.9",
- "3.10",
- "3.11",
- "pypy3.7",
- "pypy3.8",
- "pypy3.9",
-]
-
-if os.environ.get("CI", None):
- nox.options.error_on_missing_interpreters = True
-
-
-@nox.session(reuse_venv=True)
-def lint(session: nox.Session) -> None:
- """
- Lint the codebase (except for clang-format/tidy).
- """
- session.install("pre-commit")
- session.run("pre-commit", "run", "-a", *session.posargs)
-
-
-@nox.session(python=PYTHON_VERSIONS)
-def tests(session: nox.Session) -> None:
- """
- Run the tests (requires a compiler).
- """
- tmpdir = session.create_tmp()
- session.install("cmake")
- session.install("-r", "tests/requirements.txt")
- session.run(
- "cmake",
- "-S.",
- f"-B{tmpdir}",
- "-DPYBIND11_WERROR=ON",
- "-DDOWNLOAD_CATCH=ON",
- "-DDOWNLOAD_EIGEN=ON",
- *session.posargs,
- )
- session.run("cmake", "--build", tmpdir)
- session.run("cmake", "--build", tmpdir, "--config=Release", "--target", "check")
-
-
-@nox.session
-def tests_packaging(session: nox.Session) -> None:
- """
- Run the packaging tests.
- """
-
- session.install("-r", "tests/requirements.txt", "--prefer-binary")
- session.run("pytest", "tests/extra_python_package", *session.posargs)
-
-
-@nox.session(reuse_venv=True)
-def docs(session: nox.Session) -> None:
- """
- Build the docs. Pass "serve" to serve.
- """
-
- session.install("-r", "docs/requirements.txt")
- session.chdir("docs")
-
- if "pdf" in session.posargs:
- session.run("sphinx-build", "-M", "latexpdf", ".", "_build")
- return
-
- session.run("sphinx-build", "-M", "html", ".", "_build")
-
- if "serve" in session.posargs:
- session.log("Launching docs at http://localhost:8000/ - use Ctrl-C to quit")
- session.run("python", "-m", "http.server", "8000", "-d", "_build/html")
- elif session.posargs:
- session.error("Unsupported argument to docs")
-
-
-@nox.session(reuse_venv=True)
-def make_changelog(session: nox.Session) -> None:
- """
- Inspect the closed issues and make entries for a changelog.
- """
- session.install("ghapi", "rich")
- session.run("python", "tools/make_changelog.py")
-
-
-@nox.session(reuse_venv=True)
-def build(session: nox.Session) -> None:
- """
- Build SDists and wheels.
- """
-
- session.install("build")
- session.log("Building normal files")
- session.run("python", "-m", "build", *session.posargs)
- session.log("Building pybind11-global files (PYBIND11_GLOBAL_SDIST=1)")
- session.run(
- "python", "-m", "build", *session.posargs, env={"PYBIND11_GLOBAL_SDIST": "1"}
- )
diff --git a/3rdParty/pybind11/pybind11-2.10.3/pybind11/__init__.py b/3rdParty/pybind11/pybind11-2.10.3/pybind11/__init__.py
deleted file mode 100644
index 4fbb17079fbd15cf710eb24b3c0b6f4d8aae4413..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/pybind11/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import sys
-
-if sys.version_info < (3, 6):
- msg = "pybind11 does not support Python < 3.6. 2.9 was the last release supporting Python 2.7 and 3.5."
- raise ImportError(msg)
-
-
-from ._version import __version__, version_info
-from .commands import get_cmake_dir, get_include, get_pkgconfig_dir
-
-__all__ = (
- "version_info",
- "__version__",
- "get_include",
- "get_cmake_dir",
- "get_pkgconfig_dir",
-)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/pybind11/__main__.py b/3rdParty/pybind11/pybind11-2.10.3/pybind11/__main__.py
deleted file mode 100644
index 8c89533843cd014f005a7fb88c28a599c6b886b3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/pybind11/__main__.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# pylint: disable=missing-function-docstring
-
-import argparse
-import sys
-import sysconfig
-
-from .commands import get_cmake_dir, get_include, get_pkgconfig_dir
-
-
-def print_includes() -> 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() -> 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.",
- )
- parser.add_argument(
- "--pkgconfigdir",
- action="store_true",
- help="Print the pkgconfig directory, ideal for setting $PKG_CONFIG_PATH.",
- )
- 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 args.pkgconfigdir:
- print(get_pkgconfig_dir())
-
-
-if __name__ == "__main__":
- main()
diff --git a/3rdParty/pybind11/pybind11-2.10.3/pybind11/_version.py b/3rdParty/pybind11/pybind11-2.10.3/pybind11/_version.py
deleted file mode 100644
index 63078bbe6769b56ca548edb4bd830d438d776a51..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/pybind11/_version.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from typing import Union
-
-
-def _to_int(s: str) -> Union[int, str]:
- try:
- return int(s)
- except ValueError:
- return s
-
-
-__version__ = "2.10.3"
-version_info = tuple(_to_int(s) for s in __version__.split("."))
diff --git a/3rdParty/pybind11/pybind11-2.10.3/pybind11/commands.py b/3rdParty/pybind11/pybind11-2.10.3/pybind11/commands.py
deleted file mode 100644
index 152fa20ce7c6891ed4cd75ba918c1fd21a590fcc..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/pybind11/commands.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import os
-
-DIR = os.path.abspath(os.path.dirname(__file__))
-
-
-def get_include(user: bool = False) -> str: # pylint: disable=unused-argument
- """
- Return the path to the pybind11 include directory. The historical "user"
- argument is unused, and may be removed.
- """
- 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() -> str:
- """
- Return the path to the pybind11 CMake module directory.
- """
- cmake_installed_path = os.path.join(DIR, "share", "cmake", "pybind11")
- if os.path.exists(cmake_installed_path):
- return cmake_installed_path
-
- msg = "pybind11 not installed, installation required to access the CMake files"
- raise ImportError(msg)
-
-
-def get_pkgconfig_dir() -> str:
- """
- Return the path to the pybind11 pkgconfig directory.
- """
- pkgconfig_installed_path = os.path.join(DIR, "share", "pkgconfig")
- if os.path.exists(pkgconfig_installed_path):
- return pkgconfig_installed_path
-
- msg = "pybind11 not installed, installation required to access the pkgconfig files"
- raise ImportError(msg)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/pybind11/py.typed b/3rdParty/pybind11/pybind11-2.10.3/pybind11/py.typed
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/3rdParty/pybind11/pybind11-2.10.3/pybind11/setup_helpers.py b/3rdParty/pybind11/pybind11-2.10.3/pybind11/setup_helpers.py
deleted file mode 100644
index 1fd04b9154d89b3014f8fe4c58332b9179abcc0a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/pybind11/setup_helpers.py
+++ /dev/null
@@ -1,504 +0,0 @@
-"""
-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 platform
-import shlex
-import shutil
-import sys
-import sysconfig
-import tempfile
-import threading
-import warnings
-from functools import lru_cache
-from pathlib import Path
-from typing import (
- Any,
- Callable,
- Dict,
- Iterable,
- Iterator,
- List,
- Optional,
- Tuple,
- TypeVar,
- Union,
-)
-
-try:
- from setuptools import Extension as _Extension
- from setuptools.command.build_ext import build_ext as _build_ext
-except ImportError:
- from distutils.command.build_ext import build_ext as _build_ext
- from distutils.extension import Extension as _Extension
-
-import distutils.ccompiler
-import distutils.errors
-
-WIN = sys.platform.startswith("win32") and "mingw" not in sysconfig.get_platform()
-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): # type: ignore[misc]
- """
- 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 afterwards 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``.
- """
-
- # flags are prepended, so that they can be further overridden, e.g. by
- # ``extra_compile_args=["-g"]``.
-
- def _add_cflags(self, flags: List[str]) -> None:
- self.extra_compile_args[:0] = flags
-
- def _add_ldflags(self, flags: List[str]) -> None:
- self.extra_link_args[:0] = flags
-
- def __init__(self, *args: Any, **kwargs: Any) -> None:
-
- 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)
-
- super().__init__(*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 ModuleNotFoundError:
- pass
-
- self.cxx_std = cxx_std
-
- cflags = []
- ldflags = []
- if WIN:
- cflags += ["/EHsc", "/bigobj"]
- else:
- cflags += ["-fvisibility=hidden"]
- env_cflags = os.environ.get("CFLAGS", "")
- env_cppflags = os.environ.get("CPPFLAGS", "")
- c_cpp_flags = shlex.split(env_cflags) + shlex.split(env_cppflags)
- if not any(opt.startswith("-g") for opt in c_cpp_flags):
- cflags += ["-g0"]
- if MACOS:
- cflags += ["-stdlib=libc++"]
- ldflags += ["-stdlib=libc++"]
- self._add_cflags(cflags)
- self._add_ldflags(ldflags)
-
- @property
- def cxx_std(self) -> int:
- """
- 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 macos-min 10.9 or 10.14 flag if MACOSX_DEPLOYMENT_TARGET is
- unset.
- """
- return self._cxx_level
-
- @cxx_std.setter
- def cxx_std(self, level: int) -> None:
-
- 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
-
- cflags = [STD_TMPL.format(level)]
- ldflags = []
-
- if MACOS and "MACOSX_DEPLOYMENT_TARGET" not in os.environ:
- # C++17 requires a higher min version of macOS. An earlier version
- # (10.12 or 10.13) 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. However, never set higher than the
- # current macOS version!
- current_macos = tuple(int(x) for x in platform.mac_ver()[0].split(".")[:2])
- desired_macos = (10, 9) if level < 17 else (10, 14)
- macos_string = ".".join(str(x) for x in min(current_macos, desired_macos))
- macosx_min = f"-mmacosx-version-min={macos_string}"
- cflags += [macosx_min]
- ldflags += [macosx_min]
-
- self._add_cflags(cflags)
- self._add_ldflags(ldflags)
-
-
-# Just in case someone clever tries to multithread
-tmp_chdir_lock = threading.Lock()
-
-
-@contextlib.contextmanager
-def tmp_chdir() -> Iterator[str]:
- "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: Any, flag: str) -> bool:
- """
- 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 = Path("flagcheck.cpp")
- # Don't trigger -Wunused-parameter.
- fname.write_text("int main (int, char **) { return 0; }", encoding="utf-8")
-
- try:
- compiler.compile([str(fname)], extra_postargs=[flag])
- except distutils.errors.CompileError:
- return False
- return True
-
-
-# Every call will cache the result
-cpp_flag_cache = None
-
-
-@lru_cache()
-def auto_cpp_level(compiler: Any) -> Union[str, int]:
- """
- Return the max supported C++ std level (17, 14, or 11). Returns latest on Windows.
- """
-
- if WIN:
- return "latest"
-
- levels = [17, 14, 11]
-
- for level in levels:
- if has_flag(compiler, STD_TMPL.format(level)):
- return level
-
- msg = "Unsupported compiler -- at least C++11 support is needed!"
- raise RuntimeError(msg)
-
-
-class build_ext(_build_ext): # type: ignore[misc] # noqa: N801
- """
- Customized build_ext that allows an auto-search for the highest supported
- C++ level for Pybind11Extension. This is only needed for the auto-search
- for now, and is completely optional otherwise.
- """
-
- def build_extensions(self) -> None:
- """
- Build extensions, injecting C++ std for Pybind11Extension if needed.
- """
-
- for ext in self.extensions:
- if hasattr(ext, "_cxx_level") and ext._cxx_level == 0:
- ext.cxx_std = auto_cpp_level(self.compiler)
-
- super().build_extensions()
-
-
-def intree_extensions(
- paths: Iterable[str], package_dir: Optional[Dict[str, str]] = None
-) -> List[Pybind11Extension]:
- """
- Generate Pybind11Extensions from source files directly located in a Python
- source tree.
-
- ``package_dir`` behaves as in ``setuptools.setup``. If unset, the Python
- package root parent is determined as the first parent directory that does
- not contain an ``__init__.py`` file.
- """
- exts = []
-
- if package_dir is None:
- for path in paths:
- parent, _ = os.path.split(path)
- while os.path.exists(os.path.join(parent, "__init__.py")):
- parent, _ = os.path.split(parent)
- relname, _ = os.path.splitext(os.path.relpath(path, parent))
- qualified_name = relname.replace(os.path.sep, ".")
- exts.append(Pybind11Extension(qualified_name, [path]))
- return exts
-
- for path in paths:
- for prefix, parent in package_dir.items():
- if path.startswith(parent):
- relname, _ = os.path.splitext(os.path.relpath(path, parent))
- qualified_name = relname.replace(os.path.sep, ".")
- if prefix:
- qualified_name = prefix + "." + qualified_name
- exts.append(Pybind11Extension(qualified_name, [path]))
- break
- else:
- msg = (
- f"path {path} is not a child of any of the directories listed "
- f"in 'package_dir' ({package_dir})"
- )
- raise ValueError(msg)
-
- return exts
-
-
-def naive_recompile(obj: str, src: str) -> bool:
- """
- This will recompile only if the source file changes. It does not check
- header files, so a more advanced function or Ccache is better if you have
- editable header files in your package.
- """
- return os.stat(obj).st_mtime < os.stat(src).st_mtime
-
-
-def no_recompile(obg: str, src: str) -> bool: # pylint: disable=unused-argument
- """
- This is the safest but slowest choice (and is the default) - will always
- recompile sources.
- """
- return True
-
-
-S = TypeVar("S", bound="ParallelCompile")
-
-CCompilerMethod = Callable[
- [
- distutils.ccompiler.CCompiler,
- List[str],
- Optional[str],
- Optional[Union[Tuple[str], Tuple[str, Optional[str]]]],
- Optional[List[str]],
- bool,
- Optional[List[str]],
- Optional[List[str]],
- Optional[List[str]],
- ],
- List[str],
-]
-
-
-# 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:
- """
- 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
- needs_recompile:
- A function of (obj, src) that returns True when recompile is needed. No
- effect in isolated mode; use ccache instead, see
- https://github.com/matplotlib/matplotlib/issues/1507/
-
- To use::
-
- ParallelCompile("NPY_NUM_BUILD_JOBS").install()
-
- or::
-
- with ParallelCompile("NPY_NUM_BUILD_JOBS"):
- setup(...)
-
- By default, this assumes all files need to be recompiled. A smarter
- function can be provided via needs_recompile. If the output has not yet
- been generated, the compile will always run, and this function is not
- called.
- """
-
- __slots__ = ("envvar", "default", "max", "_old", "needs_recompile")
-
- def __init__(
- self,
- envvar: Optional[str] = None,
- default: int = 0,
- max: int = 0, # pylint: disable=redefined-builtin
- needs_recompile: Callable[[str, str], bool] = no_recompile,
- ) -> None:
- self.envvar = envvar
- self.default = default
- self.max = max
- self.needs_recompile = needs_recompile
- self._old: List[CCompilerMethod] = []
-
- def function(self) -> CCompilerMethod:
- """
- Builds a function object usable as distutils.ccompiler.CCompiler.compile.
- """
-
- def compile_function(
- compiler: distutils.ccompiler.CCompiler,
- sources: List[str],
- output_dir: Optional[str] = None,
- macros: Optional[Union[Tuple[str], Tuple[str, Optional[str]]]] = None,
- include_dirs: Optional[List[str]] = None,
- debug: bool = False,
- extra_preargs: Optional[List[str]] = None,
- extra_postargs: Optional[List[str]] = None,
- depends: Optional[List[str]] = None,
- ) -> Any:
-
- # These lines are directly from distutils.ccompiler.CCompiler
- macros, objects, extra_postargs, pp_opts, build = compiler._setup_compile( # type: ignore[attr-defined]
- output_dir, macros, include_dirs, sources, depends, extra_postargs
- )
- cc_args = compiler._get_cc_args(pp_opts, debug, extra_preargs) # type: ignore[attr-defined]
-
- # 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: Any) -> None:
- try:
- src, ext = build[obj]
- except KeyError:
- return
-
- if not os.path.exists(obj) or self.needs_recompile(obj, src):
- compiler._compile(obj, src, ext, cc_args, extra_postargs, pp_opts) # type: ignore[attr-defined]
-
- try:
- # Importing .synchronize checks for platforms that have some multiprocessing
- # capabilities but lack semaphores, such as AWS Lambda and Android Termux.
- import multiprocessing.synchronize
- 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:
- with ThreadPool(threads) as pool:
- for _ in pool.imap_unordered(_single_compile, objects):
- pass
- else:
- for ob in objects:
- _single_compile(ob)
-
- return objects
-
- return compile_function
-
- def install(self: S) -> S:
- """
- Installs the compile function into distutils.ccompiler.CCompiler.compile.
- """
- distutils.ccompiler.CCompiler.compile = self.function() # type: ignore[assignment]
- return self
-
- def __enter__(self: S) -> S:
- self._old.append(distutils.ccompiler.CCompiler.compile)
- return self.install()
-
- def __exit__(self, *args: Any) -> None:
- distutils.ccompiler.CCompiler.compile = self._old.pop() # type: ignore[assignment]
diff --git a/3rdParty/pybind11/pybind11-2.10.3/pyproject.toml b/3rdParty/pybind11/pybind11-2.10.3/pyproject.toml
deleted file mode 100644
index 3ba1b4b22ff0782368feab2dc64c3dc8d3aa1deb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/pyproject.toml
+++ /dev/null
@@ -1,61 +0,0 @@
-[build-system]
-requires = ["setuptools>=42", "cmake>=3.18", "ninja"]
-build-backend = "setuptools.build_meta"
-
-[tool.check-manifest]
-ignore = [
- "tests/**",
- "docs/**",
- "tools/**",
- "include/**",
- ".*",
- "pybind11/include/**",
- "pybind11/share/**",
- "CMakeLists.txt",
- "noxfile.py",
-]
-
-[tool.isort]
-# Needs the compiled .so modules and env.py from tests
-known_first_party = "env,pybind11_cross_module_tests,pybind11_tests,"
-# For black compatibility
-profile = "black"
-
-[tool.mypy]
-files = ["pybind11"]
-python_version = "3.6"
-strict = true
-show_error_codes = true
-enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
-warn_unreachable = true
-
-[[tool.mypy.overrides]]
-module = ["ghapi.*", "setuptools.*"]
-ignore_missing_imports = true
-
-
-[tool.pytest.ini_options]
-minversion = "6.0"
-addopts = ["-ra", "--showlocals", "--strict-markers", "--strict-config"]
-xfail_strict = true
-filterwarnings = ["error"]
-log_cli_level = "info"
-testpaths = [
- "tests",
-]
-timeout=300
-
-
-[tool.pylint]
-master.py-version = "3.6"
-reports.output-format = "colorized"
-messages_control.disable = [
- "design",
- "fixme",
- "imports",
- "line-too-long",
- "imports",
- "invalid-name",
- "protected-access",
- "missing-module-docstring",
-]
diff --git a/3rdParty/pybind11/pybind11-2.10.3/setup.cfg b/3rdParty/pybind11/pybind11-2.10.3/setup.cfg
deleted file mode 100644
index 8b3361981a7251134ce218b96a684c08d77b201f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/setup.cfg
+++ /dev/null
@@ -1,50 +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 :: 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
- 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
-
-project_urls =
- Documentation = https://pybind11.readthedocs.io/
- Bug Tracker = https://github.com/pybind/pybind11/issues
- Discussions = https://github.com/pybind/pybind11/discussions
- Changelog = https://pybind11.readthedocs.io/en/latest/changelog.html
- Chat = https://gitter.im/pybind/Lobby
-
-[options]
-python_requires = >=3.6
-zip_safe = False
-
-
-[flake8]
-max-line-length = 120
-show_source = True
-exclude = .git, __pycache__, build, dist, docs, tools, venv
-extend-ignore = E203, E722
-extend-select = B902, B904
diff --git a/3rdParty/pybind11/pybind11-2.10.3/setup.py b/3rdParty/pybind11/pybind11-2.10.3/setup.py
deleted file mode 100644
index 68573519c1fe1e743a41559ea9d676351fd25ca8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/setup.py
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/env python3
-
-# 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
-from pathlib import Path
-from tempfile import TemporaryDirectory
-from typing import Dict, Iterator, List, Union
-
-import setuptools.command.sdist
-
-DIR = Path(__file__).parent.absolute()
-VERSION_REGEX = re.compile(
- r"^\s*#\s*define\s+PYBIND11_VERSION_([A-Z]+)\s+(.*)$", re.MULTILINE
-)
-VERSION_FILE = Path("pybind11/_version.py")
-COMMON_FILE = Path("include/pybind11/detail/common.h")
-
-
-def build_expected_version_hex(matches: Dict[str, str]) -> str:
- patch_level_serial = matches["PATCH"]
- serial = None
- major = int(matches["MAJOR"])
- minor = int(matches["MINOR"])
- flds = patch_level_serial.split(".")
- if flds:
- patch = int(flds[0])
- if len(flds) == 1:
- level = "0"
- serial = 0
- elif len(flds) == 2:
- level_serial = flds[1]
- for level in ("a", "b", "c", "dev"):
- if level_serial.startswith(level):
- serial = int(level_serial[len(level) :])
- break
- if serial is None:
- msg = f'Invalid PYBIND11_VERSION_PATCH: "{patch_level_serial}"'
- raise RuntimeError(msg)
- version_hex_str = f"{major:02x}{minor:02x}{patch:02x}{level[:1]}{serial:x}"
- return f"0x{version_hex_str.upper()}"
-
-
-# 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 = Path(
- "tools/setup_global.py.in" if global_sdist else "tools/setup_main.py.in"
-)
-extra_cmd = 'cmdclass["sdist"] = SDist\n'
-
-to_src = (
- (Path("pyproject.toml"), Path("tools/pyproject.toml")),
- (Path("setup.py"), setup_py),
-)
-
-
-# Read the listed version
-loc: Dict[str, str] = {}
-code = compile(VERSION_FILE.read_text(encoding="utf-8"), "pybind11/_version.py", "exec")
-exec(code, loc)
-version = loc["__version__"]
-
-# Verify that the version matches the one in C++
-matches = dict(VERSION_REGEX.findall(COMMON_FILE.read_text(encoding="utf8")))
-cpp_version = "{MAJOR}.{MINOR}.{PATCH}".format(**matches)
-if version != cpp_version:
- msg = f"Python version {version} does not match C++ version {cpp_version}!"
- raise RuntimeError(msg)
-
-version_hex = matches.get("HEX", "MISSING")
-exp_version_hex = build_expected_version_hex(matches)
-if version_hex != exp_version_hex:
- msg = f"PYBIND11_VERSION_HEX {version_hex} does not match expected value {exp_version_hex}!"
- raise RuntimeError(msg)
-
-
-# TODO: use literals & overload (typing extensions or Python 3.8)
-def get_and_replace(
- filename: Path, binary: bool = False, **opts: str
-) -> Union[bytes, str]:
- if binary:
- contents = filename.read_bytes()
- return string.Template(contents.decode()).substitute(opts).encode()
-
- return string.Template(filename.read_text()).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): # type: ignore[misc]
- def make_release_tree(self, base_dir: str, files: List[str]) -> None:
- super().make_release_tree(base_dir, files)
-
- for to, src in to_src:
- txt = get_and_replace(src, binary=True, version=version, extra_cmd="")
-
- dest = Path(base_dir) / to
-
- # This is normally linked, so unlink before writing!
- dest.unlink()
- dest.write_bytes(txt) # type: ignore[arg-type]
-
-
-# Remove the CMake install directory when done
-@contextlib.contextmanager
-def remove_output(*sources: str) -> Iterator[None]:
- 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",
- "-Dprefix_for_pc_file=${pcfiledir}/../../",
- ]
- if "CMAKE_ARGS" in os.environ:
- fcommand = [
- c
- for c in os.environ["CMAKE_ARGS"].split()
- if "DCMAKE_INSTALL_PREFIX" not in c
- ]
- cmd += fcommand
- subprocess.run(cmd, check=True, cwd=DIR, stdout=sys.stdout, stderr=sys.stderr)
- subprocess.run(
- ["cmake", "--install", tmpdir],
- check=True,
- cwd=DIR,
- stdout=sys.stdout,
- stderr=sys.stderr,
- )
-
- 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.10.3/tests/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/CMakeLists.txt
deleted file mode 100644
index 9beb268ed783d19aa97f2c0068af128a2cbd6b32..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/CMakeLists.txt
+++ /dev/null
@@ -1,583 +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.21)
- cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-else()
- cmake_policy(VERSION 3.21)
-endif()
-
-# Only needed for CMake < 3.5 support
-include(CMakeParseArguments)
-
-# Filter out items; print an optional message if any items filtered. This ignores extensions.
-#
-# 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)
- # Make a list of the test without any extensions, for easier filtering.
- set(_TMP_ACTUAL_LIST "${${LISTNAME}};") # enforce ';' at the end to allow matching last item.
- string(REGEX REPLACE "\\.[^.;]*;" ";" LIST_WITHOUT_EXTENSIONS "${_TMP_ACTUAL_LIST}")
- foreach(filename IN LISTS ARG_UNPARSED_ARGUMENTS)
- string(REGEX REPLACE "\\.[^.]*$" "" filename_no_ext ${filename})
- # Search in the list without extensions.
- list(FIND LIST_WITHOUT_EXTENSIONS ${filename_no_ext} _FILE_FOUND)
- if(_FILE_FOUND GREATER -1)
- list(REMOVE_AT ${LISTNAME} ${_FILE_FOUND}) # And remove from the list with extensions.
- list(REMOVE_AT LIST_WITHOUT_EXTENSIONS ${_FILE_FOUND}
- )# And our search list, to ensure it is in sync.
- set(PYBIND11_FILTER_TESTS_FOUND ON)
- endif()
- endforeach()
- if(PYBIND11_FILTER_TESTS_FOUND AND ARG_MESSAGE)
- message(STATUS "${ARG_MESSAGE}")
- endif()
-endmacro()
-
-macro(possibly_uninitialized)
- foreach(VARNAME ${ARGN})
- if(NOT DEFINED "${VARNAME}")
- set("${VARNAME}" "")
- endif()
- endforeach()
-endmacro()
-
-# Function to add additional targets if any of the provided tests are found.
-# Needles; Specifies the test names to look for.
-# Additions; Specifies the additional test targets to add when any of the needles are found.
-macro(tests_extra_targets needles additions)
- # Add the index for this relation to the index extra targets map.
- list(LENGTH PYBIND11_TEST_EXTRA_TARGETS PYBIND11_TEST_EXTRA_TARGETS_LEN)
- list(APPEND PYBIND11_TEST_EXTRA_TARGETS ${PYBIND11_TEST_EXTRA_TARGETS_LEN})
- # Add the test names to look for, and the associated test target additions.
- set(PYBIND11_TEST_EXTRA_TARGETS_NEEDLES_${PYBIND11_TEST_EXTRA_TARGETS_LEN} ${needles})
- set(PYBIND11_TEST_EXTRA_TARGETS_ADDITION_${PYBIND11_TEST_EXTRA_TARGETS_LEN} ${additions})
-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 DEFINED 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, overrides ignore extension)
-# Any test that has no extension is both .py and .cpp, so 'foo' will add 'foo.cpp' and 'foo.py'.
-# Any test that has an extension is exclusively that and handled as such.
-set(PYBIND11_TEST_FILES
- test_async
- test_buffers
- test_builtin_casters
- test_call_policies
- test_callbacks
- test_chrono
- test_class
- test_const_name
- test_constants_and_functions
- test_copy_move
- test_custom_type_casters
- test_custom_type_setup
- test_docstring_options
- test_eigen_matrix
- test_eigen_tensor
- test_enum
- test_eval
- test_exceptions
- test_factory_constructors
- test_gil_scoped
- test_iostream
- test_kwargs_and_defaults
- test_local_bindings
- test_methods_and_attributes
- test_modules
- test_multiple_inheritance
- test_numpy_array
- test_numpy_dtypes
- test_numpy_vectorize
- test_opaque_types
- test_operator_overloading
- test_pickling
- test_pytypes
- test_sequences_and_iterators
- test_smart_ptr
- test_stl
- test_stl_binders
- test_tagbased_polymorphic
- test_thread
- test_union
- test_virtual_functions)
-
-# 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)
- # Instead of doing a direct override here, we iterate over the overrides without extension and
- # match them against entries from the PYBIND11_TEST_FILES, anything that not matches goes into the filter list.
- string(REGEX REPLACE "\\.[^.;]*;" ";" TEST_OVERRIDE_NO_EXT "${PYBIND11_TEST_OVERRIDE};")
- string(REGEX REPLACE "\\.[^.;]*;" ";" TEST_FILES_NO_EXT "${PYBIND11_TEST_FILES};")
- # This allows the override to be done with extensions, preserving backwards compatibility.
- foreach(test_name ${TEST_FILES_NO_EXT})
- if(NOT ${test_name} IN_LIST TEST_OVERRIDE_NO_EXT
- )# If not in the whitelist, add to be filtered out.
- list(APPEND PYBIND11_TEST_FILTER ${test_name})
- endif()
- endforeach()
-endif()
-
-# You can also filter tests:
-if(PYBIND11_TEST_FILTER)
- pybind11_filter_tests(PYBIND11_TEST_FILES ${PYBIND11_TEST_FILTER})
-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()
-
-# Now that the test filtering is complete, we need to split the list into the test for PYTEST
-# and the list for the cpp targets.
-set(PYBIND11_CPPTEST_FILES "")
-set(PYBIND11_PYTEST_FILES "")
-
-foreach(test_name ${PYBIND11_TEST_FILES})
- if(test_name MATCHES "\\.py$") # Ends in .py, purely python test.
- list(APPEND PYBIND11_PYTEST_FILES ${test_name})
- elseif(test_name MATCHES "\\.cpp$") # Ends in .cpp, purely cpp test.
- list(APPEND PYBIND11_CPPTEST_FILES ${test_name})
- elseif(NOT test_name MATCHES "\\.") # No extension specified, assume both, add extension.
- list(APPEND PYBIND11_PYTEST_FILES ${test_name}.py)
- list(APPEND PYBIND11_CPPTEST_FILES ${test_name}.cpp)
- else()
- message(WARNING "Unhanded test extension in test: ${test_name}")
- endif()
-endforeach()
-set(PYBIND11_TEST_FILES ${PYBIND11_CPPTEST_FILES})
-list(SORT PYBIND11_PYTEST_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.
-tests_extra_targets("test_exceptions.py;test_local_bindings.py;test_stl.py;test_stl_binders.py"
- "pybind11_cross_module_tests")
-
-# And add additional targets for other tests.
-tests_extra_targets("test_exceptions.py" "cross_module_interleaved_error_already_set")
-tests_extra_targets("test_gil_scoped.py" "cross_module_gil_utils")
-
-set(PYBIND11_EIGEN_REPO
- "https://gitlab.com/libeigen/eigen.git"
- CACHE STRING "Eigen repository to use for tests")
-# Always use a hash for reconfigure speed and security reasons
-# Include the version number for pretty printing (keep in sync)
-set(PYBIND11_EIGEN_VERSION_AND_HASH
- "3.4.0;929bc0e191d0927b1735b9a1ddc0e8b77e3a25ec"
- CACHE STRING "Eigen version to use for tests, format: VERSION;HASH")
-
-list(GET PYBIND11_EIGEN_VERSION_AND_HASH 0 PYBIND11_EIGEN_VERSION_STRING)
-list(GET PYBIND11_EIGEN_VERSION_AND_HASH 1 PYBIND11_EIGEN_VERSION_HASH)
-
-# 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_matrix.cpp PYBIND11_TEST_FILES_EIGEN_I)
-if(PYBIND11_TEST_FILES_EIGEN_I EQUAL -1)
- list(FIND PYBIND11_TEST_FILES test_eigen_tensor.cpp PYBIND11_TEST_FILES_EIGEN_I)
-endif()
-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()
-
- include(FetchContent)
- FetchContent_Declare(
- eigen
- GIT_REPOSITORY "${PYBIND11_EIGEN_REPO}"
- GIT_TAG "${PYBIND11_EIGEN_VERSION_HASH}")
-
- FetchContent_GetProperties(eigen)
- if(NOT eigen_POPULATED)
- message(
- STATUS
- "Downloading Eigen ${PYBIND11_EIGEN_VERSION_STRING} (${PYBIND11_EIGEN_VERSION_HASH}) from ${PYBIND11_EIGEN_REPO}"
- )
- FetchContent_Populate(eigen)
- endif()
-
- set(EIGEN3_INCLUDE_DIR ${eigen_SOURCE_DIR})
- set(EIGEN3_FOUND TRUE)
- # When getting locally, the version is not visible from a superprojet,
- # so just force it.
- set(EIGEN3_VERSION "${PYBIND11_EIGEN_VERSION_STRING}")
-
- 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}")
-
- if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))
- tests_extra_targets("test_eigen_tensor.py" "eigen_tensor_avoid_stl_array")
- endif()
-
- else()
- list(FIND PYBIND11_TEST_FILES test_eigen_matrix.cpp PYBIND11_TEST_FILES_EIGEN_I)
- if(PYBIND11_TEST_FILES_EIGEN_I GREATER -1)
- list(REMOVE_AT PYBIND11_TEST_FILES ${PYBIND11_TEST_FILES_EIGEN_I})
- endif()
-
- list(FIND PYBIND11_TEST_FILES test_eigen_tensor.cpp PYBIND11_TEST_FILES_EIGEN_I)
- if(PYBIND11_TEST_FILES_EIGEN_I GREATER -1)
- list(REMOVE_AT PYBIND11_TEST_FILES ${PYBIND11_TEST_FILES_EIGEN_I})
- endif()
- message(
- STATUS "Building tests WITHOUT Eigen, use -DDOWNLOAD_EIGEN=ON on CMake 3.11+ to download")
- endif()
-endif()
-
-# Some code doesn't support gcc 4
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
- list(FIND PYBIND11_TEST_FILES test_eigen_tensor.cpp PYBIND11_TEST_FILES_EIGEN_I)
- if(PYBIND11_TEST_FILES_EIGEN_I GREATER -1)
- list(REMOVE_AT PYBIND11_TEST_FILES ${PYBIND11_TEST_FILES_EIGEN_I})
- 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()
-
-# Check if we need to add -lstdc++fs or -lc++fs or nothing
-if(DEFINED CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD LESS 17)
- set(STD_FS_NO_LIB_NEEDED TRUE)
-elseif(MSVC)
- set(STD_FS_NO_LIB_NEEDED TRUE)
-else()
- file(
- WRITE ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
- "#include <filesystem>\nint main(int argc, char ** argv) {\n std::filesystem::path p(argv[0]);\n return p.string().length();\n}"
- )
- try_compile(
- STD_FS_NO_LIB_NEEDED ${CMAKE_CURRENT_BINARY_DIR}
- SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
- COMPILE_DEFINITIONS -std=c++17)
- try_compile(
- STD_FS_NEEDS_STDCXXFS ${CMAKE_CURRENT_BINARY_DIR}
- SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
- COMPILE_DEFINITIONS -std=c++17
- LINK_LIBRARIES stdc++fs)
- try_compile(
- STD_FS_NEEDS_CXXFS ${CMAKE_CURRENT_BINARY_DIR}
- SOURCES ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
- COMPILE_DEFINITIONS -std=c++17
- LINK_LIBRARIES c++fs)
-endif()
-
-if(${STD_FS_NEEDS_STDCXXFS})
- set(STD_FS_LIB stdc++fs)
-elseif(${STD_FS_NEEDS_CXXFS})
- set(STD_FS_LIB c++fs)
-elseif(${STD_FS_NO_LIB_NEEDED})
- set(STD_FS_LIB "")
-else()
- message(WARNING "Unknown C++17 compiler - not passing -lstdc++fs")
- set(STD_FS_LIB "")
-endif()
-
-# Compile with compiler warnings turned on
-function(pybind11_enable_warnings target_name)
- if(MSVC)
- target_compile_options(${target_name} PRIVATE /W4 /wd4189)
- 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
- -Wnon-virtual-dtor)
- 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|Clang|IntelLLVM)")
- target_compile_options(${target_name} PRIVATE -Werror)
- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
- if(CMAKE_CXX_STANDARD EQUAL 17) # See PR #3570
- target_compile_options(${target_name} PRIVATE -Wno-conversion)
- endif()
- target_compile_options(
- ${target_name}
- PRIVATE
- -Werror-all
- # "Inlining inhibited by limit max-size", "Inlining inhibited by limit max-total-size"
- -diag-disable 11074,11076)
- endif()
- endif()
-endfunction()
-
-set(test_targets pybind11_tests)
-
-# Check if any tests need extra targets by iterating through the mappings registered.
-foreach(i ${PYBIND11_TEST_EXTRA_TARGETS})
- foreach(needle ${PYBIND11_TEST_EXTRA_TARGETS_NEEDLES_${i}})
- if(needle IN_LIST PYBIND11_PYTEST_FILES)
- # Add all the additional targets to the test list. List join in newer cmake.
- foreach(extra_target ${PYBIND11_TEST_EXTRA_TARGETS_ADDITION_${i}})
- list(APPEND test_targets ${extra_target})
- endforeach()
- break() # Breaks out of the needle search, continues with the next mapping.
- endif()
- endforeach()
-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()
-
- target_link_libraries(${target} PRIVATE ${STD_FS_LIB})
-
- # 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}")
-
- if(DEFINED CMAKE_CONFIGURATION_TYPES)
- foreach(config ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER ${config} config)
- set_target_properties(${target} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${config}
- "${CMAKE_CURRENT_BINARY_DIR}")
- endforeach()
- endif()
- endif()
-endforeach()
-
-# Provide nice organisation in IDEs
-if(NOT CMAKE_VERSION VERSION_LESS 3.8)
- source_group(
- TREE "${CMAKE_CURRENT_SOURCE_DIR}/../include"
- PREFIX "Header Files"
- FILES ${PYBIND11_HEADERS})
-endif()
-
-# 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}")
-
-set(PYBIND11_TEST_PREFIX_COMMAND
- ""
- CACHE STRING "Put this before pytest, use for checkers and such")
-
-# A single command to compile and run the tests
-add_custom_target(
- pytest
- COMMAND ${PYBIND11_TEST_PREFIX_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()
-
-# cmake-format: off
-add_custom_target(
- memcheck
- COMMAND
- PYTHONMALLOC=malloc
- valgrind
- --leak-check=full
- --show-leak-kinds=definite,indirect
- --errors-for-leak-kinds=definite,indirect
- --error-exitcode=1
- --read-var-info=yes
- --track-origins=yes
- --suppressions="${CMAKE_CURRENT_SOURCE_DIR}/valgrind-python.supp"
- --suppressions="${CMAKE_CURRENT_SOURCE_DIR}/valgrind-numpy-scipy.supp"
- --gen-suppressions=all
- ${PYTHON_EXECUTABLE} -m pytest ${PYBIND11_ABS_PYTEST_FILES}
- DEPENDS ${test_targets}
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
- USES_TERMINAL)
-# cmake-format: on
-
-# 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.10.3/tests/conftest.py b/3rdParty/pybind11/pybind11-2.10.3/tests/conftest.py
deleted file mode 100644
index 402fd4b25bda23328a7421ae310f670fab2b276c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/conftest.py
+++ /dev/null
@@ -1,232 +0,0 @@
-"""pytest configuration
-
-Extends output capture as needed by pybind11: ignore constructors, optional unordered lines.
-Adds docstring and exceptions message sanitizers.
-"""
-
-import contextlib
-import difflib
-import gc
-import multiprocessing
-import os
-import re
-import textwrap
-
-import pytest
-
-# Early diagnostic for failed imports
-import pybind11_tests
-
-
-@pytest.fixture(scope="session", autouse=True)
-def always_forkserver_on_unix():
- if os.name == "nt":
- return
-
- # Full background: https://github.com/pybind/pybind11/issues/4105#issuecomment-1301004592
- # In a nutshell: fork() after starting threads == flakiness in the form of deadlocks.
- # It is actually a well-known pitfall, unfortunately without guard rails.
- # "forkserver" is more performant than "spawn" (~9s vs ~13s for tests/test_gil_scoped.py,
- # visit the issuecomment link above for details).
- # Windows does not have fork() and the associated pitfall, therefore it is best left
- # running with defaults.
- multiprocessing.set_start_method("forkserver")
-
-
-_long_marker = re.compile(r"([0-9])L")
-_hexadecimal = re.compile(r"0x[0-9a-fA-F]+")
-
-# Avoid collecting Python3 only files
-collect_ignore = []
-
-
-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:
- """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:
- 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:
- 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 = _long_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
-
-
-def pytest_report_header(config):
- del config # Unused.
- assert (
- pybind11_tests.compiler_info is not None
- ), "Please update pybind11_tests.cpp if this assert fails."
- return (
- "C++ Info:"
- f" {pybind11_tests.compiler_info}"
- f" {pybind11_tests.cpp_std}"
- f" {pybind11_tests.PYBIND11_INTERNALS_ID}"
- f" PYBIND11_SIMPLE_GIL_MANAGEMENT={pybind11_tests.PYBIND11_SIMPLE_GIL_MANAGEMENT}"
- )
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/constructor_stats.h b/3rdParty/pybind11/pybind11-2.10.3/tests/constructor_stats.h
deleted file mode 100644
index 937f6c233bce04280d528de451ff532348c085ce..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/constructor_stats.h
+++ /dev/null
@@ -1,322 +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 <list>
-#include <sstream>
-#include <typeindex>
-#include <unordered_map>
-
-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):\n"
- " 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.10.3/tests/cross_module_gil_utils.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/cross_module_gil_utils.cpp
deleted file mode 100644
index 7c20849dd93dfe11f97d6b450add6a353e899062..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/cross_module_gil_utils.cpp
+++ /dev/null
@@ -1,108 +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.
-*/
-#if defined(PYBIND11_INTERNALS_VERSION)
-# undef PYBIND11_INTERNALS_VERSION
-#endif
-#define PYBIND11_INTERNALS_VERSION 21814642 // Ensure this module has its own `internals` instance.
-#include <pybind11/pybind11.h>
-
-#include <cstdint>
-#include <string>
-#include <thread>
-
-// 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; }
-
-std::string gil_multi_acquire_release(unsigned bits) {
- if ((bits & 0x1u) != 0u) {
- py::gil_scoped_acquire gil;
- }
- if ((bits & 0x2u) != 0u) {
- py::gil_scoped_release gil;
- }
- if ((bits & 0x4u) != 0u) {
- py::gil_scoped_acquire gil;
- }
- if ((bits & 0x8u) != 0u) {
- py::gil_scoped_release gil;
- }
- return PYBIND11_INTERNALS_ID;
-}
-
-struct CustomAutoGIL {
- CustomAutoGIL() : gstate(PyGILState_Ensure()) {}
- ~CustomAutoGIL() { PyGILState_Release(gstate); }
-
- PyGILState_STATE gstate;
-};
-struct CustomAutoNoGIL {
- CustomAutoNoGIL() : save(PyEval_SaveThread()) {}
- ~CustomAutoNoGIL() { PyEval_RestoreThread(save); }
-
- PyThreadState *save;
-};
-
-template <typename Acquire, typename Release>
-void gil_acquire_inner() {
- Acquire acquire_outer;
- Acquire acquire_inner;
- Release release;
-}
-
-template <typename Acquire, typename Release>
-void gil_acquire_nested() {
- Acquire acquire_outer;
- Acquire acquire_inner;
- Release release;
- auto thread = std::thread(&gil_acquire_inner<Acquire, Release>);
- thread.join();
-}
-
-constexpr char kModuleName[] = "cross_module_gil_utils";
-
-struct PyModuleDef moduledef = {
- PyModuleDef_HEAD_INIT, kModuleName, nullptr, 0, nullptr, nullptr, nullptr, nullptr, nullptr};
-
-} // namespace
-
-#define ADD_FUNCTION(Name, ...) \
- PyModule_AddObject(m, Name, PyLong_FromVoidPtr(reinterpret_cast<void *>(&__VA_ARGS__)));
-
-extern "C" PYBIND11_EXPORT PyObject *PyInit_cross_module_gil_utils() {
-
- PyObject *m = PyModule_Create(&moduledef);
-
- if (m != nullptr) {
- static_assert(sizeof(&gil_acquire) == sizeof(void *),
- "Function pointer must have the same size as void*");
- ADD_FUNCTION("gil_acquire_funcaddr", gil_acquire)
- ADD_FUNCTION("gil_multi_acquire_release_funcaddr", gil_multi_acquire_release)
- ADD_FUNCTION("gil_acquire_inner_custom_funcaddr",
- gil_acquire_inner<CustomAutoGIL, CustomAutoNoGIL>)
- ADD_FUNCTION("gil_acquire_nested_custom_funcaddr",
- gil_acquire_nested<CustomAutoGIL, CustomAutoNoGIL>)
- ADD_FUNCTION("gil_acquire_inner_pybind11_funcaddr",
- gil_acquire_inner<py::gil_scoped_acquire, py::gil_scoped_release>)
- ADD_FUNCTION("gil_acquire_nested_pybind11_funcaddr",
- gil_acquire_nested<py::gil_scoped_acquire, py::gil_scoped_release>)
- }
-
- return m;
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/cross_module_interleaved_error_already_set.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/cross_module_interleaved_error_already_set.cpp
deleted file mode 100644
index fdd9939e45688bbc3ee6b4438a94a1c119be5b52..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/cross_module_interleaved_error_already_set.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- Copyright (c) 2022 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>
-
-// This file mimics a DSO that makes pybind11 calls but does not define a PYBIND11_MODULE,
-// so that the first call of cross_module_error_already_set() triggers the first call of
-// pybind11::detail::get_internals().
-
-namespace {
-
-namespace py = pybind11;
-
-void interleaved_error_already_set() {
- PyErr_SetString(PyExc_RuntimeError, "1st error.");
- try {
- throw py::error_already_set();
- } catch (const py::error_already_set &) {
- // The 2nd error could be conditional in a real application.
- PyErr_SetString(PyExc_RuntimeError, "2nd error.");
- } // Here the 1st error is destroyed before the 2nd error is fetched.
- // The error_already_set dtor triggers a pybind11::detail::get_internals()
- // call via pybind11::gil_scoped_acquire.
- if (PyErr_Occurred()) {
- throw py::error_already_set();
- }
-}
-
-constexpr char kModuleName[] = "cross_module_interleaved_error_already_set";
-
-struct PyModuleDef moduledef = {
- PyModuleDef_HEAD_INIT, kModuleName, nullptr, 0, nullptr, nullptr, nullptr, nullptr, nullptr};
-
-} // namespace
-
-extern "C" PYBIND11_EXPORT PyObject *PyInit_cross_module_interleaved_error_already_set() {
- PyObject *m = PyModule_Create(&moduledef);
- if (m != nullptr) {
- static_assert(sizeof(&interleaved_error_already_set) == sizeof(void *),
- "Function pointer must have the same size as void *");
- PyModule_AddObject(
- m,
- "funcaddr",
- PyLong_FromVoidPtr(reinterpret_cast<void *>(&interleaved_error_already_set)));
- }
- return m;
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/eigen_tensor_avoid_stl_array.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/eigen_tensor_avoid_stl_array.cpp
deleted file mode 100644
index eacc9e9bd61e49c0e481771ea6617c383475aa61..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/eigen_tensor_avoid_stl_array.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- tests/eigen_tensor.cpp -- automatic conversion of Eigen Tensor
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#ifndef EIGEN_AVOID_STL_ARRAY
-# define EIGEN_AVOID_STL_ARRAY
-#endif
-
-#include "test_eigen_tensor.inl"
-
-PYBIND11_MODULE(eigen_tensor_avoid_stl_array, m) { eigen_tensor_test::test_module(m); }
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/env.py b/3rdParty/pybind11/pybind11-2.10.3/tests/env.py
deleted file mode 100644
index 0345df65dc59e06452a0aa0c161bff09d4bd7f8c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/env.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import platform
-import sys
-
-import pytest
-
-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"
-
-
-def deprecated_call():
- """
- pytest.deprecated_call() seems broken in pytest<3.9.x; concretely, it
- doesn't work on CPython 3.8.0 with pytest==3.3.2 on Ubuntu 18.04 (#2922).
-
- This is a narrowed reimplementation of the following PR :(
- https://github.com/pytest-dev/pytest/pull/4104
- """
- # TODO: Remove this when testing requires pytest>=3.9.
- pieces = pytest.__version__.split(".")
- pytest_major_minor = (int(pieces[0]), int(pieces[1]))
- if pytest_major_minor < (3, 9):
- return pytest.warns((DeprecationWarning, PendingDeprecationWarning))
- else:
- return pytest.deprecated_call()
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/extra_python_package/pytest.ini b/3rdParty/pybind11/pybind11-2.10.3/tests/extra_python_package/pytest.ini
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/extra_python_package/test_files.py b/3rdParty/pybind11/pybind11-2.10.3/tests/extra_python_package/test_files.py
deleted file mode 100644
index 9a9bb1556ab3a6131a8b74a71e173fb51c9e6ce9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/extra_python_package/test_files.py
+++ /dev/null
@@ -1,290 +0,0 @@
-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))
-
-PKGCONFIG = """\
-prefix=${{pcfiledir}}/../../
-includedir=${{prefix}}/include
-
-Name: pybind11
-Description: Seamless operability between C++11 and Python
-Version: {VERSION}
-Cflags: -I${{includedir}}
-"""
-
-
-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/gil.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/type_caster_base.h",
- "include/pybind11/detail/typeid.h",
-}
-
-eigen_headers = {
- "include/pybind11/eigen/matrix.h",
- "include/pybind11/eigen/tensor.h",
-}
-
-stl_headers = {
- "include/pybind11/stl/filesystem.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",
-}
-
-pkgconfig_files = {
- "share/pkgconfig/pybind11.pc",
-}
-
-py_files = {
- "__init__.py",
- "__main__.py",
- "_version.py",
- "commands.py",
- "py.typed",
- "setup_helpers.py",
-}
-
-headers = main_headers | detail_headers | eigen_headers | stl_headers
-src_files = headers | cmake_files | pkgconfig_files
-all_files = src_files | py_files
-
-
-sdist_files = {
- "pybind11",
- "pybind11/include",
- "pybind11/include/pybind11",
- "pybind11/include/pybind11/detail",
- "pybind11/include/pybind11/eigen",
- "pybind11/include/pybind11/stl",
- "pybind11/share",
- "pybind11/share/cmake",
- "pybind11/share/cmake/pybind11",
- "pybind11/share/pkgconfig",
- "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 read_tz_file(tar: tarfile.TarFile, name: str) -> bytes:
- start = tar.getnames()[0] + "/"
- inner_file = tar.extractfile(tar.getmember(f"{start}{name}"))
- assert inner_file
- with contextlib.closing(inner_file) as f:
- return f.read()
-
-
-def normalize_line_endings(value: bytes) -> bytes:
- return value.replace(os.linesep.encode("utf-8"), b"\n")
-
-
-def test_build_sdist(monkeypatch, tmpdir):
-
- monkeypatch.chdir(MAIN_DIR)
-
- subprocess.run(
- [sys.executable, "-m", "build", "--sdist", f"--outdir={tmpdir}"], check=True
- )
-
- (sdist,) = tmpdir.visit("*.tar.gz")
-
- with tarfile.open(str(sdist), "r:gz") as tar:
- start = tar.getnames()[0] + "/"
- version = start[9:-1]
- simpler = {n.split("/", 1)[-1] for n in tar.getnames()[1:]}
-
- setup_py = read_tz_file(tar, "setup.py")
- pyproject_toml = read_tz_file(tar, "pyproject.toml")
- pkgconfig = read_tz_file(tar, "pybind11/share/pkgconfig/pybind11.pc")
- cmake_cfg = read_tz_file(
- tar, "pybind11/share/cmake/pybind11/pybind11Config.cmake"
- )
-
- assert (
- 'set(pybind11_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include")'
- in cmake_cfg.decode("utf-8")
- )
-
- files = {f"pybind11/{n}" for n in all_files}
- files |= sdist_files
- files |= {f"pybind11{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("utf-8"))
- .substitute(version=version, extra_cmd="")
- .encode("utf-8")
- )
- assert setup_py == contents
-
- with open(os.path.join(MAIN_DIR, "tools", "pyproject.toml"), "rb") as f:
- contents = f.read()
- assert pyproject_toml == contents
-
- simple_version = ".".join(version.split(".")[:3])
- pkgconfig_expected = PKGCONFIG.format(VERSION=simple_version).encode("utf-8")
- assert normalize_line_endings(pkgconfig) == pkgconfig_expected
-
-
-def test_build_global_dist(monkeypatch, tmpdir):
-
- monkeypatch.chdir(MAIN_DIR)
- monkeypatch.setenv("PYBIND11_GLOBAL_SDIST", "1")
- subprocess.run(
- [sys.executable, "-m", "build", "--sdist", "--outdir", str(tmpdir)], check=True
- )
-
- (sdist,) = tmpdir.visit("*.tar.gz")
-
- with tarfile.open(str(sdist), "r:gz") as tar:
- start = tar.getnames()[0] + "/"
- version = start[16:-1]
- simpler = {n.split("/", 1)[-1] for n in tar.getnames()[1:]}
-
- setup_py = read_tz_file(tar, "setup.py")
- pyproject_toml = read_tz_file(tar, "pyproject.toml")
- pkgconfig = read_tz_file(tar, "pybind11/share/pkgconfig/pybind11.pc")
- cmake_cfg = read_tz_file(
- tar, "pybind11/share/cmake/pybind11/pybind11Config.cmake"
- )
-
- assert (
- 'set(pybind11_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include")'
- in cmake_cfg.decode("utf-8")
- )
-
- files = {f"pybind11/{n}" for n in all_files}
- files |= sdist_files
- files |= {f"pybind11_global{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("utf-8")
- )
- assert setup_py == contents
-
- with open(os.path.join(MAIN_DIR, "tools", "pyproject.toml"), "rb") as f:
- contents = f.read()
- assert pyproject_toml == contents
-
- simple_version = ".".join(version.split(".")[:3])
- pkgconfig_expected = PKGCONFIG.format(VERSION=simple_version).encode("utf-8")
- assert normalize_line_endings(pkgconfig) == pkgconfig_expected
-
-
-def tests_build_wheel(monkeypatch, tmpdir):
- monkeypatch.chdir(MAIN_DIR)
-
- subprocess.run(
- [sys.executable, "-m", "pip", "wheel", ".", "-w", str(tmpdir)], check=True
- )
-
- (wheel,) = tmpdir.visit("*.whl")
-
- files = {f"pybind11/{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 = {n for n in names if "dist-info" not in n}
- trimmed |= {f"dist-info/{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.run(
- [sys.executable, "-m", "pip", "wheel", ".", "-w", str(tmpdir)], check=True
- )
-
- (wheel,) = tmpdir.visit("*.whl")
-
- files = {f"data/data/{n}" for n in src_files}
- files |= {f"data/headers/{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 = {n[len(beginning) + 1 :] for n in names}
-
- assert files == trimmed
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/extra_setuptools/pytest.ini b/3rdParty/pybind11/pybind11-2.10.3/tests/extra_setuptools/pytest.ini
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/extra_setuptools/test_setuphelper.py b/3rdParty/pybind11/pybind11-2.10.3/tests/extra_setuptools/test_setuphelper.py
deleted file mode 100644
index d5d3093bf005ac9d85fe4e320b822ec847699880..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/extra_setuptools/test_setuphelper.py
+++ /dev/null
@@ -1,151 +0,0 @@
-import os
-import subprocess
-import sys
-from textwrap import dedent
-
-import pytest
-
-DIR = os.path.abspath(os.path.dirname(__file__))
-MAIN_DIR = os.path.dirname(os.path.dirname(DIR))
-WIN = sys.platform.startswith("win32") or sys.platform.startswith("cygwin")
-
-
-@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(
- f"""\
- 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,
- )
- """
- ),
- encoding="ascii",
- )
-
- (tmpdir / "main.cpp").write_text(
- dedent(
- """\
- #include <pybind11/pybind11.h>
-
- int f(int x) {
- return x * 3;
- }
- PYBIND11_MODULE(simple_setup, m) {
- m.def("f", &f);
- }
- """
- ),
- encoding="ascii",
- )
-
- out = subprocess.check_output(
- [sys.executable, "setup.py", "build_ext", "--inplace"],
- )
- if not WIN:
- assert b"-g0" in out
- out = subprocess.check_output(
- [sys.executable, "setup.py", "build_ext", "--inplace", "--force"],
- env=dict(os.environ, CFLAGS="-g"),
- )
- if not WIN:
- assert b"-g0" not in out
-
- # Debug helper printout, normally hidden
- print(out)
- 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(
- """\
- import simple_setup
- assert simple_setup.f(3) == 9
- """
- ),
- encoding="ascii",
- )
-
- subprocess.check_call(
- [sys.executable, "test.py"], stdout=sys.stdout, stderr=sys.stderr
- )
-
-
-def test_intree_extensions(monkeypatch, tmpdir):
- monkeypatch.syspath_prepend(MAIN_DIR)
-
- from pybind11.setup_helpers import intree_extensions
-
- monkeypatch.chdir(tmpdir)
- root = tmpdir
- root.ensure_dir()
- subdir = root / "dir"
- subdir.ensure_dir()
- src = subdir / "ext.cpp"
- src.ensure()
- relpath = src.relto(tmpdir)
- (ext,) = intree_extensions([relpath])
- assert ext.name == "ext"
- subdir.ensure("__init__.py")
- (ext,) = intree_extensions([relpath])
- assert ext.name == "dir.ext"
-
-
-def test_intree_extensions_package_dir(monkeypatch, tmpdir):
- monkeypatch.syspath_prepend(MAIN_DIR)
-
- from pybind11.setup_helpers import intree_extensions
-
- monkeypatch.chdir(tmpdir)
- root = tmpdir / "src"
- root.ensure_dir()
- subdir = root / "dir"
- subdir.ensure_dir()
- src = subdir / "ext.cpp"
- src.ensure()
- (ext,) = intree_extensions([src.relto(tmpdir)], package_dir={"": "src"})
- assert ext.name == "dir.ext"
- (ext,) = intree_extensions([src.relto(tmpdir)], package_dir={"foo": "src"})
- assert ext.name == "foo.dir.ext"
- subdir.ensure("__init__.py")
- (ext,) = intree_extensions([src.relto(tmpdir)], package_dir={"": "src"})
- assert ext.name == "dir.ext"
- (ext,) = intree_extensions([src.relto(tmpdir)], package_dir={"foo": "src"})
- assert ext.name == "foo.dir.ext"
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/local_bindings.h b/3rdParty/pybind11/pybind11-2.10.3/tests/local_bindings.h
deleted file mode 100644
index 01d2785353ec006307078404f6116adb64021dc5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/local_bindings.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#pragma once
-#include "pybind11_tests.h"
-
-#include <utility>
-
-/// Simple class used to test py::local:
-template <int>
-class LocalBase {
-public:
- explicit 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>;
-
-// Exception that will be caught via the module local translator.
-class LocalException : public std::exception {
-public:
- explicit LocalException(const char *m) : message{m} {}
- const char *what() const noexcept override { return message.c_str(); }
-
-private:
- std::string message = "";
-};
-
-// Exception that will be registered with register_local_exception_translator
-class LocalSimpleException : public std::exception {
-public:
- explicit LocalSimpleException(const char *m) : message{m} {}
- const char *what() const noexcept override { return message.c_str(); }
-
-private:
- std::string message = "";
-};
-
-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:
- explicit Pet(std::string name) : name_(std::move(name)) {}
- std::string name_;
- const std::string &name() const { return name_; }
-};
-} // namespace pets
-
-struct MixGL {
- int i;
- explicit MixGL(int i) : i{i} {}
-};
-struct MixGL2 {
- int i;
- explicit MixGL2(int i) : i{i} {}
-};
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/object.h b/3rdParty/pybind11/pybind11-2.10.3/tests/object.h
deleted file mode 100644
index 564dd4a7a5dd7e2dd74e023338e8ee6c2ee3171b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/object.h
+++ /dev/null
@@ -1,205 +0,0 @@
-#if !defined(__OBJECT_H)
-# define __OBJECT_H
-
-# include "constructor_stats.h"
-
-# include <atomic>
-
-/// 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
- explicit 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) noexcept : 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) noexcept {
- 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) {
- if (this == &r) {
- return *this;
- }
- 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
- explicit 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.10.3/tests/pybind11_cross_module_tests.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/pybind11_cross_module_tests.cpp
deleted file mode 100644
index 9379f3f259e5bea210a56654d7e5af0d06b3cfca..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/pybind11_cross_module_tests.cpp
+++ /dev/null
@@ -1,149 +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/stl_bind.h>
-
-#include "local_bindings.h"
-#include "pybind11_tests.h"
-#include "test_exceptions.h"
-
-#include <numeric>
-#include <utility>
-
-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
- py::register_local_exception<LocalSimpleException>(m, "LocalSimpleException");
- 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(); });
- m.def("throw_local_error", []() { throw LocalException("just local"); });
- m.def("throw_local_simple_error", []() { throw LocalSimpleException("external mod"); });
- py::register_exception_translator([](std::exception_ptr p) {
- try {
- if (p) {
- std::rethrow_exception(p);
- }
- } catch (const shared_exception &e) {
- PyErr_SetString(PyExc_KeyError, e.what());
- }
- });
-
- // translate the local exception into a key error but only in this module
- py::register_local_exception_translator([](std::exception_ptr p) {
- try {
- if (p) {
- std::rethrow_exception(p);
- }
- } catch (const LocalException &e) {
- PyErr_SetString(PyExc_KeyError, e.what());
- }
- });
-
- // 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::get_local_internals().registered_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:
- explicit Dog(std::string name) : Pet(std::move(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", [](const std::vector<float> &) {});
- m.def("missing_header_return", []() { return std::vector<float>(); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/pybind11_tests.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/pybind11_tests.cpp
deleted file mode 100644
index 624034648741a85aedf180f2fcd660b4cc82c8e8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/pybind11_tests.cpp
+++ /dev/null
@@ -1,123 +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();
- });
-}
-
-const char *cpp_std() {
- return
-#if defined(PYBIND11_CPP20)
- "C++20";
-#elif defined(PYBIND11_CPP17)
- "C++17";
-#elif defined(PYBIND11_CPP14)
- "C++14";
-#else
- "C++11";
-#endif
-}
-
-PYBIND11_MODULE(pybind11_tests, m) {
- m.doc() = "pybind11 test module";
-
- // Intentionally kept minimal to not create a maintenance chore
- // ("just enough" to be conclusive).
-#if defined(_MSC_FULL_VER)
- m.attr("compiler_info") = "MSVC " PYBIND11_TOSTRING(_MSC_FULL_VER);
-#elif defined(__VERSION__)
- m.attr("compiler_info") = __VERSION__;
-#else
- m.attr("compiler_info") = py::none();
-#endif
- m.attr("cpp_std") = cpp_std();
- m.attr("PYBIND11_INTERNALS_ID") = PYBIND11_INTERNALS_ID;
- m.attr("PYBIND11_SIMPLE_GIL_MANAGEMENT") =
-#if defined(PYBIND11_SIMPLE_GIL_MANAGEMENT)
- true;
-#else
- false;
-#endif
-
- bind_ConstructorStats(m);
-
-#if defined(PYBIND11_DETAILED_ERROR_MESSAGES)
- m.attr("detailed_error_messages_enabled") = true;
-#else
- m.attr("detailed_error_messages_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.10.3/tests/pybind11_tests.h b/3rdParty/pybind11/pybind11-2.10.3/tests/pybind11_tests.h
deleted file mode 100644
index a7c00c2f9bb26b4afb908ad4f2749bd89ff5eeab..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/pybind11_tests.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#pragma once
-
-#include <pybind11/eval.h>
-#include <pybind11/pybind11.h>
-
-namespace py = pybind11;
-using namespace pybind11::literals;
-
-class test_initializer {
- using Initializer = void (*)(py::module_ &);
-
-public:
- explicit 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;
- explicit 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, const_name("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)
-
-template <typename F>
-void ignoreOldStyleInitWarnings(F &&body) {
- py::exec(R"(
- message = "pybind11-bound class '.+' is using an old-style placement-new '(?:__init__|__setstate__)' which has been deprecated"
-
- import warnings
- with warnings.catch_warnings():
- warnings.filterwarnings("ignore", message=message, category=FutureWarning)
- body()
- )",
- py::dict(py::arg("body") = py::cpp_function(body)));
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/pytest.ini b/3rdParty/pybind11/pybind11-2.10.3/tests/pytest.ini
deleted file mode 100644
index 792ba361f722fbc7a830ea935cad26c497557df8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/pytest.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[pytest]
-minversion = 3.10
-norecursedirs = test_* extra_*
-xfail_strict = True
-addopts =
- # show summary of tests
- -ra
- # capture only Python print and C++ py::print, but not C output (low-level Python errors)
- --capture=sys
- # Show local info when a failure occurs
- --showlocals
-log_cli_level = info
-filterwarnings =
- # make warnings into errors but ignore certain third-party extension issues
- error
- # somehow, some DeprecationWarnings do not get turned into errors
- always::DeprecationWarning
- # 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.10.3/tests/requirements.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/requirements.txt
deleted file mode 100644
index 04aafa8cf93ee7bb737174d962bf8362507b6c82..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/requirements.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-build==0.8.0
-numpy==1.21.5; platform_python_implementation=="PyPy" and sys_platform=="linux" and python_version=="3.7"
-numpy==1.19.3; platform_python_implementation!="PyPy" and python_version=="3.6"
-numpy==1.21.5; platform_python_implementation!="PyPy" and python_version>="3.7" and python_version<"3.10"
-numpy==1.22.2; platform_python_implementation!="PyPy" and python_version>="3.10" and python_version<"3.11"
-pytest==7.0.0
-pytest-timeout
-scipy==1.5.4; platform_python_implementation!="PyPy" and python_version<"3.10"
-scipy==1.8.0; platform_python_implementation!="PyPy" and python_version=="3.10"
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_async.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_async.cpp
deleted file mode 100644
index a5d7224657298d159269838ab63607cb8d8e75a5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_async.cpp
+++ /dev/null
@@ -1,25 +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.10.3/tests/test_async.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_async.py
deleted file mode 100644
index b9ff9514d2844bf544f80ec27540554dacbdfcd9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_async.py
+++ /dev/null
@@ -1,24 +0,0 @@
-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.10.3/tests/test_buffers.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_buffers.cpp
deleted file mode 100644
index 6b6e8cba7f7da9075a8f7082982fa5062b1bb2fa..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_buffers.cpp
+++ /dev/null
@@ -1,224 +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/stl.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.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");
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- 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");
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- 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) noexcept : 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) {
- if (this == &s) {
- return *this;
- }
- 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) noexcept {
- 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([](const py::buffer &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:
- explicit 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;
- explicit 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", [](const py::buffer &buffer) { return buffer.request(); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_buffers.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_buffers.py
deleted file mode 100644
index 8354b68cda848973982c7ddc3905e8257eec6c34..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_buffers.py
+++ /dev/null
@@ -1,163 +0,0 @@
-import ctypes
-import io
-import struct
-
-import pytest
-
-import env
-from pybind11_tests import ConstructorStats
-from pybind11_tests import buffers as m
-
-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
-# TODO: fix on recent PyPy
-@pytest.mark.xfail(
- env.PYPY, reason="PyPy 7.3.7 doesn't clear this anymore", strict=False
-)
-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] == 0x64
- assert view.readonly
- with pytest.raises(TypeError):
- view[0] = 0
-
-
-def test_selective_readonly_buffer():
- buf = m.BufferReadOnlySelect()
-
- memoryview(buf)[0] = 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] = 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
-
-
-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.10.3/tests/test_builtin_casters.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_builtin_casters.cpp
deleted file mode 100644
index 0623b85dc97d8bb20136a9e99a957b828a27dc1b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_builtin_casters.cpp
+++ /dev/null
@@ -1,392 +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/complex.h>
-
-#include "pybind11_tests.h"
-
-struct ConstRefCasted {
- int tag;
-};
-
-PYBIND11_NAMESPACE_BEGIN(pybind11)
-PYBIND11_NAMESPACE_BEGIN(detail)
-template <>
-class type_caster<ConstRefCasted> {
-public:
- static constexpr auto name = const_name<ConstRefCasted>();
-
- // Input is unimportant, a new value will always be constructed based on the
- // cast operator.
- bool load(handle, bool) { return true; }
-
- explicit operator ConstRefCasted &&() {
- value = {1};
- // NOLINTNEXTLINE(performance-move-const-arg)
- return std::move(value);
- }
- explicit operator ConstRefCasted &() {
- value = {2};
- return value;
- }
- explicit operator ConstRefCasted *() {
- value = {3};
- return &value;
- }
-
- explicit operator const ConstRefCasted &() {
- value = {4};
- return value;
- }
- explicit operator const ConstRefCasted *() {
- value = {5};
- return &value;
- }
-
- // custom cast_op to explicitly propagate types to the conversion operators.
- template <typename T_>
- using cast_op_type =
- /// const
- conditional_t<
- std::is_same<remove_reference_t<T_>, const ConstRefCasted *>::value,
- const ConstRefCasted *,
- conditional_t<
- std::is_same<T_, const ConstRefCasted &>::value,
- const ConstRefCasted &,
- /// non-const
- conditional_t<std::is_same<remove_reference_t<T_>, ConstRefCasted *>::value,
- ConstRefCasted *,
- conditional_t<std::is_same<T_, ConstRefCasted &>::value,
- ConstRefCasted &,
- /* else */ ConstRefCasted &&>>>>;
-
-private:
- ConstRefCasted value = {0};
-};
-PYBIND11_NAMESPACE_END(detail)
-PYBIND11_NAMESPACE_END(pybind11)
-
-TEST_SUBMODULE(builtin_casters, m) {
- PYBIND11_WARNING_PUSH
- PYBIND11_WARNING_DISABLE_MSVC(4127)
-
- // 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 didn't appear to trigger
- // UnicodeDecodeError
- m.def("bad_utf32_string", [=]() { return std::u32string({a32, char32_t(0xd800), z32}); });
- if (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", [](const 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"); });
-
- // The inner lambdas here are to also test implicit conversion
- using namespace std::literals;
- m.def("string_view_bytes",
- []() { return [](py::bytes b) { return b; }("abc \x80\x80 def"sv); });
- m.def("string_view_str",
- []() { return [](py::str s) { return s; }("abc \342\200\275 def"sv); });
- m.def("string_view_from_bytes",
- [](const py::bytes &b) { return [](std::string_view s) { return s; }(b); });
- m.def("string_view_memoryview", []() {
- static constexpr auto val = "Have some \360\237\216\202"sv;
- return py::memoryview::from_memory(val);
- });
-
-# 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"); });
- m.def("string_view8_str", []() { return py::str{std::u8string_view{u8"abc ‽ def"}}; });
-# endif
-
- struct TypeWithBothOperatorStringAndStringView {
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator std::string() const { return "success"; }
- // NOLINTNEXTLINE(google-explicit-constructor)
- operator std::string_view() const { return "failure"; }
- };
- m.def("bytes_from_type_with_both_operator_string_and_string_view",
- []() { return py::bytes(TypeWithBothOperatorStringAndStringView()); });
- m.def("str_from_type_with_both_operator_string_and_string_view",
- []() { return py::str(TypeWithBothOperatorStringAndStringView()); });
-#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_int_convert
- m.def("int_passthrough", [](int arg) { return arg; });
- m.def(
- "int_passthrough_noconvert", [](int arg) { return arg; }, py::arg{}.noconvert());
-
- // test_tuple
- m.def(
- "pair_passthrough",
- [](const 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; });
-
- m.def(
- "int_string_pair",
- []() {
- // Using no-destructor idiom to side-step warnings from overzealous compilers.
- static auto *int_string_pair = new std::pair<int, std::string>{2, "items"};
- return int_string_pair;
- },
- py::return_value_policy::reference);
-
- // 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", [](const py::none &) { return true; });
- m.def("defer_none_custom", [](UserType *) { return false; });
- m.def("defer_none_custom", [](const py::none &) { return true; });
- m.def("nodefer_none_void", [](void *) { return true; });
- m.def("nodefer_none_void", [](const 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{}; });
-
- // [workaround(intel)] ICC 20/21 breaks with py::arg().stuff, using py::arg{}.stuff works.
-
- // test_bool_caster
- m.def("bool_passthrough", [](bool arg) { return arg; });
- m.def(
- "bool_passthrough_noconvert", [](bool arg) { return arg; }, py::arg{}.noconvert());
-
- // TODO: This should be disabled and fixed in future Intel compilers
-#if !defined(__INTEL_COMPILER)
- // Test "bool_passthrough_noconvert" again, but using () instead of {} to construct py::arg
- // When compiled with the Intel compiler, this results in segmentation faults when importing
- // the module. Tested with icc (ICC) 2021.1 Beta 20200827, this should be tested again when
- // a newer version of icc is available.
- m.def(
- "bool_passthrough_noconvert2", [](bool arg) { return arg; }, py::arg().noconvert());
-#endif
-
- // 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(); });
- m.def("refwrap_usertype_const",
- [](std::reference_wrapper<const UserType> p) { return p.get().value(); });
-
- m.def("refwrap_lvalue", []() -> std::reference_wrapper<UserType> {
- static UserType x(1);
- return std::ref(x);
- });
- m.def("refwrap_lvalue_const", []() -> std::reference_wrapper<const UserType> {
- static UserType x(1);
- return std::cref(x);
- });
-
- // 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 (const 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, const 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;
- });
-
- // Tests const/non-const propagation in cast_op.
- m.def("takes", [](ConstRefCasted x) { return x.tag; });
- m.def("takes_move", [](ConstRefCasted &&x) { return x.tag; });
- m.def("takes_ptr", [](ConstRefCasted *x) { return x->tag; });
- m.def("takes_ref", [](ConstRefCasted &x) { return x.tag; });
- m.def("takes_ref_wrap", [](std::reference_wrapper<ConstRefCasted> x) { return x.get().tag; });
- m.def("takes_const_ptr", [](const ConstRefCasted *x) { return x->tag; });
- m.def("takes_const_ref", [](const ConstRefCasted &x) { return x.tag; });
- m.def("takes_const_ref_wrap",
- [](std::reference_wrapper<const ConstRefCasted> x) { return x.get().tag; });
-
- PYBIND11_WARNING_POP
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_builtin_casters.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_builtin_casters.py
deleted file mode 100644
index d38ae6802807de74ba866fe4d8deadd850d581d1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_builtin_casters.py
+++ /dev/null
@@ -1,526 +0,0 @@
-import sys
-
-import pytest
-
-import env
-from pybind11_tests import IncType, UserType
-from pybind11_tests import builtin_casters as m
-
-
-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() == "Say utf8‽ 🎂 ð€"
- assert m.good_utf16_string() == "b‽🎂ð€z"
- assert m.good_utf32_string() == "að€ðŸŽ‚‽z"
- assert m.good_wchar_string() == "a⸘ð€z"
- if hasattr(m, "has_u8string"):
- assert m.good_utf8_u8string() == "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)
- 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() == "é"
- assert m.u16_ibang() == "‽"
- assert m.u32_mathbfA() == "ð€"
- assert m.wchar_heart() == "♥"
- 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 f"Character code point not in range({r:#x})"
-
- toolong_message = "Expected a character, but multi-character string found"
-
- assert m.ord_char("a") == 0x61 # simple ASCII
- assert m.ord_char_lv("b") == 0x62
- assert (
- m.ord_char("é") == 0xE9
- ) # requires 2 bytes in utf-8, but can be stuffed in a char
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char("Ä€") == 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("ab")
- assert str(excinfo.value) == toolong_message
-
- assert m.ord_char16("a") == 0x61
- assert m.ord_char16("é") == 0xE9
- assert m.ord_char16_lv("ê") == 0xEA
- assert m.ord_char16("Ä€") == 0x100
- assert m.ord_char16("‽") == 0x203D
- assert m.ord_char16("♥") == 0x2665
- assert m.ord_char16_lv("♡") == 0x2661
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char16("🎂") == 0x1F382 # requires surrogate pair
- assert str(excinfo.value) == toobig_message(0x10000)
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char16("aa")
- assert str(excinfo.value) == toolong_message
-
- assert m.ord_char32("a") == 0x61
- assert m.ord_char32("é") == 0xE9
- assert m.ord_char32("Ä€") == 0x100
- assert m.ord_char32("‽") == 0x203D
- assert m.ord_char32("♥") == 0x2665
- assert m.ord_char32("🎂") == 0x1F382
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char32("aa")
- assert str(excinfo.value) == toolong_message
-
- assert m.ord_wchar("a") == 0x61
- assert m.ord_wchar("é") == 0xE9
- assert m.ord_wchar("Ä€") == 0x100
- assert m.ord_wchar("‽") == 0x203D
- assert m.ord_wchar("♥") == 0x2665
- if m.wchar_size == 2:
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_wchar("🎂") == 0x1F382 # requires surrogate pair
- assert str(excinfo.value) == toobig_message(0x10000)
- else:
- assert m.ord_wchar("🎂") == 0x1F382
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_wchar("aa")
- assert str(excinfo.value) == toolong_message
-
- if hasattr(m, "has_u8string"):
- assert m.ord_char8("a") == 0x61 # simple ASCII
- assert m.ord_char8_lv("b") == 0x62
- assert (
- m.ord_char8("é") == 0xE9
- ) # requires 2 bytes in utf-8, but can be stuffed in a char
- with pytest.raises(ValueError) as excinfo:
- assert m.ord_char8("Ä€") == 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("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
-
- assert m.strlen(b"hi") == 2
- assert m.string_length(b"world") == 5
- assert m.string_length("a\x00b".encode()) == 3
- assert m.strlen("a\x00b".encode()) == 1 # C-string limitation
-
- # passing in a utf8 encoded string should work
- assert m.string_length("💩".encode()) == 4
-
-
-def test_bytearray_to_string():
- """Tests the ability to pass bytearray to C++ string-accepting functions"""
- assert m.string_length(bytearray(b"Hi")) == 2
- assert m.strlen(bytearray(b"bytearray")) == 9
- assert m.string_length(bytearray()) == 0
- assert m.string_length(bytearray("🦜", "utf-8", "strict")) == 4
- assert m.string_length(bytearray(b"\x80")) == 1
-
-
-@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("Hi 🎂") == [72, 105, 32, 0xD83C, 0xDF82]
- assert m.string_view32_chars("Hi 🎂") == [72, 105, 32, 127874]
- if hasattr(m, "has_u8string"):
- assert m.string_view8_chars("Hi") == [72, 105]
- assert m.string_view8_chars("Hi 🎂") == [72, 105, 32, 0xF0, 0x9F, 0x8E, 0x82]
-
- assert m.string_view_return() == "utf8 secret 🎂"
- assert m.string_view16_return() == "utf16 secret 🎂"
- assert m.string_view32_return() == "utf32 secret 🎂"
- if hasattr(m, "has_u8string"):
- assert m.string_view8_return() == "utf8 secret 🎂"
-
- with capture:
- m.string_view_print("Hi")
- m.string_view_print("utf8 🎂")
- m.string_view16_print("utf16 🎂")
- m.string_view32_print("utf32 🎂")
- assert (
- capture
- == """
- Hi 2
- utf8 🎂 9
- utf16 🎂 8
- utf32 🎂 7
- """
- )
- if hasattr(m, "has_u8string"):
- with capture:
- m.string_view8_print("Hi")
- m.string_view8_print("utf8 🎂")
- assert (
- capture
- == """
- Hi 2
- utf8 🎂 9
- """
- )
-
- with capture:
- m.string_view_print("Hi, ascii")
- m.string_view_print("Hi, utf8 🎂")
- m.string_view16_print("Hi, utf16 🎂")
- m.string_view32_print("Hi, utf32 🎂")
- assert (
- capture
- == """
- 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("Hi, utf8 🎂")
- assert (
- capture
- == """
- Hi, ascii 9
- Hi, utf8 🎂 13
- """
- )
-
- assert m.string_view_bytes() == b"abc \x80\x80 def"
- assert m.string_view_str() == "abc ‽ def"
- assert m.string_view_from_bytes("abc ‽ def".encode()) == "abc ‽ def"
- if hasattr(m, "has_u8string"):
- assert m.string_view8_str() == "abc ‽ def"
- assert m.string_view_memoryview() == "Have some 🎂".encode()
-
- assert m.bytes_from_type_with_both_operator_string_and_string_view() == b"success"
- assert m.str_from_type_with_both_operator_string_and_string_view() == "success"
-
-
-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"
- 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)
-
-
-def test_int_convert():
- class Int:
- def __int__(self):
- return 42
-
- class NotInt:
- pass
-
- class Float:
- def __float__(self):
- return 41.99999
-
- class Index:
- def __index__(self):
- return 42
-
- class IntAndIndex:
- def __int__(self):
- return 42
-
- def __index__(self):
- return 0
-
- class RaisingTypeErrorOnIndex:
- def __index__(self):
- raise TypeError
-
- def __int__(self):
- return 42
-
- class RaisingValueErrorOnIndex:
- def __index__(self):
- raise ValueError
-
- def __int__(self):
- return 42
-
- convert, noconvert = m.int_passthrough, m.int_passthrough_noconvert
-
- def requires_conversion(v):
- pytest.raises(TypeError, noconvert, v)
-
- def cant_convert(v):
- pytest.raises(TypeError, convert, v)
-
- assert convert(7) == 7
- assert noconvert(7) == 7
- cant_convert(3.14159)
- # TODO: Avoid DeprecationWarning in `PyLong_AsLong` (and similar)
- # TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7)
- if (3, 8) <= sys.version_info < (3, 10) and env.CPYTHON:
- with env.deprecated_call():
- assert convert(Int()) == 42
- else:
- assert convert(Int()) == 42
- requires_conversion(Int())
- cant_convert(NotInt())
- cant_convert(Float())
-
- # Before Python 3.8, `PyLong_AsLong` does not pick up on `obj.__index__`,
- # but pybind11 "backports" this behavior.
- assert convert(Index()) == 42
- assert noconvert(Index()) == 42
- assert convert(IntAndIndex()) == 0 # Fishy; `int(DoubleThought)` == 42
- assert noconvert(IntAndIndex()) == 0
- assert convert(RaisingTypeErrorOnIndex()) == 42
- requires_conversion(RaisingTypeErrorOnIndex())
- assert convert(RaisingValueErrorOnIndex()) == 42
- requires_conversion(RaisingValueErrorOnIndex())
-
-
-def test_numpy_int_convert():
- np = pytest.importorskip("numpy")
-
- convert, noconvert = m.int_passthrough, m.int_passthrough_noconvert
-
- def require_implicit(v):
- pytest.raises(TypeError, noconvert, v)
-
- # `np.intc` is an alias that corresponds to a C++ `int`
- assert convert(np.intc(42)) == 42
- assert noconvert(np.intc(42)) == 42
-
- # The implicit conversion from np.float32 is undesirable but currently accepted.
- # TODO: Avoid DeprecationWarning in `PyLong_AsLong` (and similar)
- # TODO: PyPy 3.8 does not behave like CPython 3.8 here yet (7.3.7)
- # https://github.com/pybind/pybind11/issues/3408
- if (3, 8) <= sys.version_info < (3, 10) and env.CPYTHON:
- with env.deprecated_call():
- assert convert(np.float32(3.14159)) == 3
- else:
- assert convert(np.float32(3.14159)) == 3
- require_implicit(np.float32(3.14159))
-
-
-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
- assert m.refwrap_usertype_const(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)
-
- assert m.refwrap_lvalue().value == 1
- assert m.refwrap_lvalue_const().value == 1
-
- 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:
- def __init__(self, x):
- self.x = x
-
- def __nonzero__(self):
- return self.x
-
- def __bool__(self):
- return self.x
-
- class B:
- 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():
- assert isinstance(m.int_cast(), int)
- assert isinstance(m.long_cast(), int)
- assert isinstance(m.longlong_cast(), int)
-
-
-def test_void_caster_2():
- assert m.test_void_caster()
-
-
-def test_const_ref_caster():
- """Verifies that const-ref is propagated through type_caster cast_op.
- The returned ConstRefCasted type is a minimal type that is constructed to
- reference the casting mode used.
- """
- x = False
- assert m.takes(x) == 1
- assert m.takes_move(x) == 1
-
- assert m.takes_ptr(x) == 3
- assert m.takes_ref(x) == 2
- assert m.takes_ref_wrap(x) == 2
-
- assert m.takes_const_ptr(x) == 5
- assert m.takes_const_ref(x) == 4
- assert m.takes_const_ref_wrap(x) == 4
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_call_policies.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_call_policies.cpp
deleted file mode 100644
index d177008cfed00fbdf9a82edbafd6dc5efc1f5e67..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_call_policies.cpp
+++ /dev/null
@@ -1,115 +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; }
- static Child *staticFunction(Parent *) { return new Child(); }
- };
- 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>())
- .def_static("staticFunction", &Parent::staticFunction, py::keep_alive<1, 0>());
-
- m.def(
- "free_function", [](Parent *, Child *) {}, py::keep_alive<1, 2>());
- m.def(
- "invalid_arg_index", [] {}, 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.10.3/tests/test_call_policies.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_call_policies.py
deleted file mode 100644
index 6160564123992e5ad7a2eca053988c8d8179129d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_call_policies.py
+++ /dev/null
@@ -1,247 +0,0 @@
-import pytest
-
-import env # noqa: F401
-from pybind11_tests import ConstructorStats
-from pybind11_tests import call_policies as m
-
-
-@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.
- """
- )
-
- p = m.Parent()
- c = m.Child()
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
- m.free_function(p, c)
- del c
- assert ConstructorStats.detail_reg_inst() == n_inst + 2
- del p
- assert ConstructorStats.detail_reg_inst() == n_inst
-
- with pytest.raises(RuntimeError) as excinfo:
- m.invalid_arg_index()
- assert str(excinfo.value) == "Could not activate keep_alive!"
-
-
-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.
- """
- )
-
- p = m.Parent()
- assert ConstructorStats.detail_reg_inst() == n_inst + 1
- with capture:
- m.Parent.staticFunction(p)
- 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.10.3/tests/test_callbacks.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_callbacks.cpp
deleted file mode 100644
index 2fd05dec72b63a8279c5c0e00d9fff867ead2263..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_callbacks.cpp
+++ /dev/null
@@ -1,280 +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/functional.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.h"
-
-#include <thread>
-
-int dummy_function(int i) { return i + 1; }
-
-TEST_SUBMODULE(callbacks, m) {
- // test_callbacks, test_function_signatures
- m.def("test_callback1", [](const py::object &func) { return func(); });
- m.def("test_callback2", [](const 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", [](const 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", [](const 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", [](const py::function &f) { return f("x"_a = 10, "y"_a = 20); });
-
- m.def("test_unpacking_and_keywords1", [](const 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", [](const 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", [](const 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", [](const 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",
- [](const py::function &f) { f(234, UnregisteredType(), "kw"_a = 567); });
-
- m.def("test_arg_conversion_error2", [](const 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 &&) noexcept { print_move_created(this); }
- };
- // Export the payload constructor statistics for testing purposes:
- m.def("payload_cstats", &ConstructorStats::get<Payload>);
- m.def("test_lambda_closure_cleanup", []() -> std::function<void()> {
- Payload p;
-
- // In this situation, `Func` in the implementation of
- // `cpp_function::initialize` is NOT trivially destructible.
- return [p]() {
- /* p should be cleaned up when the returned function is garbage collected */
- (void) p;
- };
- });
-
- class CppCallable {
- public:
- CppCallable() { track_default_created(this); }
- ~CppCallable() { track_destroyed(this); }
- CppCallable(const CppCallable &) { track_copy_created(this); }
- CppCallable(CppCallable &&) noexcept { track_move_created(this); }
- void operator()() {}
- };
-
- m.def("test_cpp_callable_cleanup", []() {
- // Related issue: https://github.com/pybind/pybind11/issues/3228
- // Related PR: https://github.com/pybind/pybind11/pull/3229
- py::list alive_counts;
- ConstructorStats &stat = ConstructorStats::get<CppCallable>();
- alive_counts.append(stat.alive());
- {
- CppCallable cpp_callable;
- alive_counts.append(stat.alive());
- {
- // In this situation, `Func` in the implementation of
- // `cpp_function::initialize` IS trivially destructible,
- // only `capture` is not.
- py::cpp_function py_func(cpp_callable);
- py::detail::silence_unused_warnings(py_func);
- alive_counts.append(stat.alive());
- }
- alive_counts.append(stat.alive());
- {
- py::cpp_function py_func(std::move(cpp_callable));
- py::detail::silence_unused_warnings(py_func);
- alive_counts.append(stat.alive());
- }
- alive_counts.append(stat.alive());
- }
- alive_counts.append(stat.alive());
- return alive_counts;
- });
-
- // 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_function_overloaded", [](int i, int j) { return i + j; });
- m.def("dummy_function_overloaded", &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);
- const 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);
- }
- if (*result == dummy_function) {
- auto r = (*result)(1);
- return "matches dummy_function: eval(1) = " + std::to_string(r);
- }
- return "argument does NOT match dummy_function. This should never happen!";
- });
-
- class AbstractBase {
- public:
- // [workaround(intel)] = default does not work here
- // Defaulting this destructor results in linking errors with the Intel compiler
- // (in Debug builds only, tested with icpc (ICC) 2021.1 Beta 20200827)
- virtual ~AbstractBase() {} // NOLINT(modernize-use-equals-default)
- virtual unsigned int func() = 0;
- };
- m.def("func_accepting_func_accepting_base",
- [](const std::function<double(AbstractBase &)> &) {});
-
- struct MovableObject {
- bool valid = true;
-
- MovableObject() = default;
- MovableObject(const MovableObject &) = default;
- MovableObject &operator=(const MovableObject &) = default;
- MovableObject(MovableObject &&o) noexcept : valid(o.valid) { o.valid = false; }
- MovableObject &operator=(MovableObject &&o) noexcept {
- valid = o.valid;
- o.valid = false;
- return *this;
- }
- };
- py::class_<MovableObject>(m, "MovableObject");
-
- // test_movable_object
- m.def("callback_with_movable", [](const 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; });
-
- // This checks that builtin functions can be passed as callbacks
- // rather than throwing RuntimeError due to trying to extract as capsule
- m.def("test_sum_builtin",
- [](const std::function<double(py::iterable)> &sum_builtin, const py::iterable &i) {
- return sum_builtin(i);
- });
-
- // test async Python callbacks
- using callback_f = std::function<void(int)>;
- m.def("test_async_callback", [](const callback_f &f, const 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));
- }
- });
-
- m.def("callback_num_times", [](const py::function &f, std::size_t num) {
- for (std::size_t i = 0; i < num; i++) {
- f();
- }
- });
-
- auto *custom_def = []() {
- static PyMethodDef def;
- def.ml_name = "example_name";
- def.ml_doc = "Example doc";
- def.ml_meth = [](PyObject *, PyObject *args) -> PyObject * {
- if (PyTuple_Size(args) != 1) {
- throw std::runtime_error("Invalid number of arguments for example_name");
- }
- PyObject *first = PyTuple_GetItem(args, 0);
- if (!PyLong_Check(first)) {
- throw std::runtime_error("Invalid argument to example_name");
- }
- auto result = py::cast(PyLong_AsLong(first) * 9);
- return result.release().ptr();
- };
- def.ml_flags = METH_VARARGS;
- return &def;
- }();
-
- // rec_capsule with name that has the same value (but not pointer) as our internal one
- // This capsule should be detected by our code as foreign and not inspected as the pointers
- // shouldn't match
- constexpr const char *rec_capsule_name
- = pybind11::detail::internals_function_record_capsule_name;
- py::capsule rec_capsule(std::malloc(1), [](void *data) { std::free(data); });
- rec_capsule.set_name(rec_capsule_name);
- m.add_object("custom_function", PyCFunction_New(custom_def, rec_capsule.ptr()));
-
- // This test requires a new ABI version to pass
-#if PYBIND11_INTERNALS_VERSION > 4
- // rec_capsule with nullptr name
- py::capsule rec_capsule2(std::malloc(1), [](void *data) { std::free(data); });
- m.add_object("custom_function2", PyCFunction_New(custom_def, rec_capsule2.ptr()));
-#else
- m.add_object("custom_function2", py::none());
-#endif
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_callbacks.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_callbacks.py
deleted file mode 100644
index 57b6599880b7710edf749de833718cec4544f0ae..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_callbacks.py
+++ /dev/null
@@ -1,208 +0,0 @@
-import time
-from threading import Thread
-
-import pytest
-
-import env # noqa: F401
-from pybind11_tests import callbacks as m
-
-
-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 f"func3({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_lambda_closure_cleanup()
- cstats = m.payload_cstats()
- assert cstats.alive() == 0
- assert cstats.copy_constructions == 1
- assert cstats.move_constructions >= 1
-
-
-def test_cpp_callable_cleanup():
- alive_counts = m.test_cpp_callable_cleanup()
- assert alive_counts == [0, 1, 2, 1, 2, 1, 0]
-
-
-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.test_dummy_function(m.dummy_function_overloaded)
- == "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
-
-
-@pytest.mark.skipif(
- "env.PYPY",
- reason="PyPy segfaults on here. See discussion on #1413.",
-)
-def test_python_builtins():
- """Test if python builtins like sum() can be used as callbacks"""
- assert m.test_sum_builtin(sum, [1, 2, 3]) == 6
- assert m.test_sum_builtin(sum, []) == 0
-
-
-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()
-
-
-def test_callback_num_times():
- # Super-simple micro-benchmarking related to PR #2919.
- # Example runtimes (Intel Xeon 2.2GHz, fully optimized):
- # num_millions 1, repeats 2: 0.1 secs
- # num_millions 20, repeats 10: 11.5 secs
- one_million = 1000000
- num_millions = 1 # Try 20 for actual micro-benchmarking.
- repeats = 2 # Try 10.
- rates = []
- for rep in range(repeats):
- t0 = time.time()
- m.callback_num_times(lambda: None, num_millions * one_million)
- td = time.time() - t0
- rate = num_millions / td if td else 0
- rates.append(rate)
- if not rep:
- print()
- print(
- f"callback_num_times: {num_millions:d} million / {td:.3f} seconds = {rate:.3f} million / second"
- )
- if len(rates) > 1:
- print("Min Mean Max")
- print(f"{min(rates):6.3f} {sum(rates) / len(rates):6.3f} {max(rates):6.3f}")
-
-
-def test_custom_func():
- assert m.custom_function(4) == 36
- assert m.roundtrip(m.custom_function)(4) == 36
-
-
-@pytest.mark.skipif(
- m.custom_function2 is None, reason="Current PYBIND11_INTERNALS_VERSION too low"
-)
-def test_custom_func2():
- assert m.custom_function2(3) == 27
- assert m.roundtrip(m.custom_function2)(3) == 27
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_chrono.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_chrono.cpp
deleted file mode 100644
index 8be0ffd1837032b8637273a9ccc07528916ec0e3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_chrono.cpp
+++ /dev/null
@@ -1,81 +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/chrono.h>
-
-#include "pybind11_tests.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.10.3/tests/test_chrono.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_chrono.py
deleted file mode 100644
index 7f47b37a255480549c11f9f51def836e29d50a94..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_chrono.py
+++ /dev/null
@@ -1,209 +0,0 @@
-import datetime
-
-import pytest
-
-import env # noqa: F401
-from pybind11_tests import chrono as m
-
-
-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 == datetime.timedelta(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 == date2
-
- # 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", f"/usr/share/zoneinfo/{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 == time2
-
- # 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 == diff
-
- # Negative timedelta roundtrip
- diff = datetime.timedelta(microseconds=-1)
- cpp_diff = m.test_chrono3(diff)
-
- assert cpp_diff == diff
-
-
-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 == diff
-
-
-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 == diff
-
-
-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 == time2
-
-
-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.10.3/tests/test_class.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_class.cpp
deleted file mode 100644
index ca925917e60eeba6ffc4de211c2420ab66f825d4..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_class.cpp
+++ /dev/null
@@ -1,657 +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.
-*/
-
-#if defined(__INTEL_COMPILER) && __cplusplus >= 201703L
-// Intel compiler requires a separate header file to support aligned new operators
-// and does not set the __cpp_aligned_new feature macro.
-// This header needs to be included before pybind11.
-# include <aligned_new>
-#endif
-
-#include <pybind11/stl.h>
-
-#include "constructor_stats.h"
-#include "local_bindings.h"
-#include "pybind11_tests.h"
-
-#include <utility>
-
-PYBIND11_WARNING_DISABLE_MSVC(4324)
-// warning C4324: structure was padded due to alignment specifier
-
-// test_brace_initialization
-struct NoBraceInitialization {
- explicit NoBraceInitialization(std::vector<int> v) : vec{std::move(v)} {}
- template <typename T>
- NoBraceInitialization(std::initializer_list<T> l) : vec(l) {}
-
- std::vector<int> vec;
-};
-
-namespace test_class {
-namespace pr4220_tripped_over_this { // PR #4227
-
-template <int>
-struct SoEmpty {};
-
-template <typename T>
-std::string get_msg(const T &) {
- return "This is really only meant to exercise successful compilation.";
-}
-
-using Empty0 = SoEmpty<0x0>;
-
-void bind_empty0(py::module_ &m) {
- py::class_<Empty0>(m, "Empty0").def(py::init<>()).def("get_msg", get_msg<Empty0>);
-}
-
-} // namespace pr4220_tripped_over_this
-} // namespace test_class
-
-TEST_SUBMODULE(class_, m) {
- m.def("obj_class_name", [](py::handle obj) { return py::detail::obj_class_name(obj.ptr()); });
-
- // 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); }
- };
- struct NoConstructorNew {
- NoConstructorNew() = default;
- NoConstructorNew(const NoConstructorNew &) = default;
- NoConstructorNew(NoConstructorNew &&) = default;
- static NoConstructorNew *new_instance() {
- auto *ptr = new NoConstructorNew();
- print_created(ptr, "via new_instance");
- return ptr;
- }
- ~NoConstructorNew() { print_destroyed(this); }
- };
-
- py::class_<NoConstructor>(m, "NoConstructor")
- .def_static("new_instance", &NoConstructor::new_instance, "Return an instance");
-
- py::class_<NoConstructorNew>(m, "NoConstructorNew")
- .def(py::init([](const NoConstructorNew &self) { return self; })) // Need a NOOP __init__
- .def_static("__new__",
- [](const py::object &) { return NoConstructorNew::new_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:
- explicit Dog(const std::string &name) : Pet(name, "dog") {}
- std::string bark() const { return "Woof!"; }
- };
-
- class Rabbit : public Pet {
- public:
- explicit Rabbit(const std::string &name) : Pet(name, "parrot") {}
- };
-
- class Hamster : public Pet {
- public:
- explicit 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", [](const 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>();
- }
- return py::type::of<Invalid>();
- });
-
- m.def("get_type_of", [](py::object ob) { return py::type::of(std::move(ob)); });
-
- m.def("get_type_classic", [](py::handle h) { return h.get_type(); });
-
- m.def("as_type", [](const 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;
-
- explicit 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", [](const 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};
- py::capsule def_capsule(def,
- [](void *ptr) { delete reinterpret_cast<PyMethodDef *>(ptr); });
- return py::reinterpret_steal<py::object>(
- PyCFunction_NewEx(def, def_capsule.ptr(), 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;
- explicit 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<>()).def("foo", &PublicistA::foo);
-
- class ProtectedB {
- public:
- virtual ~ProtectedB() = default;
- ProtectedB() = default;
- ProtectedB(const ProtectedB &) = delete;
-
- protected:
- virtual int foo() const { return value; }
- virtual void *void_foo() { return static_cast<void *>(&value); }
- virtual void *get_self() { return static_cast<void *>(this); }
-
- private:
- int value = 42;
- };
-
- class TrampolineB : public ProtectedB {
- public:
- int foo() const override { PYBIND11_OVERRIDE(int, ProtectedB, foo, ); }
- void *void_foo() override { PYBIND11_OVERRIDE(void *, ProtectedB, void_foo, ); }
- void *get_self() override { PYBIND11_OVERRIDE(void *, ProtectedB, get_self, ); }
- };
-
- class PublicistB : public ProtectedB {
- public:
- // [workaround(intel)] = default does not work here
- // Removing or defaulting this destructor results in linking errors with the Intel compiler
- // (in Debug builds only, tested with icpc (ICC) 2021.1 Beta 20200827)
- ~PublicistB() override{}; // NOLINT(modernize-use-equals-default)
- using ProtectedB::foo;
- using ProtectedB::get_self;
- using ProtectedB::void_foo;
- };
-
- m.def("read_foo", [](const void *original) {
- const int *ptr = reinterpret_cast<const int *>(original);
- return *ptr;
- });
-
- m.def("pointers_equal",
- [](const void *original, const void *comparison) { return original == comparison; });
-
- py::class_<ProtectedB, TrampolineB>(m, "ProtectedB")
- .def(py::init<>())
- .def("foo", &PublicistB::foo)
- .def("void_foo", &PublicistB::void_foo)
- .def("get_self", &PublicistB::get_self);
-
- // 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",
- [](const 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; }));
-
- 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", [](const py::module_ &m) {
- py::class_<Duplicate>(m, "Duplicate");
- py::class_<OtherDuplicate>(m, "Duplicate");
- });
- m.def("register_duplicate_class_type", [](const py::module_ &m) {
- py::class_<OtherDuplicate>(m, "OtherDuplicate");
- py::class_<OtherDuplicate>(m, "YetAnotherDuplicate");
- });
- m.def("register_duplicate_nested_class_name", [](const py::object >) {
- py::class_<DuplicateNested>(gt, "DuplicateNested");
- py::class_<OtherDuplicateNested>(gt, "DuplicateNested");
- });
- m.def("register_duplicate_nested_class_type", [](const py::object >) {
- py::class_<OtherDuplicateNested>(gt, "OtherDuplicateNested");
- py::class_<OtherDuplicateNested>(gt, "YetAnotherDuplicateNested");
- });
-
- test_class::pr4220_tripped_over_this::bind_empty0(m);
-}
-
-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!");
-
-#ifdef PYBIND11_NEVER_DEFINED_EVER
-// 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);
-#endif
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_class.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_class.py
deleted file mode 100644
index 9c964e001b5f7860724122b046bc7c145784faac..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_class.py
+++ /dev/null
@@ -1,489 +0,0 @@
-import pytest
-
-import env
-from pybind11_tests import ConstructorStats, UserType
-from pybind11_tests import class_ as m
-
-
-def test_obj_class_name():
- if env.PYPY:
- expected_name = "UserType"
- else:
- expected_name = "pybind11_tests.UserType"
- assert m.obj_class_name(UserType(1)) == expected_name
- assert m.obj_class_name(UserType) == expected_name
-
-
-def test_repr():
- 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_instance_new(msg):
- instance = m.NoConstructorNew() # .__new__(m.NoConstructor.__class__)
- cstats = ConstructorStats.get(m.NoConstructorNew)
- 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__ 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
- """
- )
- assert (
- doc(m.NestBase.Nested.fa)
- == """
- fa(self: m.class_.NestBase.Nested, a: int, b: m.class_.NestBase, c: m.class_.NestBase.Nested) -> None
- """
- )
- 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
- assert m.read_foo(b.void_foo()) == 42
- assert m.pointers_equal(b.get_self(), b)
-
- 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
-
-
-def test_pr4220_tripped_over_this():
- assert (
- m.Empty0().get_msg()
- == "This is really only meant to exercise successful compilation."
- )
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/CMakeLists.txt
deleted file mode 100644
index 8bfaa386ae4f9c737324a20153e9514ebe131884..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/CMakeLists.txt
+++ /dev/null
@@ -1,84 +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_SOURCE_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()
-
-possibly_uninitialized(PYTHON_MODULE_EXTENSION Python_INTERPRETER_ID)
-
-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)
-
-add_subdirectory(subdirectory_target EXCLUDE_FROM_ALL)
-add_subdirectory(subdirectory_embed EXCLUDE_FROM_ALL)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/embed.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/embed.cpp
deleted file mode 100644
index 30bc4f1e14da9f876947c6ef53e8fde766fd1ee0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/embed.cpp
+++ /dev/null
@@ -1,23 +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.10.3/tests/test_cmake_build/installed_embed/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/installed_embed/CMakeLists.txt
deleted file mode 100644
index f7d6939982354841f66bc258e1dfedeb488cb06f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/installed_embed/CMakeLists.txt
+++ /dev/null
@@ -1,28 +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
- DEPENDS test_installed_embed)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/installed_function/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/installed_function/CMakeLists.txt
deleted file mode 100644
index d7ca4db55dac46fb160cf6c70bbfb9db617efed8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/installed_function/CMakeLists.txt
+++ /dev/null
@@ -1,39 +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}
- DEPENDS test_installed_function)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/installed_target/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/installed_target/CMakeLists.txt
deleted file mode 100644
index bc5e101f1dc9339206068d36040b9269fdd0a0ac..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/installed_target/CMakeLists.txt
+++ /dev/null
@@ -1,46 +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}
- DEPENDS test_installed_target)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/main.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/main.cpp
deleted file mode 100644
index e30f2c4b9a31205185d2b221a994dc001a30730a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
deleted file mode 100644
index 58cdd7cfd111e5e151e40e5a2e1ff81a81ff8670..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+++ /dev/null
@@ -1,41 +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_SOURCE_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"
- DEPENDS test_subdirectory_embed)
-
-# 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.10.3/tests/test_cmake_build/subdirectory_function/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
deleted file mode 100644
index 01557c439afa8bb837b89c2d3633cda0c346a927..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+++ /dev/null
@@ -1,35 +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_SOURCE_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}
- DEPENDS test_subdirectory_function)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/subdirectory_target/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
deleted file mode 100644
index ba82fdee2e0e6d2ca723e96f99c966d15b7e77ba..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+++ /dev/null
@@ -1,41 +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_SOURCE_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}
- DEPENDS test_subdirectory_target)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/test.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/test.py
deleted file mode 100644
index 807fd43b4a01850ebd9aa1ec398b7485baf31060..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_cmake_build/test.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import sys
-
-import test_cmake_build
-
-assert isinstance(__file__, str) # Test this is properly set
-
-assert test_cmake_build.add(1, 2) == 3
-print(f"{sys.argv[1]} imports, runs, and adds: 1 + 2 = 3")
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_const_name.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_const_name.cpp
deleted file mode 100644
index 2ad01e6827a46c02719eea21a98b2151480a7195..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_const_name.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2021 The Pybind Development Team.
-// 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"
-
-// IUT = Implementation Under Test
-#define CONST_NAME_TESTS(TEST_FUNC, IUT) \
- std::string TEST_FUNC(int selector) { \
- switch (selector) { \
- case 0: \
- return IUT("").text; \
- case 1: \
- return IUT("A").text; \
- case 2: \
- return IUT("Bd").text; \
- case 3: \
- return IUT("Cef").text; \
- case 4: \
- return IUT<int>().text; /*NOLINT(bugprone-macro-parentheses)*/ \
- case 5: \
- return IUT<std::string>().text; /*NOLINT(bugprone-macro-parentheses)*/ \
- case 6: \
- return IUT<true>("T1", "T2").text; /*NOLINT(bugprone-macro-parentheses)*/ \
- case 7: \
- return IUT<false>("U1", "U2").text; /*NOLINT(bugprone-macro-parentheses)*/ \
- case 8: \
- /*NOLINTNEXTLINE(bugprone-macro-parentheses)*/ \
- return IUT<true>(IUT("D1"), IUT("D2")).text; \
- case 9: \
- /*NOLINTNEXTLINE(bugprone-macro-parentheses)*/ \
- return IUT<false>(IUT("E1"), IUT("E2")).text; \
- case 10: \
- return IUT("KeepAtEnd").text; \
- default: \
- break; \
- } \
- throw std::runtime_error("Invalid selector value."); \
- }
-
-CONST_NAME_TESTS(const_name_tests, py::detail::const_name)
-
-#ifdef PYBIND11_DETAIL_UNDERSCORE_BACKWARD_COMPATIBILITY
-CONST_NAME_TESTS(underscore_tests, py::detail::_)
-#endif
-
-TEST_SUBMODULE(const_name, m) {
- m.def("const_name_tests", const_name_tests);
-
-#if defined(PYBIND11_DETAIL_UNDERSCORE_BACKWARD_COMPATIBILITY)
- m.def("underscore_tests", underscore_tests);
-#else
- m.attr("underscore_tests") = "PYBIND11_DETAIL_UNDERSCORE_BACKWARD_COMPATIBILITY not defined.";
-#endif
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_const_name.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_const_name.py
deleted file mode 100644
index 10b0caee2e66b3ad82a7576b1d2e6629181bd811..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_const_name.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import pytest
-
-from pybind11_tests import const_name as m
-
-
-@pytest.mark.parametrize("func", (m.const_name_tests, m.underscore_tests))
-@pytest.mark.parametrize(
- "selector, expected",
- enumerate(
- (
- "",
- "A",
- "Bd",
- "Cef",
- "%",
- "%",
- "T1",
- "U2",
- "D1",
- "E2",
- "KeepAtEnd",
- )
- ),
-)
-def test_const_name(func, selector, expected):
- if isinstance(func, str):
- pytest.skip(func)
- text = func(selector)
- assert text == expected
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_constants_and_functions.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_constants_and_functions.cpp
deleted file mode 100644
index 922375c5ea7709bed1bbc72f2fa52ca5eabe1aac..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_constants_and_functions.cpp
+++ /dev/null
@@ -1,151 +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(const py::bytes &bytes) {
- std::string ret = "bytes[";
- const auto value = static_cast<std::string>(bytes);
- for (char c : value) {
- ret += std::to_string(static_cast<int>(c)) + ' ';
- }
- 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 {
-// [workaround(intel)] Unable to use noexcept instead of noexcept(true)
-// Make the f1 test basically the same as the f2 test in C++17 mode for the Intel compiler as
-// it fails to compile with a plain noexcept (tested with icc (ICC) 2021.1 Beta 20200827).
-#if defined(__INTEL_COMPILER) && defined(PYBIND11_CPP17)
-int f1(int x) noexcept(true) { return x + 1; }
-#else
-int f1(int x) noexcept { return x + 1; }
-#endif
-int f2(int x) noexcept(true) { return x + 2; }
-int f3(int x) noexcept(false) { return x + 3; }
-PYBIND11_WARNING_PUSH
-PYBIND11_WARNING_DISABLE_GCC("-Wdeprecated")
-PYBIND11_WARNING_DISABLE_CLANG("-Wdeprecated")
-// NOLINTNEXTLINE(modernize-use-noexcept)
-int f4(int x) throw() { return x + 4; } // Deprecated equivalent to noexcept(true)
-PYBIND11_WARNING_POP
-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; }
- PYBIND11_WARNING_PUSH
- PYBIND11_WARNING_DISABLE_GCC("-Wdeprecated")
- PYBIND11_WARNING_DISABLE_CLANG("-Wdeprecated")
- // NOLINTNEXTLINE(modernize-use-noexcept)
- int m7(int x) throw() { return x - 7; }
- // NOLINTNEXTLINE(modernize-use-noexcept)
- int m8(int x) const throw() { return x - 8; }
- PYBIND11_WARNING_POP
-};
-} // 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);
-
- PYBIND11_WARNING_PUSH
- PYBIND11_WARNING_DISABLE_INTEL(878) // incompatible exception specifications
- m.def("f3", f3);
- PYBIND11_WARNING_POP
-
- m.def("f4", f4);
-
- // test_function_record_leaks
- m.def("register_large_capture_with_invalid_arguments", [](py::module_ m) {
- // This should always be enough to trigger the alternative branch
- // where `sizeof(capture) > sizeof(rec->data)`
- uint64_t capture[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
-#if defined(__GNUC__) && __GNUC__ == 4 // CentOS7
- py::detail::silence_unused_warnings(capture);
-#endif
- m.def(
- "should_raise", [capture](int) { return capture[9] + 33; }, py::kw_only(), py::arg());
- });
- m.def("register_with_raising_repr", [](py::module_ m, const py::object &default_value) {
- m.def(
- "should_raise",
- [](int, int, const py::object &) { return 42; },
- "some docstring",
- py::arg_v("x", 42),
- py::arg_v("y", 42, "<the answer>"),
- py::arg_v("z", default_value));
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_constants_and_functions.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_constants_and_functions.py
deleted file mode 100644
index 5da0b84b8e3d1d284b05dfca800b8cbd084fef38..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_constants_and_functions.py
+++ /dev/null
@@ -1,52 +0,0 @@
-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
-
-
-def test_function_record_leaks():
- class RaisingRepr:
- def __repr__(self):
- raise RuntimeError("Surprise!")
-
- with pytest.raises(RuntimeError):
- m.register_large_capture_with_invalid_arguments(m)
- with pytest.raises(RuntimeError):
- m.register_with_raising_repr(m, RaisingRepr())
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_copy_move.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_copy_move.cpp
deleted file mode 100644
index 28c244564489e532ae6c2f8cb8d35efed0497e5e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_copy_move.cpp
+++ /dev/null
@@ -1,295 +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/stl.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.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); }
- explicit MoveOnlyInt(int v) : value{v} { print_created(this, value); }
- MoveOnlyInt(MoveOnlyInt &&m) noexcept {
- print_move_created(this, m.value);
- std::swap(value, m.value);
- }
- MoveOnlyInt &operator=(MoveOnlyInt &&m) noexcept {
- 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); }
- explicit MoveOrCopyInt(int v) : value{v} { print_created(this, value); }
- MoveOrCopyInt(MoveOrCopyInt &&m) noexcept {
- print_move_created(this, m.value);
- std::swap(value, m.value);
- }
- MoveOrCopyInt &operator=(MoveOrCopyInt &&m) noexcept {
- print_move_assigned(this, m.value);
- std::swap(value, m.value);
- return *this;
- }
- MoveOrCopyInt(const MoveOrCopyInt &c) {
- print_copy_created(this, c.value);
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- 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); }
- explicit CopyOnlyInt(int v) : value{v} { print_created(this, value); }
- CopyOnlyInt(const CopyOnlyInt &c) {
- print_copy_created(this, c.value);
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- 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, const_name("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, const_name("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 = const_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);
- }
- explicit operator CopyOnlyInt *() { return &value; }
- explicit 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
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- m.def("move_and_copy_casts", [](const 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 */
- auto m1(py::cast<MoveOrCopyInt>(o)); /* moves */
- auto m2(py::cast<MoveOnlyInt>(o)); /* moves */
- auto 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; });
- // Changing this breaks the existing test: needs careful review.
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- m.def("move_or_copy", [](MoveOrCopyInt m) { return m.value; });
- // Changing this breaks the existing test: needs careful review.
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- 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;
- }
- 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;
- explicit 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;
- explicit MoveIssue2(int v) : v{v} {}
- MoveIssue2(MoveIssue2 &&) = default;
- };
- py::class_<MoveIssue2>(m, "MoveIssue2")
- .def(py::init<int>())
- .def_readwrite("value", &MoveIssue2::v);
-
- // #2742: Don't expect ownership of raw pointer to `new`ed object to be transferred with
- // `py::return_value_policy::move`
- m.def(
- "get_moveissue1",
- [](int i) { return std::unique_ptr<MoveIssue1>(new MoveIssue1(i)); },
- py::return_value_policy::move);
- m.def(
- "get_moveissue2", [](int i) { return MoveIssue2(i); }, py::return_value_policy::move);
-
- // Make sure that cast from pytype rvalue to other pytype works
- m.def("get_pytype_rvalue_castissue", [](double i) { return py::float_(i).cast<py::int_>(); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_copy_move.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_copy_move.py
deleted file mode 100644
index 9fef089339ca5f59d09262bab26a2cb3217d97f7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_copy_move.py
+++ /dev/null
@@ -1,132 +0,0 @@
-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"""
-
- m1 = m.get_moveissue1(1)
- assert m1.value == 1
- m2 = m.get_moveissue2(2)
- assert m2.value == 2
-
-
-def test_pytype_rvalue_cast():
- """Make sure that cast from pytype rvalue to other pytype works"""
-
- value = m.get_pytype_rvalue_castissue(1.0)
- assert value == 1
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_casters.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_casters.cpp
deleted file mode 100644
index b4af02a45222c2188df93d917e88dfb62e75d33d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_casters.cpp
+++ /dev/null
@@ -1,209 +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 "constructor_stats.h"
-#include "pybind11_tests.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 {
-namespace detail {
-template <>
-struct type_caster<ArgInspector1> {
-public:
- // Classic
-#ifdef PYBIND11_DETAIL_UNDERSCORE_BACKWARD_COMPATIBILITY
- PYBIND11_TYPE_CASTER(ArgInspector1, _("ArgInspector1"));
-#else
- PYBIND11_TYPE_CASTER(ArgInspector1, const_name("ArgInspector1"));
-#endif
-
- 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, const_name("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, const_name("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_NAMESPACE
-
-// 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 &&) noexcept { print_move_created(this); }
- DestructionTester &operator=(const DestructionTester &) {
- print_copy_assigned(this);
- return *this;
- }
- DestructionTester &operator=(DestructionTester &&) noexcept {
- print_move_assigned(this);
- return *this;
- }
-};
-namespace PYBIND11_NAMESPACE {
-namespace detail {
-template <>
-struct type_caster<DestructionTester> {
- PYBIND11_TYPE_CASTER(DestructionTester, const_name("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_NAMESPACE
-
-// Define type caster outside of `pybind11::detail` and then alias it.
-namespace other_lib {
-struct MyType {};
-// Corrupt `py` shorthand alias for surrounding context.
-namespace py {}
-// Corrupt unqualified relative `pybind11` namespace.
-namespace PYBIND11_NAMESPACE {}
-// Correct alias.
-namespace py_ = ::pybind11;
-// Define caster. This is effectively no-op, we only ensure it compiles and we
-// don't have any symbol collision when using macro mixin.
-struct my_caster {
- PYBIND11_TYPE_CASTER(MyType, py_::detail::const_name("MyType"));
- bool load(py_::handle, bool) { return true; }
-
- static py_::handle cast(const MyType &, py_::return_value_policy, py_::handle) {
- return py_::bool_(true).release();
- }
-};
-} // namespace other_lib
-// Effectively "alias" it into correct namespace (via inheritance).
-namespace PYBIND11_NAMESPACE {
-namespace detail {
-template <>
-struct type_caster<other_lib::MyType> : public other_lib::my_caster {};
-} // namespace detail
-} // namespace PYBIND11_NAMESPACE
-
-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(const 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; }
- };
- // [workaround(intel)] ICC 20/21 breaks with py::arg().stuff, using py::arg{}.stuff works.
- 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",
- [](const ArgInspector2 &a, const 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; }, "f"_a);
- m.def(
- "floats_only", [](double f) { return 0.5 * f; }, "f"_a.noconvert());
- m.def(
- "ints_preferred", [](int i) { return i / 2; }, "i"_a);
- m.def(
- "ints_only", [](int i) { return i / 2; }, "i"_a.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);
-
- m.def("other_lib_type", [](other_lib::MyType x) { return x; });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_casters.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_casters.py
deleted file mode 100644
index adfa6cf86e40b99ec8f41cfe5deacc44c0baadce..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_casters.py
+++ /dev/null
@@ -1,120 +0,0 @@
-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)
- """
- )
- 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)
- """
- )
- 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
- """
- )
-
- 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
-
-
-def test_custom_caster_other_lib():
- assert m.other_lib_type(True)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_setup.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_setup.cpp
deleted file mode 100644
index 42fae05d5d1c062c834795e46ef77b5315307082..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_setup.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- tests/test_custom_type_setup.cpp -- Tests `pybind11::custom_type_setup`
-
- Copyright (c) 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 "pybind11_tests.h"
-
-namespace py = pybind11;
-
-namespace {
-
-struct OwnsPythonObjects {
- py::object value = py::none();
-};
-} // namespace
-
-TEST_SUBMODULE(custom_type_setup, m) {
- py::class_<OwnsPythonObjects> cls(
- m, "OwnsPythonObjects", py::custom_type_setup([](PyHeapTypeObject *heap_type) {
- auto *type = &heap_type->ht_type;
- type->tp_flags |= Py_TPFLAGS_HAVE_GC;
- type->tp_traverse = [](PyObject *self_base, visitproc visit, void *arg) {
- auto &self = py::cast<OwnsPythonObjects &>(py::handle(self_base));
- Py_VISIT(self.value.ptr());
- return 0;
- };
- type->tp_clear = [](PyObject *self_base) {
- auto &self = py::cast<OwnsPythonObjects &>(py::handle(self_base));
- self.value = py::none();
- return 0;
- };
- }));
- cls.def(py::init<>());
- cls.def_readwrite("value", &OwnsPythonObjects::value);
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_setup.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_setup.py
deleted file mode 100644
index 19b44c9de2d1e21b753767f52ac0f4d5ca5a40c1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_custom_type_setup.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import gc
-import weakref
-
-import pytest
-
-import env # noqa: F401
-from pybind11_tests import custom_type_setup as m
-
-
-@pytest.fixture
-def gc_tester():
- """Tests that an object is garbage collected.
-
- Assumes that any unreferenced objects are fully collected after calling
- `gc.collect()`. That is true on CPython, but does not appear to reliably
- hold on PyPy.
- """
-
- weak_refs = []
-
- def add_ref(obj):
- # PyPy does not support `gc.is_tracked`.
- if hasattr(gc, "is_tracked"):
- assert gc.is_tracked(obj)
- weak_refs.append(weakref.ref(obj))
-
- yield add_ref
-
- gc.collect()
- for ref in weak_refs:
- assert ref() is None
-
-
-# PyPy does not seem to reliably garbage collect.
-@pytest.mark.skipif("env.PYPY")
-def test_self_cycle(gc_tester):
- obj = m.OwnsPythonObjects()
- obj.value = obj
- gc_tester(obj)
-
-
-# PyPy does not seem to reliably garbage collect.
-@pytest.mark.skipif("env.PYPY")
-def test_indirect_cycle(gc_tester):
- obj = m.OwnsPythonObjects()
- obj_list = [obj]
- obj.value = obj_list
- gc_tester(obj)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_docstring_options.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_docstring_options.cpp
deleted file mode 100644
index dda1cf6e41b532c9fd124da3f344730f22ddbcd9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_docstring_options.cpp
+++ /dev/null
@@ -1,141 +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();
- options.disable_function_signatures();
-
- m.def("test_function8", []() {});
- }
-
- {
- 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");
- }
-
- {
- enum class DocstringTestEnum1 { Member1, Member2 };
-
- py::enum_<DocstringTestEnum1>(m, "DocstringTestEnum1", "Enum docstring")
- .value("Member1", DocstringTestEnum1::Member1)
- .value("Member2", DocstringTestEnum1::Member2);
- }
-
- {
- py::options options;
- options.enable_enum_members_docstring();
-
- enum class DocstringTestEnum2 { Member1, Member2 };
-
- py::enum_<DocstringTestEnum2>(m, "DocstringTestEnum2", "Enum docstring")
- .value("Member1", DocstringTestEnum2::Member1)
- .value("Member2", DocstringTestEnum2::Member2);
- }
-
- {
- py::options options;
- options.disable_enum_members_docstring();
-
- enum class DocstringTestEnum3 { Member1, Member2 };
-
- py::enum_<DocstringTestEnum3>(m, "DocstringTestEnum3", "Enum docstring")
- .value("Member1", DocstringTestEnum3::Member1)
- .value("Member2", DocstringTestEnum3::Member2);
- }
-
- {
- py::options options;
- options.disable_user_defined_docstrings();
-
- enum class DocstringTestEnum4 { Member1, Member2 };
-
- py::enum_<DocstringTestEnum4>(m, "DocstringTestEnum4", "Enum docstring")
- .value("Member1", DocstringTestEnum4::Member1)
- .value("Member2", DocstringTestEnum4::Member2);
- }
-
- {
- py::options options;
- options.disable_user_defined_docstrings();
- options.disable_enum_members_docstring();
-
- enum class DocstringTestEnum5 { Member1, Member2 };
-
- py::enum_<DocstringTestEnum5>(m, "DocstringTestEnum5", "Enum docstring")
- .value("Member1", DocstringTestEnum5::Member1)
- .value("Member2", DocstringTestEnum5::Member2);
- }
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_docstring_options.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_docstring_options.py
deleted file mode 100644
index e6f5a9d9871e5a1e44701a490811e1b9f0d642bb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_docstring_options.py
+++ /dev/null
@@ -1,64 +0,0 @@
-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")
-
- # when all options are disabled, no docstring (instead of an empty one) should be generated
- assert m.test_function8.__doc__ is None
-
- # Suppression of user-defined docstrings for non-function objects
- assert not m.DocstringTestFoo.__doc__
- assert not m.DocstringTestFoo.value_prop.__doc__
-
- # Check existig behaviour of enum docstings
- assert (
- m.DocstringTestEnum1.__doc__
- == "Enum docstring\n\nMembers:\n\n Member1\n\n Member2"
- )
-
- # options.enable_enum_members_docstring()
- assert (
- m.DocstringTestEnum2.__doc__
- == "Enum docstring\n\nMembers:\n\n Member1\n\n Member2"
- )
-
- # options.disable_enum_members_docstring()
- assert m.DocstringTestEnum3.__doc__ == "Enum docstring"
-
- # options.disable_user_defined_docstrings()
- assert m.DocstringTestEnum4.__doc__ == "Members:\n\n Member1\n\n Member2"
-
- # options.disable_user_defined_docstrings()
- # options.disable_enum_members_docstring()
- # When all options are disabled, no docstring (instead of an empty one) should be generated
- assert m.DocstringTestEnum5.__doc__ is None
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_matrix.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_matrix.cpp
deleted file mode 100644
index 554cc4d7f8daa7df951cf88101bd461f821f859c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_matrix.cpp
+++ /dev/null
@@ -1,428 +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/eigen/matrix.h>
-#include <pybind11/stl.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.h"
-
-PYBIND11_WARNING_DISABLE_MSVC(4996)
-
-#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(const 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; // NOLINT(clang-analyzer-core.uninitialized.Assign)
- }
- }
- 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_matrix, 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", [](const Eigen::MatrixXf &x) -> Eigen::MatrixXf { return 2.0f * x; });
- m.def("double_mat_rm", [](const 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",
- [](const 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", [](const 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",
- [m](const py::object &x_obj,
- int start_row,
- int start_col,
- int block_rows,
- int block_cols) {
- return m.attr("_block")(x_obj, x_obj, start_row, start_col, block_rows, block_cols);
- });
-
- m.def(
- "_block",
- [](const py::object &x_obj,
- const Eigen::Ref<const Eigen::MatrixXd> &x,
- int start_row,
- int start_col,
- int block_rows,
- int block_cols) {
- // See PR #4217 for background. This test is a bit over the top, but might be useful
- // as a concrete example to point to when explaining the dangling reference trap.
- auto i0 = py::make_tuple(0, 0);
- auto x0_orig = x_obj[*i0].cast<double>();
- if (x(0, 0) != x0_orig) {
- throw std::runtime_error(
- "Something in the type_caster for Eigen::Ref is terribly wrong.");
- }
- double x0_mod = x0_orig + 1;
- x_obj[*i0] = x0_mod;
- auto copy_detected = (x(0, 0) != x0_mod);
- x_obj[*i0] = x0_orig;
- if (copy_detected) {
- throw std::runtime_error("type_caster for Eigen::Ref made a copy.");
- }
- return x.block(start_row, start_col, block_rows, block_cols);
- },
- py::keep_alive<0, 1>());
-
- // 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); }
- // NOLINTNEXTLINE(readability-const-return-type)
- 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); });
- // Our Eigen does a hack which respects constness through the numpy writeable flag.
- // Therefore, the const return actually affects this type despite being an rvalue.
- // NOLINTNEXTLINE(readability-const-return-type)
- 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", [](const Eigen::Ref<FixedMatrixR> &) {});
- m.def("fixed_mutator_c", [](const Eigen::Ref<FixedMatrixC> &) {});
- m.def("fixed_mutator_a", [](const 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 {
- // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
- 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); });
-
- // [workaround(intel)] ICC 20/21 breaks with py::arg().stuff, using py::arg{}.stuff works.
-
- // 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",
- [](const 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, test_zero_length
- // Issue #738: 1×N or N×1 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.
- // Similarly, 0×N or N×0 matrices were not accepted--again, these should be allowed since
- // they contain no data. This particularly affects numpy ≥ 1.23, which sets the strides to
- // 0 if any dimension size is 0.
- 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", [](const Eigen::VectorXd &) { return true; });
- m.def("iss1105_row", [](const 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", [](const 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.10.3/tests/test_eigen_matrix.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_matrix.py
deleted file mode 100644
index 4407fa6aee9061d34cba14cbffa33b244bd76377..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_matrix.py
+++ /dev/null
@@ -1,784 +0,0 @@
-import pytest
-
-from pybind11_tests import ConstructorStats
-
-np = pytest.importorskip("numpy")
-m = pytest.importorskip("pybind11_tests.eigen_matrix")
-
-
-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: """
- + 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: """
- + repr(np.array([7.0, 4.0, 1.0], dtype="float32"))
- )
-
-
-def test_block_runtime_error_type_caster_eigen_ref_made_a_copy():
- with pytest.raises(RuntimeError) as excinfo:
- m.block(ref, 0, 0, 0, 0)
- assert str(excinfo.value) == "type_caster for Eigen::Ref made a copy."
-
-
-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)), f"m.diagonal_n({i})"
-
- # Must be order="F", otherwise the type_caster will make a copy and
- # m.block() will return a dangling reference (heap-use-after-free).
- rof = np.asarray(ref, order="F")
- assert np.all(m.block(rof, 2, 1, 3, 3) == rof[2:5, 1:4])
- assert np.all(m.block(rof, 1, 4, 4, 2) == rof[1:, 4:])
- assert np.all(m.block(rof, 1, 4, 3, 2) == rof[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]])
- ), f"cholesky{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"""
-
- primary = 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, primary, 3, 3, 5)
- a_get2 = a.get_ptr()
- assert not a_get2.flags.owndata and a_get2.flags.writeable
- assign_both(a_get1, primary, 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, primary)
- a_copy1[7, 7] = -44 # Shouldn't affect anything else
- c1want = array_copy_but_one(primary, 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, primary)
- a_copy2[4, 4] = -22 # Shouldn't affect anything else
- c2want = array_copy_but_one(primary, 4, 4, -22)
-
- a_ref1 = a.ref()
- assert not a_ref1.flags.owndata and a_ref1.flags.writeable
- assign_both(a_ref1, primary, 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, primary, 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, primary)
- a_copy3[8, 1] = 11
- c3want = array_copy_but_one(primary, 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, primary)
- a_copy4[8, 4] = 88
- c4want = array_copy_but_one(primary, 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
- primary[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
- primary[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, primary[2:4, 2:5])
- a_copy5[1, 1] = 777
- c5want = array_copy_but_one(primary[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
- primary[0, 0] = 50
- primary[0, 9] = 50
- primary[9, 0] = 50
- primary[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, primary)
- np.testing.assert_array_equal(a_get2, primary)
- np.testing.assert_array_equal(a_view1, primary)
- np.testing.assert_array_equal(a_view2, primary)
- np.testing.assert_array_equal(a_ref1, primary)
- np.testing.assert_array_equal(a_ref2, primary)
- np.testing.assert_array_equal(a_ref3, primary)
- np.testing.assert_array_equal(a_ref4, primary)
- np.testing.assert_array_equal(a_block1, primary[3:5, 3:5])
- np.testing.assert_array_equal(a_block2, primary[2:5, 2:4])
- np.testing.assert_array_equal(a_block3, primary[6:10, 7:10])
- np.testing.assert_array_equal(
- a_corn1, primary[0 :: primary.shape[0] - 1, 0 :: primary.shape[1] - 1]
- )
- np.testing.assert_array_equal(
- a_corn2, primary[0 :: primary.shape[0] - 1, 0 :: primary.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]
- """
- )
- assert (
- doc(m.sparse_copy_c)
- == """
- sparse_copy_c(arg0: scipy.sparse.csc_matrix[numpy.float32]) -> scipy.sparse.csc_matrix[numpy.float32]
- """
- )
-
-
-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]])
- )
-
-
-@pytest.mark.parametrize("func", [m.iss738_f1, m.iss738_f2])
-@pytest.mark.parametrize("sizes", [(0, 2), (2, 0)])
-def test_zero_length(func, sizes):
- """Ignore strides on a length-0 dimension (even if they would be incompatible length > 1)"""
- assert np.all(func(np.zeros(sizes)) == np.zeros(sizes))
-
-
-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.10.3/tests/test_eigen_tensor.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_tensor.cpp
deleted file mode 100644
index 503c69c7d3d574be824a530ef544257b1dd692a1..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_tensor.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- tests/eigen_tensor.cpp -- automatic conversion of Eigen Tensor
-
- All rights reserved. Use of this source code is governed by a
- BSD-style license that can be found in the LICENSE file.
-*/
-
-#define PYBIND11_TEST_EIGEN_TENSOR_NAMESPACE eigen_tensor
-
-#ifdef EIGEN_AVOID_STL_ARRAY
-# undef EIGEN_AVOID_STL_ARRAY
-#endif
-
-#include "test_eigen_tensor.inl"
-
-#include "pybind11_tests.h"
-
-test_initializer egien_tensor("eigen_tensor", eigen_tensor_test::test_module);
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_tensor.inl b/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_tensor.inl
deleted file mode 100644
index d864ce7379fb870f1b844fef251c84eea9e51f09..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_tensor.inl
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- tests/eigen_tensor.cpp -- automatic conversion of Eigen Tensor
-
- 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/eigen/tensor.h>
-
-PYBIND11_NAMESPACE_BEGIN(eigen_tensor_test)
-
-namespace py = pybind11;
-
-PYBIND11_WARNING_DISABLE_MSVC(4127)
-
-template <typename M>
-void reset_tensor(M &x) {
- for (int i = 0; i < x.dimension(0); i++) {
- for (int j = 0; j < x.dimension(1); j++) {
- for (int k = 0; k < x.dimension(2); k++) {
- x(i, j, k) = i * (5 * 2) + j * 2 + k;
- }
- }
- }
-}
-
-template <typename M>
-bool check_tensor(M &x) {
- for (int i = 0; i < x.dimension(0); i++) {
- for (int j = 0; j < x.dimension(1); j++) {
- for (int k = 0; k < x.dimension(2); k++) {
- if (x(i, j, k) != (i * (5 * 2) + j * 2 + k)) {
- return false;
- }
- }
- }
- }
- return true;
-}
-
-template <int Options>
-Eigen::Tensor<double, 3, Options> &get_tensor() {
- static Eigen::Tensor<double, 3, Options> *x;
-
- if (!x) {
- x = new Eigen::Tensor<double, 3, Options>(3, 5, 2);
- reset_tensor(*x);
- }
-
- return *x;
-}
-
-template <int Options>
-Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> &get_tensor_map() {
- static Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> *x;
-
- if (!x) {
- x = new Eigen::TensorMap<Eigen::Tensor<double, 3, Options>>(get_tensor<Options>());
- }
-
- return *x;
-}
-
-template <int Options>
-Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options> &get_fixed_tensor() {
- static Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options> *x;
-
- if (!x) {
- Eigen::aligned_allocator<Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options>>
- allocator;
- x = new (allocator.allocate(1))
- Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options>();
- reset_tensor(*x);
- }
-
- return *x;
-}
-
-template <int Options>
-const Eigen::Tensor<double, 3, Options> &get_const_tensor() {
- return get_tensor<Options>();
-}
-
-template <int Options>
-struct CustomExample {
- CustomExample() : member(get_tensor<Options>()), view_member(member) {}
-
- Eigen::Tensor<double, 3, Options> member;
- Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> view_member;
-};
-
-template <int Options>
-void init_tensor_module(pybind11::module &m) {
- const char *needed_options = "";
- if (Options == Eigen::ColMajor) {
- needed_options = "F";
- } else {
- needed_options = "C";
- }
- m.attr("needed_options") = needed_options;
-
- m.def("setup", []() {
- reset_tensor(get_tensor<Options>());
- reset_tensor(get_fixed_tensor<Options>());
- });
-
- m.def("is_ok", []() {
- return check_tensor(get_tensor<Options>()) && check_tensor(get_fixed_tensor<Options>());
- });
-
- py::class_<CustomExample<Options>>(m, "CustomExample", py::module_local())
- .def(py::init<>())
- .def_readonly(
- "member", &CustomExample<Options>::member, py::return_value_policy::reference_internal)
- .def_readonly("member_view",
- &CustomExample<Options>::view_member,
- py::return_value_policy::reference_internal);
-
- m.def(
- "copy_fixed_tensor",
- []() { return &get_fixed_tensor<Options>(); },
- py::return_value_policy::copy);
-
- m.def(
- "copy_tensor", []() { return &get_tensor<Options>(); }, py::return_value_policy::copy);
-
- m.def(
- "copy_const_tensor",
- []() { return &get_const_tensor<Options>(); },
- py::return_value_policy::copy);
-
- m.def(
- "move_fixed_tensor_copy",
- []() -> Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options> {
- return get_fixed_tensor<Options>();
- },
- py::return_value_policy::move);
-
- m.def(
- "move_tensor_copy",
- []() -> Eigen::Tensor<double, 3, Options> { return get_tensor<Options>(); },
- py::return_value_policy::move);
-
- m.def(
- "move_const_tensor",
- []() -> const Eigen::Tensor<double, 3, Options> & { return get_const_tensor<Options>(); },
- py::return_value_policy::move);
-
- m.def(
- "take_fixed_tensor",
-
- []() {
- Eigen::aligned_allocator<
- Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options>>
- allocator;
- return new (allocator.allocate(1))
- Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options>(
- get_fixed_tensor<Options>());
- },
- py::return_value_policy::take_ownership);
-
- m.def(
- "take_tensor",
- []() { return new Eigen::Tensor<double, 3, Options>(get_tensor<Options>()); },
- py::return_value_policy::take_ownership);
-
- m.def(
- "take_const_tensor",
- []() -> const Eigen::Tensor<double, 3, Options> * {
- return new Eigen::Tensor<double, 3, Options>(get_tensor<Options>());
- },
- py::return_value_policy::take_ownership);
-
- m.def(
- "take_view_tensor",
- []() -> const Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> * {
- return new Eigen::TensorMap<Eigen::Tensor<double, 3, Options>>(get_tensor<Options>());
- },
- py::return_value_policy::take_ownership);
-
- m.def(
- "reference_tensor",
- []() { return &get_tensor<Options>(); },
- py::return_value_policy::reference);
-
- m.def(
- "reference_tensor_v2",
- []() -> Eigen::Tensor<double, 3, Options> & { return get_tensor<Options>(); },
- py::return_value_policy::reference);
-
- m.def(
- "reference_tensor_internal",
- []() { return &get_tensor<Options>(); },
- py::return_value_policy::reference_internal);
-
- m.def(
- "reference_fixed_tensor",
- []() { return &get_tensor<Options>(); },
- py::return_value_policy::reference);
-
- m.def(
- "reference_const_tensor",
- []() { return &get_const_tensor<Options>(); },
- py::return_value_policy::reference);
-
- m.def(
- "reference_const_tensor_v2",
- []() -> const Eigen::Tensor<double, 3, Options> & { return get_const_tensor<Options>(); },
- py::return_value_policy::reference);
-
- m.def(
- "reference_view_of_tensor",
- []() -> Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> {
- return get_tensor_map<Options>();
- },
- py::return_value_policy::reference);
-
- m.def(
- "reference_view_of_tensor_v2",
- // NOLINTNEXTLINE(readability-const-return-type)
- []() -> const Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> {
- return get_tensor_map<Options>(); // NOLINT(readability-const-return-type)
- }, // NOLINT(readability-const-return-type)
- py::return_value_policy::reference);
-
- m.def(
- "reference_view_of_tensor_v3",
- []() -> Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> * {
- return &get_tensor_map<Options>();
- },
- py::return_value_policy::reference);
-
- m.def(
- "reference_view_of_tensor_v4",
- []() -> const Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> * {
- return &get_tensor_map<Options>();
- },
- py::return_value_policy::reference);
-
- m.def(
- "reference_view_of_tensor_v5",
- []() -> Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> & {
- return get_tensor_map<Options>();
- },
- py::return_value_policy::reference);
-
- m.def(
- "reference_view_of_tensor_v6",
- []() -> const Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> & {
- return get_tensor_map<Options>();
- },
- py::return_value_policy::reference);
-
- m.def(
- "reference_view_of_fixed_tensor",
- []() {
- return Eigen::TensorMap<
- Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options>>(
- get_fixed_tensor<Options>());
- },
- py::return_value_policy::reference);
-
- m.def("round_trip_tensor",
- [](const Eigen::Tensor<double, 3, Options> &tensor) { return tensor; });
-
- m.def(
- "round_trip_tensor_noconvert",
- [](const Eigen::Tensor<double, 3, Options> &tensor) { return tensor; },
- py::arg("tensor").noconvert());
-
- m.def("round_trip_tensor2",
- [](const Eigen::Tensor<int32_t, 3, Options> &tensor) { return tensor; });
-
- m.def("round_trip_fixed_tensor",
- [](const Eigen::TensorFixedSize<double, Eigen::Sizes<3, 5, 2>, Options> &tensor) {
- return tensor;
- });
-
- m.def(
- "round_trip_view_tensor",
- [](Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> view) { return view; },
- py::return_value_policy::reference);
-
- m.def(
- "round_trip_view_tensor_ref",
- [](Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> &view) { return view; },
- py::return_value_policy::reference);
-
- m.def(
- "round_trip_view_tensor_ptr",
- [](Eigen::TensorMap<Eigen::Tensor<double, 3, Options>> *view) { return view; },
- py::return_value_policy::reference);
-
- m.def(
- "round_trip_aligned_view_tensor",
- [](Eigen::TensorMap<Eigen::Tensor<double, 3, Options>, Eigen::Aligned> view) {
- return view;
- },
- py::return_value_policy::reference);
-
- m.def(
- "round_trip_const_view_tensor",
- [](Eigen::TensorMap<const Eigen::Tensor<double, 3, Options>> view) {
- return Eigen::Tensor<double, 3, Options>(view);
- },
- py::return_value_policy::move);
-
- m.def(
- "round_trip_rank_0",
- [](const Eigen::Tensor<double, 0, Options> &tensor) { return tensor; },
- py::return_value_policy::move);
-
- m.def(
- "round_trip_rank_0_noconvert",
- [](const Eigen::Tensor<double, 0, Options> &tensor) { return tensor; },
- py::arg("tensor").noconvert(),
- py::return_value_policy::move);
-
- m.def(
- "round_trip_rank_0_view",
- [](Eigen::TensorMap<Eigen::Tensor<double, 0, Options>> &tensor) { return tensor; },
- py::return_value_policy::reference);
-}
-
-void test_module(py::module_ &m) {
- auto f_style = m.def_submodule("f_style");
- auto c_style = m.def_submodule("c_style");
-
- init_tensor_module<Eigen::ColMajor>(f_style);
- init_tensor_module<Eigen::RowMajor>(c_style);
-}
-
-PYBIND11_NAMESPACE_END(eigen_tensor_test)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_tensor.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_tensor.py
deleted file mode 100644
index dc8aa4643e770f292a1bd89aee75fcb1e3faf8ea..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eigen_tensor.py
+++ /dev/null
@@ -1,296 +0,0 @@
-import sys
-
-import pytest
-
-np = pytest.importorskip("numpy")
-eigen_tensor = pytest.importorskip("pybind11_tests.eigen_tensor")
-submodules = [eigen_tensor.c_style, eigen_tensor.f_style]
-try:
- import eigen_tensor_avoid_stl_array as avoid
-
- submodules += [avoid.c_style, avoid.f_style]
-except ImportError as e:
- # Ensure config, build, toolchain, etc. issues are not masked here:
- raise RuntimeError(
- "import eigen_tensor_avoid_stl_array FAILED, while "
- "import pybind11_tests.eigen_tensor succeeded. "
- "Please ensure that "
- "test_eigen_tensor.cpp & "
- "eigen_tensor_avoid_stl_array.cpp "
- "are built together (or both are not built if Eigen is not available)."
- ) from e
-
-tensor_ref = np.empty((3, 5, 2), dtype=np.int64)
-
-for i in range(tensor_ref.shape[0]):
- for j in range(tensor_ref.shape[1]):
- for k in range(tensor_ref.shape[2]):
- tensor_ref[i, j, k] = i * (5 * 2) + j * 2 + k
-
-indices = (2, 3, 1)
-
-
-@pytest.fixture(autouse=True)
-def cleanup():
- for module in submodules:
- module.setup()
-
- yield
-
- for module in submodules:
- assert module.is_ok()
-
-
-def test_import_avoid_stl_array():
- pytest.importorskip("eigen_tensor_avoid_stl_array")
- assert len(submodules) == 4
-
-
-def assert_equal_tensor_ref(mat, writeable=True, modified=None):
- assert mat.flags.writeable == writeable
-
- copy = np.array(tensor_ref)
- if modified is not None:
- copy[indices] = modified
-
- np.testing.assert_array_equal(mat, copy)
-
-
-@pytest.mark.parametrize("m", submodules)
-@pytest.mark.parametrize("member_name", ["member", "member_view"])
-def test_reference_internal(m, member_name):
-
- if not hasattr(sys, "getrefcount"):
- pytest.skip("No reference counting")
- foo = m.CustomExample()
- counts = sys.getrefcount(foo)
- mem = getattr(foo, member_name)
- assert_equal_tensor_ref(mem, writeable=False)
- new_counts = sys.getrefcount(foo)
- assert new_counts == counts + 1
- assert_equal_tensor_ref(mem, writeable=False)
- del mem
- assert sys.getrefcount(foo) == counts
-
-
-assert_equal_funcs = [
- "copy_tensor",
- "copy_fixed_tensor",
- "copy_const_tensor",
- "move_tensor_copy",
- "move_fixed_tensor_copy",
- "take_tensor",
- "take_fixed_tensor",
- "reference_tensor",
- "reference_tensor_v2",
- "reference_fixed_tensor",
- "reference_view_of_tensor",
- "reference_view_of_tensor_v3",
- "reference_view_of_tensor_v5",
- "reference_view_of_fixed_tensor",
-]
-
-assert_equal_const_funcs = [
- "reference_view_of_tensor_v2",
- "reference_view_of_tensor_v4",
- "reference_view_of_tensor_v6",
- "reference_const_tensor",
- "reference_const_tensor_v2",
-]
-
-
-@pytest.mark.parametrize("m", submodules)
-@pytest.mark.parametrize("func_name", assert_equal_funcs + assert_equal_const_funcs)
-def test_convert_tensor_to_py(m, func_name):
- writeable = func_name in assert_equal_funcs
- assert_equal_tensor_ref(getattr(m, func_name)(), writeable=writeable)
-
-
-@pytest.mark.parametrize("m", submodules)
-def test_bad_cpp_to_python_casts(m):
-
- with pytest.raises(
- RuntimeError, match="Cannot use reference internal when there is no parent"
- ):
- m.reference_tensor_internal()
-
- with pytest.raises(RuntimeError, match="Cannot move from a constant reference"):
- m.move_const_tensor()
-
- with pytest.raises(
- RuntimeError, match="Cannot take ownership of a const reference"
- ):
- m.take_const_tensor()
-
- with pytest.raises(
- RuntimeError,
- match="Invalid return_value_policy for Eigen Map type, must be either reference or reference_internal",
- ):
- m.take_view_tensor()
-
-
-@pytest.mark.parametrize("m", submodules)
-def test_bad_python_to_cpp_casts(m):
-
- with pytest.raises(
- TypeError, match=r"^round_trip_tensor\(\): incompatible function arguments"
- ):
- m.round_trip_tensor(np.zeros((2, 3)))
-
- with pytest.raises(TypeError, match=r"^Cannot cast array data from dtype"):
- m.round_trip_tensor(np.zeros(dtype=np.str_, shape=(2, 3, 1)))
-
- with pytest.raises(
- TypeError,
- match=r"^round_trip_tensor_noconvert\(\): incompatible function arguments",
- ):
- m.round_trip_tensor_noconvert(tensor_ref)
-
- assert_equal_tensor_ref(
- m.round_trip_tensor_noconvert(tensor_ref.astype(np.float64))
- )
-
- if m.needed_options == "F":
- bad_options = "C"
- else:
- bad_options = "F"
- # Shape, dtype and the order need to be correct for a TensorMap cast
- with pytest.raises(
- TypeError, match=r"^round_trip_view_tensor\(\): incompatible function arguments"
- ):
- m.round_trip_view_tensor(
- np.zeros((3, 5, 2), dtype=np.float64, order=bad_options)
- )
-
- with pytest.raises(
- TypeError, match=r"^round_trip_view_tensor\(\): incompatible function arguments"
- ):
- m.round_trip_view_tensor(
- np.zeros((3, 5, 2), dtype=np.float32, order=m.needed_options)
- )
-
- with pytest.raises(
- TypeError, match=r"^round_trip_view_tensor\(\): incompatible function arguments"
- ):
- m.round_trip_view_tensor(
- np.zeros((3, 5), dtype=np.float64, order=m.needed_options)
- )
-
- with pytest.raises(
- TypeError, match=r"^round_trip_view_tensor\(\): incompatible function arguments"
- ):
- temp = np.zeros((3, 5, 2), dtype=np.float64, order=m.needed_options)
- m.round_trip_view_tensor(
- temp[:, ::-1, :],
- )
-
- with pytest.raises(
- TypeError, match=r"^round_trip_view_tensor\(\): incompatible function arguments"
- ):
- temp = np.zeros((3, 5, 2), dtype=np.float64, order=m.needed_options)
- temp.setflags(write=False)
- m.round_trip_view_tensor(temp)
-
-
-@pytest.mark.parametrize("m", submodules)
-def test_references_actually_refer(m):
-
- a = m.reference_tensor()
- temp = a[indices]
- a[indices] = 100
- assert_equal_tensor_ref(m.copy_const_tensor(), modified=100)
- a[indices] = temp
- assert_equal_tensor_ref(m.copy_const_tensor())
-
- a = m.reference_view_of_tensor()
- a[indices] = 100
- assert_equal_tensor_ref(m.copy_const_tensor(), modified=100)
- a[indices] = temp
- assert_equal_tensor_ref(m.copy_const_tensor())
-
-
-@pytest.mark.parametrize("m", submodules)
-def test_round_trip(m):
-
- assert_equal_tensor_ref(m.round_trip_tensor(tensor_ref))
-
- with pytest.raises(TypeError, match="^Cannot cast array data from"):
- assert_equal_tensor_ref(m.round_trip_tensor2(tensor_ref))
-
- assert_equal_tensor_ref(m.round_trip_tensor2(np.array(tensor_ref, dtype=np.int32)))
- assert_equal_tensor_ref(m.round_trip_fixed_tensor(tensor_ref))
- assert_equal_tensor_ref(m.round_trip_aligned_view_tensor(m.reference_tensor()))
-
- copy = np.array(tensor_ref, dtype=np.float64, order=m.needed_options)
- assert_equal_tensor_ref(m.round_trip_view_tensor(copy))
- assert_equal_tensor_ref(m.round_trip_view_tensor_ref(copy))
- assert_equal_tensor_ref(m.round_trip_view_tensor_ptr(copy))
- copy.setflags(write=False)
- assert_equal_tensor_ref(m.round_trip_const_view_tensor(copy))
-
- np.testing.assert_array_equal(
- tensor_ref[:, ::-1, :], m.round_trip_tensor(tensor_ref[:, ::-1, :])
- )
-
- assert m.round_trip_rank_0(np.float64(3.5)) == 3.5
- assert m.round_trip_rank_0(3.5) == 3.5
-
- with pytest.raises(
- TypeError,
- match=r"^round_trip_rank_0_noconvert\(\): incompatible function arguments",
- ):
- m.round_trip_rank_0_noconvert(np.float64(3.5))
-
- with pytest.raises(
- TypeError,
- match=r"^round_trip_rank_0_noconvert\(\): incompatible function arguments",
- ):
- m.round_trip_rank_0_noconvert(3.5)
-
- with pytest.raises(
- TypeError, match=r"^round_trip_rank_0_view\(\): incompatible function arguments"
- ):
- m.round_trip_rank_0_view(np.float64(3.5))
-
- with pytest.raises(
- TypeError, match=r"^round_trip_rank_0_view\(\): incompatible function arguments"
- ):
- m.round_trip_rank_0_view(3.5)
-
-
-@pytest.mark.parametrize("m", submodules)
-def test_round_trip_references_actually_refer(m):
-
- # Need to create a copy that matches the type on the C side
- copy = np.array(tensor_ref, dtype=np.float64, order=m.needed_options)
- a = m.round_trip_view_tensor(copy)
- temp = a[indices]
- a[indices] = 100
- assert_equal_tensor_ref(copy, modified=100)
- a[indices] = temp
- assert_equal_tensor_ref(copy)
-
-
-@pytest.mark.parametrize("m", submodules)
-def test_doc_string(m, doc):
- assert (
- doc(m.copy_tensor) == "copy_tensor() -> numpy.ndarray[numpy.float64[?, ?, ?]]"
- )
- assert (
- doc(m.copy_fixed_tensor)
- == "copy_fixed_tensor() -> numpy.ndarray[numpy.float64[3, 5, 2]]"
- )
- assert (
- doc(m.reference_const_tensor)
- == "reference_const_tensor() -> numpy.ndarray[numpy.float64[?, ?, ?]]"
- )
-
- order_flag = f"flags.{m.needed_options.lower()}_contiguous"
- assert doc(m.round_trip_view_tensor) == (
- f"round_trip_view_tensor(arg0: numpy.ndarray[numpy.float64[?, ?, ?], flags.writeable, {order_flag}])"
- + f" -> numpy.ndarray[numpy.float64[?, ?, ?], flags.writeable, {order_flag}]"
- )
- assert doc(m.round_trip_const_view_tensor) == (
- f"round_trip_const_view_tensor(arg0: numpy.ndarray[numpy.float64[?, ?, ?], {order_flag}])"
- + " -> numpy.ndarray[numpy.float64[?, ?, ?]]"
- )
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/CMakeLists.txt b/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/CMakeLists.txt
deleted file mode 100644
index 09a3693999b8ffb7c03b4edc02da2654fe518ed9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-possibly_uninitialized(PYTHON_MODULE_EXTENSION Python_INTERPRETER_ID)
-
-if("${PYTHON_MODULE_EXTENSION}" MATCHES "pypy" OR "${Python_INTERPRETER_ID}" STREQUAL "PyPy")
- message(STATUS "Skipping embed test on 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.9)
-
-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 test_trampoline.py DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-endif()
-
-add_custom_target(
- cpptest
- COMMAND "$<TARGET_FILE:test_embed>"
- DEPENDS 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.10.3/tests/test_embed/catch.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/catch.cpp
deleted file mode 100644
index 558a7a35e5c741b00656576f5c21c1aca668f545..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/catch.cpp
+++ /dev/null
@@ -1,43 +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>
-
-// 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).
-PYBIND11_WARNING_DISABLE_MSVC(4996)
-
-// Catch uses _ internally, which breaks gettext style defines
-#ifdef _
-# undef _
-#endif
-
-#define CATCH_CONFIG_RUNNER
-#include <catch.hpp>
-
-namespace py = pybind11;
-
-int main(int argc, char *argv[]) {
- // Setup for TEST_CASE in test_interpreter.cpp, tagging on a large random number:
- std::string updated_pythonpath("pybind11_test_embed_PYTHONPATH_2099743835476552");
- const char *preexisting_pythonpath = getenv("PYTHONPATH");
- if (preexisting_pythonpath != nullptr) {
-#if defined(_WIN32)
- updated_pythonpath += ';';
-#else
- updated_pythonpath += ':';
-#endif
- updated_pythonpath += preexisting_pythonpath;
- }
-#if defined(_WIN32)
- _putenv_s("PYTHONPATH", updated_pythonpath.c_str());
-#else
- setenv("PYTHONPATH", updated_pythonpath.c_str(), /*replace=*/1);
-#endif
-
- py::scoped_interpreter guard{};
-
- auto result = Catch::Session().run(argc, argv);
-
- return result < 0xff ? result : 0xff;
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/external_module.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/external_module.cpp
deleted file mode 100644
index 5c482fe061d7afc266e4017372cf94eb3d431476..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/external_module.cpp
+++ /dev/null
@@ -1,20 +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:
- explicit 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.10.3/tests/test_embed/test_interpreter.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/test_interpreter.cpp
deleted file mode 100644
index 10b20f37158c9dbb4230af177e0fca1eaa92c178..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/test_interpreter.cpp
+++ /dev/null
@@ -1,468 +0,0 @@
-#include <pybind11/embed.h>
-
-// 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).
-PYBIND11_WARNING_DISABLE_MSVC(4996)
-
-#include <catch.hpp>
-#include <cstdlib>
-#include <fstream>
-#include <functional>
-#include <thread>
-#include <utility>
-
-namespace py = pybind11;
-using namespace py::literals;
-
-size_t get_sys_path_size() {
- auto sys_path = py::module::import("sys").attr("path");
- return py::len(sys_path);
-}
-
-class Widget {
-public:
- explicit Widget(std::string message) : message(std::move(message)) {}
- virtual ~Widget() = default;
-
- std::string the_message() const { return message; }
- virtual int the_answer() const = 0;
- virtual std::string argv0() 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); }
- std::string argv0() const override { PYBIND11_OVERRIDE_PURE(std::string, Widget, argv0); }
-};
-
-class test_override_cache_helper {
-
-public:
- virtual int func() { return 0; }
-
- test_override_cache_helper() = default;
- virtual ~test_override_cache_helper() = default;
- // Non-copyable
- test_override_cache_helper &operator=(test_override_cache_helper const &Right) = delete;
- test_override_cache_helper(test_override_cache_helper const &Copy) = delete;
-};
-
-class test_override_cache_helper_trampoline : public test_override_cache_helper {
- int func() override { PYBIND11_OVERRIDE(int, test_override_cache_helper, func); }
-};
-
-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(trampoline_module, m) {
- py::class_<test_override_cache_helper,
- test_override_cache_helper_trampoline,
- std::shared_ptr<test_override_cache_helper>>(m, "test_override_cache_helper")
- .def(py::init_alias<>())
- .def("func", &test_override_cache_helper::func);
-}
-
-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("PYTHONPATH is used to update sys.path") {
- // The setup for this TEST_CASE is in catch.cpp!
- auto sys_path = py::str(py::module_::import("sys").attr("path")).cast<std::string>();
- REQUIRE_THAT(sys_path,
- Catch::Matchers::Contains("pybind11_test_embed_PYTHONPATH_2099743835476552"));
-}
-
-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("Override cache") {
- auto module_ = py::module_::import("test_trampoline");
- REQUIRE(py::hasattr(module_, "func"));
- REQUIRE(py::hasattr(module_, "func2"));
-
- auto locals = py::dict(**module_.attr("__dict__"));
-
- int i = 0;
- for (; i < 1500; ++i) {
- std::shared_ptr<test_override_cache_helper> p_obj;
- std::shared_ptr<test_override_cache_helper> p_obj2;
-
- py::object loc_inst = locals["func"]();
- p_obj = py::cast<std::shared_ptr<test_override_cache_helper>>(loc_inst);
-
- int ret = p_obj->func();
-
- REQUIRE(ret == 42);
-
- loc_inst = locals["func2"]();
-
- p_obj2 = py::cast<std::shared_ptr<test_override_cache_helper>>(loc_inst);
-
- p_obj2->func();
- }
-}
-
-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: initialization failed"));
-
- auto locals = py::dict("is_keyerror"_a = false, "message"_a = "not set");
- py::exec(R"(
- try:
- import throw_error_already_set
- except ImportError as e:
- is_keyerror = type(e.__cause__) == KeyError
- message = str(e.__cause__)
- )",
- py::globals(),
- locals);
- REQUIRE(locals["is_keyerror"].cast<bool>() == true);
- REQUIRE(locals["message"].cast<std::string>() == "'missing'");
-}
-
-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();
-}
-
-#if PY_VERSION_HEX >= PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
-TEST_CASE("Custom PyConfig") {
- py::finalize_interpreter();
- PyConfig config;
- PyConfig_InitPythonConfig(&config);
- REQUIRE_NOTHROW(py::scoped_interpreter{&config});
- {
- py::scoped_interpreter p{&config};
- REQUIRE(py::module_::import("widget_module").attr("add")(1, 41).cast<int>() == 42);
- }
- py::initialize_interpreter();
-}
-
-TEST_CASE("Custom PyConfig with argv") {
- py::finalize_interpreter();
- {
- PyConfig config;
- PyConfig_InitIsolatedConfig(&config);
- char *argv[] = {strdup("a.out")};
- py::scoped_interpreter argv_scope{&config, 1, argv};
- std::free(argv[0]);
- auto module = py::module::import("test_interpreter");
- auto py_widget = module.attr("DerivedWidget")("The question");
- const auto &cpp_widget = py_widget.cast<const Widget &>();
- REQUIRE(cpp_widget.argv0() == "a.out");
- }
- py::initialize_interpreter();
-}
-#endif
-
-TEST_CASE("Add program dir to path pre-PyConfig") {
- py::finalize_interpreter();
- size_t path_size_add_program_dir_to_path_false = 0;
- {
- py::scoped_interpreter scoped_interp{true, 0, nullptr, false};
- path_size_add_program_dir_to_path_false = get_sys_path_size();
- }
- {
- py::scoped_interpreter scoped_interp{};
- REQUIRE(get_sys_path_size() == path_size_add_program_dir_to_path_false + 1);
- }
- py::initialize_interpreter();
-}
-
-#if PY_VERSION_HEX >= PYBIND11_PYCONFIG_SUPPORT_PY_VERSION_HEX
-TEST_CASE("Add program dir to path using PyConfig") {
- py::finalize_interpreter();
- size_t path_size_add_program_dir_to_path_false = 0;
- {
- PyConfig config;
- PyConfig_InitPythonConfig(&config);
- py::scoped_interpreter scoped_interp{&config, 0, nullptr, false};
- path_size_add_program_dir_to_path_false = get_sys_path_size();
- }
- {
- PyConfig config;
- PyConfig_InitPythonConfig(&config);
- py::scoped_interpreter scoped_interp{&config};
- REQUIRE(get_sys_path_size() == path_size_add_program_dir_to_path_false + 1);
- }
- py::initialize_interpreter();
-}
-#endif
-
-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 != nullptr) && (*ipp != nullptr);
-}
-
-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{};
-
- 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);
-}
-
-TEST_CASE("sys.argv gets initialized properly") {
- py::finalize_interpreter();
- {
- py::scoped_interpreter default_scope;
- auto module = py::module::import("test_interpreter");
- auto py_widget = module.attr("DerivedWidget")("The question");
- const auto &cpp_widget = py_widget.cast<const Widget &>();
- REQUIRE(cpp_widget.argv0().empty());
- }
-
- {
- char *argv[] = {strdup("a.out")};
- py::scoped_interpreter argv_scope(true, 1, argv);
- std::free(argv[0]);
- auto module = py::module::import("test_interpreter");
- auto py_widget = module.attr("DerivedWidget")("The question");
- const auto &cpp_widget = py_widget.cast<const Widget &>();
- REQUIRE(cpp_widget.argv0() == "a.out");
- }
- py::initialize_interpreter();
-}
-
-TEST_CASE("make_iterator can be called before then after finalizing an interpreter") {
- // Reproduction of issue #2101 (https://github.com/pybind/pybind11/issues/2101)
- py::finalize_interpreter();
-
- std::vector<int> container;
- {
- pybind11::scoped_interpreter g;
- auto iter = pybind11::make_iterator(container.begin(), container.end());
- }
-
- REQUIRE_NOTHROW([&]() {
- pybind11::scoped_interpreter g;
- auto iter = pybind11::make_iterator(container.begin(), container.end());
- }());
-
- py::initialize_interpreter();
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/test_interpreter.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/test_interpreter.py
deleted file mode 100644
index f279449722e7264016721600c62532ee872f565f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/test_interpreter.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import sys
-
-from widget_module import Widget
-
-
-class DerivedWidget(Widget):
- def __init__(self, message):
- super().__init__(message)
-
- def the_answer(self):
- return 42
-
- def argv0(self):
- return sys.argv[0]
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/test_trampoline.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/test_trampoline.py
deleted file mode 100644
index 8e14e8ef0b2d725be84ab7568dc3a5fae71ba6a0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_embed/test_trampoline.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import trampoline_module
-
-
-def func():
- class Test(trampoline_module.test_override_cache_helper):
- def func(self):
- return 42
-
- return Test()
-
-
-def func2():
- class Test(trampoline_module.test_override_cache_helper):
- pass
-
- return Test()
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_enum.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_enum.cpp
deleted file mode 100644
index 2597b275ef6dc806f33cffb0499fa0ba971a6085..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_enum.cpp
+++ /dev/null
@@ -1,133 +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();
- });
-
- // test_enum_scalar
- enum UnscopedUCharEnum : unsigned char {};
- enum class ScopedShortEnum : short {};
- enum class ScopedLongEnum : long {};
- enum UnscopedUInt64Enum : std::uint64_t {};
- static_assert(
- py::detail::all_of<
- std::is_same<py::enum_<UnscopedUCharEnum>::Scalar, unsigned char>,
- std::is_same<py::enum_<ScopedShortEnum>::Scalar, short>,
- std::is_same<py::enum_<ScopedLongEnum>::Scalar, long>,
- std::is_same<py::enum_<UnscopedUInt64Enum>::Scalar, std::uint64_t>>::value,
- "Error during the deduction of enum's scalar type with normal integer underlying");
-
- // test_enum_scalar_with_char_underlying
- enum class ScopedCharEnum : char { Zero, Positive };
- enum class ScopedWCharEnum : wchar_t { Zero, Positive };
- enum class ScopedChar32Enum : char32_t { Zero, Positive };
- enum class ScopedChar16Enum : char16_t { Zero, Positive };
-
- // test the scalar of char type enums according to chapter 'Character types'
- // from https://en.cppreference.com/w/cpp/language/types
- static_assert(
- py::detail::any_of<
- std::is_same<py::enum_<ScopedCharEnum>::Scalar, signed char>, // e.g. gcc on x86
- std::is_same<py::enum_<ScopedCharEnum>::Scalar, unsigned char> // e.g. arm linux
- >::value,
- "char should be cast to either signed char or unsigned char");
- static_assert(sizeof(py::enum_<ScopedWCharEnum>::Scalar) == 2
- || sizeof(py::enum_<ScopedWCharEnum>::Scalar) == 4,
- "wchar_t should be either 16 bits (Windows) or 32 (everywhere else)");
- static_assert(
- py::detail::all_of<
- std::is_same<py::enum_<ScopedChar32Enum>::Scalar, std::uint_least32_t>,
- std::is_same<py::enum_<ScopedChar16Enum>::Scalar, std::uint_least16_t>>::value,
- "char32_t, char16_t (and char8_t)'s size, signedness, and alignment is determined");
-#if defined(PYBIND11_HAS_U8STRING)
- enum class ScopedChar8Enum : char8_t { Zero, Positive };
- static_assert(std::is_same<py::enum_<ScopedChar8Enum>::Scalar, unsigned char>::value);
-#endif
-
- // test_char_underlying_enum
- py::enum_<ScopedCharEnum>(m, "ScopedCharEnum")
- .value("Zero", ScopedCharEnum::Zero)
- .value("Positive", ScopedCharEnum::Positive);
- py::enum_<ScopedWCharEnum>(m, "ScopedWCharEnum")
- .value("Zero", ScopedWCharEnum::Zero)
- .value("Positive", ScopedWCharEnum::Positive);
- py::enum_<ScopedChar32Enum>(m, "ScopedChar32Enum")
- .value("Zero", ScopedChar32Enum::Zero)
- .value("Positive", ScopedChar32Enum::Positive);
- py::enum_<ScopedChar16Enum>(m, "ScopedChar16Enum")
- .value("Zero", ScopedChar16Enum::Zero)
- .value("Positive", ScopedChar16Enum::Positive);
-
- // test_bool_underlying_enum
- enum class ScopedBoolEnum : bool { FALSE, TRUE };
-
- // bool is unsigned (std::is_signed returns false) and 1-byte long, so represented with u8
- static_assert(std::is_same<py::enum_<ScopedBoolEnum>::Scalar, std::uint8_t>::value, "");
-
- py::enum_<ScopedBoolEnum>(m, "ScopedBoolEnum")
- .value("FALSE", ScopedBoolEnum::FALSE)
- .value("TRUE", ScopedBoolEnum::TRUE);
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_enum.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_enum.py
deleted file mode 100644
index f14a72398f0b479d21cf85f91cfd290f7dd22265..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_enum.py
+++ /dev/null
@@ -1,264 +0,0 @@
-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.EOne.value == 1
- assert m.UnscopedEnum.ETwo.name == "ETwo"
- assert m.UnscopedEnum.ETwo.value == 2
- assert m.EOne is m.UnscopedEnum.EOne
- # name, value readonly
- with pytest.raises(AttributeError):
- m.UnscopedEnum.EOne.name = ""
- with pytest.raises(AttributeError):
- m.UnscopedEnum.EOne.value = 10
- # name, value returns a copy
- # TODO: Neither the name nor value tests actually check against aliasing.
- # Use a mutable type that has reference semantics.
- nonaliased_name = m.UnscopedEnum.EOne.name
- nonaliased_name = "bar" # noqa: F841
- assert m.UnscopedEnum.EOne.name == "EOne"
- nonaliased_value = m.UnscopedEnum.EOne.value
- nonaliased_value = 10 # noqa: F841
- assert m.UnscopedEnum.EOne.value == 1
-
- # __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
- nonaliased_members = m.UnscopedEnum.__members__
- nonaliased_members["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() # noqa: B015
-
- with pytest.raises(TypeError):
- y <= object() # noqa: B015
-
- with pytest.raises(TypeError):
- y > object() # noqa: B015
-
- with pytest.raises(TypeError):
- y >= object() # noqa: B015
-
- 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 # noqa: B015
- with pytest.raises(TypeError):
- z < 3 # noqa: B015
- with pytest.raises(TypeError):
- z >= 3 # noqa: B015
- with pytest.raises(TypeError):
- z <= 3 # noqa: B015
-
- # 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_int(m.ScopedCharEnum.Positive)
- m.test_enum_to_int(m.ScopedBoolEnum.TRUE)
- m.test_enum_to_uint(m.Flags.Read)
- m.test_enum_to_uint(m.ClassWithUnscopedEnum.EMode.EFirstMode)
- m.test_enum_to_uint(m.ScopedCharEnum.Positive)
- m.test_enum_to_uint(m.ScopedBoolEnum.TRUE)
- m.test_enum_to_long_long(m.Flags.Read)
- m.test_enum_to_long_long(m.ClassWithUnscopedEnum.EMode.EFirstMode)
- m.test_enum_to_long_long(m.ScopedCharEnum.Positive)
- m.test_enum_to_long_long(m.ScopedBoolEnum.TRUE)
-
-
-def test_duplicate_enum_name():
- with pytest.raises(ValueError) as excinfo:
- m.register_bad_enum()
- assert str(excinfo.value) == 'SimpleEnum: element "ONE" already exists!'
-
-
-def test_char_underlying_enum(): # Issue #1331/PR #1334:
- assert type(m.ScopedCharEnum.Positive.__int__()) is int
- assert int(m.ScopedChar16Enum.Zero) == 0
- assert hash(m.ScopedChar32Enum.Positive) == 1
- assert type(m.ScopedCharEnum.Positive.__getstate__()) is int
- assert m.ScopedWCharEnum(1) == m.ScopedWCharEnum.Positive
- with pytest.raises(TypeError):
- # Even if the underlying type is char, only an int can be used to construct the enum:
- m.ScopedCharEnum("0")
-
-
-def test_bool_underlying_enum():
- assert type(m.ScopedBoolEnum.TRUE.__int__()) is int
- assert int(m.ScopedBoolEnum.FALSE) == 0
- assert hash(m.ScopedBoolEnum.TRUE) == 1
- assert type(m.ScopedBoolEnum.TRUE.__getstate__()) is int
- assert m.ScopedBoolEnum(1) == m.ScopedBoolEnum.TRUE
- # Enum could construct with a bool
- # (bool is a strict subclass of int, and False will be converted to 0)
- assert m.ScopedBoolEnum(False) == m.ScopedBoolEnum.FALSE
-
-
-def test_docstring_signatures():
- for enum_type in [m.ScopedEnum, m.UnscopedEnum]:
- for attr in enum_type.__dict__.values():
- # Issue #2623/PR #2637: Add argument names to enum_ methods
- assert "arg0" not in (attr.__doc__ or "")
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval.cpp
deleted file mode 100644
index cd2903f0ab2f1c1c86936e95b01af305c59b28a0..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval.cpp
+++ /dev/null
@@ -1,118 +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"
-
-#include <utility>
-
-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 = 0;
- local["call_test2"] = py::cpp_function([&](int value) { val_out = value; });
-
- auto result = py::eval_file(std::move(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;
- });
-
- // test_eval_empty_globals
- m.def("eval_empty_globals", [](py::object global) {
- if (global.is_none()) {
- global = py::dict();
- }
- auto int_class = py::eval("isinstance(42, int)", global);
- return global;
- });
-
- // test_eval_closure
- m.def("test_eval_closure", []() {
- py::dict global;
- global["closure_value"] = 42;
- py::dict local;
- local["closure_value"] = 0;
- py::exec(R"(
- local_value = closure_value
-
- def func_global():
- return closure_value
-
- def func_local():
- return local_value
- )",
- global,
- local);
- return std::make_pair(global, local);
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval.py
deleted file mode 100644
index 51b6b796b4b7671c5531c883b959a9ef51b7c3b4..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval.py
+++ /dev/null
@@ -1,50 +0,0 @@
-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", 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()
-
-
-def test_eval_empty_globals():
- assert "__builtins__" in m.eval_empty_globals(None)
-
- g = {}
- assert "__builtins__" in m.eval_empty_globals(g)
- assert "__builtins__" in g
-
-
-def test_eval_closure():
- global_, local = m.test_eval_closure()
-
- assert global_["closure_value"] == 42
- assert local["closure_value"] == 0
-
- assert "local_value" not in global_
- assert local["local_value"] == 0
-
- assert "func_global" not in global_
- assert local["func_global"]() == 42
-
- assert "func_local" not in global_
- with pytest.raises(NameError):
- local["func_local"]()
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval_call.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval_call.py
deleted file mode 100644
index fd1da2a5cc8e3b49fb6feb7dfe7f344c2d1bd3eb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_eval_call.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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.10.3/tests/test_exceptions.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_exceptions.cpp
deleted file mode 100644
index f57e0950685ee838f3aba4e4d4416a34f7cd7a65..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_exceptions.cpp
+++ /dev/null
@@ -1,342 +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 "test_exceptions.h"
-
-#include "local_bindings.h"
-#include "pybind11_tests.h"
-
-#include <exception>
-#include <stdexcept>
-#include <utility>
-
-// 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(); }
- // Rule of 5 BEGIN: to preempt compiler warnings.
- MyException3(const MyException3 &) = default;
- MyException3(MyException3 &&) = default;
- MyException3 &operator=(const MyException3 &) = default;
- MyException3 &operator=(MyException3 &&) = default;
- virtual ~MyException3() = default;
- // Rule of 5 END.
-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;
-};
-
-// Exception that will be caught via the module local translator.
-class MyException6 : public std::exception {
-public:
- explicit MyException6(const char *m) : message{m} {}
- const char *what() const noexcept override { return message.c_str(); }
-
-private:
- std::string message = "";
-};
-
-struct PythonCallInDestructor {
- explicit PythonCallInDestructor(const py::dict &d) : d(d) {}
- ~PythonCallInDestructor() { d["good"] = true; }
-
- py::dict d;
-};
-
-struct PythonAlreadySetInDestructor {
- explicit 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());
-
- // py::register_local_exception<LocalSimpleException>(m, "LocalSimpleException")
-
- py::register_local_exception_translator([](std::exception_ptr p) {
- try {
- if (p) {
- std::rethrow_exception(p);
- }
- } catch (const MyException6 &e) {
- PyErr_SetString(PyExc_RuntimeError, e.what());
- }
- });
-
- 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("throws6", []() { throw MyException6("MyException6 only handled in this module"); });
- 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("throws_local_error", []() { throw LocalException("never caught"); });
- m.def("throws_local_simple_error", []() { throw LocalSimpleException("this mod"); });
- 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("Internal error: pybind11::error_already_set called "
- "while Python error indicator not set."))) {
- 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", [](const py::dict &d) {
- bool retval = false;
- try {
- PythonCallInDestructor set_dict_in_destructor(d);
- PyErr_SetString(PyExc_ValueError, "foo");
- throw py::error_already_set();
- } catch (const py::error_already_set &) {
- retval = true;
- }
- return retval;
- });
-
- m.def("python_alreadyset_in_destructor", [](const py::str &s) {
- PythonAlreadySetInDestructor alreadyset_in_destructor(s);
- return true;
- });
-
- // test_nested_throws
- m.def("try_catch",
- [m](const py::object &exc_type, const py::function &f, const py::args &args) {
- try {
- f(*args);
- } catch (py::error_already_set &ex) {
- if (ex.matches(exc_type)) {
- py::print(ex.what());
- } else {
- // Simply `throw;` also works and is better, but using `throw ex;`
- // here to cover that situation (as observed in the wild).
- throw ex; // Invokes the copy ctor.
- }
- }
- });
-
- // Test repr that cannot be displayed
- m.def("simple_bool_passthrough", [](bool x) { return x; });
-
- m.def("throw_should_be_translated_to_key_error", []() { throw shared_exception(); });
-
- m.def("raise_from", []() {
- PyErr_SetString(PyExc_ValueError, "inner");
- py::raise_from(PyExc_ValueError, "outer");
- throw py::error_already_set();
- });
-
- m.def("raise_from_already_set", []() {
- try {
- PyErr_SetString(PyExc_ValueError, "inner");
- throw py::error_already_set();
- } catch (py::error_already_set &e) {
- py::raise_from(e, PyExc_ValueError, "outer");
- throw py::error_already_set();
- }
- });
-
- m.def("throw_nested_exception", []() {
- try {
- throw std::runtime_error("Inner Exception");
- } catch (const std::runtime_error &) {
- std::throw_with_nested(std::runtime_error("Outer Exception"));
- }
- });
-
- m.def("error_already_set_what", [](const py::object &exc_type, const py::object &exc_value) {
- PyErr_SetObject(exc_type.ptr(), exc_value.ptr());
- std::string what = py::error_already_set().what();
- bool py_err_set_after_what = (PyErr_Occurred() != nullptr);
- PyErr_Clear();
- return py::make_tuple(std::move(what), py_err_set_after_what);
- });
-
- m.def("test_cross_module_interleaved_error_already_set", []() {
- auto cm = py::module_::import("cross_module_interleaved_error_already_set");
- auto interleaved_error_already_set
- = reinterpret_cast<void (*)()>(PyLong_AsVoidPtr(cm.attr("funcaddr").ptr()));
- interleaved_error_already_set();
- });
-
- m.def("test_error_already_set_double_restore", [](bool dry_run) {
- PyErr_SetString(PyExc_ValueError, "Random error.");
- py::error_already_set e;
- e.restore();
- PyErr_Clear();
- if (!dry_run) {
- e.restore();
- }
- });
-
- // https://github.com/pybind/pybind11/issues/4075
- m.def("test_pypy_oserror_normalization", []() {
- try {
- py::module_::import("io").attr("open")("this_filename_must_not_exist", "r");
- } catch (const py::error_already_set &e) {
- return py::str(e.what()); // str must be built before e goes out of scope.
- }
- return py::str("UNEXPECTED");
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_exceptions.h b/3rdParty/pybind11/pybind11-2.10.3/tests/test_exceptions.h
deleted file mode 100644
index 03684b89fa2e9a5e23ea8ebcb49415632660379e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_exceptions.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-#include "pybind11_tests.h"
-
-#include <stdexcept>
-
-// shared exceptions for cross_module_tests
-
-class PYBIND11_EXPORT_EXCEPTION shared_exception : public pybind11::builtin_exception {
-public:
- using builtin_exception::builtin_exception;
- explicit shared_exception() : shared_exception("") {}
- void set_error() const override { PyErr_SetString(PyExc_RuntimeError, what()); }
-};
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_exceptions.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_exceptions.py
deleted file mode 100644
index 0d2c8081437f6101cdf8c3530799429faf0f37ff..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_exceptions.py
+++ /dev/null
@@ -1,383 +0,0 @@
-import sys
-
-import pytest
-
-import env
-import pybind11_cross_module_tests as cm
-import pybind11_tests # noqa: F401
-from pybind11_tests import exceptions as m
-
-
-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)
- == "Internal error: pybind11::error_already_set called while Python error indicator not set."
- )
-
- with pytest.raises(ValueError) as excinfo:
- m.throw_already_set(True)
- assert msg(excinfo.value) == "foo"
-
-
-def test_raise_from(msg):
- with pytest.raises(ValueError) as excinfo:
- m.raise_from()
- assert msg(excinfo.value) == "outer"
- assert msg(excinfo.value.__cause__) == "inner"
-
-
-def test_raise_from_already_set(msg):
- with pytest.raises(ValueError) as excinfo:
- m.raise_from_already_set()
- assert msg(excinfo.value) == "outer"
- assert msg(excinfo.value.__cause__) == "inner"
-
-
-def test_cross_module_exceptions(msg):
- 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()
-
- with pytest.raises(cm.LocalSimpleException) as excinfo:
- cm.throw_local_simple_error()
- assert msg(excinfo.value) == "external mod"
-
- with pytest.raises(KeyError) as excinfo:
- cm.throw_local_error()
- # KeyError is a repr of the key, so it has an extra set of quotes
- assert str(excinfo.value) == "'just local'"
-
-
-# TODO: FIXME
-@pytest.mark.xfail(
- "env.MACOS and (env.PYPY or pybind11_tests.compiler_info.startswith('Homebrew Clang'))",
- raises=RuntimeError,
- reason="See Issue #2847, PR #2999, PR #4324",
-)
-def test_cross_module_exception_translator():
- with pytest.raises(KeyError):
- # translator registered in cross_module_tests
- m.throw_should_be_translated_to_key_error()
-
-
-def test_python_call_in_catch():
- d = {}
- assert m.python_call_in_destructor(d) is True
- assert d["good"] is True
-
-
-def ignore_pytest_unraisable_warning(f):
- unraisable = "PytestUnraisableExceptionWarning"
- if hasattr(pytest, unraisable): # Python >= 3.8 and pytest >= 6
- dec = pytest.mark.filterwarnings(f"ignore::pytest.{unraisable}")
- return dec(f)
- else:
- return f
-
-
-# TODO: find out why this fails on PyPy, https://foss.heptapod.net/pypy/pypy/-/issues/3583
-@pytest.mark.xfail(env.PYPY, reason="Failure on PyPy 3.8 (7.3.7)", strict=False)
-@ignore_pytest_unraisable_warning
-def test_python_alreadyset_in_destructor(monkeypatch, capsys):
- hooked = False
- triggered = False
-
- if hasattr(sys, "unraisablehook"): # Python 3.8+
- hooked = True
- # Don't take `sys.unraisablehook`, as that's overwritten by pytest
- 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":
- nonlocal triggered
- triggered = 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 is True
-
- _, captured_stderr = capsys.readouterr()
- assert captured_stderr.startswith("Exception ignored in: 'already_set demo'")
- assert captured_stderr.rstrip().endswith("KeyError: 'bar'")
-
-
-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 as err:
- raise RuntimeError("Exception error: caught child from parent") from err
- 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"
-
-
-def test_throw_nested_exception():
- with pytest.raises(RuntimeError) as excinfo:
- m.throw_nested_exception()
- assert str(excinfo.value) == "Outer Exception"
- assert str(excinfo.value.__cause__) == "Inner Exception"
-
-
-# This can often happen if you wrap a pybind11 class in a Python wrapper
-def test_invalid_repr():
- class MyRepr:
- def __repr__(self):
- raise AttributeError("Example error")
-
- with pytest.raises(TypeError):
- m.simple_bool_passthrough(MyRepr())
-
-
-def test_local_translator(msg):
- """Tests that a local translator works and that the local translator from
- the cross module is not applied"""
- with pytest.raises(RuntimeError) as excinfo:
- m.throws6()
- assert msg(excinfo.value) == "MyException6 only handled in this module"
-
- with pytest.raises(RuntimeError) as excinfo:
- m.throws_local_error()
- assert not isinstance(excinfo.value, KeyError)
- assert msg(excinfo.value) == "never caught"
-
- with pytest.raises(Exception) as excinfo:
- m.throws_local_simple_error()
- assert not isinstance(excinfo.value, cm.LocalSimpleException)
- assert msg(excinfo.value) == "this mod"
-
-
-def test_error_already_set_message_with_unicode_surrogate(): # Issue #4288
- assert m.error_already_set_what(RuntimeError, "\ud927") == (
- "RuntimeError: \\ud927",
- False,
- )
-
-
-def test_error_already_set_message_with_malformed_utf8():
- assert m.error_already_set_what(RuntimeError, b"\x80") == (
- "RuntimeError: b'\\x80'",
- False,
- )
-
-
-class FlakyException(Exception):
- def __init__(self, failure_point):
- if failure_point == "failure_point_init":
- raise ValueError("triggered_failure_point_init")
- self.failure_point = failure_point
-
- def __str__(self):
- if self.failure_point == "failure_point_str":
- raise ValueError("triggered_failure_point_str")
- return "FlakyException.__str__"
-
-
-@pytest.mark.parametrize(
- "exc_type, exc_value, expected_what",
- (
- (ValueError, "plain_str", "ValueError: plain_str"),
- (ValueError, ("tuple_elem",), "ValueError: tuple_elem"),
- (FlakyException, ("happy",), "FlakyException: FlakyException.__str__"),
- ),
-)
-def test_error_already_set_what_with_happy_exceptions(
- exc_type, exc_value, expected_what
-):
- what, py_err_set_after_what = m.error_already_set_what(exc_type, exc_value)
- assert not py_err_set_after_what
- assert what == expected_what
-
-
-@pytest.mark.skipif("env.PYPY", reason="PyErr_NormalizeException Segmentation fault")
-def test_flaky_exception_failure_point_init():
- with pytest.raises(RuntimeError) as excinfo:
- m.error_already_set_what(FlakyException, ("failure_point_init",))
- lines = str(excinfo.value).splitlines()
- # PyErr_NormalizeException replaces the original FlakyException with ValueError:
- assert lines[:3] == [
- "pybind11::error_already_set: MISMATCH of original and normalized active exception types:"
- " ORIGINAL FlakyException REPLACED BY ValueError: triggered_failure_point_init",
- "",
- "At:",
- ]
- # Checking the first two lines of the traceback as formatted in error_string():
- assert "test_exceptions.py(" in lines[3]
- assert lines[3].endswith("): __init__")
- assert lines[4].endswith("): test_flaky_exception_failure_point_init")
-
-
-def test_flaky_exception_failure_point_str():
- what, py_err_set_after_what = m.error_already_set_what(
- FlakyException, ("failure_point_str",)
- )
- assert not py_err_set_after_what
- lines = what.splitlines()
- if env.PYPY and len(lines) == 3:
- n = 3 # Traceback is missing.
- else:
- n = 5
- assert (
- lines[:n]
- == [
- "FlakyException: <MESSAGE UNAVAILABLE DUE TO ANOTHER EXCEPTION>",
- "",
- "MESSAGE UNAVAILABLE DUE TO EXCEPTION: ValueError: triggered_failure_point_str",
- "",
- "At:",
- ][:n]
- )
-
-
-def test_cross_module_interleaved_error_already_set():
- with pytest.raises(RuntimeError) as excinfo:
- m.test_cross_module_interleaved_error_already_set()
- assert str(excinfo.value) in (
- "2nd error.", # Almost all platforms.
- "RuntimeError: 2nd error.", # Some PyPy builds (seen under macOS).
- )
-
-
-def test_error_already_set_double_restore():
- m.test_error_already_set_double_restore(True) # dry_run
- with pytest.raises(RuntimeError) as excinfo:
- m.test_error_already_set_double_restore(False)
- assert str(excinfo.value) == (
- "Internal error: pybind11::detail::error_fetch_and_normalize::restore()"
- " called a second time. ORIGINAL ERROR: ValueError: Random error."
- )
-
-
-def test_pypy_oserror_normalization():
- # https://github.com/pybind/pybind11/issues/4075
- what = m.test_pypy_oserror_normalization()
- assert "this_filename_must_not_exist" in what
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_factory_constructors.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_factory_constructors.cpp
deleted file mode 100644
index a387cd2e761c86d62cd6c042a6f3169b6c73f44a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_factory_constructors.cpp
+++ /dev/null
@@ -1,430 +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 "constructor_stats.h"
-#include "pybind11_tests.h"
-
-#include <cmath>
-#include <new>
-#include <utility>
-
-// 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); }
- explicit TestFactory1(int v) : value(std::to_string(v)) { print_created(this, value); }
- explicit TestFactory1(std::string v) : value(std::move(v)) { print_created(this, value); }
-
-public:
- std::string value;
- TestFactory1(TestFactory1 &&) = delete;
- TestFactory1(const TestFactory1 &) = delete;
- TestFactory1 &operator=(TestFactory1 &&) = delete;
- TestFactory1 &operator=(const TestFactory1 &) = delete;
- ~TestFactory1() { print_destroyed(this); }
-};
-// Non-public construction, but moveable:
-class TestFactory2 {
- friend class TestFactoryHelper;
- TestFactory2() : value("(empty2)") { print_default_created(this); }
- explicit TestFactory2(int v) : value(std::to_string(v)) { print_created(this, value); }
- explicit TestFactory2(std::string v) : value(std::move(v)) { print_created(this, value); }
-
-public:
- TestFactory2(TestFactory2 &&m) noexcept : value{std::move(m.value)} {
- print_move_created(this);
- }
- TestFactory2 &operator=(TestFactory2 &&m) noexcept {
- 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); }
- explicit TestFactory3(int v) : value(std::to_string(v)) { print_created(this, value); }
-
-public:
- explicit TestFactory3(std::string v) : value(std::move(v)) { print_created(this, value); }
- TestFactory3(TestFactory3 &&m) noexcept : value{std::move(m.value)} {
- print_move_created(this);
- }
- TestFactory3 &operator=(TestFactory3 &&m) noexcept {
- 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); }
- explicit 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:
- explicit TestFactory5(int i) : TestFactory3(i) { print_created(this, i); }
- ~TestFactory5() override { print_destroyed(this); }
-};
-
-class TestFactory6 {
-protected:
- int value;
- bool alias = false;
-
-public:
- explicit TestFactory6(int i) : value{i} { print_created(this, i); }
- TestFactory6(TestFactory6 &&f) noexcept {
- print_move_created(this);
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- value = f.value;
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- alias = f.alias;
- }
- TestFactory6(const TestFactory6 &f) {
- print_copy_created(this);
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- value = f.value;
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- alias = f.alias;
- }
- virtual ~TestFactory6() { print_destroyed(this); }
- virtual int get() { return value; }
- bool has_alias() const { 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:
- explicit PyTF6(TestFactory6 &&base) : TestFactory6(std::move(base)) {
- alias = true;
- print_created(this, "move", value);
- }
- explicit PyTF6(int i) : TestFactory6(i) {
- alias = true;
- print_created(this, i);
- }
- PyTF6(PyTF6 &&f) noexcept : TestFactory6(std::move(f)) { print_move_created(this); }
- PyTF6(const PyTF6 &f) : TestFactory6(f) { print_copy_created(this); }
- explicit 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:
- explicit TestFactory7(int i) : value{i} { print_created(this, i); }
- TestFactory7(TestFactory7 &&f) noexcept {
- print_move_created(this);
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- value = f.value;
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- alias = f.alias;
- }
- TestFactory7(const TestFactory7 &f) {
- print_copy_created(this);
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- value = f.value;
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- alias = f.alias;
- }
- virtual ~TestFactory7() { print_destroyed(this); }
- virtual int get() { return value; }
- bool has_alias() const { return alias; }
-};
-class PyTF7 : public TestFactory7 {
-public:
- explicit PyTF7(int i) : TestFactory7(i) {
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- alias = true;
- print_created(this, i);
- }
- PyTF7(PyTF7 &&f) noexcept : 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(std::move(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(std::move(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(std::move(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>> pyTestFactory3(m, "TestFactory3");
- pyTestFactory3
- .def(py::init([](pointer_tag, int v) { return TestFactoryHelper::construct3(v); }))
- .def(py::init([](shared_ptr_tag) { return TestFactoryHelper::construct3(); }));
- ignoreOldStyleInitWarnings([&pyTestFactory3]() {
- pyTestFactory3.def("__init__", [](TestFactory3 &self, std::string v) {
- new (&self) TestFactory3(std::move(v));
- }); // placement-new ctor
- });
- pyTestFactory3
- // 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(std::move(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, const std::string &s) { return TestFactory7((int) s.size()); },
- [](mixed_tag, const 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:
- explicit 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;
- explicit NoisyAlloc(int i) { py::print(py::str("NoisyAlloc(int {})").format(i)); }
- explicit 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"); }
- };
-
- py::class_<NoisyAlloc> pyNoisyAlloc(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:
- ignoreOldStyleInitWarnings([&pyNoisyAlloc]() {
- pyNoisyAlloc.def("__init__", [](NoisyAlloc *a, int i) {
- new (a) NoisyAlloc(i);
- }); // Regular constructor, runs first, requires preallocation
- });
-
- pyNoisyAlloc.def(py::init([](double d) { return new NoisyAlloc(d); }));
-
- // The two-argument version: first the factory pointer overload.
- pyNoisyAlloc.def(py::init([](int i, int) { return new NoisyAlloc(i); }));
- // Return-by-value:
- pyNoisyAlloc.def(py::init([](double d, int) { return NoisyAlloc(d); }));
- // Old-style placement new init; requires preallocation
- ignoreOldStyleInitWarnings([&pyNoisyAlloc]() {
- pyNoisyAlloc.def("__init__",
- [](NoisyAlloc &a, double d, double) { new (&a) NoisyAlloc(d); });
- });
- // Requires deallocation of previous overload preallocated value:
- pyNoisyAlloc.def(py::init([](int i, double) { return new NoisyAlloc(i); }));
- // Regular again: requires yet another preallocation
- ignoreOldStyleInitWarnings([&pyNoisyAlloc]() {
- pyNoisyAlloc.def(
- "__init__", [](NoisyAlloc &a, int i, const 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.10.3/tests/test_factory_constructors.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_factory_constructors.py
deleted file mode 100644
index 120a587c451547059de7def1779401cf9ed2e6d5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_factory_constructors.py
+++ /dev/null
@@ -1,516 +0,0 @@
-import re
-
-import pytest
-
-from pybind11_tests import ConstructorStats
-from pybind11_tests import factory_constructors as m
-from pybind11_tests.factory_constructors import tag
-
-
-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'
- """
- )
-
- 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
- """
- )
-
-
-def test_invalid_self():
- """Tests invocation of the pybind-registered base class with an invalid `self` argument."""
-
- class NotPybindDerived:
- 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 == 0:
- m.TestFactory6.__init__()
- elif 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 or missing `self` argument"
- )
-
- for arg in (0, 1, 2, 3, 4):
- with pytest.raises(TypeError) as excinfo:
- BrokenTF6(arg)
- assert (
- str(excinfo.value)
- == "__init__(self, ...) called with invalid or missing `self` argument"
- )
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_gil_scoped.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_gil_scoped.cpp
deleted file mode 100644
index f136086e842dacf5f913028061cb1b536a71446b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_gil_scoped.cpp
+++ /dev/null
@@ -1,144 +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/functional.h>
-
-#include "pybind11_tests.h"
-
-#include <string>
-#include <thread>
-
-#define CROSS_MODULE(Function) \
- auto cm = py::module_::import("cross_module_gil_utils"); \
- auto target = reinterpret_cast<void (*)()>(PyLong_AsVoidPtr(cm.attr(Function).ptr()));
-
-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) {
- m.attr("defined_THREAD_SANITIZER") =
-#if defined(THREAD_SANITIZER)
- true;
-#else
- false;
-#endif
-
- m.def("intentional_deadlock",
- []() { std::thread([]() { py::gil_scoped_acquire gil_acquired; }).join(); });
-
- 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_released", []() {
- CROSS_MODULE("gil_acquire_funcaddr")
- py::gil_scoped_release gil_release;
- target();
- });
- m.def("test_cross_module_gil_acquired", []() {
- CROSS_MODULE("gil_acquire_funcaddr")
- py::gil_scoped_acquire gil_acquire;
- target();
- });
- m.def("test_cross_module_gil_inner_custom_released", []() {
- CROSS_MODULE("gil_acquire_inner_custom_funcaddr")
- py::gil_scoped_release gil_release;
- target();
- });
- m.def("test_cross_module_gil_inner_custom_acquired", []() {
- CROSS_MODULE("gil_acquire_inner_custom_funcaddr")
- py::gil_scoped_acquire gil_acquire;
- target();
- });
- m.def("test_cross_module_gil_inner_pybind11_released", []() {
- CROSS_MODULE("gil_acquire_inner_pybind11_funcaddr")
- py::gil_scoped_release gil_release;
- target();
- });
- m.def("test_cross_module_gil_inner_pybind11_acquired", []() {
- CROSS_MODULE("gil_acquire_inner_pybind11_funcaddr")
- py::gil_scoped_acquire gil_acquire;
- target();
- });
- m.def("test_cross_module_gil_nested_custom_released", []() {
- CROSS_MODULE("gil_acquire_nested_custom_funcaddr")
- py::gil_scoped_release gil_release;
- target();
- });
- m.def("test_cross_module_gil_nested_custom_acquired", []() {
- CROSS_MODULE("gil_acquire_nested_custom_funcaddr")
- py::gil_scoped_acquire gil_acquire;
- target();
- });
- m.def("test_cross_module_gil_nested_pybind11_released", []() {
- CROSS_MODULE("gil_acquire_nested_pybind11_funcaddr")
- py::gil_scoped_release gil_release;
- target();
- });
- m.def("test_cross_module_gil_nested_pybind11_acquired", []() {
- CROSS_MODULE("gil_acquire_nested_pybind11_funcaddr")
- py::gil_scoped_acquire gil_acquire;
- target();
- });
- m.def("test_release_acquire", [](const py::object &obj) {
- py::gil_scoped_release gil_released;
- py::gil_scoped_acquire gil_acquired;
- return py::str(obj);
- });
- m.def("test_nested_acquire", [](const py::object &obj) {
- py::gil_scoped_release gil_released;
- py::gil_scoped_acquire gil_acquired_outer;
- py::gil_scoped_acquire gil_acquired_inner;
- return py::str(obj);
- });
- m.def("test_multi_acquire_release_cross_module", [](unsigned bits) {
- py::set internals_ids;
- internals_ids.add(PYBIND11_INTERNALS_ID);
- {
- py::gil_scoped_release gil_released;
- auto thread_f = [bits, &internals_ids]() {
- py::gil_scoped_acquire gil_acquired;
- auto cm = py::module_::import("cross_module_gil_utils");
- auto target = reinterpret_cast<std::string (*)(unsigned)>(
- PyLong_AsVoidPtr(cm.attr("gil_multi_acquire_release_funcaddr").ptr()));
- std::string cm_internals_id = target(bits >> 3);
- internals_ids.add(cm_internals_id);
- };
- if ((bits & 0x1u) != 0u) {
- thread_f();
- }
- if ((bits & 0x2u) != 0u) {
- std::thread non_python_thread(thread_f);
- non_python_thread.join();
- }
- if ((bits & 0x4u) != 0u) {
- thread_f();
- }
- }
- return internals_ids;
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_gil_scoped.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_gil_scoped.py
deleted file mode 100644
index 6af6a472d55f1728d0bab6b448c6f800c1a12d2c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_gil_scoped.py
+++ /dev/null
@@ -1,244 +0,0 @@
-import multiprocessing
-import sys
-import threading
-import time
-
-import pytest
-
-import env
-from pybind11_tests import gil_scoped as m
-
-
-class ExtendedVirtClass(m.VirtClass):
- def virtual_func(self):
- pass
-
- def pure_virtual_func(self):
- pass
-
-
-def test_callback_py_obj():
- m.test_callback_py_obj(lambda: None)
-
-
-def test_callback_std_func():
- m.test_callback_std_func(lambda: None)
-
-
-def test_callback_virtual_func():
- extended = ExtendedVirtClass()
- m.test_callback_virtual_func(extended)
-
-
-def test_callback_pure_virtual_func():
- extended = ExtendedVirtClass()
- m.test_callback_pure_virtual_func(extended)
-
-
-def test_cross_module_gil_released():
- """Makes sure that the GIL can be acquired by another module from a GIL-released state."""
- m.test_cross_module_gil_released() # Should not raise a SIGSEGV
-
-
-def test_cross_module_gil_acquired():
- """Makes sure that the GIL can be acquired by another module from a GIL-acquired state."""
- m.test_cross_module_gil_acquired() # Should not raise a SIGSEGV
-
-
-def test_cross_module_gil_inner_custom_released():
- """Makes sure that the GIL can be acquired/released by another module
- from a GIL-released state using custom locking logic."""
- m.test_cross_module_gil_inner_custom_released()
-
-
-def test_cross_module_gil_inner_custom_acquired():
- """Makes sure that the GIL can be acquired/acquired by another module
- from a GIL-acquired state using custom locking logic."""
- m.test_cross_module_gil_inner_custom_acquired()
-
-
-def test_cross_module_gil_inner_pybind11_released():
- """Makes sure that the GIL can be acquired/released by another module
- from a GIL-released state using pybind11 locking logic."""
- m.test_cross_module_gil_inner_pybind11_released()
-
-
-def test_cross_module_gil_inner_pybind11_acquired():
- """Makes sure that the GIL can be acquired/acquired by another module
- from a GIL-acquired state using pybind11 locking logic."""
- m.test_cross_module_gil_inner_pybind11_acquired()
-
-
-def test_cross_module_gil_nested_custom_released():
- """Makes sure that the GIL can be nested acquired/released by another module
- from a GIL-released state using custom locking logic."""
- m.test_cross_module_gil_nested_custom_released()
-
-
-def test_cross_module_gil_nested_custom_acquired():
- """Makes sure that the GIL can be nested acquired/acquired by another module
- from a GIL-acquired state using custom locking logic."""
- m.test_cross_module_gil_nested_custom_acquired()
-
-
-def test_cross_module_gil_nested_pybind11_released():
- """Makes sure that the GIL can be nested acquired/released by another module
- from a GIL-released state using pybind11 locking logic."""
- m.test_cross_module_gil_nested_pybind11_released()
-
-
-def test_cross_module_gil_nested_pybind11_acquired():
- """Makes sure that the GIL can be nested acquired/acquired by another module
- from a GIL-acquired state using pybind11 locking logic."""
- m.test_cross_module_gil_nested_pybind11_acquired()
-
-
-def test_release_acquire():
- assert m.test_release_acquire(0xAB) == "171"
-
-
-def test_nested_acquire():
- assert m.test_nested_acquire(0xAB) == "171"
-
-
-def test_multi_acquire_release_cross_module():
- for bits in range(16 * 8):
- internals_ids = m.test_multi_acquire_release_cross_module(bits)
- assert len(internals_ids) == 2 if bits % 8 else 1
-
-
-# Intentionally putting human review in the loop here, to guard against accidents.
-VARS_BEFORE_ALL_BASIC_TESTS = dict(vars()) # Make a copy of the dict (critical).
-ALL_BASIC_TESTS = (
- test_callback_py_obj,
- test_callback_std_func,
- test_callback_virtual_func,
- test_callback_pure_virtual_func,
- test_cross_module_gil_released,
- test_cross_module_gil_acquired,
- test_cross_module_gil_inner_custom_released,
- test_cross_module_gil_inner_custom_acquired,
- test_cross_module_gil_inner_pybind11_released,
- test_cross_module_gil_inner_pybind11_acquired,
- test_cross_module_gil_nested_custom_released,
- test_cross_module_gil_nested_custom_acquired,
- test_cross_module_gil_nested_pybind11_released,
- test_cross_module_gil_nested_pybind11_acquired,
- test_release_acquire,
- test_nested_acquire,
- test_multi_acquire_release_cross_module,
-)
-
-
-def test_all_basic_tests_completeness():
- num_found = 0
- for key, value in VARS_BEFORE_ALL_BASIC_TESTS.items():
- if not key.startswith("test_"):
- continue
- assert value in ALL_BASIC_TESTS
- num_found += 1
- assert len(ALL_BASIC_TESTS) == num_found
-
-
-def _intentional_deadlock():
- m.intentional_deadlock()
-
-
-ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK = ALL_BASIC_TESTS + (_intentional_deadlock,)
-
-
-def _run_in_process(target, *args, **kwargs):
- if len(args) == 0:
- test_fn = target
- else:
- test_fn = args[0]
- # Do not need to wait much, 10s should be more than enough.
- timeout = 0.1 if test_fn is _intentional_deadlock else 10
- process = multiprocessing.Process(target=target, args=args, kwargs=kwargs)
- process.daemon = True
- try:
- t_start = time.time()
- process.start()
- if timeout >= 100: # For debugging.
- print(
- "\nprocess.pid STARTED", process.pid, (sys.argv, target, args, kwargs)
- )
- print(f"COPY-PASTE-THIS: gdb {sys.argv[0]} -p {process.pid}", flush=True)
- process.join(timeout=timeout)
- if timeout >= 100:
- print("\nprocess.pid JOINED", process.pid, flush=True)
- t_delta = time.time() - t_start
- if process.exitcode == 66 and m.defined_THREAD_SANITIZER: # Issue #2754
- # WOULD-BE-NICE-TO-HAVE: Check that the message below is actually in the output.
- # Maybe this could work:
- # https://gist.github.com/alexeygrigorev/01ce847f2e721b513b42ea4a6c96905e
- pytest.skip(
- "ThreadSanitizer: starting new threads after multi-threaded fork is not supported."
- )
- elif test_fn is _intentional_deadlock:
- assert process.exitcode is None
- return 0
- elif process.exitcode is None:
- assert t_delta > 0.9 * timeout
- msg = "DEADLOCK, most likely, exactly what this test is meant to detect."
- if env.PYPY and env.WIN:
- pytest.skip(msg)
- raise RuntimeError(msg)
- return process.exitcode
- finally:
- if process.is_alive():
- process.terminate()
-
-
-def _run_in_threads(test_fn, num_threads, parallel):
- threads = []
- for _ in range(num_threads):
- thread = threading.Thread(target=test_fn)
- 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
-@pytest.mark.parametrize("test_fn", ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK)
-def test_run_in_process_one_thread(test_fn):
- """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(_run_in_threads, test_fn, num_threads=1, parallel=False) == 0
-
-
-# TODO: FIXME on macOS Python 3.9
-@pytest.mark.parametrize("test_fn", ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK)
-def test_run_in_process_multiple_threads_parallel(test_fn):
- """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(_run_in_threads, test_fn, num_threads=8, parallel=True) == 0
-
-
-# TODO: FIXME on macOS Python 3.9
-@pytest.mark.parametrize("test_fn", ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK)
-def test_run_in_process_multiple_threads_sequential(test_fn):
- """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(_run_in_threads, test_fn, num_threads=8, parallel=False) == 0
-
-
-# TODO: FIXME on macOS Python 3.9
-@pytest.mark.parametrize("test_fn", ALL_BASIC_TESTS_PLUS_INTENTIONAL_DEADLOCK)
-def test_run_in_process_direct(test_fn):
- """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(test_fn) == 0
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_iostream.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_iostream.cpp
deleted file mode 100644
index 421eaa2dd896af80be1834281fe1a5fd668e10c9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_iostream.cpp
+++ /dev/null
@@ -1,126 +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 <atomic>
-#include <iostream>
-#include <mutex>
-#include <string>
-#include <thread>
-
-void noisy_function(const std::string &msg, bool flush) {
-
- std::cout << msg;
- if (flush) {
- std::cout << std::flush;
- }
-}
-
-void noisy_funct_dual(const std::string &msg, const std::string &emsg) {
- std::cout << msg;
- std::cerr << emsg;
-}
-
-// object to manage C++ thread
-// simply repeatedly write to std::cerr until stopped
-// redirect is called at some point to test the safety of scoped_estream_redirect
-struct TestThread {
- TestThread() : stop_{false} {
- auto thread_f = [this] {
- static std::mutex cout_mutex;
- while (!stop_) {
- {
- // #HelpAppreciated: Work on iostream.h thread safety.
- // Without this lock, the clang ThreadSanitizer (tsan) reliably reports a
- // data race, and this test is predictably flakey on Windows.
- // For more background see the discussion under
- // https://github.com/pybind/pybind11/pull/2982 and
- // https://github.com/pybind/pybind11/pull/2995.
- const std::lock_guard<std::mutex> lock(cout_mutex);
- std::cout << "x" << std::flush;
- }
- std::this_thread::sleep_for(std::chrono::microseconds(50));
- }
- };
- t_ = new std::thread(std::move(thread_f));
- }
-
- ~TestThread() { delete t_; }
-
- void stop() { stop_ = true; }
-
- void join() const {
- py::gil_scoped_release gil_lock;
- t_->join();
- }
-
- void sleep() {
- py::gil_scoped_release gil_lock;
- std::this_thread::sleep_for(std::chrono::milliseconds(50));
- }
-
- std::thread *t_{nullptr};
- std::atomic<bool> stop_;
-};
-
-TEST_SUBMODULE(iostream, m) {
-
- add_ostream_redirect(m);
-
- // test_evals
-
- m.def("captured_output_default", [](const std::string &msg) {
- py::scoped_ostream_redirect redir;
- std::cout << msg << std::flush;
- });
-
- m.def("captured_output", [](const 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", [](const 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", [](const std::string &msg) { std::cout << msg << std::flush; });
-
- m.def("raw_err", [](const std::string &msg) { std::cerr << msg << std::flush; });
-
- m.def("captured_dual", [](const std::string &msg, const 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;
- });
-
- py::class_<TestThread>(m, "TestThread")
- .def(py::init<>())
- .def("stop", &TestThread::stop)
- .def("join", &TestThread::join)
- .def("sleep", &TestThread::sleep);
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_iostream.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_iostream.py
deleted file mode 100644
index 5bbdf6955dd60cb8b76d2b394e2a684bd64083cf..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_iostream.py
+++ /dev/null
@@ -1,295 +0,0 @@
-from contextlib import redirect_stderr, redirect_stdout
-from io import StringIO
-
-from pybind11_tests import iostream as m
-
-
-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_captured_utf8_2byte_offset0(capsys):
- msg = "\u07FF"
- msg = "" + msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_captured_utf8_2byte_offset1(capsys):
- msg = "\u07FF"
- msg = "1" + msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_captured_utf8_3byte_offset0(capsys):
- msg = "\uFFFF"
- msg = "" + msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_captured_utf8_3byte_offset1(capsys):
- msg = "\uFFFF"
- msg = "1" + msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_captured_utf8_3byte_offset2(capsys):
- msg = "\uFFFF"
- msg = "12" + msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_captured_utf8_4byte_offset0(capsys):
- msg = "\U0010FFFF"
- msg = "" + msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_captured_utf8_4byte_offset1(capsys):
- msg = "\U0010FFFF"
- msg = "1" + msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_captured_utf8_4byte_offset2(capsys):
- msg = "\U0010FFFF"
- msg = "12" + msg * (1024 // len(msg) + 1)
-
- m.captured_output_default(msg)
- stdout, stderr = capsys.readouterr()
- assert stdout == msg
- assert stderr == ""
-
-
-def test_captured_utf8_4byte_offset3(capsys):
- msg = "\U0010FFFF"
- msg = "123" + 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
-
-
-def test_threading():
- with m.ostream_redirect(stdout=True, stderr=False):
- # start some threads
- threads = []
-
- # start some threads
- for _j in range(20):
- threads.append(m.TestThread())
-
- # give the threads some time to fail
- threads[0].sleep()
-
- # stop all the threads
- for t in threads:
- t.stop()
-
- for t in threads:
- t.join()
-
- # if a thread segfaults, we don't get here
- assert True
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_kwargs_and_defaults.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_kwargs_and_defaults.cpp
deleted file mode 100644
index 77e72c0c70bb2e125d0c7bf350ecc9e1ca92c589..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_kwargs_and_defaults.cpp
+++ /dev/null
@@ -1,281 +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/stl.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.h"
-
-#include <utility>
-
-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 {
- PYBIND11_WARNING_PUSH
-
-#ifdef PYBIND11_DETECTED_CLANG_WITH_MISLEADING_CALL_STD_MOVE_EXPLICITLY_WARNING
- PYBIND11_WARNING_DISABLE_CLANG("-Wreturn-std-move")
-#endif
- return args;
- PYBIND11_WARNING_POP
- });
- m.def("args_kwargs_function", [](const py::args &args, const py::kwargs &kwargs) {
- return py::make_tuple(args, kwargs);
- });
-
- // test_mixed_args_and_kwargs
- m.def("mixed_plus_args",
- [](int i, double j, const py::args &args) { return py::make_tuple(i, j, args); });
- m.def("mixed_plus_kwargs",
- [](int i, double j, const py::kwargs &kwargs) { return py::make_tuple(i, j, kwargs); });
- auto mixed_plus_both = [](int i, double j, const py::args &args, const 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);
-
- m.def(
- "args_kwonly",
- [](int i, double j, const py::args &args, int z) { return py::make_tuple(i, j, args, z); },
- "i"_a,
- "j"_a,
- "z"_a);
- m.def(
- "args_kwonly_kwargs",
- [](int i, double j, const py::args &args, int z, const py::kwargs &kwargs) {
- return py::make_tuple(i, j, args, z, kwargs);
- },
- "i"_a,
- "j"_a,
- py::kw_only{},
- "z"_a);
- m.def(
- "args_kwonly_kwargs_defaults",
- [](int i, double j, const py::args &args, int z, const py::kwargs &kwargs) {
- return py::make_tuple(i, j, args, z, kwargs);
- },
- "i"_a = 1,
- "j"_a = 3.14159,
- "z"_a = 42);
- m.def(
- "args_kwonly_full_monty",
- [](int h, int i, double j, const py::args &args, int z, const py::kwargs &kwargs) {
- return py::make_tuple(h, i, j, args, z, kwargs);
- },
- py::arg() = 1,
- py::arg() = 2,
- py::pos_only{},
- "j"_a = 3.14159,
- "z"_a = 42);
-
-// 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", [](const 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", [](const 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, const 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:
-#ifdef PYBIND11_NEVER_DEFINED_EVER
- // 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);
-#endif
-
- // 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(std::move(a)); },
- "a"_a = py::module_::import("decimal").attr("Decimal"));
-
- // Initial implementation of kw_only was broken when used on a method/constructor before any
- // other arguments
- // https://github.com/pybind/pybind11/pull/3402#issuecomment-963341987
-
- struct first_arg_kw_only {};
- py::class_<first_arg_kw_only>(m, "first_arg_kw_only")
- .def(py::init([](int) { return first_arg_kw_only(); }),
- py::kw_only(), // This being before any args was broken
- py::arg("i") = 0)
- .def(
- "method",
- [](first_arg_kw_only &, int, int) {},
- py::kw_only(), // and likewise here
- py::arg("i") = 1,
- py::arg("j") = 2)
- // Closely related: pos_only marker didn't show up properly when it was before any other
- // arguments (although that is fairly useless in practice).
- .def(
- "pos_only",
- [](first_arg_kw_only &, int, int) {},
- py::pos_only{},
- py::arg("i"),
- py::arg("j"));
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_kwargs_and_defaults.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_kwargs_and_defaults.py
deleted file mode 100644
index ab7017886eb575555499ba014bdeb7f203f4c9d8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_kwargs_and_defaults.py
+++ /dev/null
@@ -1,390 +0,0 @@
-import pytest
-
-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
- """
- )
- 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:
- """
- )
-
- 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
- """
- )
- 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
- """
- )
-
- # Arguments after a py::args are automatically keyword-only (pybind 2.9+)
- assert m.args_kwonly(2, 2.5, z=22) == (2, 2.5, (), 22)
- assert m.args_kwonly(2, 2.5, "a", "b", "c", z=22) == (2, 2.5, ("a", "b", "c"), 22)
- assert m.args_kwonly(z=22, i=4, j=16) == (4, 16, (), 22)
-
- with pytest.raises(TypeError) as excinfo:
- assert m.args_kwonly(2, 2.5, 22) # missing z= keyword
- assert (
- msg(excinfo.value)
- == """
- args_kwonly(): incompatible function arguments. The following argument types are supported:
- 1. (i: int, j: float, *args, z: int) -> tuple
-
- Invoked with: 2, 2.5, 22
- """
- )
-
- assert m.args_kwonly_kwargs(i=1, k=4, j=10, z=-1, y=9) == (
- 1,
- 10,
- (),
- -1,
- {"k": 4, "y": 9},
- )
- assert m.args_kwonly_kwargs(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, z=11, y=12) == (
- 1,
- 2,
- (3, 4, 5, 6, 7, 8, 9, 10),
- 11,
- {"y": 12},
- )
- assert (
- m.args_kwonly_kwargs.__doc__
- == "args_kwonly_kwargs(i: int, j: float, *args, z: int, **kwargs) -> tuple\n"
- )
-
- assert (
- m.args_kwonly_kwargs_defaults.__doc__
- == "args_kwonly_kwargs_defaults(i: int = 1, j: float = 3.14159, *args, z: int = 42, **kwargs) -> tuple\n" # noqa: E501 line too long
- )
- assert m.args_kwonly_kwargs_defaults() == (1, 3.14159, (), 42, {})
- assert m.args_kwonly_kwargs_defaults(2) == (2, 3.14159, (), 42, {})
- assert m.args_kwonly_kwargs_defaults(z=-99) == (1, 3.14159, (), -99, {})
- assert m.args_kwonly_kwargs_defaults(5, 6, 7, 8) == (5, 6, (7, 8), 42, {})
- assert m.args_kwonly_kwargs_defaults(5, 6, 7, m=8) == (5, 6, (7,), 42, {"m": 8})
- assert m.args_kwonly_kwargs_defaults(5, 6, 7, m=8, z=9) == (5, 6, (7,), 9, {"m": 8})
-
-
-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 a kw_only() annotation or args() argument
- """
- )
-
- # https://github.com/pybind/pybind11/pull/3402#issuecomment-963341987
- x = m.first_arg_kw_only(i=1)
- x.method()
- x.method(i=1, j=2)
- assert (
- m.first_arg_kw_only.__init__.__doc__
- == "__init__(self: pybind11_tests.kwargs_and_defaults.first_arg_kw_only, *, i: int = 0) -> None\n" # noqa: E501 line too long
- )
- assert (
- m.first_arg_kw_only.method.__doc__
- == "method(self: pybind11_tests.kwargs_and_defaults.first_arg_kw_only, *, i: int = 1, j: int = 2) -> None\n" # noqa: E501 line too long
- )
-
-
-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)
-
- # Mix it with args and kwargs:
- assert (
- m.args_kwonly_full_monty.__doc__
- == "args_kwonly_full_monty(arg0: int = 1, arg1: int = 2, /, j: float = 3.14159, *args, z: int = 42, **kwargs) -> tuple\n" # noqa: E501 line too long
- )
- assert m.args_kwonly_full_monty() == (1, 2, 3.14159, (), 42, {})
- assert m.args_kwonly_full_monty(8) == (8, 2, 3.14159, (), 42, {})
- assert m.args_kwonly_full_monty(8, 9) == (8, 9, 3.14159, (), 42, {})
- assert m.args_kwonly_full_monty(8, 9, 10) == (8, 9, 10.0, (), 42, {})
- assert m.args_kwonly_full_monty(3, 4, 5, 6, 7, m=8, z=9) == (
- 3,
- 4,
- 5.0,
- (
- 6,
- 7,
- ),
- 9,
- {"m": 8},
- )
- assert m.args_kwonly_full_monty(3, 4, 5, 6, 7, m=8, z=9) == (
- 3,
- 4,
- 5.0,
- (
- 6,
- 7,
- ),
- 9,
- {"m": 8},
- )
- assert m.args_kwonly_full_monty(5, j=7, m=8, z=9) == (5, 2, 7.0, (), 9, {"m": 8})
- assert m.args_kwonly_full_monty(i=5, j=7, m=8, z=9) == (
- 1,
- 2,
- 7.0,
- (),
- 9,
- {"i": 5, "m": 8},
- )
-
- # pos_only at the beginning of the argument list was "broken" in how it was displayed (though
- # this is fairly useless in practice). Related to:
- # https://github.com/pybind/pybind11/pull/3402#issuecomment-963341987
- assert (
- m.first_arg_kw_only.pos_only.__doc__
- == "pos_only(self: pybind11_tests.kwargs_and_defaults.first_arg_kw_only, /, i: int, j: int) -> None\n" # noqa: E501 line too long
- )
-
-
-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__
- )
-
-
-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.10.3/tests/test_local_bindings.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_local_bindings.cpp
deleted file mode 100644
index 13736774479902093fae1b04a7ee0a21758273b7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_local_bindings.cpp
+++ /dev/null
@@ -1,106 +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/stl.h>
-#include <pybind11/stl_bind.h>
-
-#include "local_bindings.h"
-#include "pybind11_tests.h"
-
-#include <numeric>
-#include <utility>
-
-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::get_local_internals().registered_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:
- explicit Cat(std::string name) : Pet(std::move(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.10.3/tests/test_local_bindings.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_local_bindings.py
deleted file mode 100644
index 654d96d49051c7e38f587371e9555dc064b5e3fb..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_local_bindings.py
+++ /dev/null
@@ -1,256 +0,0 @@
-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)
- 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]
- """
- )
-
-
-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.10.3/tests/test_methods_and_attributes.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_methods_and_attributes.cpp
deleted file mode 100644
index 815dd5e98a5651e283b0262156834301415a235b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_methods_and_attributes.cpp
+++ /dev/null
@@ -1,459 +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 "constructor_stats.h"
-#include "pybind11_tests.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); }
- explicit ExampleMandA(int value) : value(value) { print_created(this, value); }
- ExampleMandA(const ExampleMandA &e) : value(e.value) { print_copy_created(this); }
- explicit ExampleMandA(std::string &&) {}
- ExampleMandA(ExampleMandA &&e) noexcept : value(e.value) { print_move_created(this); }
- ~ExampleMandA() { print_destroyed(this); }
-
- std::string toString() const { return "ExampleMandA[value=" + std::to_string(value) + "]"; }
-
- void operator=(const ExampleMandA &e) {
- print_copy_assigned(this);
- value = e.value;
- }
- void operator=(ExampleMandA &&e) noexcept {
- print_move_assigned(this);
- value = e.value;
- }
-
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- 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
- // NOLINTNEXTLINE(readability-non-const-parameter) Deliberately non-const for testing
- 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() const { return *this; } // return by const reference
- ExampleMandA *self4() { return this; } // return by pointer
- const ExampleMandA *self5() const { return this; } // return by const pointer
-
- int internal1() const { return value; } // return by value
- int &internal2() { return value; } // return by reference
- const int &internal3() const { 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(const std::shared_ptr<NoneTester> &obj) { return obj ? obj->answer : -1; }
-
-// Issue #2778: implicit casting from None to object (not pointer)
-class NoneCastTester {
-public:
- int answer = -1;
- NoneCastTester() = default;
- explicit NoneCastTester(int v) : answer(v) {}
-};
-
-struct StrIssue {
- int val = -1;
-
- StrIssue() = default;
- explicit 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 rvalue ref param
-struct RValueRefParam {
- std::size_t func1(std::string &&s) { return s.size(); }
- std::size_t func2(std::string &&s) const { return s.size(); }
- std::size_t func3(std::string &&s) & { return s.size(); }
- std::size_t func4(std::string &&s) const & { return s.size(); }
-};
-
-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,
- [](const py::object &, int v) { TestProperties::static_value = v; })
- .def_property_readonly_static(
- "def_property_readonly_static",
- [](const py::object &) { return TestProperties::static_get(); })
- .def_property_static(
- "def_property_writeonly_static",
- nullptr,
- [](const py::object &, int v) { return TestProperties::static_set(v); })
- .def_property_static(
- "def_property_static",
- [](const py::object &) { return TestProperties::static_get(); },
- [](const py::object &, int v) { TestProperties::static_set(v); })
- .def_property_static(
- "static_cls",
- [](py::object cls) { return cls; },
- [](const py::object &cls, const 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 = [](const py::object &) -> const UserType & { return TestPropRVP::sv1; };
- auto static_get2 = [](const py::object &) -> const UserType & { return TestPropRVP::sv2; };
- auto static_set1 = [](const py::object &, int v) { TestPropRVP::sv1.set(v); };
- auto static_set2 = [](const 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",
- [](const 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", [](const py::object &) { return 1; });
-
- // test_overload_ordering
- m.def("overload_order", [](const std::string &) { return 1; });
- m.def("overload_order", [](const 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(PYBIND11_DETAILED_ERROR_MESSAGES)
- m.attr("detailed_error_messages_enabled") = true;
-#else
- m.attr("detailed_error_messages_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());
- });
-
- // [workaround(intel)] ICC 20/21 breaks with py::arg().stuff, using py::arg{}.stuff works.
-
- // 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, "a"_a.none(false));
- m.def("no_none_kwarg_kw_only", &none2, py::kw_only(), "a"_a.none(false));
-
- // test_casts_none
- // Issue #2778: implicit casting from None to object (not pointer)
- py::class_<NoneCastTester>(m, "NoneCastTester")
- .def(py::init<>())
- .def(py::init<int>())
- .def(py::init([](py::none const &) { return NoneCastTester{}; }));
- py::implicitly_convertible<py::none, NoneCastTester>();
- m.def("ok_obj_or_none", [](NoneCastTester const &foo) { return foo.answer; });
-
- // 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)
- // Uncommenting the next line should trigger a static_assert:
- // .def_readwrite("fails", &UserType::value)
- // Uncommenting the next line should trigger a static_assert:
- // .def_readonly("fails", &UserType::value)
- .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);
-
- py::class_<RValueRefParam>(m, "RValueRefParam")
- .def(py::init<>())
- .def("func1", &RValueRefParam::func1)
- .def("func2", &RValueRefParam::func2)
- .def("func3", &RValueRefParam::func3)
- .def("func4", &RValueRefParam::func4);
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_methods_and_attributes.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_methods_and_attributes.py
deleted file mode 100644
index 0a2ae1239aeb19e6f281deb4dccdf5cfb66f441f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_methods_and_attributes.py
+++ /dev/null
@@ -1,527 +0,0 @@
-import sys
-
-import pytest
-
-import env # noqa: F401
-from pybind11_tests import ConstructorStats
-from pybind11_tests import methods_and_attributes as m
-
-NO_GETTER_MSG = (
- "unreadable attribute" if sys.version_info < (3, 11) else "object has no getter"
-)
-NO_SETTER_MSG = (
- "can't set attribute" if sys.version_info < (3, 11) else "object has no setter"
-)
-NO_DELETER_MSG = (
- "can't delete attribute" if sys.version_info < (3, 11) else "object has no deleter"
-)
-
-
-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 # unused var
- assert NO_GETTER_MSG 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 NO_GETTER_MSG in str(excinfo.value)
-
- with pytest.raises(AttributeError) as excinfo:
- instance.def_property_impossible = 5
- assert NO_SETTER_MSG 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 NO_SETTER_MSG 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 # unused var
- assert NO_GETTER_MSG 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 NO_SETTER_MSG 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 NO_GETTER_MSG 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 NO_GETTER_MSG 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
-
- # Only static attributes can be deleted
- del m.TestPropertiesOverride.def_readonly_static
- assert (
- hasattr(m.TestPropertiesOverride, "def_readonly_static")
- and m.TestPropertiesOverride.def_readonly_static
- is m.TestProperties.def_readonly_static
- )
- assert "def_readonly_static" not in m.TestPropertiesOverride.__dict__
- properties_override = m.TestPropertiesOverride()
- with pytest.raises(AttributeError) as excinfo:
- del properties_override.def_readonly
- assert NO_DELETER_MSG in str(excinfo.value)
-
-
-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 detailed_error_messages_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; " + (
- "#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for more details"
- if not detailed_error_messages_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; " + (
- "#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for more details"
- if not detailed_error_messages_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 detailed_error_messages_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 detailed_error_messages_enabled
- else "arg(): could not convert default argument into a Python object (type not registered "
- "yet?). #define PYBIND11_DETAILED_ERROR_MESSAGES or 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 detailed_error_messages_enabled
- else "arg(): could not convert default argument into a Python object (type not registered "
- "yet?). #define PYBIND11_DETAILED_ERROR_MESSAGES or 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_casts_none():
- """#2778: implicit casting from None to object (not pointer)"""
- a = m.NoneCastTester()
- assert m.ok_obj_or_none(a) == -1
- a = m.NoneCastTester(4)
- assert m.ok_obj_or_none(a) == 4
- a = m.NoneCastTester(None)
- assert m.ok_obj_or_none(a) == -1
- assert m.ok_obj_or_none(None) == -1
-
-
-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
-
- assert "1. overload_order(arg0: int) -> int" in m.overload_order.__doc__
- assert "2. overload_order(arg0: str) -> int" in m.overload_order.__doc__
- assert "3. overload_order(arg0: str) -> int" 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: str) -> int" in str(err.value)
- assert "3. (arg0: str) -> int" in str(err.value)
- assert "4. (arg0: int) -> int" in str(err.value)
-
-
-def test_rvalue_ref_param():
- r = m.RValueRefParam()
- assert r.func1("123") == 3
- assert r.func2("1234") == 4
- assert r.func3("12345") == 5
- assert r.func4("123456") == 6
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_modules.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_modules.cpp
deleted file mode 100644
index 18a7ec74cce02503b6dab608e48017a4fa81e17a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_modules.cpp
+++ /dev/null
@@ -1,125 +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 "constructor_stats.h"
-#include "pybind11_tests.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:
- explicit 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() const { 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;
- });
-
- m.def("def_submodule", [](py::module_ m, const char *name) { return m.def_submodule(name); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_modules.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_modules.py
deleted file mode 100644
index e11d68e78e904006646faba0379fa7b81942e120..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_modules.py
+++ /dev/null
@@ -1,121 +0,0 @@
-import pytest
-
-import env
-from pybind11_tests import ConstructorStats
-from pybind11_tests import modules as m
-from pybind11_tests.modules import subsubmodule as ms
-
-
-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 collections import OrderedDict
-
- from pybind11_tests.modules import OD
-
- 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 pydoc
-
- import pybind11_tests
-
- 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() == []
-
-
-def test_builtin_key_type():
- """Test that all the keys in the builtin modules have type str.
-
- Previous versions of pybind11 would add a unicode key in python 2.
- """
- if hasattr(__builtins__, "keys"):
- keys = __builtins__.keys()
- else: # this is to make pypy happy since builtins is different there.
- keys = __builtins__.__dict__.keys()
-
- assert {type(k) for k in keys} == {str}
-
-
-@pytest.mark.xfail("env.PYPY", reason="PyModule_GetName()")
-def test_def_submodule_failures():
- sm = m.def_submodule(m, b"ScratchSubModuleName") # Using bytes to show it works.
- assert sm.__name__ == m.__name__ + "." + "ScratchSubModuleName"
- malformed_utf8 = b"\x80"
- if env.PYPY:
- # It is not worth the effort finding a trigger for a failure when running with PyPy.
- pytest.skip("Sufficiently exercised on platforms other than PyPy.")
- else:
- # Meant to trigger PyModule_GetName() failure:
- sm_name_orig = sm.__name__
- sm.__name__ = malformed_utf8
- try:
- with pytest.raises(Exception):
- # Seen with Python 3.9: SystemError: nameless module
- # But we do not want to exercise the internals of PyModule_GetName(), which could
- # change in future versions of Python, but a bad __name__ is very likely to cause
- # some kind of failure indefinitely.
- m.def_submodule(sm, b"SubSubModuleName")
- finally:
- # Clean up to ensure nothing gets upset by a module with an invalid __name__.
- sm.__name__ = sm_name_orig # Purely precautionary.
- # Meant to trigger PyImport_AddModule() failure:
- with pytest.raises(UnicodeDecodeError):
- m.def_submodule(sm, malformed_utf8)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_multiple_inheritance.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_multiple_inheritance.cpp
deleted file mode 100644
index 5916ae901065c47f12b04ad51d3b1a58f5366041..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_multiple_inheritance.cpp
+++ /dev/null
@@ -1,341 +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 "constructor_stats.h"
-#include "pybind11_tests.h"
-
-namespace {
-
-// 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 {
- explicit 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_multiple_inheritance_virtbase
-struct Base1a {
- explicit Base1a(int i) : i(i) {}
- int foo() const { return i; }
- int i;
-};
-struct Base2a {
- explicit Base2a(int i) : i(i) {}
- int bar() const { return i; }
- int i;
-};
-struct Base12a : Base1a, Base2a {
- Base12a(int i, int j) : Base1a(i), Base2a(j) {}
-};
-
-// test_mi_unaligned_base
-// test_mi_base_return
-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
-
-} // namespace
-
-TEST_SUBMODULE(multiple_inheritance, m) {
- // Please do not interleave `struct` and `class` definitions with bindings code,
- // but implement `struct`s and `class`es in the anonymous namespace above.
- // This helps keeping the smart_holder branch in sync with master.
-
- // test_multiple_inheritance_mix1
- // test_multiple_inheritance_mix2
- struct Base1 {
- explicit Base1(int i) : i(i) {}
- int foo() const { return i; }
- int i;
- };
- py::class_<Base1> b1(m, "Base1");
- b1.def(py::init<int>()).def("foo", &Base1::foo);
-
- struct Base2 {
- explicit Base2(int i) : i(i) {}
- int bar() const { 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.
- py::class_<Base1a, std::shared_ptr<Base1a>>(m, "Base1a")
- .def(py::init<int>())
- .def("foo", &Base1a::foo);
-
- py::class_<Base2a, std::shared_ptr<Base2a>>(m, "Base2a")
- .def(py::init<int>())
- .def("bar", &Base2a::bar);
-
- 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", [](const 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
- // 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<>());
-
- // test_pr3635_diamond_*
- // - functions are get_{base}_{var}, return {var}
- struct MVB {
- MVB() = default;
- MVB(const MVB &) = default;
- virtual ~MVB() = default;
-
- int b = 1;
- int get_b_b() const { return b; }
- };
- struct MVC : virtual MVB {
- int c = 2;
- int get_c_b() const { return b; }
- int get_c_c() const { return c; }
- };
- struct MVD0 : virtual MVC {
- int d0 = 3;
- int get_d0_b() const { return b; }
- int get_d0_c() const { return c; }
- int get_d0_d0() const { return d0; }
- };
- struct MVD1 : virtual MVC {
- int d1 = 4;
- int get_d1_b() const { return b; }
- int get_d1_c() const { return c; }
- int get_d1_d1() const { return d1; }
- };
- struct MVE : virtual MVD0, virtual MVD1 {
- int e = 5;
- int get_e_b() const { return b; }
- int get_e_c() const { return c; }
- int get_e_d0() const { return d0; }
- int get_e_d1() const { return d1; }
- int get_e_e() const { return e; }
- };
- struct MVF : virtual MVE {
- int f = 6;
- int get_f_b() const { return b; }
- int get_f_c() const { return c; }
- int get_f_d0() const { return d0; }
- int get_f_d1() const { return d1; }
- int get_f_e() const { return e; }
- int get_f_f() const { return f; }
- };
- py::class_<MVB>(m, "MVB")
- .def(py::init<>())
- .def("get_b_b", &MVB::get_b_b)
- .def_readwrite("b", &MVB::b);
- py::class_<MVC, MVB>(m, "MVC")
- .def(py::init<>())
- .def("get_c_b", &MVC::get_c_b)
- .def("get_c_c", &MVC::get_c_c)
- .def_readwrite("c", &MVC::c);
- py::class_<MVD0, MVC>(m, "MVD0")
- .def(py::init<>())
- .def("get_d0_b", &MVD0::get_d0_b)
- .def("get_d0_c", &MVD0::get_d0_c)
- .def("get_d0_d0", &MVD0::get_d0_d0)
- .def_readwrite("d0", &MVD0::d0);
- py::class_<MVD1, MVC>(m, "MVD1")
- .def(py::init<>())
- .def("get_d1_b", &MVD1::get_d1_b)
- .def("get_d1_c", &MVD1::get_d1_c)
- .def("get_d1_d1", &MVD1::get_d1_d1)
- .def_readwrite("d1", &MVD1::d1);
- py::class_<MVE, MVD0, MVD1>(m, "MVE")
- .def(py::init<>())
- .def("get_e_b", &MVE::get_e_b)
- .def("get_e_c", &MVE::get_e_c)
- .def("get_e_d0", &MVE::get_e_d0)
- .def("get_e_d1", &MVE::get_e_d1)
- .def("get_e_e", &MVE::get_e_e)
- .def_readwrite("e", &MVE::e);
- py::class_<MVF, MVE>(m, "MVF")
- .def(py::init<>())
- .def("get_f_b", &MVF::get_f_b)
- .def("get_f_c", &MVF::get_f_c)
- .def("get_f_d0", &MVF::get_f_d0)
- .def("get_f_d1", &MVF::get_f_d1)
- .def("get_f_e", &MVF::get_f_e)
- .def("get_f_f", &MVF::get_f_f)
- .def_readwrite("f", &MVF::f);
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_multiple_inheritance.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_multiple_inheritance.py
deleted file mode 100644
index 3a1d88d7119e8cbacc92d329f220b0a2e0f0f287..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_multiple_inheritance.py
+++ /dev/null
@@ -1,493 +0,0 @@
-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.xfail("env.PYPY")
-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.xfail("env.PYPY")
-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:
- 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:
- 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()
-
-
-def test_pr3635_diamond_b():
- o = m.MVB()
- assert o.b == 1
-
- assert o.get_b_b() == 1
-
-
-def test_pr3635_diamond_c():
- o = m.MVC()
- assert o.b == 1
- assert o.c == 2
-
- assert o.get_b_b() == 1
- assert o.get_c_b() == 1
-
- assert o.get_c_c() == 2
-
-
-def test_pr3635_diamond_d0():
- o = m.MVD0()
- assert o.b == 1
- assert o.c == 2
- assert o.d0 == 3
-
- assert o.get_b_b() == 1
- assert o.get_c_b() == 1
- assert o.get_d0_b() == 1
-
- assert o.get_c_c() == 2
- assert o.get_d0_c() == 2
-
- assert o.get_d0_d0() == 3
-
-
-def test_pr3635_diamond_d1():
- o = m.MVD1()
- assert o.b == 1
- assert o.c == 2
- assert o.d1 == 4
-
- assert o.get_b_b() == 1
- assert o.get_c_b() == 1
- assert o.get_d1_b() == 1
-
- assert o.get_c_c() == 2
- assert o.get_d1_c() == 2
-
- assert o.get_d1_d1() == 4
-
-
-def test_pr3635_diamond_e():
- o = m.MVE()
- assert o.b == 1
- assert o.c == 2
- assert o.d0 == 3
- assert o.d1 == 4
- assert o.e == 5
-
- assert o.get_b_b() == 1
- assert o.get_c_b() == 1
- assert o.get_d0_b() == 1
- assert o.get_d1_b() == 1
- assert o.get_e_b() == 1
-
- assert o.get_c_c() == 2
- assert o.get_d0_c() == 2
- assert o.get_d1_c() == 2
- assert o.get_e_c() == 2
-
- assert o.get_d0_d0() == 3
- assert o.get_e_d0() == 3
-
- assert o.get_d1_d1() == 4
- assert o.get_e_d1() == 4
-
- assert o.get_e_e() == 5
-
-
-def test_pr3635_diamond_f():
- o = m.MVF()
- assert o.b == 1
- assert o.c == 2
- assert o.d0 == 3
- assert o.d1 == 4
- assert o.e == 5
- assert o.f == 6
-
- assert o.get_b_b() == 1
- assert o.get_c_b() == 1
- assert o.get_d0_b() == 1
- assert o.get_d1_b() == 1
- assert o.get_e_b() == 1
- assert o.get_f_b() == 1
-
- assert o.get_c_c() == 2
- assert o.get_d0_c() == 2
- assert o.get_d1_c() == 2
- assert o.get_e_c() == 2
- assert o.get_f_c() == 2
-
- assert o.get_d0_d0() == 3
- assert o.get_e_d0() == 3
- assert o.get_f_d0() == 3
-
- assert o.get_d1_d1() == 4
- assert o.get_e_d1() == 4
- assert o.get_f_d1() == 4
-
- assert o.get_e_e() == 5
- assert o.get_f_e() == 5
-
- assert o.get_f_f() == 6
-
-
-def test_python_inherit_from_mi():
- """Tests extending a Python class from a single inheritor of a MI class"""
-
- class PyMVF(m.MVF):
- g = 7
-
- def get_g_g(self):
- return self.g
-
- o = PyMVF()
-
- assert o.b == 1
- assert o.c == 2
- assert o.d0 == 3
- assert o.d1 == 4
- assert o.e == 5
- assert o.f == 6
- assert o.g == 7
-
- assert o.get_g_g() == 7
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_array.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_array.cpp
deleted file mode 100644
index b118e2c6ccd4cf5d96a7315c16fee9f90ac81c45..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_array.cpp
+++ /dev/null
@@ -1,526 +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/numpy.h>
-#include <pybind11/stl.h>
-
-#include "pybind11_tests.h"
-
-#include <cstdint>
-#include <utility>
-
-// 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 (const py::error_already_set &) {
- 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", [](const 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>(std::move(yes))
- && !py::isinstance<py::array>(std::move(no));
- });
- sm.def("isinstance_typed", [](const 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", [](const 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", [](const py::array_t<double> &) { return "double"; });
- sm.def("overloaded", [](const py::array_t<float> &) { return "float"; });
- sm.def("overloaded", [](const py::array_t<int> &) { return "int"; });
- sm.def("overloaded", [](const py::array_t<unsigned short> &) { return "unsigned short"; });
- sm.def("overloaded", [](const py::array_t<long long> &) { return "long long"; });
- sm.def("overloaded",
- [](const py::array_t<std::complex<double>> &) { return "double complex"; });
- sm.def("overloaded", [](const py::array_t<std::complex<float>> &) { return "float complex"; });
-
- sm.def("overloaded2",
- [](const py::array_t<std::complex<double>> &) { return "double complex"; });
- sm.def("overloaded2", [](const py::array_t<double> &) { return "double"; });
- sm.def("overloaded2",
- [](const py::array_t<std::complex<float>> &) { return "float complex"; });
- sm.def("overloaded2", [](const py::array_t<float> &) { return "float"; });
-
- // [workaround(intel)] ICC 20/21 breaks with py::arg().stuff, using py::arg{}.stuff works.
-
- // Only accept the exact types:
- sm.def(
- "overloaded3", [](const py::array_t<int> &) { return "int"; }, py::arg{}.noconvert());
- sm.def(
- "overloaded3",
- [](const 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", [](const py::array_t<long long, 0> &) { return "long long"; });
- sm.def("overloaded4", [](const 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", [](const py::array_t<unsigned int> &) { return "unsigned int"; });
- sm.def("overloaded5", [](const py::array_t<double> &) { return "double"; });
-
- // test_greedy_string_overload
- // Issue 685: ndarray shouldn't go to std::string overload
- sm.def("issue685", [](const std::string &) { return "string"; });
- sm.def("issue685", [](const py::array &) { return "array"; });
- sm.def("issue685", [](const 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", [](const 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 for the above, 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("array_view",
- [](py::array_t<uint8_t> a, const std::string &dtype) { return a.view(dtype); });
-
- sm.def("reshape_initializer_list", [](py::array_t<int> a, size_t N, size_t M, size_t O) {
- return a.reshape({N, M, O});
- });
- sm.def("reshape_tuple", [](py::array_t<int> a, const std::vector<int> &new_shape) {
- return a.reshape(new_shape);
- });
-
- sm.def("index_using_ellipsis",
- [](const py::array &a) { return a[py::make_tuple(0, py::ellipsis(), 0)]; });
-
- // test_argument_conversions
- sm.def(
- "accept_double", [](const py::array_t<double, 0> &) {}, py::arg("a"));
- sm.def(
- "accept_double_forcecast",
- [](const py::array_t<double, py::array::forcecast> &) {},
- py::arg("a"));
- sm.def(
- "accept_double_c_style",
- [](const py::array_t<double, py::array::c_style> &) {},
- py::arg("a"));
- sm.def(
- "accept_double_c_style_forcecast",
- [](const py::array_t<double, py::array::forcecast | py::array::c_style> &) {},
- py::arg("a"));
- sm.def(
- "accept_double_f_style",
- [](const py::array_t<double, py::array::f_style> &) {},
- py::arg("a"));
- sm.def(
- "accept_double_f_style_forcecast",
- [](const py::array_t<double, py::array::forcecast | py::array::f_style> &) {},
- py::arg("a"));
- sm.def(
- "accept_double_noconvert", [](const py::array_t<double, 0> &) {}, "a"_a.noconvert());
- sm.def(
- "accept_double_forcecast_noconvert",
- [](const py::array_t<double, py::array::forcecast> &) {},
- "a"_a.noconvert());
- sm.def(
- "accept_double_c_style_noconvert",
- [](const py::array_t<double, py::array::c_style> &) {},
- "a"_a.noconvert());
- sm.def(
- "accept_double_c_style_forcecast_noconvert",
- [](const py::array_t<double, py::array::forcecast | py::array::c_style> &) {},
- "a"_a.noconvert());
- sm.def(
- "accept_double_f_style_noconvert",
- [](const py::array_t<double, py::array::f_style> &) {},
- "a"_a.noconvert());
- sm.def(
- "accept_double_f_style_forcecast_noconvert",
- [](const py::array_t<double, py::array::forcecast | py::array::f_style> &) {},
- "a"_a.noconvert());
-
- // Check that types returns correct npy format descriptor
- sm.def("test_fmt_desc_float", [](const py::array_t<float> &) {});
- sm.def("test_fmt_desc_double", [](const py::array_t<double> &) {});
- sm.def("test_fmt_desc_const_float", [](const py::array_t<const float> &) {});
- sm.def("test_fmt_desc_const_double", [](const py::array_t<const double> &) {});
-
- sm.def("round_trip_float", [](double d) { return d; });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_array.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_array.py
deleted file mode 100644
index cdec9ad60bb11bfeca404c0fd5468b5e32b8834c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_array.py
+++ /dev/null
@@ -1,593 +0,0 @@
-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(
- f"NOTE: typenum mismatch for {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) == f"index dimension mismatch: {dim} (ndim = 2)"
-
-
-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):
- 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
- # 1.13 supported Python 3.6
- if tuple(int(x) for x in np.__version__.split(".")[:2]) >= (1, 14):
- 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():
- 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():
- 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():
- a = m.create_and_resize(2)
- assert a.size == 4
- assert np.all(a == 42.0)
-
-
-def test_array_view():
- a = np.ones(100 * 4).astype("uint8")
- a_float_view = m.array_view(a, "float32")
- assert a_float_view.shape == (100 * 1,) # 1 / 4 bytes = 8 / 32
-
- a_int16_view = m.array_view(a, "int16") # 1 / 2 bytes = 16 / 32
- assert a_int16_view.shape == (100 * 2,)
-
-
-def test_array_view_invalid():
- a = np.ones(100 * 4).astype("uint8")
- with pytest.raises(TypeError):
- m.array_view(a, "deadly_dtype")
-
-
-def test_reshape_initializer_list():
- a = np.arange(2 * 7 * 3) + 1
- x = m.reshape_initializer_list(a, 2, 7, 3)
- assert x.shape == (2, 7, 3)
- assert list(x[1][4]) == [34, 35, 36]
- with pytest.raises(ValueError) as excinfo:
- m.reshape_initializer_list(a, 1, 7, 3)
- assert str(excinfo.value) == "cannot reshape array of size 42 into shape (1,7,3)"
-
-
-def test_reshape_tuple():
- a = np.arange(3 * 7 * 2) + 1
- x = m.reshape_tuple(a, (3, 7, 2))
- assert x.shape == (3, 7, 2)
- assert list(x[1][4]) == [23, 24]
- y = m.reshape_tuple(x, (x.size,))
- assert y.shape == (42,)
- with pytest.raises(ValueError) as excinfo:
- m.reshape_tuple(a, (3, 7, 1))
- assert str(excinfo.value) == "cannot reshape array of size 42 into shape (3,7,1)"
- with pytest.raises(ValueError) as excinfo:
- m.reshape_tuple(a, ())
- assert str(excinfo.value) == "cannot reshape array of size 42 into shape ()"
-
-
-def test_index_using_ellipsis():
- a = m.index_using_ellipsis(np.zeros((5, 6, 7)))
- assert a.shape == (6,)
-
-
-@pytest.mark.parametrize(
- "test_func",
- [
- m.test_fmt_desc_float,
- m.test_fmt_desc_double,
- m.test_fmt_desc_const_float,
- m.test_fmt_desc_const_double,
- ],
-)
-def test_format_descriptors_for_floating_point_types(test_func):
- assert "numpy.ndarray[numpy.float" in test_func.__doc__
-
-
-@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
-
-
-def test_round_trip_float():
- arr = np.zeros((), np.float64)
- arr[()] = 37.2
- assert m.round_trip_float(arr) == 37.2
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_dtypes.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_dtypes.cpp
deleted file mode 100644
index 6654f9ed8fbf7c41cba855f3734b824f5a0dee4f..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_dtypes.cpp
+++ /dev/null
@@ -1,614 +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/numpy.h>
-
-#include "pybind11_tests.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] != 0); i++) {
- os << v.a[i];
- }
- os << "',b='";
- for (size_t i = 0; i < 3 && (v.b[i] != 0); 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();
- auto *const 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 *) nullptr, sizeof(unsigned int), "I", 1)));
- list.append(py::dtype(py::buffer_info((void *) nullptr, 0, "T{i:a:f:b:}", 1)));
- list.append(py::dtype(py::detail::npy_api::NPY_DOUBLE_));
- return list;
-}
-
-struct A {};
-struct B {};
-
-TEST_SUBMODULE(numpy_dtypes, m) {
- try {
- py::module_::import("numpy");
- } catch (const py::error_already_set &) {
- 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");
-
-#ifdef PYBIND11_NEVER_DEFINED_EVER
- // If enabled, 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);
-#endif
-
- // 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
- std::vector<const char *> dtype_names{
- "byte", "short", "intc", "int_", "longlong", "ubyte", "ushort",
- "uintc", "uint", "ulonglong", "half", "single", "double", "longdouble",
- "csingle", "cdouble", "clongdouble", "bool_", "datetime64", "timedelta64", "object_"};
-
- 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_kind", [dtype_names]() {
- py::list list;
- for (const auto &dt_name : dtype_names) {
- list.append(py::dtype(dt_name).kind());
- }
- return list;
- });
- m.def("test_dtype_char_", [dtype_names]() {
- py::list list;
- for (const auto &dt_name : dtype_names) {
- list.append(py::dtype(dt_name).char_());
- }
- return list;
- });
- m.def("test_dtype_num", [dtype_names]() {
- py::list list;
- for (const auto &dt_name : dtype_names) {
- list.append(py::dtype(dt_name).num());
- }
- return list;
- });
- m.def("test_dtype_byteorder", [dtype_names]() {
- py::list list;
- for (const auto &dt_name : dtype_names) {
- list.append(py::dtype(dt_name).byteorder());
- }
- return list;
- });
- m.def("test_dtype_alignment", [dtype_names]() {
- py::list list;
- for (const auto &dt_name : dtype_names) {
- list.append(py::dtype(dt_name).alignment());
- }
- return list;
- });
- m.def("test_dtype_flags", [dtype_names]() {
- py::list list;
- for (const auto &dt_name : dtype_names) {
- list.append(py::dtype(dt_name).flags());
- }
- return list;
- });
- 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", [](const py::object &d) { return py::dtype::from_args(d); });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_dtypes.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_dtypes.py
deleted file mode 100644
index fcfd587b188099d6a2ad7d3afd1d2ca6661f3c70..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_dtypes.py
+++ /dev/null
@@ -1,446 +0,0 @@
-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"f{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()
- partial_size = partial_ld_off + ld.itemsize
- partial_end_padding = partial_size % np.dtype("uint64").alignment
- return dt_fmt().format(
- ld.itemsize, partial_ld_off, partial_size + partial_end_padding
- )
-
-
-def partial_nested_fmt():
- ld = np.dtype("longdouble")
- partial_nested_off = 8 + 8 * (ld.alignment > 8)
- partial_ld_off = partial_ld_offset()
- partial_size = partial_ld_off + ld.itemsize
- partial_end_padding = partial_size % np.dtype("uint64").alignment
- partial_nested_size = partial_nested_off * 2 + partial_size + partial_end_padding
- 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")
- end_padding = ld.itemsize % np.dtype("uint64").alignment
- partial_fmt = (
- "^T{?:bool_:3xI:uint_:f:float_:"
- + str(4 * (dbl.alignment > 4) + dbl.itemsize + 8 * (ld.alignment > 8))
- + "xg:ldbl_:"
- + (str(end_padding) + "x}" if end_padding > 0 else "}")
- )
- 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 [x.replace(" ", "") for x in m.print_dtypes()] == [
- simple_dtype_fmt(),
- packed_dtype_fmt(),
- f"[('a',{simple_dtype_fmt()}),('b',{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,
- np.dtype("d"),
- ]
-
- 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())
- )
-
- expected_chars = "bhilqBHILQefdgFDG?MmO"
- assert m.test_dtype_kind() == list("iiiiiuuuuuffffcccbMmO")
- assert m.test_dtype_char_() == list(expected_chars)
- assert m.test_dtype_num() == [np.dtype(ch).num for ch in expected_chars]
- assert m.test_dtype_byteorder() == [np.dtype(ch).byteorder for ch in expected_chars]
- assert m.test_dtype_alignment() == [np.dtype(ch).alignment for ch in expected_chars]
- assert m.test_dtype_flags() == [chr(np.dtype(ch).flags) for ch in expected_chars]
-
-
-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).replace(" ", "") == 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).replace(" ", "") == 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).replace(" ", "") == (
- "{{'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.10.3/tests/test_numpy_vectorize.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_vectorize.cpp
deleted file mode 100644
index dcc4c6ac250c1b113c697db6aab31d8105ea681e..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_vectorize.cpp
+++ /dev/null
@@ -1,107 +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/numpy.h>
-
-#include "pybind11_tests.h"
-
-#include <utility>
-
-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 (const py::error_already_set &) {
- 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); })(std::move(x),
- std::move(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
- // A lot of these no lints could be replaced with const refs, and probably should at some
- // point.
- m.def("selective_func",
- [](const py::array_t<int, py::array::c_style> &) { return "Int branch taken."; });
- m.def("selective_func",
- [](const py::array_t<float, py::array::c_style> &) { return "Float branch taken."; });
- m.def("selective_func", [](const 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 {
- explicit 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([](const double *a,
- double b,
- // Changing this broke things
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- 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 {
- explicit VectorizeTestClass(int v) : value{v} {};
- float method(int x, float y) const { 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",
- [](const py::array_t<int, py::array::forcecast> &arg1,
- const py::array_t<float, py::array::forcecast> &arg2,
- const py::array_t<double, py::array::forcecast> &arg3) {
- py::ssize_t ndim = 0;
- 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.10.3/tests/test_numpy_vectorize.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_vectorize.py
deleted file mode 100644
index 7e8c015c4632354fc75e0736ef7c7adb64bb6dc9..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_numpy_vectorize.py
+++ /dev/null
@@ -1,266 +0,0 @@
-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.10.3/tests/test_opaque_types.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_opaque_types.cpp
deleted file mode 100644
index 0386dba03db469eefe4465c7df9d6562dda315d3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_opaque_types.cpp
+++ /dev/null
@@ -1,77 +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/stl.h>
-
-#include "pybind11_tests.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 (const 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.10.3/tests/test_opaque_types.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_opaque_types.py
deleted file mode 100644
index 5d4f2a1bf4cbe0b5fca500a68ca38aabf0b7a94a..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_opaque_types.py
+++ /dev/null
@@ -1,58 +0,0 @@
-import pytest
-
-from pybind11_tests import ConstructorStats, UserType
-from pybind11_tests import opaque_types as m
-
-
-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 == f"Element {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]
- """
- )
-
- 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.10.3/tests/test_operator_overloading.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_operator_overloading.cpp
deleted file mode 100644
index 112a363b4b0ced84173b662418938432ce35de02..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_operator_overloading.cpp
+++ /dev/null
@@ -1,281 +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/operators.h>
-#include <pybind11/stl.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.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) noexcept : 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) noexcept {
- 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; }
-
-struct HashMe {
- std::string member;
-};
-
-bool operator==(const HashMe &lhs, const HashMe &rhs) { return lhs.member == rhs.member; }
-
-// 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; }
-};
-
-// HashMe has a hash function in C++ but no `__hash__` for Python.
-template <>
-struct hash<HashMe> {
- std::size_t operator()(const HashMe &selector) const {
- return std::hash<std::string>()(selector.member);
- }
-};
-} // namespace std
-
-// Not a good abs function, but easy to test.
-std::string abs(const Vector2 &) { return "abs(Vector2)"; }
-
-// 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
-// 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)
-PYBIND11_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
-# endif
-#elif defined(__clang__)
-# if (__clang_major__ >= 7)
-PYBIND11_WARNING_DISABLE_CLANG("-Wself-assign-overloaded")
-# 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);
-
- // define __eq__ but not __hash__
- py::class_<HashMe>(m, "HashMe").def(py::self == py::self);
-
- m.def("get_unhashable_HashMe_set", []() { return std::unordered_set<HashMe>{{"one"}}; });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_operator_overloading.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_operator_overloading.py
deleted file mode 100644
index b228da3cc34ab4e42ea8ab9cd3f41c376e02c75c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_operator_overloading.py
+++ /dev/null
@@ -1,152 +0,0 @@
-import pytest
-
-from pybind11_tests import ConstructorStats
-from pybind11_tests import operators as m
-
-
-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) as excinfo:
- hash(m.Comparable(15))
- assert str(excinfo.value).startswith("unhashable type:")
-
- 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))
-
-
-def test_return_set_of_unhashable():
- with pytest.raises(TypeError) as excinfo:
- m.get_unhashable_HashMe_set()
- assert str(excinfo.value.__cause__).startswith("unhashable type:")
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_pickling.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_pickling.cpp
deleted file mode 100644
index e154bc483c641e6ddc0b28cbdf520780b3c55f37..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_pickling.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- tests/test_pickling.cpp -- pickle support
-
- Copyright (c) 2016 Wenzel Jakob <wenzel.jakob@epfl.ch>
- Copyright (c) 2021 The Pybind Development Team.
-
- 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 <memory>
-#include <stdexcept>
-#include <utility>
-
-namespace exercise_trampoline {
-
-struct SimpleBase {
- int num = 0;
- virtual ~SimpleBase() = default;
-
- // For compatibility with old clang versions:
- SimpleBase() = default;
- SimpleBase(const SimpleBase &) = default;
-};
-
-struct SimpleBaseTrampoline : SimpleBase {};
-
-struct SimpleCppDerived : SimpleBase {};
-
-void wrap(py::module m) {
- py::class_<SimpleBase, SimpleBaseTrampoline>(m, "SimpleBase")
- .def(py::init<>())
- .def_readwrite("num", &SimpleBase::num)
- .def(py::pickle(
- [](const py::object &self) {
- py::dict d;
- if (py::hasattr(self, "__dict__")) {
- d = self.attr("__dict__");
- }
- return py::make_tuple(self.attr("num"), d);
- },
- [](const py::tuple &t) {
- if (t.size() != 2) {
- throw std::runtime_error("Invalid state!");
- }
- auto cpp_state = std::unique_ptr<SimpleBase>(new SimpleBaseTrampoline);
- cpp_state->num = t[0].cast<int>();
- auto py_state = t[1].cast<py::dict>();
- return std::make_pair(std::move(cpp_state), py_state);
- }));
-
- m.def("make_SimpleCppDerivedAsBase",
- []() { return std::unique_ptr<SimpleBase>(new SimpleCppDerived); });
- m.def("check_dynamic_cast_SimpleCppDerived", [](const SimpleBase *base_ptr) {
- return dynamic_cast<const SimpleCppDerived *>(base_ptr) != nullptr;
- });
-}
-
-} // namespace exercise_trampoline
-
-TEST_SUBMODULE(pickling, m) {
- m.def("simple_callable", []() { return 20220426; });
-
- // test_roundtrip
- class Pickleable {
- public:
- explicit 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> pyPickleable(m, "Pickleable");
- pyPickleable.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());
- });
- ignoreOldStyleInitWarnings([&pyPickleable]() {
- pyPickleable.def("__setstate__", [](Pickleable &p, const 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());
- },
- [](const 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:
- explicit PickleableWithDict(const std::string &value) : value(value) {}
-
- std::string value;
- int extra;
- };
-
- class PickleableWithDictNew : public PickleableWithDict {
- public:
- using PickleableWithDict::PickleableWithDict;
- };
-
- py::class_<PickleableWithDict> pyPickleableWithDict(
- m, "PickleableWithDict", py::dynamic_attr());
- pyPickleableWithDict.def(py::init<std::string>())
- .def_readwrite("value", &PickleableWithDict::value)
- .def_readwrite("extra", &PickleableWithDict::extra)
- .def("__getstate__", [](const py::object &self) {
- /* Also include __dict__ in state */
- return py::make_tuple(self.attr("value"), self.attr("extra"), self.attr("__dict__"));
- });
- ignoreOldStyleInitWarnings([&pyPickleableWithDict]() {
- pyPickleableWithDict.def("__setstate__", [](const py::object &self, const 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(
- [](const 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
-
- exercise_trampoline::wrap(m);
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_pickling.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_pickling.py
deleted file mode 100644
index 12361a661e208b7c21994c113f884ef945358540..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_pickling.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import pickle
-import re
-
-import pytest
-
-import env
-from pybind11_tests import pickling as m
-
-
-def test_pickle_simple_callable():
- assert m.simple_callable() == 20220426
- if env.PYPY:
- serialized = pickle.dumps(m.simple_callable)
- deserialized = pickle.loads(serialized)
- assert deserialized() == 20220426
- else:
- # To document broken behavior: currently it fails universally with
- # all C Python versions.
- with pytest.raises(TypeError) as excinfo:
- pickle.dumps(m.simple_callable)
- assert re.search("can.*t pickle .*PyCapsule.* object", str(excinfo.value))
-
-
-@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)
-
-
-#
-# exercise_trampoline
-#
-class SimplePyDerived(m.SimpleBase):
- pass
-
-
-def test_roundtrip_simple_py_derived():
- p = SimplePyDerived()
- p.num = 202
- p.stored_in_dict = 303
- data = pickle.dumps(p, pickle.HIGHEST_PROTOCOL)
- p2 = pickle.loads(data)
- assert isinstance(p2, SimplePyDerived)
- assert p2.num == 202
- assert p2.stored_in_dict == 303
-
-
-def test_roundtrip_simple_cpp_derived():
- p = m.make_SimpleCppDerivedAsBase()
- assert m.check_dynamic_cast_SimpleCppDerived(p)
- p.num = 404
- if not env.PYPY:
- # To ensure that this unit test is not accidentally invalidated.
- with pytest.raises(AttributeError):
- # Mimics the `setstate` C++ implementation.
- setattr(p, "__dict__", {}) # noqa: B010
- data = pickle.dumps(p, pickle.HIGHEST_PROTOCOL)
- p2 = pickle.loads(data)
- assert isinstance(p2, m.SimpleBase)
- assert p2.num == 404
- # Issue #3062: pickleable base C++ classes can incur object slicing
- # if derived typeid is not registered with pybind11
- assert not m.check_dynamic_cast_SimpleCppDerived(p2)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_pytypes.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_pytypes.cpp
deleted file mode 100644
index 1028bb58e8f0dcc231d3b5f8e1521342f80ccece..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_pytypes.cpp
+++ /dev/null
@@ -1,814 +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"
-
-#include <utility>
-
-namespace external {
-namespace detail {
-bool check(PyObject *o) { return PyFloat_Check(o) != 0; }
-
-PyObject *conv(PyObject *o) {
- PyObject *ret = nullptr;
- if (PyLong_Check(o)) {
- double v = PyLong_AsDouble(o);
- if (!(v == -1.0 && PyErr_Occurred())) {
- ret = PyFloat_FromDouble(v);
- }
- } else {
- PyErr_SetString(PyExc_TypeError, "Unexpected type");
- }
- return ret;
-}
-
-PyObject *default_constructed() { return PyFloat_FromDouble(0.0); }
-} // namespace detail
-class float_ : public py::object {
- PYBIND11_OBJECT_CVT(float_, py::object, external::detail::check, external::detail::conv)
-
- float_() : py::object(external::detail::default_constructed(), stolen_t{}) {}
-
- double get_value() const { return PyFloat_AsDouble(this->ptr()); }
-};
-} // namespace external
-
-namespace implicit_conversion_from_0_to_handle {
-// Uncomment to trigger compiler error. Note: Before PR #4008 this used to compile successfully.
-// void expected_to_trigger_compiler_error() { py::handle(0); }
-} // namespace implicit_conversion_from_0_to_handle
-
-// Used to validate systematically that PR #4008 does/did NOT change the behavior.
-void pure_compile_tests_for_handle_from_PyObject_pointers() {
- {
- PyObject *ptr = Py_None;
- py::handle{ptr};
- }
- {
- PyObject *const ptr = Py_None;
- py::handle{ptr};
- }
- // Uncomment to trigger compiler errors.
- // PyObject const * ptr = Py_None; py::handle{ptr};
- // PyObject const *const ptr = Py_None; py::handle{ptr};
- // PyObject volatile * ptr = Py_None; py::handle{ptr};
- // PyObject volatile *const ptr = Py_None; py::handle{ptr};
- // PyObject const volatile * ptr = Py_None; py::handle{ptr};
- // PyObject const volatile *const ptr = Py_None; py::handle{ptr};
-}
-
-namespace handle_from_move_only_type_with_operator_PyObject {
-
-// Reduced from
-// https://github.com/pytorch/pytorch/blob/279634f384662b7c3a9f8bf7ccc3a6afd2f05657/torch/csrc/utils/object_ptr.h
-struct operator_ncnst {
- operator_ncnst() = default;
- operator_ncnst(operator_ncnst &&) = default;
- operator PyObject *() /* */ { return Py_None; } // NOLINT(google-explicit-constructor)
-};
-
-struct operator_const {
- operator_const() = default;
- operator_const(operator_const &&) = default;
- operator PyObject *() const { return Py_None; } // NOLINT(google-explicit-constructor)
-};
-
-bool from_ncnst() {
- operator_ncnst obj;
- auto h = py::handle(obj); // Critical part of test: does this compile?
- return h.ptr() == Py_None; // Just something.
-}
-
-bool from_const() {
- operator_const obj;
- auto h = py::handle(obj); // Critical part of test: does this compile?
- return h.ptr() == Py_None; // Just something.
-}
-
-void m_defs(py::module_ &m) {
- m.def("handle_from_move_only_type_with_operator_PyObject_ncnst", from_ncnst);
- m.def("handle_from_move_only_type_with_operator_PyObject_const", from_const);
-}
-
-} // namespace handle_from_move_only_type_with_operator_PyObject
-
-TEST_SUBMODULE(pytypes, m) {
- m.def("obj_class_name", [](py::handle obj) { return py::detail::obj_class_name(obj.ptr()); });
-
- handle_from_move_only_type_with_operator_PyObject::m_defs(m);
-
- // test_bool
- m.def("get_bool", [] { return py::bool_(false); });
- // 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(); });
- m.def("get_frozenset_from_iterable",
- [](const py::iterable &iter) { return py::frozenset(iter); });
- m.def("get_list_from_iterable", [](const py::iterable &iter) { return py::list(iter); });
- m.def("get_set_from_iterable", [](const py::iterable &iter) { return py::set(iter); });
- m.def("get_tuple_from_iterable", [](const py::iterable &iter) { return py::tuple(iter); });
- // test_float
- m.def("get_float", [] { return py::float_(0.0f); });
- // test_list
- m.def("list_no_args", []() { return py::list{}; });
- m.def("list_ssize_t", []() { return py::list{(py::ssize_t) 0}; });
- m.def("list_size_t", []() { return py::list{(py::size_t) 0}; });
- m.def("list_insert_ssize_t", [](py::list *l) { return l->insert((py::ssize_t) 1, 83); });
- m.def("list_insert_size_t", [](py::list *l) { return l->insert((py::size_t) 3, 57); });
- 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", [](const 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", [](const py::none &none) { py::print("none: {}"_s.format(none)); });
-
- // test_set, test_frozenset
- m.def("get_set", []() {
- py::set set;
- set.add(py::str("key1"));
- set.add("key2");
- set.add(std::string("key3"));
- return set;
- });
- m.def("get_frozenset", []() {
- py::set set;
- set.add(py::str("key1"));
- set.add("key2");
- set.add(std::string("key3"));
- return py::frozenset(set);
- });
- m.def("print_anyset", [](const py::anyset &set) {
- for (auto item : set) {
- py::print("key:", item);
- }
- });
- m.def("anyset_size", [](const py::anyset &set) { return set.size(); });
- m.def("anyset_empty", [](const py::anyset &set) { return set.empty(); });
- m.def("anyset_contains",
- [](const py::anyset &set, const py::object &key) { return set.contains(key); });
- m.def("anyset_contains",
- [](const py::anyset &set, const char *key) { return set.contains(key); });
- m.def("set_add", [](py::set &set, const py::object &key) { set.add(key); });
- m.def("set_clear", [](py::set &set) { set.clear(); });
-
- // test_dict
- m.def("get_dict", []() { return py::dict("key"_a = "value"); });
- m.def("print_dict", [](const 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",
- [](const py::dict &dict, const py::object &val) { return dict.contains(val); });
- m.def("dict_contains",
- [](const py::dict &dict, const char *val) { return dict.contains(val); });
-
- // test_tuple
- m.def("tuple_no_args", []() { return py::tuple{}; });
- m.def("tuple_ssize_t", []() { return py::tuple{(py::ssize_t) 0}; });
- m.def("tuple_size_t", []() { return py::tuple{(py::size_t) 0}; });
- m.def("get_tuple", []() { return py::make_tuple(42, py::none(), "spam"); });
-
- // test_simple_namespace
- m.def("get_simple_namespace", []() {
- auto ns = py::module_::import("types").attr("SimpleNamespace")(
- "attr"_a = 42, "x"_a = "foo", "wrong"_a = 1);
- py::delattr(ns, "wrong");
- py::setattr(ns, "right", py::int_(2));
- return ns;
- });
-
- // test_str
- m.def("str_from_char_ssize_t", []() { return py::str{"red", (py::ssize_t) 3}; });
- m.def("str_from_char_size_t", []() { return py::str{"blue", (py::size_t) 4}; });
- m.def("str_from_string", []() { return py::str(std::string("baz")); });
- m.def("str_from_std_string_input", [](const std::string &stri) { return py::str(stri); });
- m.def("str_from_cstr_input", [](const char *c_str) { return py::str(c_str); });
- m.def("str_from_bytes", []() { return py::str(py::bytes("boo", 3)); });
- m.def("str_from_bytes_input",
- [](const py::bytes &encoded_str) { return py::str(encoded_str); });
-
- 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_from_string_from_str",
- [](const py::str &obj) { return py::str(static_cast<std::string>(obj)); });
-
- 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_char_ssize_t", []() { return py::bytes{"green", (py::ssize_t) 5}; });
- m.def("bytes_from_char_size_t", []() { return py::bytes{"purple", (py::size_t) 6}; });
- m.def("bytes_from_string", []() { return py::bytes(std::string("foo")); });
- m.def("bytes_from_str", []() { return py::bytes(py::str("bar", 3)); });
-
- // test bytearray
- m.def("bytearray_from_char_ssize_t", []() { return py::bytearray{"$%", (py::ssize_t) 2}; });
- m.def("bytearray_from_char_size_t", []() { return py::bytearray{"@$!", (py::size_t) 3}; });
- m.def("bytearray_from_string", []() { return py::bytearray(std::string("foo")); });
- m.def("bytearray_size", []() { return py::bytearray("foo").size(); });
-
- // test_capsule
- m.def("return_capsule_with_destructor", []() {
- py::print("creating capsule");
- return py::capsule([]() { py::print("destructing capsule"); });
- });
-
- m.def("return_renamed_capsule_with_destructor", []() {
- py::print("creating capsule");
- auto cap = py::capsule([]() { py::print("destructing capsule"); });
- static const char *capsule_name = "test_name1";
- py::print("renaming capsule");
- cap.set_name(capsule_name);
- return cap;
- });
-
- 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_renamed_capsule_with_destructor_2", []() {
- py::print("creating capsule");
- auto cap = py::capsule((void *) 1234, [](void *ptr) {
- py::print("destructing capsule: {}"_s.format((size_t) ptr));
- });
- static const char *capsule_name = "test_name2";
- py::print("renaming capsule");
- cap.set_name(capsule_name);
- return cap;
- });
-
- m.def("return_capsule_with_name_and_destructor", []() {
- auto capsule = py::capsule((void *) 12345, "pointer type description", [](PyObject *ptr) {
- if (ptr) {
- const 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;
- });
-
- m.def("return_capsule_with_explicit_nullptr_dtor", []() {
- py::print("creating capsule with explicit nullptr dtor");
- return py::capsule(reinterpret_cast<void *>(1234),
- static_cast<void (*)(void *)>(nullptr)); // PR #4221
- });
-
- // test_accessors
- m.def("accessor_api", [](const 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", [](const 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;
- });
-
- m.def("accessor_moves", []() { // See PR #3970
- py::list return_list;
-#ifdef PYBIND11_HANDLE_REF_DEBUG
- py::int_ py_int_0(0);
- py::int_ py_int_42(42);
- py::str py_str_count("count");
-
- auto tup = py::make_tuple(0);
-
- py::sequence seq(tup);
-
- py::list lst;
- lst.append(0);
-
-# define PYBIND11_LOCAL_DEF(...) \
- { \
- std::size_t inc_refs = py::handle::inc_ref_counter(); \
- __VA_ARGS__; \
- inc_refs = py::handle::inc_ref_counter() - inc_refs; \
- return_list.append(inc_refs); \
- }
-
- PYBIND11_LOCAL_DEF(tup[py_int_0]) // l-value (to have a control)
- PYBIND11_LOCAL_DEF(tup[py::int_(0)]) // r-value
-
- PYBIND11_LOCAL_DEF(tup.attr(py_str_count)) // l-value
- PYBIND11_LOCAL_DEF(tup.attr(py::str("count"))) // r-value
-
- PYBIND11_LOCAL_DEF(seq[py_int_0]) // l-value
- PYBIND11_LOCAL_DEF(seq[py::int_(0)]) // r-value
-
- PYBIND11_LOCAL_DEF(seq.attr(py_str_count)) // l-value
- PYBIND11_LOCAL_DEF(seq.attr(py::str("count"))) // r-value
-
- PYBIND11_LOCAL_DEF(lst[py_int_0]) // l-value
- PYBIND11_LOCAL_DEF(lst[py::int_(0)]) // r-value
-
- PYBIND11_LOCAL_DEF(lst.attr(py_str_count)) // l-value
- PYBIND11_LOCAL_DEF(lst.attr(py::str("count"))) // r-value
-
- auto lst_acc = lst[py::int_(0)];
- lst_acc = py::int_(42); // Detaches lst_acc from lst.
- PYBIND11_LOCAL_DEF(lst_acc = py_int_42) // l-value
- PYBIND11_LOCAL_DEF(lst_acc = py::int_(42)) // r-value
-# undef PYBIND11_LOCAL_DEF
-#endif
- return return_list;
- });
-
- // test_constructors
- m.def("default_constructors", []() {
- return py::dict("bytes"_a = py::bytes(),
- "bytearray"_a = py::bytearray(),
- "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", [](const py::dict &d) {
- return py::dict("bytes"_a = py::bytes(d["bytes"]),
- "bytearray"_a = py::bytearray(d["bytearray"]),
- "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"]),
- "frozenset"_a = py::frozenset(d["frozenset"]),
- "memoryview"_a = py::memoryview(d["memoryview"]));
- });
-
- m.def("cast_functions", [](const 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>(),
- "bytearray"_a = d["bytearray"].cast<py::bytearray>(),
- "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>(),
- "frozenset"_a = d["frozenset"].cast<py::frozenset>(),
- "memoryview"_a = d["memoryview"].cast<py::memoryview>());
- });
-
- m.def("convert_to_pybind11_str", [](const py::object &o) { return py::str(o); });
-
- m.def("nonconverting_constructor",
- [](const std::string &type, py::object value, bool move) -> py::object {
- if (type == "bytes") {
- return move ? py::bytes(std::move(value)) : py::bytes(value);
- }
- if (type == "none") {
- return move ? py::none(std::move(value)) : py::none(value);
- }
- if (type == "ellipsis") {
- return move ? py::ellipsis(std::move(value)) : py::ellipsis(value);
- }
- if (type == "type") {
- return move ? py::type(std::move(value)) : py::type(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(std::move(obj)); });
-
- m.def("obj_contains",
- [](py::object &obj, const py::object &key) { return obj.contains(key); });
-
- m.def("test_number_protocol", [](const py::object &a, const 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", [](const 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", [](const py::buffer &b) { return py::memoryview(b); });
-
- m.def("test_memoryview_buffer_info",
- [](const 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)});
- }
- 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", {}, {});
- });
-
- 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)));
- });
-
- // test_builtin_functions
- m.def("get_len", [](py::handle h) { return py::len(h); });
-
-#ifdef PYBIND11_STR_LEGACY_PERMISSIVE
- m.attr("PYBIND11_STR_LEGACY_PERMISSIVE") = true;
-#endif
-
- m.def("isinstance_pybind11_bytes",
- [](py::object o) { return py::isinstance<py::bytes>(std::move(o)); });
- m.def("isinstance_pybind11_str",
- [](py::object o) { return py::isinstance<py::str>(std::move(o)); });
-
- m.def("pass_to_pybind11_bytes", [](py::bytes b) { return py::len(std::move(b)); });
- m.def("pass_to_pybind11_str", [](py::str s) { return py::len(std::move(s)); });
- m.def("pass_to_std_string", [](const std::string &s) { return s.size(); });
-
- // test_weakref
- m.def("weakref_from_handle", [](py::handle h) { return py::weakref(h); });
- m.def("weakref_from_handle_and_function",
- [](py::handle h, py::function f) { return py::weakref(h, std::move(f)); });
- m.def("weakref_from_object", [](const py::object &o) { return py::weakref(o); });
- m.def("weakref_from_object_and_function",
- [](py::object o, py::function f) { return py::weakref(std::move(o), std::move(f)); });
-
-// See PR #3263 for background (https://github.com/pybind/pybind11/pull/3263):
-// pytypes.h could be changed to enforce the "most correct" user code below, by removing
-// `const` from iterator `reference` using type aliases, but that will break existing
-// user code.
-#if (defined(__APPLE__) && defined(__clang__)) || defined(PYPY_VERSION)
-// This is "most correct" and enforced on these platforms.
-# define PYBIND11_AUTO_IT auto it
-#else
-// This works on many platforms and is (unfortunately) reflective of existing user code.
-// NOLINTNEXTLINE(bugprone-macro-parentheses)
-# define PYBIND11_AUTO_IT auto &it
-#endif
-
- m.def("tuple_iterator", []() {
- auto tup = py::make_tuple(5, 7);
- int tup_sum = 0;
- for (PYBIND11_AUTO_IT : tup) {
- tup_sum += it.cast<int>();
- }
- return tup_sum;
- });
-
- m.def("dict_iterator", []() {
- py::dict dct;
- dct[py::int_(3)] = 5;
- dct[py::int_(7)] = 11;
- int kv_sum = 0;
- for (PYBIND11_AUTO_IT : dct) {
- kv_sum += it.first.cast<int>() * 100 + it.second.cast<int>();
- }
- return kv_sum;
- });
-
- m.def("passed_iterator", [](const py::iterator &py_it) {
- int elem_sum = 0;
- for (PYBIND11_AUTO_IT : py_it) {
- elem_sum += it.cast<int>();
- }
- return elem_sum;
- });
-
-#undef PYBIND11_AUTO_IT
-
- // Tests below this line are for pybind11 IMPLEMENTATION DETAILS:
-
- m.def("sequence_item_get_ssize_t", [](const py::object &o) {
- return py::detail::accessor_policies::sequence_item::get(o, (py::ssize_t) 1);
- });
- m.def("sequence_item_set_ssize_t", [](const py::object &o) {
- auto s = py::str{"peppa", 5};
- py::detail::accessor_policies::sequence_item::set(o, (py::ssize_t) 1, s);
- });
- m.def("sequence_item_get_size_t", [](const py::object &o) {
- return py::detail::accessor_policies::sequence_item::get(o, (py::size_t) 2);
- });
- m.def("sequence_item_set_size_t", [](const py::object &o) {
- auto s = py::str{"george", 6};
- py::detail::accessor_policies::sequence_item::set(o, (py::size_t) 2, s);
- });
- m.def("list_item_get_ssize_t", [](const py::object &o) {
- return py::detail::accessor_policies::list_item::get(o, (py::ssize_t) 3);
- });
- m.def("list_item_set_ssize_t", [](const py::object &o) {
- auto s = py::str{"rebecca", 7};
- py::detail::accessor_policies::list_item::set(o, (py::ssize_t) 3, s);
- });
- m.def("list_item_get_size_t", [](const py::object &o) {
- return py::detail::accessor_policies::list_item::get(o, (py::size_t) 4);
- });
- m.def("list_item_set_size_t", [](const py::object &o) {
- auto s = py::str{"richard", 7};
- py::detail::accessor_policies::list_item::set(o, (py::size_t) 4, s);
- });
- m.def("tuple_item_get_ssize_t", [](const py::object &o) {
- return py::detail::accessor_policies::tuple_item::get(o, (py::ssize_t) 5);
- });
- m.def("tuple_item_set_ssize_t", []() {
- auto s0 = py::str{"emely", 5};
- auto s1 = py::str{"edmond", 6};
- auto o = py::tuple{2};
- py::detail::accessor_policies::tuple_item::set(o, (py::ssize_t) 0, s0);
- py::detail::accessor_policies::tuple_item::set(o, (py::ssize_t) 1, s1);
- return o;
- });
- m.def("tuple_item_get_size_t", [](const py::object &o) {
- return py::detail::accessor_policies::tuple_item::get(o, (py::size_t) 6);
- });
- m.def("tuple_item_set_size_t", []() {
- auto s0 = py::str{"candy", 5};
- auto s1 = py::str{"cat", 3};
- auto o = py::tuple{2};
- py::detail::accessor_policies::tuple_item::set(o, (py::size_t) 1, s1);
- py::detail::accessor_policies::tuple_item::set(o, (py::size_t) 0, s0);
- return o;
- });
-
- m.def("square_float_", [](const external::float_ &x) -> double {
- double v = x.get_value();
- return v * v;
- });
-
- m.def("tuple_rvalue_getter", [](const py::tuple &tup) {
- // tests accessing tuple object with rvalue int
- for (size_t i = 0; i < tup.size(); i++) {
- auto o = py::handle(tup[py::int_(i)]);
- if (!o) {
- throw py::value_error("tuple is malformed");
- }
- }
- return tup;
- });
- m.def("list_rvalue_getter", [](const py::list &l) {
- // tests accessing list with rvalue int
- for (size_t i = 0; i < l.size(); i++) {
- auto o = py::handle(l[py::int_(i)]);
- if (!o) {
- throw py::value_error("list is malformed");
- }
- }
- return l;
- });
- m.def("populate_dict_rvalue", [](int population) {
- auto d = py::dict();
- for (int i = 0; i < population; i++) {
- d[py::int_(i)] = py::int_(i);
- }
- return d;
- });
- m.def("populate_obj_str_attrs", [](py::object &o, int population) {
- for (int i = 0; i < population; i++) {
- o.attr(py::str(py::int_(i))) = py::str(py::int_(i));
- }
- return o;
- });
-
- // testing immutable object augmented assignment: #issue 3812
- m.def("inplace_append", [](py::object &a, const py::object &b) {
- a += b;
- return a;
- });
- m.def("inplace_subtract", [](py::object &a, const py::object &b) {
- a -= b;
- return a;
- });
- m.def("inplace_multiply", [](py::object &a, const py::object &b) {
- a *= b;
- return a;
- });
- m.def("inplace_divide", [](py::object &a, const py::object &b) {
- a /= b;
- return a;
- });
- m.def("inplace_or", [](py::object &a, const py::object &b) {
- a |= b;
- return a;
- });
- m.def("inplace_and", [](py::object &a, const py::object &b) {
- a &= b;
- return a;
- });
- m.def("inplace_lshift", [](py::object &a, const py::object &b) {
- a <<= b;
- return a;
- });
- m.def("inplace_rshift", [](py::object &a, const py::object &b) {
- a >>= b;
- return a;
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_pytypes.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_pytypes.py
deleted file mode 100644
index 8f9f2987e976680b2f14c750c33c73463e70757b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_pytypes.py
+++ /dev/null
@@ -1,885 +0,0 @@
-import contextlib
-import sys
-import types
-
-import pytest
-
-import env
-from pybind11_tests import detailed_error_messages_enabled
-from pybind11_tests import pytypes as m
-
-
-def test_obj_class_name():
- assert m.obj_class_name(None) == "NoneType"
- assert m.obj_class_name(list) == "list"
- assert m.obj_class_name([]) == "list"
-
-
-def test_handle_from_move_only_type_with_operator_PyObject(): # noqa: N802
- assert m.handle_from_move_only_type_with_operator_PyObject_ncnst()
- assert m.handle_from_move_only_type_with_operator_PyObject_const()
-
-
-def test_bool(doc):
- assert doc(m.get_bool) == "get_bool() -> bool"
-
-
-def test_int(doc):
- assert doc(m.get_int) == "get_int() -> int"
-
-
-def test_iterator(doc):
- assert doc(m.get_iterator) == "get_iterator() -> Iterator"
-
-
-@pytest.mark.parametrize(
- "pytype, from_iter_func",
- [
- (frozenset, m.get_frozenset_from_iterable),
- (list, m.get_list_from_iterable),
- (set, m.get_set_from_iterable),
- (tuple, m.get_tuple_from_iterable),
- ],
-)
-def test_from_iterable(pytype, from_iter_func):
- my_iter = iter(range(10))
- s = from_iter_func(my_iter)
- assert type(s) == pytype
- assert s == pytype(range(10))
-
-
-def test_iterable(doc):
- assert doc(m.get_iterable) == "get_iterable() -> Iterable"
-
-
-def test_float(doc):
- assert doc(m.get_float) == "get_float() -> float"
-
-
-def test_list(capture, doc):
- assert m.list_no_args() == []
- assert m.list_ssize_t() == []
- assert m.list_size_t() == []
- lins = [1, 2]
- m.list_insert_ssize_t(lins)
- assert lins == [1, 83, 2]
- m.list_insert_size_t(lins)
- assert lins == [1, 83, 2, 57]
-
- 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 isinstance(s, set)
- assert s == {"key1", "key2", "key3"}
-
- s.add("key4")
- with capture:
- m.print_anyset(s)
- assert (
- capture.unordered
- == """
- key: key1
- key: key2
- key: key3
- key: key4
- """
- )
-
- m.set_add(s, "key5")
- assert m.anyset_size(s) == 5
-
- m.set_clear(s)
- assert m.anyset_empty(s)
-
- assert not m.anyset_contains(set(), 42)
- assert m.anyset_contains({42}, 42)
- assert m.anyset_contains({"foo"}, "foo")
-
- assert doc(m.get_set) == "get_set() -> set"
- assert doc(m.print_anyset) == "print_anyset(arg0: anyset) -> None"
-
-
-def test_frozenset(capture, doc):
- s = m.get_frozenset()
- assert isinstance(s, frozenset)
- assert s == frozenset({"key1", "key2", "key3"})
-
- with capture:
- m.print_anyset(s)
- assert (
- capture.unordered
- == """
- key: key1
- key: key2
- key: key3
- """
- )
- assert m.anyset_size(s) == 3
- assert not m.anyset_empty(s)
-
- assert not m.anyset_contains(frozenset(), 42)
- assert m.anyset_contains(frozenset({42}), 42)
- assert m.anyset_contains(frozenset({"foo"}), "foo")
-
- assert doc(m.get_frozenset) == "get_frozenset() -> frozenset"
-
-
-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}
-
-
-class CustomContains:
- d = {"key": None}
-
- def __contains__(self, m):
- return m in self.d
-
-
-@pytest.mark.parametrize(
- "arg,func",
- [
- (set(), m.anyset_contains),
- (dict(), m.dict_contains),
- (CustomContains(), m.obj_contains),
- ],
-)
-@pytest.mark.xfail("env.PYPY and sys.pypy_version_info < (7, 3, 10)", strict=False)
-def test_unhashable_exceptions(arg, func):
- class Unhashable:
- __hash__ = None
-
- with pytest.raises(TypeError) as exc_info:
- func(arg, Unhashable())
- assert "unhashable type:" in str(exc_info.value)
-
-
-def test_tuple():
- assert m.tuple_no_args() == ()
- assert m.tuple_ssize_t() == ()
- assert m.tuple_size_t() == ()
- assert m.get_tuple() == (42, None, "spam")
-
-
-def test_simple_namespace():
- ns = m.get_simple_namespace()
- assert ns.attr == 42
- assert ns.x == "foo"
- assert ns.right == 2
- assert not hasattr(ns, "wrong")
-
-
-def test_str(doc):
- assert m.str_from_char_ssize_t().encode().decode() == "red"
- assert m.str_from_char_size_t().encode().decode() == "blue"
- 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:
- 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"
- if hasattr(m, "PYBIND11_STR_LEGACY_PERMISSIVE"):
- assert m.str_from_object(malformed_utf8) is malformed_utf8
- else:
- assert m.str_from_object(malformed_utf8) == "b'\\x80'"
- assert m.str_from_handle(malformed_utf8) == "b'\\x80'"
-
- assert m.str_from_string_from_str("this is a str") == "this is a str"
- ucs_surrogates_str = "\udcc3"
- with pytest.raises(UnicodeEncodeError):
- m.str_from_string_from_str(ucs_surrogates_str)
-
-
-@pytest.mark.parametrize(
- "func",
- [
- m.str_from_bytes_input,
- m.str_from_cstr_input,
- m.str_from_std_string_input,
- ],
-)
-def test_surrogate_pairs_unicode_error(func):
- input_str = "\ud83d\ude4f".encode("utf-8", "surrogatepass")
- with pytest.raises(UnicodeDecodeError):
- func(input_str)
-
-
-def test_bytes(doc):
- assert m.bytes_from_char_ssize_t().decode() == "green"
- assert m.bytes_from_char_size_t().decode() == "purple"
- assert m.bytes_from_string().decode() == "foo"
- assert m.bytes_from_str().decode() == "bar"
-
- assert doc(m.bytes_from_str) == "bytes_from_str() -> bytes"
-
-
-def test_bytearray(doc):
- assert m.bytearray_from_char_ssize_t().decode() == "$%"
- assert m.bytearray_from_char_size_t().decode() == "@$!"
- assert m.bytearray_from_string().decode() == "foo"
- assert m.bytearray_size() == len("foo")
-
-
-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_renamed_capsule_with_destructor()
- del a
- pytest.gc_collect()
- assert (
- capture.unordered
- == """
- creating capsule
- renaming 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_renamed_capsule_with_destructor_2()
- del a
- pytest.gc_collect()
- assert (
- capture.unordered
- == """
- creating capsule
- renaming 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')
- """
- )
-
- with capture:
- a = m.return_capsule_with_explicit_nullptr_dtor()
- del a
- pytest.gc_collect()
- assert (
- capture.unordered
- == """
- creating capsule with explicit nullptr dtor
- """
- )
-
-
-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_accessor_moves():
- inc_refs = m.accessor_moves()
- if inc_refs:
- assert inc_refs == [1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0]
- else:
- pytest.skip("Not defined: PYBIND11_HANDLE_REF_DEBUG")
-
-
-def test_constructors():
- """C++ default and converting constructors are equivalent to type calls in Python"""
- types = [bytes, bytearray, str, bool, int, float, tuple, list, dict, set]
- expected = {t.__name__: t() for t in types}
- assert m.default_constructors() == expected
-
- data = {
- bytes: b"41", # Currently no supported or working conversions.
- bytearray: bytearray(b"41"),
- 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],
- frozenset: [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()}
-
- 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),
- ("type", 42),
- ]
- for t, v in non_converting_test_cases:
- for move in [True, False]:
- with pytest.raises(TypeError) as excinfo:
- m.nonconverting_constructor(t, v, move)
- expected_error = (
- f"Object of type '{type(v).__name__}' is not an instance of '{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("Str") == "Str"
- assert cvt(b"Bytes") == "b'Bytes'"
- assert cvt(None) == "None"
- assert cvt(False) == "False"
- assert cvt(True) == "True"
- assert cvt(42) == "42"
- assert cvt(2**65) == "36893488147419103232"
- assert cvt(-1.50) == "-1.5"
- assert cvt(()) == "()"
- assert cvt((18,)) == "(18,)"
- assert cvt([]) == "[]"
- assert cvt([28]) == "[28]"
- assert cvt({}) == "{}"
- assert cvt({3: 4}) == "{3: 4}"
- assert cvt(set()) == "set()"
- assert cvt({3, 3}) == "{3}"
-
- valid_orig = "DZ"
- valid_utf8 = valid_orig.encode("utf-8")
- valid_cvt = cvt(valid_utf8)
- if hasattr(m, "PYBIND11_STR_LEGACY_PERMISSIVE"):
- assert valid_cvt is valid_utf8
- else:
- assert type(valid_cvt) is str
- assert valid_cvt == "b'\\xc7\\xb1'"
-
- malformed_utf8 = b"\x80"
- if hasattr(m, "PYBIND11_STR_LEGACY_PERMISSIVE"):
- assert cvt(malformed_utf8) is malformed_utf8
- else:
- malformed_cvt = cvt(malformed_utf8)
- assert type(malformed_cvt) is str
- 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) == "Unable to convert call argument " + (
- "'1' of type 'UnregisteredType' to Python object"
- if detailed_error_messages_enabled
- else "to Python object (#define PYBIND11_DETAILED_ERROR_MESSAGES or compile in debug mode for details)"
- )
-
-
-def test_hash():
- class Hashable:
- def __init__(self, value):
- self.value = value
-
- def __hash__(self):
- return self.value
-
- class Unhashable:
- __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" in str(excinfo.value)
- assert "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
- assert list(view) == 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"
- 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():
- with pytest.raises(ValueError):
- m.test_memoryview_from_buffer_nullptr()
-
-
-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
-
-
-def test_isinstance_string_types():
- assert m.isinstance_pybind11_bytes(b"")
- assert not m.isinstance_pybind11_bytes("")
-
- assert m.isinstance_pybind11_str("")
- if hasattr(m, "PYBIND11_STR_LEGACY_PERMISSIVE"):
- assert m.isinstance_pybind11_str(b"")
- else:
- assert not m.isinstance_pybind11_str(b"")
-
-
-def test_pass_bytes_or_unicode_to_string_types():
- assert m.pass_to_pybind11_bytes(b"Bytes") == 5
- with pytest.raises(TypeError):
- m.pass_to_pybind11_bytes("Str")
-
- if hasattr(m, "PYBIND11_STR_LEGACY_PERMISSIVE"):
- assert m.pass_to_pybind11_str(b"Bytes") == 5
- else:
- with pytest.raises(TypeError):
- m.pass_to_pybind11_str(b"Bytes")
- assert m.pass_to_pybind11_str("Str") == 3
-
- assert m.pass_to_std_string(b"Bytes") == 5
- assert m.pass_to_std_string("Str") == 3
-
- malformed_utf8 = b"\x80"
- if hasattr(m, "PYBIND11_STR_LEGACY_PERMISSIVE"):
- assert m.pass_to_pybind11_str(malformed_utf8) == 1
- else:
- with pytest.raises(TypeError):
- m.pass_to_pybind11_str(malformed_utf8)
-
-
-@pytest.mark.parametrize(
- "create_weakref, create_weakref_with_callback",
- [
- (m.weakref_from_handle, m.weakref_from_handle_and_function),
- (m.weakref_from_object, m.weakref_from_object_and_function),
- ],
-)
-def test_weakref(create_weakref, create_weakref_with_callback):
- from weakref import getweakrefcount
-
- # Apparently, you cannot weakly reference an object()
- class WeaklyReferenced:
- pass
-
- callback_called = False
-
- def callback(wr):
- nonlocal callback_called
- callback_called = True
-
- obj = WeaklyReferenced()
- assert getweakrefcount(obj) == 0
- wr = create_weakref(obj)
- assert getweakrefcount(obj) == 1
-
- obj = WeaklyReferenced()
- assert getweakrefcount(obj) == 0
- wr = create_weakref_with_callback(obj, callback) # noqa: F841
- assert getweakrefcount(obj) == 1
- assert not callback_called
- del obj
- pytest.gc_collect()
- assert callback_called
-
-
-@pytest.mark.parametrize(
- "create_weakref, has_callback",
- [
- (m.weakref_from_handle, False),
- (m.weakref_from_object, False),
- (m.weakref_from_handle_and_function, True),
- (m.weakref_from_object_and_function, True),
- ],
-)
-def test_weakref_err(create_weakref, has_callback):
- class C:
- __slots__ = []
-
- def callback(_):
- pass
-
- ob = C()
- # Should raise TypeError on CPython
- with pytest.raises(TypeError) if not env.PYPY else contextlib.nullcontext():
- if has_callback:
- _ = create_weakref(ob, callback)
- else:
- _ = create_weakref(ob)
-
-
-def test_cpp_iterators():
- assert m.tuple_iterator() == 12
- assert m.dict_iterator() == 305 + 711
- assert m.passed_iterator(iter((-7, 3))) == -4
-
-
-def test_implementation_details():
- lst = [39, 43, 92, 49, 22, 29, 93, 98, 26, 57, 8]
- tup = tuple(lst)
- assert m.sequence_item_get_ssize_t(lst) == 43
- assert m.sequence_item_set_ssize_t(lst) is None
- assert lst[1] == "peppa"
- assert m.sequence_item_get_size_t(lst) == 92
- assert m.sequence_item_set_size_t(lst) is None
- assert lst[2] == "george"
- assert m.list_item_get_ssize_t(lst) == 49
- assert m.list_item_set_ssize_t(lst) is None
- assert lst[3] == "rebecca"
- assert m.list_item_get_size_t(lst) == 22
- assert m.list_item_set_size_t(lst) is None
- assert lst[4] == "richard"
- assert m.tuple_item_get_ssize_t(tup) == 29
- assert m.tuple_item_set_ssize_t() == ("emely", "edmond")
- assert m.tuple_item_get_size_t(tup) == 93
- assert m.tuple_item_set_size_t() == ("candy", "cat")
-
-
-def test_external_float_():
- r1 = m.square_float_(2.0)
- assert r1 == 4.0
-
-
-def test_tuple_rvalue_getter():
- pop = 1000
- tup = tuple(range(pop))
- m.tuple_rvalue_getter(tup)
-
-
-def test_list_rvalue_getter():
- pop = 1000
- my_list = list(range(pop))
- m.list_rvalue_getter(my_list)
-
-
-def test_populate_dict_rvalue():
- pop = 1000
- my_dict = {i: i for i in range(pop)}
- assert m.populate_dict_rvalue(pop) == my_dict
-
-
-def test_populate_obj_str_attrs():
- pop = 1000
- o = types.SimpleNamespace(**{str(i): i for i in range(pop)})
- new_o = m.populate_obj_str_attrs(o, pop)
- new_attrs = {k: v for k, v in new_o.__dict__.items() if not k.startswith("_")}
- assert all(isinstance(v, str) for v in new_attrs.values())
- assert len(new_attrs) == pop
-
-
-@pytest.mark.parametrize(
- "a,b", [("foo", "bar"), (1, 2), (1.0, 2.0), (list(range(3)), list(range(3, 6)))]
-)
-def test_inplace_append(a, b):
- expected = a + b
- assert m.inplace_append(a, b) == expected
-
-
-@pytest.mark.parametrize("a,b", [(3, 2), (3.0, 2.0), (set(range(3)), set(range(2)))])
-def test_inplace_subtract(a, b):
- expected = a - b
- assert m.inplace_subtract(a, b) == expected
-
-
-@pytest.mark.parametrize("a,b", [(3, 2), (3.0, 2.0), ([1], 3)])
-def test_inplace_multiply(a, b):
- expected = a * b
- assert m.inplace_multiply(a, b) == expected
-
-
-@pytest.mark.parametrize("a,b", [(6, 3), (6.0, 3.0)])
-def test_inplace_divide(a, b):
- expected = a / b
- assert m.inplace_divide(a, b) == expected
-
-
-@pytest.mark.parametrize(
- "a,b",
- [
- (False, True),
- (
- set(),
- {
- 1,
- },
- ),
- ],
-)
-def test_inplace_or(a, b):
- expected = a | b
- assert m.inplace_or(a, b) == expected
-
-
-@pytest.mark.parametrize(
- "a,b",
- [
- (True, False),
- (
- {1, 2, 3},
- {
- 1,
- },
- ),
- ],
-)
-def test_inplace_and(a, b):
- expected = a & b
- assert m.inplace_and(a, b) == expected
-
-
-@pytest.mark.parametrize("a,b", [(8, 1), (-3, 2)])
-def test_inplace_lshift(a, b):
- expected = a << b
- assert m.inplace_lshift(a, b) == expected
-
-
-@pytest.mark.parametrize("a,b", [(8, 1), (-2, 2)])
-def test_inplace_rshift(a, b):
- expected = a >> b
- assert m.inplace_rshift(a, b) == expected
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_sequences_and_iterators.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_sequences_and_iterators.cpp
deleted file mode 100644
index 1de65edbf2330f12cfc6437b1e9d54304313283d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_sequences_and_iterators.cpp
+++ /dev/null
@@ -1,581 +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/operators.h>
-#include <pybind11/stl.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.h"
-
-#include <algorithm>
-#include <utility>
-#include <vector>
-
-#ifdef PYBIND11_HAS_OPTIONAL
-# include <optional>
-#endif // PYBIND11_HAS_OPTIONAL
-
-template <typename T>
-class NonZeroIterator {
- const T *ptr_;
-
-public:
- explicit 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;
-}
-
-/* Iterator where dereferencing returns prvalues instead of references. */
-template <typename T>
-class NonRefIterator {
- const T *ptr_;
-
-public:
- explicit NonRefIterator(const T *ptr) : ptr_(ptr) {}
- T operator*() const { return T(*ptr_); }
- NonRefIterator &operator++() {
- ++ptr_;
- return *this;
- }
- bool operator==(const NonRefIterator &other) const { return ptr_ == other.ptr_; }
-};
-
-class NonCopyableInt {
-public:
- explicit NonCopyableInt(int value) : value_(value) {}
- NonCopyableInt(const NonCopyableInt &) = delete;
- NonCopyableInt(NonCopyableInt &&other) noexcept : value_(other.value_) {
- other.value_ = -1; // detect when an unwanted move occurs
- }
- NonCopyableInt &operator=(const NonCopyableInt &) = delete;
- NonCopyableInt &operator=(NonCopyableInt &&other) noexcept {
- value_ = other.value_;
- other.value_ = -1; // detect when an unwanted move occurs
- return *this;
- }
- int get() const { return value_; }
- void set(int value) { value_ = value; }
- ~NonCopyableInt() = default;
-
-private:
- int value_;
-};
-using NonCopyableIntPair = std::pair<NonCopyableInt, NonCopyableInt>;
-PYBIND11_MAKE_OPAQUE(std::vector<NonCopyableInt>);
-PYBIND11_MAKE_OPAQUE(std::vector<NonCopyableIntPair>);
-
-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:
- explicit 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, const py::slice &slice) {
- py::ssize_t start = 0, stop = 0, step = 0, slicelength = 0;
- 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);
- });
-
- m.def("make_forward_slice_size_t", []() { return py::slice(0, -1, 1); });
- m.def("make_reversed_slice_object",
- []() { return py::slice(py::none(), py::none(), py::int_(-1)); });
-#ifdef PYBIND11_HAS_OPTIONAL
- m.attr("has_optional") = true;
- m.def("make_reversed_slice_size_t_optional_verbose",
- []() { return py::slice(std::nullopt, std::nullopt, -1); });
- // Warning: The following spelling may still compile if optional<> is not present and give
- // wrong answers. Please use with caution.
- m.def("make_reversed_slice_size_t_optional", []() { return py::slice({}, {}, -1); });
-#else
- m.attr("has_optional") = false;
-#endif
-
- // test_sequence
- class Sequence {
- public:
- explicit Sequence(size_t size) : m_size(size) {
- print_created(this, "of size", m_size);
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- m_data = new float[size];
- memset(m_data, 0, sizeof(float) * size);
- }
- explicit Sequence(const std::vector<float> &value) : m_size(value.size()) {
- print_created(this, "of size", m_size, "from std::vector");
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- 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);
- // NOLINTNEXTLINE(cppcoreguidelines-prefer-member-initializer)
- m_data = new float[m_size];
- memcpy(m_data, s.m_data, sizeof(float) * m_size);
- }
- Sequence(Sequence &&s) noexcept : 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) noexcept {
- 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, const py::slice &slice) -> Sequence * {
- size_t start = 0, stop = 0, step = 0, slicelength = 0;
- 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, const py::slice &slice, const Sequence &value) {
- size_t start = 0, stop = 0, step = 0, slicelength = 0;
- 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;
- explicit StringMap(std::unordered_map<std::string, std::string> init)
- : map(std::move(init)) {}
-
- void set(const std::string &key, std::string val) { map[key] = std::move(val); }
- std::string get(const 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, const 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>())
- .def(
- "values",
- [](const StringMap &map) { return py::make_value_iterator(map.begin(), map.end()); },
- py::keep_alive<0, 1>());
-
- // test_generalized_iterators
- class IntPairs {
- public:
- explicit IntPairs(std::vector<std::pair<int, int>> data) : data_(std::move(data)) {}
- const std::pair<int, int> *begin() const { return data_.data(); }
- // .end() only required for py::make_iterator(self) overload
- const std::pair<int, int> *end() const { return data_.data() + data_.size(); }
-
- 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>())
- .def(
- "nonzero_values",
- [](const IntPairs &s) {
- return py::make_value_iterator(NonZeroIterator<std::pair<int, int>>(s.begin()),
- NonZeroSentinel());
- },
- py::keep_alive<0, 1>())
-
- // test iterator that returns values instead of references
- .def(
- "nonref",
- [](const IntPairs &s) {
- return py::make_iterator(NonRefIterator<std::pair<int, int>>(s.begin()),
- NonRefIterator<std::pair<int, int>>(s.end()));
- },
- py::keep_alive<0, 1>())
- .def(
- "nonref_keys",
- [](const IntPairs &s) {
- return py::make_key_iterator(NonRefIterator<std::pair<int, int>>(s.begin()),
- NonRefIterator<std::pair<int, int>>(s.end()));
- },
- py::keep_alive<0, 1>())
- .def(
- "nonref_values",
- [](const IntPairs &s) {
- return py::make_value_iterator(NonRefIterator<std::pair<int, int>>(s.begin()),
- NonRefIterator<std::pair<int, int>>(s.end()));
- },
- py::keep_alive<0, 1>())
-
- // test single-argument make_iterator
- .def(
- "simple_iterator",
- [](IntPairs &self) { return py::make_iterator(self); },
- py::keep_alive<0, 1>())
- .def(
- "simple_keys",
- [](IntPairs &self) { return py::make_key_iterator(self); },
- py::keep_alive<0, 1>())
- .def(
- "simple_values",
- [](IntPairs &self) { return py::make_value_iterator(self); },
- py::keep_alive<0, 1>())
-
- // Test iterator with an Extra (doesn't do anything useful, so not used
- // at runtime, but tests need to be able to compile with the correct
- // overload. See PR #3293.
- .def(
- "_make_iterator_extras",
- [](IntPairs &self) { return py::make_iterator(self, py::call_guard<int>()); },
- py::keep_alive<0, 1>())
- .def(
- "_make_key_extras",
- [](IntPairs &self) { return py::make_key_iterator(self, py::call_guard<int>()); },
- py::keep_alive<0, 1>())
- .def(
- "_make_value_extras",
- [](IntPairs &self) { return py::make_value_iterator(self, py::call_guard<int>()); },
- py::keep_alive<0, 1>());
-
- // test_iterator_referencing
- py::class_<NonCopyableInt>(m, "NonCopyableInt")
- .def(py::init<int>())
- .def("set", &NonCopyableInt::set)
- .def("__int__", &NonCopyableInt::get);
- py::class_<std::vector<NonCopyableInt>>(m, "VectorNonCopyableInt")
- .def(py::init<>())
- .def("append",
- [](std::vector<NonCopyableInt> &vec, int value) { vec.emplace_back(value); })
- .def("__iter__", [](std::vector<NonCopyableInt> &vec) {
- return py::make_iterator(vec.begin(), vec.end());
- });
- py::class_<std::vector<NonCopyableIntPair>>(m, "VectorNonCopyableIntPair")
- .def(py::init<>())
- .def("append",
- [](std::vector<NonCopyableIntPair> &vec, const std::pair<int, int> &value) {
- vec.emplace_back(NonCopyableInt(value.first), NonCopyableInt(value.second));
- })
- .def("keys",
- [](std::vector<NonCopyableIntPair> &vec) {
- return py::make_key_iterator(vec.begin(), vec.end());
- })
- .def("values", [](std::vector<NonCopyableIntPair> &vec) {
- return py::make_value_iterator(vec.begin(), vec.end());
- });
-
-#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", [](const 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", [](const py::sequence &seq) { return seq.size(); });
-
- // Make sure that py::iterator works with std algorithms
- m.def("count_none", [](const py::object &o) {
- return std::count_if(o.begin(), o.end(), [](py::handle h) { return h.is_none(); });
- });
-
- m.def("find_none", [](const 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", [](const 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); });
-
- // test_iterator on c arrays
- // #4100: ensure lvalue required as increment operand
- class CArrayHolder {
- public:
- CArrayHolder(double x, double y, double z) {
- values[0] = x;
- values[1] = y;
- values[2] = z;
- };
- double values[3];
- };
-
- py::class_<CArrayHolder>(m, "CArrayHolder")
- .def(py::init<double, double, double>())
- .def(
- "__iter__",
- [](const CArrayHolder &v) { return py::make_iterator(v.values, v.values + 3); },
- py::keep_alive<0, 1>());
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_sequences_and_iterators.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_sequences_and_iterators.py
deleted file mode 100644
index de486e3e8e0a09ede9bd42f9d57cb38859cdbc00..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_sequences_and_iterators.py
+++ /dev/null
@@ -1,251 +0,0 @@
-import pytest
-from pytest import approx
-
-from pybind11_tests import ConstructorStats
-from pybind11_tests import sequences_and_iterators as m
-
-
-def test_slice_constructors():
- assert m.make_forward_slice_size_t() == slice(0, -1, 1)
- assert m.make_reversed_slice_object() == slice(None, None, -1)
-
-
-@pytest.mark.skipif(not m.has_optional, reason="no <optional>")
-def test_slice_constructors_explicit_optional():
- assert m.make_reversed_slice_size_t_optional() == slice(None, None, -1)
- assert m.make_reversed_slice_size_t_optional_verbose() == slice(None, None, -1)
-
-
-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()) == []
-
- assert list(m.IntPairs([(1, 2), (3, 4), (0, 5)]).nonzero_values()) == [2, 4]
- assert list(m.IntPairs([(1, 2), (2, 0), (0, 3), (4, 5)]).nonzero_values()) == [2]
- assert list(m.IntPairs([(0, 3), (1, 2), (3, 4)]).nonzero_values()) == []
-
- # __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_nonref_iterators():
- pairs = m.IntPairs([(1, 2), (3, 4), (0, 5)])
- assert list(pairs.nonref()) == [(1, 2), (3, 4), (0, 5)]
- assert list(pairs.nonref_keys()) == [1, 3, 0]
- assert list(pairs.nonref_values()) == [2, 4, 5]
-
-
-def test_generalized_iterators_simple():
- assert list(m.IntPairs([(1, 2), (3, 4), (0, 5)]).simple_iterator()) == [
- (1, 2),
- (3, 4),
- (0, 5),
- ]
- assert list(m.IntPairs([(1, 2), (3, 4), (0, 5)]).simple_keys()) == [1, 3, 0]
- assert list(m.IntPairs([(1, 2), (3, 4), (0, 5)]).simple_values()) == [2, 4, 5]
-
-
-def test_iterator_referencing():
- """Test that iterators reference rather than copy their referents."""
- vec = m.VectorNonCopyableInt()
- vec.append(3)
- vec.append(5)
- assert [int(x) for x in vec] == [3, 5]
- # Increment everything to make sure the referents can be mutated
- for x in vec:
- x.set(int(x) + 1)
- assert [int(x) for x in vec] == [4, 6]
-
- vec = m.VectorNonCopyableIntPair()
- vec.append([3, 4])
- vec.append([5, 7])
- assert [int(x) for x in vec.keys()] == [3, 5]
- assert [int(x) for x in vec.values()] == [4, 7]
- for x in vec.keys():
- x.set(int(x) + 1)
- for x in vec.values():
- x.set(int(x) + 10)
- assert [int(x) for x in vec.keys()] == [4, 6]
- assert [int(x) for x in vec.values()] == [14, 17]
-
-
-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 s[0] == approx(12.34, rel=1e-05)
- assert s[3] == approx(56.78, rel=1e-05)
-
- 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 rev == approx(expected, rel=1e-05)
- assert rev2 == approx(expected, rel=1e-05)
- assert rev == rev2
-
- rev[0::2] = m.Sequence([2.0, 2.0, 2.0])
- assert cstats.values() == ["of size", "3", "from std::vector"]
-
- assert rev == approx([2, 56.78, 2, 0, 2], rel=1e-05)
-
- 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]
- assert list(sm.values()) == [expected[k] for k in sm]
-
- 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()))
-
-
-def test_carray_iterator():
- """#4100: Check for proper iterator overload with C-Arrays"""
- args_gt = list(float(i) for i in range(3))
- arr_h = m.CArrayHolder(*args_gt)
- args = list(arr_h)
- assert args_gt == args
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_smart_ptr.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_smart_ptr.cpp
deleted file mode 100644
index 6d9efcedce52769a1bcda809b4378c950eacaf64..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_smart_ptr.cpp
+++ /dev/null
@@ -1,470 +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.
-*/
-
-#include "object.h"
-#include "pybind11_tests.h"
-
-namespace {
-
-// 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:
- explicit huge_unique_ptr(T *p) : ptr(p) {}
- T *get() { return ptr.get(); }
-};
-
-// Simple custom holder that works like unique_ptr
-template <typename T>
-class custom_unique_ptr {
- std::unique_ptr<T> impl;
-
-public:
- explicit custom_unique_ptr(T *p) : impl(p) {}
- T *get() const { return impl.get(); }
- T *release_ptr() { return impl.release(); }
-};
-
-// 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;
- explicit 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"); }
-};
-
-// 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;
- explicit 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"); }
-};
-
-// Custom object with builtin reference counting (see 'object.h' for the implementation)
-class MyObject1 : public Object {
-public:
- explicit 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;
-};
-
-// Object managed by a std::shared_ptr<>
-class MyObject2 {
-public:
- MyObject2(const MyObject2 &) = default;
- explicit 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;
-};
-
-// 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;
- explicit 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;
-};
-
-// test_unique_nodelete
-// Object with a private destructor
-class MyObject4;
-std::unordered_set<MyObject4 *> myobject4_instances;
-class MyObject4 {
-public:
- explicit MyObject4(int value) : value{value} {
- print_created(this);
- myobject4_instances.insert(this);
- }
- int value;
-
- static void cleanupAllInstances() {
- auto tmp = std::move(myobject4_instances);
- myobject4_instances.clear();
- for (auto *o : tmp) {
- delete o;
- }
- }
-
-private:
- ~MyObject4() {
- myobject4_instances.erase(this);
- print_destroyed(this);
- }
-};
-
-// 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;
-std::unordered_set<MyObject4a *> myobject4a_instances;
-class MyObject4a {
-public:
- explicit MyObject4a(int i) : value{i} {
- print_created(this);
- myobject4a_instances.insert(this);
- };
- int value;
-
- static void cleanupAllInstances() {
- auto tmp = std::move(myobject4a_instances);
- myobject4a_instances.clear();
- for (auto *o : tmp) {
- delete o;
- }
- }
-
-protected:
- virtual ~MyObject4a() {
- myobject4a_instances.erase(this);
- print_destroyed(this);
- }
-};
-
-// Object derived but with public destructor and no Deleter in default holder
-class MyObject4b : public MyObject4a {
-public:
- explicit MyObject4b(int i) : MyObject4a(i) { print_created(this); }
- ~MyObject4b() override { print_destroyed(this); }
-};
-
-// test_large_holder
-class MyObject5 { // managed by huge_unique_ptr
-public:
- explicit MyObject5(int value) : value{value} { print_created(this); }
- ~MyObject5() { print_destroyed(this); }
- int value;
-};
-
-// test_shared_ptr_and_references
-struct SharedPtrRef {
- struct A {
- A() { print_created(this); }
- A(const A &) { print_copy_created(this); }
- A(A &&) noexcept { print_move_created(this); }
- ~A() { print_destroyed(this); }
- };
-
- A value = {};
- std::shared_ptr<A> shared = std::make_shared<A>();
-};
-
-// test_shared_ptr_from_this_and_references
-struct SharedFromThisRef {
- struct B : std::enable_shared_from_this<B> {
- B() { print_created(this); }
- // NOLINTNEXTLINE(bugprone-copy-constructor-init)
- B(const B &) : std::enable_shared_from_this<B>() { print_copy_created(this); }
- B(B &&) noexcept : 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>();
-};
-
-// 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 {};
-
-// test_move_only_holder
-struct C {
- C() { print_created(this); }
- ~C() { print_destroyed(this); }
-};
-
-// test_holder_with_addressof_operator
-struct TypeForHolderWithAddressOf {
- TypeForHolderWithAddressOf() { print_created(this); }
- TypeForHolderWithAddressOf(const TypeForHolderWithAddressOf &) { print_copy_created(this); }
- TypeForHolderWithAddressOf(TypeForHolderWithAddressOf &&) noexcept {
- print_move_created(this);
- }
- ~TypeForHolderWithAddressOf() { print_destroyed(this); }
- std::string toString() const {
- return "TypeForHolderWithAddressOf[" + std::to_string(value) + "]";
- }
- int value = 42;
-};
-
-// test_move_only_holder_with_addressof_operator
-struct TypeForMoveOnlyHolderWithAddressOf {
- explicit TypeForMoveOnlyHolderWithAddressOf(int value) : value{value} { print_created(this); }
- ~TypeForMoveOnlyHolderWithAddressOf() { print_destroyed(this); }
- std::string toString() const {
- return "MoveOnlyHolderWithAddressOf[" + std::to_string(value) + "]";
- }
- int value;
-};
-
-// test_smart_ptr_from_default
-struct 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;
-};
-
-struct ElementA : ElementBase {
- explicit ElementA(int v) : v(v) {}
- int value() const { return v; }
- int v;
-};
-
-struct ElementList {
- void add(const std::shared_ptr<ElementBase> &e) { l.push_back(e); }
- std::vector<std::shared_ptr<ElementBase>> l;
-};
-
-} // namespace
-
-// 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.
-// Make pybind11 aware of the non-standard getter member function
-namespace PYBIND11_NAMESPACE {
-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_NAMESPACE
-
-// Make pybind aware of the ref-counted wrapper type (s):
-PYBIND11_DECLARE_HOLDER_TYPE(T, ref<T>, true);
-// 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>);
-PYBIND11_DECLARE_HOLDER_TYPE(T, huge_unique_ptr<T>);
-PYBIND11_DECLARE_HOLDER_TYPE(T, custom_unique_ptr<T>);
-PYBIND11_DECLARE_HOLDER_TYPE(T, shared_ptr_with_addressof_operator<T>);
-PYBIND11_DECLARE_HOLDER_TYPE(T, unique_ptr_with_addressof_operator<T>);
-
-TEST_SUBMODULE(smart_ptr, m) {
- // Please do not interleave `struct` and `class` definitions with bindings code,
- // but implement `struct`s and `class`es in the anonymous namespace above.
- // This helps keeping the smart_holder branch in sync with master.
-
- // test_smart_ptr
-
- // Object implementation in `object.h`
- py::class_<Object, ref<Object>> obj(m, "Object");
- obj.def("getRefCount", &Object::getRefCount);
-
- 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 ref<Object>(new MyObject1(2)); });
- m.def("make_myobject1_1", []() -> MyObject1 * { return new MyObject1(4); });
- m.def("make_myobject1_2", []() -> ref<MyObject1> { return ref<MyObject1>(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>);
-
- 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()); });
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- 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()); });
-
- 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()); });
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- 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", []() {
- auto o = ref<MyObject1>(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
- py::class_<MyObject4, std::unique_ptr<MyObject4, py::nodelete>>(m, "MyObject4")
- .def(py::init<int>())
- .def_readwrite("value", &MyObject4::value)
- .def_static("cleanup_all_instances", &MyObject4::cleanupAllInstances);
-
- // test_unique_deleter
- py::class_<MyObject4a, std::unique_ptr<MyObject4a, py::nodelete>>(m, "MyObject4a")
- .def(py::init<int>())
- .def_readwrite("value", &MyObject4a::value)
- .def_static("cleanup_all_instances", &MyObject4a::cleanupAllInstances);
-
- py::class_<MyObject4b, MyObject4a, std::unique_ptr<MyObject4b>>(m, "MyObject4b")
- .def(py::init<int>());
-
- // test_large_holder
- py::class_<MyObject5, huge_unique_ptr<MyObject5>>(m, "MyObject5")
- .def(py::init<int>())
- .def_readwrite("value", &MyObject5::value);
-
- // test_shared_ptr_and_references
- using A = SharedPtrRef::A;
- py::class_<A, std::shared_ptr<A>>(m, "A");
- py::class_<SharedPtrRef, std::unique_ptr<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; })
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- .def("set_holder", [](SharedPtrRef &, std::shared_ptr<A>) { return true; });
-
- // test_shared_ptr_from_this_and_references
- using B = SharedFromThisRef::B;
- py::class_<B, std::shared_ptr<B>>(m, "B");
- py::class_<SharedFromThisRef, std::unique_ptr<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; })
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- .def("set_holder", [](SharedFromThisRef &, std::shared_ptr<B>) { return true; });
-
- // Issue #865: shared_from_this doesn't work with virtual inheritance
- 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
- 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
- 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()); })
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- .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
- 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
- py::class_<HeldByDefaultHolder, std::unique_ptr<HeldByDefaultHolder>>(m, "HeldByDefaultHolder")
- .def(py::init<>())
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- .def_static("load_shared_ptr", [](std::shared_ptr<HeldByDefaultHolder>) {});
-
- // test_shared_ptr_gc
- // #187: issue involving std::shared_ptr<> return value policy & garbage collection
- py::class_<ElementBase, std::shared_ptr<ElementBase>>(m, "ElementBase");
-
- py::class_<ElementA, ElementBase, std::shared_ptr<ElementA>>(m, "ElementA")
- .def(py::init<int>())
- .def("value", &ElementA::value);
-
- 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.10.3/tests/test_smart_ptr.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_smart_ptr.py
deleted file mode 100644
index 2f204e01b10305f9a42110c142635a9394986892..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_smart_ptr.py
+++ /dev/null
@@ -1,315 +0,0 @@
-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 == f"MyObject1[{i}]\n" * 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 == f"MyObject1[{i}]\n" * times
-
- cstats = ConstructorStats.get(m.MyObject1)
- assert cstats.alive() == 0
- expected_values = [f"MyObject1[{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 == f"MyObject2[{i}]\n" * 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 == f"MyObject3[{i}]\n" * 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
- m.MyObject4.cleanup_all_instances()
- assert cstats.alive() == 0
-
-
-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
- m.MyObject4a.cleanup_all_instances()
- assert cstats.alive() == 0
-
-
-def test_unique_deleter():
- m.MyObject4a(0)
- o = m.MyObject4b(23)
- assert o.value == 23
- cstats4a = ConstructorStats.get(m.MyObject4a)
- assert cstats4a.alive() == 2
- cstats4b = ConstructorStats.get(m.MyObject4b)
- assert cstats4b.alive() == 1
- del o
- assert cstats4a.alive() == 1 # Should now only be one leftover
- assert cstats4b.alive() == 0 # Should be deleted
- m.MyObject4a.cleanup_all_instances()
- assert cstats4a.alive() == 0
- assert cstats4b.alive() == 0
-
-
-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.10.3/tests/test_stl.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl.cpp
deleted file mode 100644
index d45465d681ca6a92e32b26c2a7753927c3d18f66..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl.cpp
+++ /dev/null
@@ -1,551 +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/stl.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.h"
-
-#ifndef PYBIND11_HAS_FILESYSTEM_IS_OPTIONAL
-# define PYBIND11_HAS_FILESYSTEM_IS_OPTIONAL
-#endif
-#include <pybind11/stl/filesystem.h>
-
-#include <string>
-#include <vector>
-
-#if defined(PYBIND11_TEST_BOOST)
-# include <boost/optional.hpp>
-
-namespace PYBIND11_NAMESPACE {
-namespace detail {
-template <typename T>
-struct type_caster<boost::optional<T>> : optional_caster<boost::optional<T>> {};
-
-template <>
-struct type_caster<boost::none_t> : void_caster<boost::none_t> {};
-} // namespace detail
-} // namespace PYBIND11_NAMESPACE
-#endif
-
-// Test with `std::variant` in C++17 mode, or with `boost::variant` in C++11/14
-#if defined(PYBIND11_HAS_VARIANT)
-using std::variant;
-# define PYBIND11_TEST_VARIANT 1
-#elif defined(PYBIND11_TEST_BOOST)
-# include <boost/variant.hpp>
-# define PYBIND11_TEST_VARIANT 1
-using boost::variant;
-
-namespace PYBIND11_NAMESPACE {
-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 detail
-} // namespace PYBIND11_NAMESPACE
-#endif
-
-PYBIND11_MAKE_OPAQUE(std::vector<std::string, std::allocator<std::string>>);
-
-/// Issue #528: templated constructor
-struct TplCtorClass {
- template <typename T>
- explicit 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 {
- // NOLINTNEXTLINE(modernize-use-equals-default): breaks GCC 4.8
- OptionalHolder(){};
- bool member_initialized() const { return member && member->initialized; }
- OptionalImpl<T> member = T{};
-};
-
-enum class EnumType {
- kSet = 42,
- kUnset = 85,
-};
-
-// This is used to test that return-by-ref and return-by-copy policies are
-// handled properly for optional types. This is a regression test for a dangling
-// reference issue. The issue seemed to require the enum value type to
-// reproduce - it didn't seem to happen if the value type is just an integer.
-template <template <typename> class OptionalImpl>
-class OptionalProperties {
-public:
- using OptionalEnumValue = OptionalImpl<EnumType>;
-
- OptionalProperties() : value(EnumType::kSet) {}
- ~OptionalProperties() {
- // Reset value to detect use-after-destruction.
- // This is set to a specific value rather than nullopt to ensure that
- // the memory that contains the value gets re-written.
- value = EnumType::kUnset;
- }
-
- OptionalEnumValue &access_by_ref() { return value; }
- OptionalEnumValue access_by_copy() { return value; }
-
-private:
- OptionalEnumValue value;
-};
-
-// This type mimics aspects of boost::optional from old versions of Boost,
-// which exposed a dangling reference bug in Pybind11. Recent versions of
-// boost::optional, as well as libstdc++'s std::optional, don't seem to be
-// affected by the same issue. This is meant to be a minimal implementation
-// required to reproduce the issue, not fully standard-compliant.
-// See issue #3330 for more details.
-template <typename T>
-class ReferenceSensitiveOptional {
-public:
- using value_type = T;
-
- ReferenceSensitiveOptional() = default;
- // NOLINTNEXTLINE(google-explicit-constructor)
- ReferenceSensitiveOptional(const T &value) : storage{value} {}
- // NOLINTNEXTLINE(google-explicit-constructor)
- ReferenceSensitiveOptional(T &&value) : storage{std::move(value)} {}
- ReferenceSensitiveOptional &operator=(const T &value) {
- storage = {value};
- return *this;
- }
- ReferenceSensitiveOptional &operator=(T &&value) {
- storage = {std::move(value)};
- return *this;
- }
-
- template <typename... Args>
- T &emplace(Args &&...args) {
- storage.clear();
- storage.emplace_back(std::forward<Args>(args)...);
- return storage.back();
- }
-
- const T &value() const noexcept {
- assert(!storage.empty());
- return storage[0];
- }
-
- const T &operator*() const noexcept { return value(); }
-
- const T *operator->() const noexcept { return &value(); }
-
- explicit operator bool() const noexcept { return !storage.empty(); }
-
-private:
- std::vector<T> storage;
-};
-
-namespace PYBIND11_NAMESPACE {
-namespace detail {
-template <typename T>
-struct type_caster<ReferenceSensitiveOptional<T>>
- : optional_caster<ReferenceSensitiveOptional<T>> {};
-} // namespace detail
-} // namespace PYBIND11_NAMESPACE
-
-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
- m.def(
- "cast_ptr_vector",
- []() {
- // Using no-destructor idiom to side-step warnings from overzealous compilers.
- static auto *v = new std::vector<RValueCaster>{2};
- return v;
- },
- py::return_value_policy::reference);
-
- // 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") != 0u) && (set.count("key2") != 0u) && (set.count("key3") != 0u);
- });
-
- // 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
- static std::vector<RValueCaster> lvv{2};
- 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;
- });
-
- pybind11::enum_<EnumType>(m, "EnumType")
- .value("kSet", EnumType::kSet)
- .value("kUnset", EnumType::kUnset);
-
- // 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 != 0 ? 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", [](const 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);
-
- using opt_props = OptionalProperties<std::optional>;
- pybind11::class_<opt_props>(m, "OptionalProperties")
- .def(pybind11::init<>())
- .def_property_readonly("access_by_ref", &opt_props::access_by_ref)
- .def_property_readonly("access_by_copy", &opt_props::access_by_copy);
-#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);
-
- using opt_exp_props = OptionalProperties<std::experimental::optional>;
- pybind11::class_<opt_exp_props>(m, "OptionalExpProperties")
- .def(pybind11::init<>())
- .def_property_readonly("access_by_ref", &opt_exp_props::access_by_ref)
- .def_property_readonly("access_by_copy", &opt_exp_props::access_by_copy);
-#endif
-
-#if defined(PYBIND11_TEST_BOOST)
- // test_boost_optional
- m.attr("has_boost_optional") = true;
-
- using boost_opt_int = boost::optional<int>;
- using boost_opt_no_assign = boost::optional<NoAssign>;
- m.def("double_or_zero_boost", [](const boost_opt_int &x) -> int { return x.value_or(0) * 2; });
- m.def("half_or_none_boost",
- [](int x) -> boost_opt_int { return x != 0 ? boost_opt_int(x / 2) : boost_opt_int(); });
- m.def(
- "test_nullopt_boost",
- [](boost_opt_int x) { return x.value_or(42); },
- py::arg_v("x", boost::none, "None"));
- m.def(
- "test_no_assign_boost",
- [](const boost_opt_no_assign &x) { return x ? x->value : 42; },
- py::arg_v("x", boost::none, "None"));
-
- using opt_boost_holder = OptionalHolder<boost::optional, MoveOutDetector>;
- py::class_<opt_boost_holder>(m, "OptionalBoostHolder", "Class with optional member")
- .def(py::init<>())
- .def_readonly("member", &opt_boost_holder::member)
- .def("member_initialized", &opt_boost_holder::member_initialized);
-
- using opt_boost_props = OptionalProperties<boost::optional>;
- pybind11::class_<opt_boost_props>(m, "OptionalBoostProperties")
- .def(pybind11::init<>())
- .def_property_readonly("access_by_ref", &opt_boost_props::access_by_ref)
- .def_property_readonly("access_by_copy", &opt_boost_props::access_by_copy);
-#endif
-
- // test_refsensitive_optional
- using refsensitive_opt_int = ReferenceSensitiveOptional<int>;
- using refsensitive_opt_no_assign = ReferenceSensitiveOptional<NoAssign>;
- m.def("double_or_zero_refsensitive",
- [](const refsensitive_opt_int &x) -> int { return (x ? x.value() : 0) * 2; });
- m.def("half_or_none_refsensitive", [](int x) -> refsensitive_opt_int {
- return x != 0 ? refsensitive_opt_int(x / 2) : refsensitive_opt_int();
- });
- m.def(
- "test_nullopt_refsensitive",
- // NOLINTNEXTLINE(performance-unnecessary-value-param)
- [](refsensitive_opt_int x) { return x ? x.value() : 42; },
- py::arg_v("x", refsensitive_opt_int(), "None"));
- m.def(
- "test_no_assign_refsensitive",
- [](const refsensitive_opt_no_assign &x) { return x ? x->value : 42; },
- py::arg_v("x", refsensitive_opt_no_assign(), "None"));
-
- using opt_refsensitive_holder = OptionalHolder<ReferenceSensitiveOptional, MoveOutDetector>;
- py::class_<opt_refsensitive_holder>(
- m, "OptionalRefSensitiveHolder", "Class with optional member")
- .def(py::init<>())
- .def_readonly("member", &opt_refsensitive_holder::member)
- .def("member_initialized", &opt_refsensitive_holder::member_initialized);
-
- using opt_refsensitive_props = OptionalProperties<ReferenceSensitiveOptional>;
- pybind11::class_<opt_refsensitive_props>(m, "OptionalRefSensitiveProperties")
- .def(pybind11::init<>())
- .def_property_readonly("access_by_ref", &opt_refsensitive_props::access_by_ref)
- .def_property_readonly("access_by_copy", &opt_refsensitive_props::access_by_copy);
-
-#ifdef PYBIND11_HAS_FILESYSTEM
- // test_fs_path
- m.attr("has_filesystem") = true;
- m.def("parent_path", [](const std::filesystem::path &p) { return p.parent_path(); });
-#endif
-
-#ifdef PYBIND11_TEST_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()(const std::string &) { return "std::string"; }
- result_type operator()(double) { return "double"; }
- result_type operator()(std::nullptr_t) { return "std::nullptr_t"; }
-# if defined(PYBIND11_HAS_VARIANT)
- result_type operator()(std::monostate) { return "std::monostate"; }
-# endif
- };
-
- // test_variant
- m.def("load_variant", [](const 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"));
- });
-
-# if defined(PYBIND11_HAS_VARIANT)
- // std::monostate tests.
- m.def("load_monostate_variant",
- [](const variant<std::monostate, int, std::string> &v) -> const char * {
- return py::detail::visit_helper<variant>::call(visitor(), v);
- });
- m.def("cast_monostate_variant", []() {
- using V = variant<std::monostate, int, std::string>;
- return py::make_tuple(V{}, V(5), V("Hello"));
- });
-# endif
-#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> &) {});
-#endif
-#if defined(PYBIND11_HAS_EXP_OPTIONAL)
- m.def("tpl_constr_optional_exp", [](std::experimental::optional<TplCtorClass> &) {});
-#endif
-#if defined(PYBIND11_TEST_BOOST)
- m.def("tpl_constr_optional_boost", [](boost::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",
- [](const std::vector<std::string> &) { return 1; });
- m.def("func_with_string_or_vector_string_arg_overload",
- [](const std::list<std::string> &) { return 2; });
- m.def("func_with_string_or_vector_string_arg_overload", [](const 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);
-
- m.def(
- "return_vector_bool_raw_ptr",
- []() { return new std::vector<bool>(4513); },
- // Without explicitly specifying `take_ownership`, this function leaks.
- py::return_value_policy::take_ownership);
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl.py
deleted file mode 100644
index d30c382113d1e44fddfcdab6535fb05cb10818ee..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl.py
+++ /dev/null
@@ -1,377 +0,0 @@
-import pytest
-
-from pybind11_tests import ConstructorStats, UserType
-from pybind11_tests import stl as m
-
-
-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 m.load_bool_vector(tuple([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 m.load_array(tuple(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 m.load_valarray(tuple(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 m.load_set(frozenset(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()
-
- props = m.OptionalProperties()
- assert int(props.access_by_ref) == 42
- assert int(props.access_by_copy) == 42
-
-
-@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()
-
- props = m.OptionalExpProperties()
- assert int(props.access_by_ref) == 42
- assert int(props.access_by_copy) == 42
-
-
-@pytest.mark.skipif(not hasattr(m, "has_boost_optional"), reason="no <boost/optional>")
-def test_boost_optional():
- assert m.double_or_zero_boost(None) == 0
- assert m.double_or_zero_boost(42) == 84
- pytest.raises(TypeError, m.double_or_zero_boost, "foo")
-
- assert m.half_or_none_boost(0) is None
- assert m.half_or_none_boost(42) == 21
- pytest.raises(TypeError, m.half_or_none_boost, "foo")
-
- assert m.test_nullopt_boost() == 42
- assert m.test_nullopt_boost(None) == 42
- assert m.test_nullopt_boost(42) == 42
- assert m.test_nullopt_boost(43) == 43
-
- assert m.test_no_assign_boost() == 42
- assert m.test_no_assign_boost(None) == 42
- assert m.test_no_assign_boost(m.NoAssign(43)) == 43
- pytest.raises(TypeError, m.test_no_assign_boost, 43)
-
- holder = m.OptionalBoostHolder()
- mvalue = holder.member
- assert mvalue.initialized
- assert holder.member_initialized()
-
- props = m.OptionalBoostProperties()
- assert int(props.access_by_ref) == 42
- assert int(props.access_by_copy) == 42
-
-
-def test_reference_sensitive_optional():
- assert m.double_or_zero_refsensitive(None) == 0
- assert m.double_or_zero_refsensitive(42) == 84
- pytest.raises(TypeError, m.double_or_zero_refsensitive, "foo")
-
- assert m.half_or_none_refsensitive(0) is None
- assert m.half_or_none_refsensitive(42) == 21
- pytest.raises(TypeError, m.half_or_none_refsensitive, "foo")
-
- assert m.test_nullopt_refsensitive() == 42
- assert m.test_nullopt_refsensitive(None) == 42
- assert m.test_nullopt_refsensitive(42) == 42
- assert m.test_nullopt_refsensitive(43) == 43
-
- assert m.test_no_assign_refsensitive() == 42
- assert m.test_no_assign_refsensitive(None) == 42
- assert m.test_no_assign_refsensitive(m.NoAssign(43)) == 43
- pytest.raises(TypeError, m.test_no_assign_refsensitive, 43)
-
- holder = m.OptionalRefSensitiveHolder()
- mvalue = holder.member
- assert mvalue.initialized
- assert holder.member_initialized()
-
- props = m.OptionalRefSensitiveProperties()
- assert int(props.access_by_ref) == 42
- assert int(props.access_by_copy) == 42
-
-
-@pytest.mark.skipif(not hasattr(m, "has_filesystem"), reason="no <filesystem>")
-def test_fs_path():
- from pathlib import Path
-
- class PseudoStrPath:
- def __fspath__(self):
- return "foo/bar"
-
- class PseudoBytesPath:
- def __fspath__(self):
- return b"foo/bar"
-
- assert m.parent_path(Path("foo/bar")) == Path("foo")
- assert m.parent_path("foo/bar") == Path("foo")
- assert m.parent_path(b"foo/bar") == Path("foo")
- assert m.parent_path(PseudoStrPath()) == Path("foo")
- assert m.parent_path(PseudoBytesPath()) == Path("foo")
-
-
-@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"
- )
-
-
-@pytest.mark.skipif(
- not hasattr(m, "load_monostate_variant"), reason="no std::monostate"
-)
-def test_variant_monostate(doc):
- assert m.load_monostate_variant(None) == "std::monostate"
- assert m.load_monostate_variant(1) == "int"
- assert m.load_monostate_variant("1") == "std::string"
-
- assert m.cast_monostate_variant() == (None, 5, "Hello")
-
- assert (
- doc(m.load_monostate_variant)
- == "load_monostate_variant(arg0: Union[None, int, str]) -> 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:
- """
- )
-
- 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
- """
- )
-
- 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"
-
-
-def test_return_vector_bool_raw_ptr():
- # Add `while True:` for manual leak checking.
- v = m.return_vector_bool_raw_ptr()
- assert isinstance(v, list)
- assert len(v) == 4513
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl_binders.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl_binders.cpp
deleted file mode 100644
index ca9630bd192220b66b39f1c4447413f9f740d4d6..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl_binders.cpp
+++ /dev/null
@@ -1,152 +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/numpy.h>
-#include <pybind11/stl_bind.h>
-
-#include "pybind11_tests.h"
-
-#include <deque>
-#include <map>
-#include <unordered_map>
-
-class El {
-public:
- El() = delete;
- explicit 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::bind_vector<std::deque<E_nc>>(m, "DequeENC");
- m.def("get_dnc", &one_to_n<std::deque<E_nc>>);
- py::bind_map<std::map<int, E_nc>>(m, "MapENC");
- m.def("get_mnc", ×_ten<std::map<int, E_nc>>);
- py::bind_map<std::unordered_map<int, E_nc>>(m, "UmapENC");
- m.def("get_umnc", ×_ten<std::unordered_map<int, E_nc>>);
- // 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::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::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>>>);
-
- // 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>{{false, 5, 3.0, true}, {true, 30, -1e4, false}};
- });
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl_binders.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl_binders.py
deleted file mode 100644
index 9eb906f065e3b6ab02ffdf783247445c6bac39bd..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_stl_binders.py
+++ /dev/null
@@ -1,337 +0,0 @@
-import pytest
-
-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
- assert mv[2] == 5
- mv[2] = 6
- assert v[2] == 6
-
- 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 str(mm) == "MapStringDouble{a: 1, b: 2.5}"
- assert "b" in mm
- assert "c" not in mm
- assert 123 not in mm
-
- # Check that keys, values, items are views, not merely iterable
- keys = mm.keys()
- values = mm.values()
- items = mm.items()
- assert list(keys) == ["a", "b"]
- assert len(keys) == 2
- assert "a" in keys
- assert "c" not in keys
- assert 123 not in keys
- assert list(items) == [("a", 1), ("b", 2.5)]
- assert len(items) == 2
- assert ("b", 2.5) in items
- assert "hello" not in items
- assert ("b", 2.5, None) not in items
- assert list(values) == [1, 2.5]
- assert len(values) == 2
- assert 1 in values
- assert 2 not in values
- # Check that views update when the map is updated
- mm["c"] = -1
- assert list(keys) == ["a", "b", "c"]
- assert list(values) == [1, 2.5, -1]
- assert list(items) == [("a", 1), ("b", 2.5), ("c", -1)]
-
- um = m.UnorderedMapStringDouble()
- um["ua"] = 1.1
- um["ub"] = 2.6
-
- assert sorted(list(um)) == ["ua", "ub"]
- assert list(um.keys()) == list(um)
- assert sorted(list(um.items())) == [("ua", 1.1), ("ub", 2.6)]
- assert list(zip(um.keys(), um.values())) == list(um.items())
- 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)]
-
-
-def test_map_view_types():
- map_string_double = m.MapStringDouble()
- unordered_map_string_double = m.UnorderedMapStringDouble()
- map_string_double_const = m.MapStringDoubleConst()
- unordered_map_string_double_const = m.UnorderedMapStringDoubleConst()
-
- assert map_string_double.keys().__class__.__name__ == "KeysView[str]"
- assert map_string_double.values().__class__.__name__ == "ValuesView[float]"
- assert map_string_double.items().__class__.__name__ == "ItemsView[str, float]"
-
- keys_type = type(map_string_double.keys())
- assert type(unordered_map_string_double.keys()) is keys_type
- assert type(map_string_double_const.keys()) is keys_type
- assert type(unordered_map_string_double_const.keys()) is keys_type
-
- values_type = type(map_string_double.values())
- assert type(unordered_map_string_double.values()) is values_type
- assert type(map_string_double_const.values()) is values_type
- assert type(unordered_map_string_double_const.values()) is values_type
-
- items_type = type(map_string_double.items())
- assert type(unordered_map_string_double.items()) is items_type
- assert type(map_string_double_const.items()) is items_type
- assert type(unordered_map_string_double_const.items()) is items_type
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_tagbased_polymorphic.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_tagbased_polymorphic.cpp
deleted file mode 100644
index 12ba6532f362c152c2dbfe7087afe46aeb609ee2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_tagbased_polymorphic.cpp
+++ /dev/null
@@ -1,147 +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/stl.h>
-
-#include "pybind11_tests.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 {
- explicit 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 {
- explicit Labrador(const std::string &_name, int _excitement = 9001)
- : Dog(_name, Kind::Labrador), excitement(_excitement) {}
- int excitement;
-};
-
-struct Chihuahua : Dog {
- explicit 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 {
- explicit Cat(const std::string &_name, Kind _kind = Kind::Cat) : Animal(_name, _kind) {}
- std::string purr() const { return "mrowr"; }
-};
-
-struct Panther : Cat {
- explicit 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:
- case Kind::Dog:
- break;
-
- case Kind::Labrador:
- return &typeid(Labrador);
- case Kind::Chihuahua:
- return &typeid(Chihuahua);
-
- case Kind::LastDog:
- 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_NAMESPACE {
-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_NAMESPACE
-
-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.10.3/tests/test_tagbased_polymorphic.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_tagbased_polymorphic.py
deleted file mode 100644
index 84f0ea71784d1e562911d001ac183d4f726045e4..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_tagbased_polymorphic.py
+++ /dev/null
@@ -1,28 +0,0 @@
-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.10.3/tests/test_thread.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_thread.cpp
deleted file mode 100644
index 1536503b6b2b98f1c61711470c8c9674b90e8d33..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_thread.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- tests/test_thread.cpp -- call pybind11 bound methods in threads
-
- Copyright (c) 2021 Laramie Leavitt (Google LLC) <lar@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/cast.h>
-#include <pybind11/pybind11.h>
-
-#include "pybind11_tests.h"
-
-#include <chrono>
-#include <thread>
-
-namespace py = pybind11;
-
-namespace {
-
-struct IntStruct {
- explicit IntStruct(int v) : value(v){};
- ~IntStruct() { value = -value; }
- IntStruct(const IntStruct &) = default;
- IntStruct &operator=(const IntStruct &) = default;
-
- int value;
-};
-
-} // namespace
-
-TEST_SUBMODULE(thread, m) {
-
- py::class_<IntStruct>(m, "IntStruct").def(py::init([](const int i) { return IntStruct(i); }));
-
- // implicitly_convertible uses loader_life_support when an implicit
- // conversion is required in order to lifetime extend the reference.
- //
- // This test should be run with ASAN for better effectiveness.
- py::implicitly_convertible<int, IntStruct>();
-
- m.def("test", [](int expected, const IntStruct &in) {
- {
- py::gil_scoped_release release;
- std::this_thread::sleep_for(std::chrono::milliseconds(5));
- }
-
- if (in.value != expected) {
- throw std::runtime_error("Value changed!!");
- }
- });
-
- m.def(
- "test_no_gil",
- [](int expected, const IntStruct &in) {
- std::this_thread::sleep_for(std::chrono::milliseconds(5));
- if (in.value != expected) {
- throw std::runtime_error("Value changed!!");
- }
- },
- py::call_guard<py::gil_scoped_release>());
-
- // NOTE: std::string_view also uses loader_life_support to ensure that
- // the string contents remain alive, but that's a C++ 17 feature.
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_thread.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_thread.py
deleted file mode 100644
index e89991f9d62104fd318043677b65aee72f3019e5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_thread.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import threading
-
-from pybind11_tests import thread as m
-
-
-class Thread(threading.Thread):
- def __init__(self, fn):
- super().__init__()
- self.fn = fn
- self.e = None
-
- def run(self):
- try:
- for i in range(10):
- self.fn(i, i)
- except Exception as e:
- self.e = e
-
- def join(self):
- super().join()
- if self.e:
- raise self.e
-
-
-def test_implicit_conversion():
- a = Thread(m.test)
- b = Thread(m.test)
- c = Thread(m.test)
- for x in [a, b, c]:
- x.start()
- for x in [c, b, a]:
- x.join()
-
-
-def test_implicit_conversion_no_gil():
- a = Thread(m.test_no_gil)
- b = Thread(m.test_no_gil)
- c = Thread(m.test_no_gil)
- for x in [a, b, c]:
- x.start()
- for x in [c, b, a]:
- x.join()
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/test_union.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_union.cpp
deleted file mode 100644
index 7b98ea216ca0b272978134d9dd1d1eff1b804ad5..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/tests/test_union.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_union.py
deleted file mode 100644
index e1866e701dec2085f9b38b862fc197b008ea9096..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_union.py
+++ /dev/null
@@ -1,8 +0,0 @@
-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.10.3/tests/test_virtual_functions.cpp b/3rdParty/pybind11/pybind11-2.10.3/tests/test_virtual_functions.cpp
deleted file mode 100644
index 93b136ad3c15940726ffd10f95524b4ebc2f99b3..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_virtual_functions.cpp
+++ /dev/null
@@ -1,592 +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/functional.h>
-
-#include "constructor_stats.h"
-#include "pybind11_tests.h"
-
-#include <thread>
-
-/* This is an example class that we'll want to be able to extend from Python */
-class ExampleVirt {
-public:
- explicit ExampleVirt(int state) : state(state) { print_created(this, state); }
- ExampleVirt(const ExampleVirt &e) : state(e.state) { print_copy_created(this); }
- ExampleVirt(ExampleVirt &&e) noexcept : 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) noexcept : 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);
- }
- 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) noexcept : value{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 {
- virtual std::string dispatch() const = 0;
- 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 */);
- }
-};
-
-// An abstract adder class that uses visitor pattern to add two data
-// objects and send the result to the visitor functor
-struct AdderBase {
- struct Data {};
- using DataVisitor = std::function<void(const Data &)>;
-
- virtual void
- operator()(const Data &first, const Data &second, const DataVisitor &visitor) const
- = 0;
- virtual ~AdderBase() = default;
- AdderBase() = default;
- AdderBase(const AdderBase &) = delete;
-};
-
-struct Adder : AdderBase {
- void
- operator()(const Data &first, const Data &second, const DataVisitor &visitor) const override {
- PYBIND11_OVERRIDE_PURE_NAME(
- void, AdderBase, "__call__", operator(), first, second, visitor);
- }
-};
-
-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();
-}
-
-class test_override_cache_helper {
-
-public:
- virtual int func() { return 0; }
-
- test_override_cache_helper() = default;
- virtual ~test_override_cache_helper() = default;
- // Non-copyable
- test_override_cache_helper &operator=(test_override_cache_helper const &Right) = delete;
- test_override_cache_helper(test_override_cache_helper const &Copy) = delete;
-};
-
-class test_override_cache_helper_trampoline : public test_override_cache_helper {
- int func() override { PYBIND11_OVERRIDE(int, test_override_cache_helper, func); }
-};
-
-inline int test_override_cache(std::shared_ptr<test_override_cache_helper> const &instance) {
- return instance->func();
-}
-
-// 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_recursive_dispatch_issue
- // #3357: Recursive dispatch fails to find python function override
- pybind11::class_<AdderBase, Adder>(m, "Adder")
- .def(pybind11::init<>())
- .def("__call__", &AdderBase::operator());
-
- pybind11::class_<AdderBase::Data>(m, "Data").def(pybind11::init<>());
-
- m.def("add2",
- [](const AdderBase::Data &first,
- const AdderBase::Data &second,
- const AdderBase &adder,
- const AdderBase::DataVisitor &visitor) { adder(first, second, visitor); });
-
- m.def("add3",
- [](const AdderBase::Data &first,
- const AdderBase::Data &second,
- const AdderBase::Data &third,
- const AdderBase &adder,
- const AdderBase::DataVisitor &visitor) {
- adder(first, second, [&](const AdderBase::Data &first_plus_second) {
- // NOLINTNEXTLINE(readability-suspicious-call-argument)
- adder(first_plus_second, third, visitor);
- });
- });
-
- // 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 (enabling the below 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:
-#ifdef PYBIND11_NEVER_DEFINED_EVER
- std::string &str_ref() override {
- PYBIND11_OVERRIDE(std::string &, OverrideTest, str_ref);
- }
-#endif
- // 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)
-#ifdef PYBIND11_NEVER_DEFINED_EVER
- .def("str_ref", &OverrideTest::str_ref)
-#endif
- .def("A_value", &OverrideTest::A_value)
- .def("A_ref", &OverrideTest::A_ref);
-
- py::class_<test_override_cache_helper,
- test_override_cache_helper_trampoline,
- std::shared_ptr<test_override_cache_helper>>(m, "test_override_cache_helper")
- .def(py::init_alias<>())
- .def("func", &test_override_cache_helper::func);
-
- m.def("test_override_cache", test_override_cache);
-}
-
-// 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)
- // NOLINTNEXTLINE(bugprone-parent-virtual-call)
- 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.10.3/tests/test_virtual_functions.py b/3rdParty/pybind11/pybind11-2.10.3/tests/test_virtual_functions.py
deleted file mode 100644
index 4d00d3690dad27fe9541b71ec2e64b098f3959a2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/test_virtual_functions.py
+++ /dev/null
@@ -1,459 +0,0 @@
-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().__init__(state + 1)
- self.data = "Hello world"
-
- def run(self, value):
- print(f"ExtendedExampleVirt::run({value}), calling parent..")
- return super().run(value + 1)
-
- def run_bool(self):
- print("ExtendedExampleVirt::run_bool()")
- return False
-
- def get_string1(self):
- return "override1"
-
- def pure_virtual(self):
- print(f"ExtendedExampleVirt::pure_virtual(): {self.data}")
-
- class ExtendedExampleVirt2(ExtendedExampleVirt):
- def __init__(self, state):
- super().__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)
- """
- )
-
- 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)
- """
- )
- 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)
- """
- )
-
- 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().__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().__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().dispatch()
- assert (
- msg(excinfo.value)
- == 'Tried to call pure virtual function "Base::dispatch"'
- )
-
- return m.dispatch_issue_go(PyClass1())
-
- b = PyClass2()
- assert m.dispatch_issue_go(b) == "Yay.."
-
-
-def test_recursive_dispatch_issue(msg):
- """#3357: Recursive dispatch fails to find python function override"""
-
- class Data(m.Data):
- def __init__(self, value):
- super().__init__()
- self.value = value
-
- class Adder(m.Adder):
- def __call__(self, first, second, visitor):
- # lambda is a workaround, which adds extra frame to the
- # current CPython thread. Removing lambda reveals the bug
- # [https://github.com/pybind/pybind11/issues/3357]
- (lambda: visitor(Data(first.value + second.value)))()
-
- class StoreResultVisitor:
- def __init__(self):
- self.result = None
-
- def __call__(self, data):
- self.result = data.value
-
- store = StoreResultVisitor()
-
- m.add2(Data(1), Data(2), Adder(), store)
- assert store.result == 3
-
- # without lambda in Adder class, this function fails with
- # RuntimeError: Tried to call pure virtual function "AdderBase::__call__"
- m.add3(Data(1), Data(2), Data(3), Adder(), store)
- assert store.result == 6
-
-
-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()
-
-
-def test_python_override():
- def func():
- class Test(m.test_override_cache_helper):
- def func(self):
- return 42
-
- return Test()
-
- def func2():
- class Test(m.test_override_cache_helper):
- pass
-
- return Test()
-
- for _ in range(1500):
- assert m.test_override_cache(func()) == 42
- assert m.test_override_cache(func2()) == 0
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/valgrind-numpy-scipy.supp b/3rdParty/pybind11/pybind11-2.10.3/tests/valgrind-numpy-scipy.supp
deleted file mode 100644
index 16db302c17a0d314a4773ab5443824e23e6f0a3d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/valgrind-numpy-scipy.supp
+++ /dev/null
@@ -1,140 +0,0 @@
-# Valgrind suppression file for NumPy & SciPy errors and leaks in pybind11 tests
-#
-# On updating a dependency, to get a list of "default" leaks in e.g. NumPy, run
-# `PYTHONMALLOC=malloc valgrind --leak-check=full --show-leak-kinds=definite,indirect python3.9-dbg -c "import numpy"`
-# To use these suppression files, add e.g. `--suppressions=valgrind-numpy-scipy.supp`
-
-{
- Leaks when importing NumPy
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyObject_Malloc
- fun:_PyObject_GC_Alloc
- fun:_PyObject_GC_Malloc
- fun:_PyObject_GC_NewVar
- fun:tuple_alloc
- fun:PyTuple_Pack
- ...
- fun:__pyx_pymod_exec_*
-}
-
-{
- Leaks when importing NumPy (bis)
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyObject_Malloc
- fun:_PyObject_New
- fun:PyCode_NewWithPosOnlyArgs
- fun:PyCode_New
- ...
- fun:__pyx_pymod_exec_*
-}
-
-{
- Leaks when importing NumPy (ter)
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyObject_Malloc
- fun:_PyObject_GC_Alloc
- fun:_PyObject_GC_Malloc
- fun:_PyObject_GC_NewVar
- fun:tuple_alloc
- fun:_PyTuple_FromArray
- fun:_PyObject_MakeTpCall
- fun:_PyObject_VectorcallTstate
- fun:PyObject_Vectorcall
- fun:call_function
- fun:_PyEval_EvalFrameDefault
- fun:_PyEval_EvalFrame
- fun:function_code_fastcall
- fun:_PyFunction_Vectorcall
-}
-
-{
- Leaks when importing NumPy (quater)
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyObject_Malloc
- fun:_PyObject_GC_Alloc
- fun:_PyObject_GC_Malloc
- fun:_PyObject_GC_NewVar
- fun:tuple_alloc
- fun:_PyTuple_FromArray
- fun:_PyObject_MakeTpCall
- fun:_PyObject_VectorcallTstate
- fun:_PyObject_CallFunctionVa
- fun:PyObject_CallFunction
- fun:PyImport_Import
-}
-
-{
- Leaks when importing NumPy (quinquies)
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyObject_Malloc
- fun:_PyObject_GC_Alloc
- fun:_PyObject_GC_Malloc
- fun:_PyObject_GC_NewVar
- fun:tuple_alloc
- fun:PyTuple_New
- fun:r_object
- fun:r_object
- fun:r_object
- fun:r_object
-}
-
-{
- Leaks when importing NumPy (sexies)
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyObject_Malloc
- fun:_PyObject_GC_Alloc
- fun:_PyObject_GC_Malloc
- fun:_PyObject_GC_NewVar
- fun:tuple_alloc
- fun:PyTuple_New
- fun:dictiter_iternextitem
- fun:list_extend
- fun:_PyList_Extend
- fun:PySequence_List
-}
-
-{
- Leak when importing scipy.fft
- Memcheck:Leak
- fun:_Znwm
- fun:PyInit_pypocketfft
- fun:_PyImport_LoadDynamicModuleWithSpec
- fun:_imp_create_dynamic_impl*
- fun:_imp_create_dynamic
- fun:cfunction_vectorcall_FASTCALL
- fun:PyVectorcall_Call
- fun:_PyObject_Call
- fun:PyObject_Call
- fun:do_call_core
- fun:_PyEval_EvalFrameDefault
- fun:_PyEval_EvalFrame
- fun:_PyEval_EvalCode
-}
-
-{
- NumPy leaks when spawning a subprocess
- Memcheck:Leak
- fun:malloc
- ...
- fun:_buffer_get_info
- fun:array_getbuffer
- fun:PyObject_GetBuffer
- fun:__Pyx__GetBufferAndValidate*
- fun:__pyx_f_5numpy_6random_13bit_generator_12SeedSequence_mix_entropy
- fun:__pyx_pw_5numpy_6random_13bit_generator_12SeedSequence_1__init__
- fun:type_call
- fun:__Pyx__PyObject_CallOneArg
- fun:__pyx_pw_5numpy_6random_13bit_generator_12BitGenerator_1__init__
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tests/valgrind-python.supp b/3rdParty/pybind11/pybind11-2.10.3/tests/valgrind-python.supp
deleted file mode 100644
index d77d5e5c5c60653d979c23bc7f7b9c610b8ff3b8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tests/valgrind-python.supp
+++ /dev/null
@@ -1,117 +0,0 @@
-# Valgrind suppression file for CPython errors and leaks in pybind11 tests
-
-# Taken verbatim from https://github.com/python/cpython/blob/3.9/Misc/valgrind-python.supp#L266-L272
-{
- Uninitialised byte(s) false alarm, see bpo-35561
- Memcheck:Param
- epoll_ctl(event)
- fun:epoll_ctl
- fun:pyepoll_internal_ctl
-}
-
-{
- Python leaks when spawning a subprocess
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyMem_RawMalloc
- fun:PyThread_allocate_lock
- fun:_PyEval_InitState
- fun:PyInterpreterState_New
- ...
- fun:pyinit_core*
- fun:Py_InitializeFromConfig
- fun:pymain_init
- fun:pymain_main
-}
-
-{
- Python leaks when spawning a subprocess
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:_PyMem_DebugRawAlloc
- fun:_PyMem_DebugRawMalloc
- fun:PyMem_RawMalloc
- fun:PyThread_allocate_lock
- fun:_PyRuntimeState_Init_impl
- fun:_PyRuntimeState_Init
- fun:_PyRuntime_Initialize
- fun:pymain_init
- fun:pymain_main
- fun:Py_BytesMain
-}
-
-{
- Python leaks when spawning a subprocess
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyMem_RawMalloc
- fun:PyThread_allocate_lock
- fun:_PyImport_AcquireLock
- fun:_imp_acquire_lock_impl*
- fun:_imp_acquire_lock
- fun:cfunction_vectorcall_NOARGS
- fun:_PyObject_VectorcallTstate
- fun:PyObject_Vectorcall
- fun:call_function
- fun:_PyEval_EvalFrameDefault
- fun:_PyEval_EvalFrame
- fun:function_code_fastcall
-}
-
-{
- Python leaks when spawning a subprocess
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyMem_RawMalloc
- fun:PyThread_allocate_lock
- fun:newlockobject
- ...
- fun:cfunction_vectorcall_NOARGS
- fun:_PyObject_VectorcallTstate
- fun:PyObject_Vectorcall
- fun:call_function
- fun:_PyEval_EvalFrameDefault
- fun:_PyEval_EvalFrame
- fun:function_code_fastcall
- fun:_PyFunction_Vectorcall
-}
-
-{
- Python leaks when spawning a subprocess
- Memcheck:Leak
- fun:malloc
- fun:_PyMem_RawMalloc
- fun:PyMem_RawMalloc
- fun:PyThread_allocate_lock
- fun:rlock_new
- fun:type_call
- fun:_PyObject_Call
- fun:PyObject_Call
- fun:do_call_core
- fun:_PyEval_EvalFrameDefault
- fun:_PyEval_EvalFrame
- fun:_PyEval_EvalCode
- fun:_PyFunction_Vectorcall
-}
-
-# Not really CPython-specific, see link
-{
- dlopen leak (https://stackoverflow.com/questions/1542457/memory-leak-reported-by-valgrind-in-dlopen)
- Memcheck:Leak
- fun:malloc
- ...
- fun:dl_open_worker
- fun:_dl_catch_exception
- fun:_dl_open
- fun:dlopen_doit
- fun:_dl_catch_exception
- fun:_dl_catch_error
- fun:_dlerror_run
- fun:dlopen@@GLIBC_2.2.5
- fun:_PyImport_FindSharedFuncptr
- fun:_PyImport_LoadDynamicModuleWithSpec
-}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tools/FindCatch.cmake b/3rdParty/pybind11/pybind11-2.10.3/tools/FindCatch.cmake
deleted file mode 100644
index 57bba58b30ffd25336a57b35b3405f1dfadca63c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/FindCatch.cmake
+++ /dev/null
@@ -1,72 +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
-
-option(DOWNLOAD_CATCH "Download catch2 if not found")
-
-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.10.3/tools/FindEigen3.cmake b/3rdParty/pybind11/pybind11-2.10.3/tools/FindEigen3.cmake
deleted file mode 100644
index 83625d92e071abdda3e1e066d2d3770dd1a4e38c..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/FindEigen3.cmake
+++ /dev/null
@@ -1,86 +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)
- if(NOT DEFINED KDE4_INCLUDE_DIR)
- set(KDE4_INCLUDE_DIR "")
- endif()
-
- 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.10.3/tools/FindPythonLibsNew.cmake b/3rdParty/pybind11/pybind11-2.10.3/tools/FindPythonLibsNew.cmake
deleted file mode 100644
index ce558d4ece62d2403bad09ee7fa026923509ef53..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/FindPythonLibsNew.cmake
+++ /dev/null
@@ -1,287 +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)
-else()
- set(_pythonlibs_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 "3.6")
-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" "
-import sys;import struct;
-import sysconfig as s
-USE_SYSCONFIG = sys.version_info >= (3, 10)
-if not USE_SYSCONFIG:
- from distutils import sysconfig as ds
-print('.'.join(str(v) for v in sys.version_info));
-print(sys.prefix);
-if USE_SYSCONFIG:
- scheme = s.get_default_scheme()
- if scheme == 'posix_local':
- # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
- scheme = 'posix_prefix'
- print(s.get_path('platinclude', scheme))
- print(s.get_path('platlib'))
- print(s.get_config_var('EXT_SUFFIX') or s.get_config_var('SO'))
-else:
- print(ds.get_python_inc(plat_specific=True));
- print(ds.get_python_lib(plat_specific=True));
- print(ds.get_config_var('EXT_SUFFIX') or ds.get_config_var('SO'));
-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()
-
-option(
- PYBIND11_PYTHONLIBS_OVERWRITE
- "Overwrite cached values read from Python library (classic search). Turn off if cross-compiling and manually setting these values."
- ON)
-# Can manually set values when cross-compiling
-macro(_PYBIND11_GET_IF_UNDEF lst index name)
- if(PYBIND11_PYTHONLIBS_OVERWRITE OR NOT DEFINED "${name}")
- list(GET "${lst}" "${index}" "${name}")
- endif()
-endmacro()
-
-# 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})
-_pybind11_get_if_undef(_PYTHON_VALUES 0 _PYTHON_VERSION_LIST)
-_pybind11_get_if_undef(_PYTHON_VALUES 1 PYTHON_PREFIX)
-_pybind11_get_if_undef(_PYTHON_VALUES 2 PYTHON_INCLUDE_DIR)
-_pybind11_get_if_undef(_PYTHON_VALUES 3 PYTHON_SITE_PACKAGES)
-_pybind11_get_if_undef(_PYTHON_VALUES 4 PYTHON_MODULE_EXTENSION)
-_pybind11_get_if_undef(_PYTHON_VALUES 5 PYTHON_IS_DEBUG)
-_pybind11_get_if_undef(_PYTHON_VALUES 6 PYTHON_SIZEOF_VOID_P)
-_pybind11_get_if_undef(_PYTHON_VALUES 7 PYTHON_LIBRARY_SUFFIX)
-_pybind11_get_if_undef(_PYTHON_VALUES 8 PYTHON_LIBDIR)
-_pybind11_get_if_undef(_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
-# This should be skipped for (non-Apple) cross-compiles (like EMSCRIPTEN)
-if(NOT CMAKE_CROSSCOMPILING
- AND 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(DEFINED PYTHON_LIBRARY)
- # Don't write to PYTHON_LIBRARY if it's already set
-elseif(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_LIBRARIES}"
- "${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.10.3/tools/JoinPaths.cmake b/3rdParty/pybind11/pybind11-2.10.3/tools/JoinPaths.cmake
deleted file mode 100644
index c68d91b84dbc7238d8202cd55c6022e8c94fac3d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/JoinPaths.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-# This module provides function for joining paths
-# known from most languages
-#
-# SPDX-License-Identifier: (MIT OR CC0-1.0)
-# Copyright 2020 Jan Tojnar
-# https://github.com/jtojnar/cmake-snips
-#
-# Modelled after Python’s os.path.join
-# https://docs.python.org/3.7/library/os.path.html#os.path.join
-# Windows not supported
-function(join_paths joined_path first_path_segment)
- set(temp_path "${first_path_segment}")
- foreach(current_segment IN LISTS ARGN)
- if(NOT ("${current_segment}" STREQUAL ""))
- if(IS_ABSOLUTE "${current_segment}")
- set(temp_path "${current_segment}")
- else()
- set(temp_path "${temp_path}/${current_segment}")
- endif()
- endif()
- endforeach()
- set(${joined_path} "${temp_path}" PARENT_SCOPE)
-endfunction()
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tools/check-style.sh b/3rdParty/pybind11/pybind11-2.10.3/tools/check-style.sh
deleted file mode 100755
index 6d832523a7c9a63ac95adcb89e6f10e488873c87..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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//^/ /}"
-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.10.3/tools/cmake_uninstall.cmake.in b/3rdParty/pybind11/pybind11-2.10.3/tools/cmake_uninstall.cmake.in
deleted file mode 100644
index 1e5d2bb876d17f24b88b19ddb525d4146869944b..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/tools/codespell_ignore_lines_from_errors.py b/3rdParty/pybind11/pybind11-2.10.3/tools/codespell_ignore_lines_from_errors.py
deleted file mode 100644
index 5403ec3ad060d9b87d3a12fa5eef63589c259ad6..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/codespell_ignore_lines_from_errors.py
+++ /dev/null
@@ -1,35 +0,0 @@
-"""Simple script for rebuilding .codespell-ignore-lines
-
-Usage:
-
-cat < /dev/null > .codespell-ignore-lines
-pre-commit run --all-files codespell >& /tmp/codespell_errors.txt
-python3 tools/codespell_ignore_lines_from_errors.py /tmp/codespell_errors.txt > .codespell-ignore-lines
-
-git diff to review changes, then commit, push.
-"""
-
-import sys
-from typing import List
-
-
-def run(args: List[str]) -> None:
- assert len(args) == 1, "codespell_errors.txt"
- cache = {}
- done = set()
- for line in sorted(open(args[0]).read().splitlines()):
- i = line.find(" ==> ")
- if i > 0:
- flds = line[:i].split(":")
- if len(flds) >= 2:
- filename, line_num = flds[:2]
- if filename not in cache:
- cache[filename] = open(filename).read().splitlines()
- supp = cache[filename][int(line_num) - 1]
- if supp not in done:
- print(supp)
- done.add(supp)
-
-
-if __name__ == "__main__":
- run(args=sys.argv[1:])
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tools/libsize.py b/3rdParty/pybind11/pybind11-2.10.3/tools/libsize.py
deleted file mode 100644
index 1ac9afbe81a070db471caa2f93ed2fc211f0eb37..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/libsize.py
+++ /dev/null
@@ -1,36 +0,0 @@
-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(f"Error: requested file ({lib}) does not exist")
-
-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(f" (change of {change:+} bytes = {change / oldsize:+.2%})")
-else:
- print()
-
-with open(save, "w") as sf:
- sf.write(str(libsize))
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tools/make_changelog.py b/3rdParty/pybind11/pybind11-2.10.3/tools/make_changelog.py
deleted file mode 100755
index b5bd832940b6af415c0bf74fe447c9d2a8ae7170..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/make_changelog.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-
-import re
-
-import ghapi.all
-from rich import print
-from rich.syntax import Syntax
-
-ENTRY = re.compile(
- r"""
- Suggested \s changelog \s entry:
- .*
- ```rst
- \s*
- (.*?)
- \s*
- ```
-""",
- re.DOTALL | re.VERBOSE,
-)
-
-print()
-
-
-api = ghapi.all.GhApi(owner="pybind", repo="pybind11")
-
-issues_pages = ghapi.page.paged(
- api.issues.list_for_repo, labels="needs changelog", state="closed"
-)
-issues = (issue for page in issues_pages for issue in page)
-missing = []
-
-for issue in issues:
- changelog = ENTRY.findall(issue.body or "")
- if not changelog or not changelog[0]:
- missing.append(issue)
- else:
- (msg,) = changelog
- if not msg.startswith("* "):
- msg = "* " + msg
- if not msg.endswith("."):
- msg += "."
-
- msg += f"\n `#{issue.number} <{issue.html_url}>`_"
-
- print(Syntax(msg, "rst", theme="ansi_light", word_wrap=True))
- print()
-
-if missing:
- print()
- print("[blue]" + "-" * 30)
- print()
-
- for issue in missing:
- print(f"[red bold]Missing:[/red bold][red] {issue.title}")
- print(f"[red] {issue.html_url}\n")
-
- print("[bold]Template:\n")
- msg = "## Suggested changelog entry:\n\n```rst\n\n```"
- print(Syntax(msg, "md", theme="ansi_light"))
-
-print()
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11.pc.in b/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11.pc.in
deleted file mode 100644
index 402f0b357d25eb6b4e310a8810bba3420f4812c8..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix=@prefix_for_pc_file@
-includedir=@includedir_for_pc_file@
-
-Name: @PROJECT_NAME@
-Description: Seamless operability between C++11 and Python
-Version: @PROJECT_VERSION@
-Cflags: -I${includedir}
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11Common.cmake b/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11Common.cmake
deleted file mode 100644
index 0c985bc8e515af48b02fa1780a4a5b28bfa31ca2..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11Common.cmake
+++ /dev/null
@@ -1,395 +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::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
-# include_guard(global) (pre-CMake 3.10)
-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()
-
-# If not run in Python mode, we still would like this to at least
-# include pybind11's include directory:
-set(pybind11_INCLUDE_DIRS
- "${pybind11_INCLUDE_DIR}"
- CACHE INTERNAL "Include directory for pybind11 (Python not requested)")
-
-# --------------------- 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)
-
-# --------------------------- 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) # That's also clang-cl
- # /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 $<$<COMPILE_LANGUAGE:CXX>:/bigobj>)
-
- # /MP enables multithreaded builds (relevant when there are many files) for MSVC
- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") # no Clang no Intel
- 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()
-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(MINGW)
- message(STATUS "${target} disabled (problems with undefined symbols for MinGW for now)")
- return()
- endif()
-
- 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" AND NOT MINGW)
- set(cxx_append ";-fno-fat-lto-objects")
- endif()
-
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "mips64")
- set(NO_FLTO_ARCH TRUE)
- else()
- set(NO_FLTO_ARCH FALSE)
- endif()
-
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang"
- AND prefer_thin_lto
- AND NOT NO_FLTO_ARCH)
- _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 AND NOT NO_FLTO_ARCH)
- _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 "IntelLLVM")
- # IntelLLVM equivalent to LTO is called IPO; also IntelLLVM is WIN32/UNIX
- # WARNING/HELP WANTED: This block of code is currently not covered by pybind11 GitHub Actions!
- if(WIN32)
- _pybind11_return_if_cxx_and_linker_flags_work(
- HAS_INTEL_IPO "-Qipo" "-Qipo" PYBIND11_LTO_CXX_FLAGS PYBIND11_LTO_LINKER_FLAGS)
- else()
- _pybind11_return_if_cxx_and_linker_flags_work(
- HAS_INTEL_IPO "-ipo" "-ipo" 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.10.3/tools/pybind11Config.cmake.in b/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11Config.cmake.in
deleted file mode 100644
index 9383e8c671e90f249c55e1d3fa3540b09af9f1e7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11Config.cmake.in
+++ /dev/null
@@ -1,231 +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*`` or empty for a 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::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
- VISIBILITY_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_SOABI]
- <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 ``MinSizeRel``.
-``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.9 EXACT CONFIG REQUIRED)
-
-#]=============================================================================]
-@PACKAGE_INIT@
-
-# Location of pybind11/pybind11.h
-# This will be relative unless explicitly set as absolute
-set(pybind11_INCLUDE_DIR "@pybind11_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.10.3/tools/pybind11NewTools.cmake b/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11NewTools.cmake
deleted file mode 100644
index 7d7424a790ecc8808a357292406aded19285aa4d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11NewTools.cmake
+++ /dev/null
@@ -1,256 +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.
-
-if(CMAKE_VERSION VERSION_LESS 3.12)
- message(FATAL_ERROR "You cannot use the new FindPython module with CMake < 3.12")
-endif()
-
-include_guard(DIRECTORY)
-
-get_property(
- is_config
- TARGET pybind11::headers
- PROPERTY IMPORTED)
-
-if(pybind11_FIND_QUIETLY)
- set(_pybind11_quiet QUIET)
-else()
- set(_pybind11_quiet "")
-endif()
-
-if(NOT Python_FOUND AND NOT Python3_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 3.6 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)
- set(_Python
- Python3
- CACHE INTERNAL "" FORCE)
-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 ${_Python}_EXECUTABLE STREQUAL PYBIND11_PYTHON_EXECUTABLE_LAST)
- # Detect changes to the Python version/binary in subsequent CMake runs, and refresh config if needed
- unset(PYTHON_IS_DEBUG CACHE)
- unset(PYTHON_MODULE_EXTENSION CACHE)
- set(PYBIND11_PYTHON_EXECUTABLE_LAST
- "${${_Python}_EXECUTABLE}"
- CACHE INTERNAL "Python executable during the last CMake run")
-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"
- "import sys, importlib; s = importlib.import_module('distutils.sysconfig' if sys.version_info < (3, 10) else 'sysconfig'); print(s.get_config_var('EXT_SUFFIX') or s.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 Python can change - do nothing in that case.
-
-if(DEFINED ${_Python}_INCLUDE_DIRS)
- # Only add Python for build - must be added during the import for config
- # since it has to be re-discovered.
- #
- # This needs to be a target to be included after the local pybind11
- # directory, just in case there there is an installed pybind11 sitting
- # next to Python's includes. It also ensures Python is a SYSTEM library.
- add_library(pybind11::python_headers INTERFACE IMPORTED)
- set_property(
- TARGET pybind11::python_headers PROPERTY INTERFACE_INCLUDE_DIRECTORIES
- "$<BUILD_INTERFACE:${${_Python}_INCLUDE_DIRS}>")
- set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python_headers)
- set(pybind11_INCLUDE_DIRS
- "${pybind11_INCLUDE_DIR}" "${${_Python}_INCLUDE_DIRS}"
- CACHE INTERNAL "Directories where pybind11 and possibly Python headers are located")
-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_STATIC)
- set(lib_type STATIC)
- elseif(ARG_SHARED)
- set(lib_type SHARED)
- else()
- set(lib_type MODULE)
- endif()
-
- if("${_Python}" STREQUAL "Python")
- python_add_library(${target_name} ${lib_type} ${ARG_UNPARSED_ARGUMENTS})
- elseif("${_Python}" STREQUAL "Python3")
- python3_add_library(${target_name} ${lib_type} ${ARG_UNPARSED_ARGUMENTS})
- else()
- message(FATAL_ERROR "Cannot detect FindPython version: ${_Python}")
- endif()
-
- target_link_libraries(${target_name} PRIVATE pybind11::headers)
-
- if(lib_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()
-
- # -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.
- if(NOT DEFINED CMAKE_CXX_VISIBILITY_PRESET)
- set_target_properties(${target_name} PROPERTIES CXX_VISIBILITY_PRESET "hidden")
- endif()
-
- if(NOT DEFINED CMAKE_CUDA_VISIBILITY_PRESET)
- set_target_properties(${target_name} PROPERTIES CUDA_VISIBILITY_PRESET "hidden")
- endif()
-
- # If we don't pass a WITH_SOABI or WITHOUT_SOABI, use our own default handling of extensions
- if(NOT ARG_WITHOUT_SOABI AND 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()
-
- # Use case-insensitive comparison to match the result of $<CONFIG:cfgs>
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- if(NOT MSVC AND NOT "${uppercase_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.10.3/tools/pybind11Tools.cmake b/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11Tools.cmake
deleted file mode 100644
index 66ad00a4782203fb4c567d71bb4c2393365dc801..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/pybind11Tools.cmake
+++ /dev/null
@@ -1,233 +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.
-
-# include_guard(global) (pre-CMake 3.10)
-if(TARGET pybind11::python_headers)
- return()
-endif()
-
-# Built-in in CMake 3.5+
-include(CMakeParseArguments)
-
-if(pybind11_FIND_QUIETLY)
- set(_pybind11_quiet QUIET)
-else()
- set(_pybind11_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)
-elseif(DEFINED PYBIND11_PYTHON_VERSION)
- # If this is set as a normal variable, promote it
- set(PYBIND11_PYTHON_VERSION
- "${PYBIND11_PYTHON_VERSION}"
- CACHE STRING "Python version to use for compiling modules")
-else()
- # Make an empty cache variable.
- set(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.11;3.10;3.9;3.8;3.7;3.6"
- 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)
-
-# Makes a normal variable a cached variable
-macro(_PYBIND11_PROMOTE_TO_CACHE NAME)
- set(_tmp_ptc "${${NAME}}")
- # CMake 3.21 complains if a cached variable is shadowed by a normal one
- unset(${NAME})
- set(${NAME}
- "${_tmp_ptc}"
- CACHE INTERNAL "")
-endmacro()
-
-# Cache variables so pybind11_add_module can be used in parent projects
-_pybind11_promote_to_cache(PYTHON_INCLUDE_DIRS)
-_pybind11_promote_to_cache(PYTHON_LIBRARIES)
-_pybind11_promote_to_cache(PYTHON_MODULE_PREFIX)
-_pybind11_promote_to_cache(PYTHON_MODULE_EXTENSION)
-_pybind11_promote_to_cache(PYTHON_VERSION_MAJOR)
-_pybind11_promote_to_cache(PYTHON_VERSION_MINOR)
-_pybind11_promote_to_cache(PYTHON_VERSION)
-_pybind11_promote_to_cache(PYTHON_IS_DEBUG)
-
-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.
-#
-# This needs to be an target to it is included after the local pybind11
-# directory, just in case there are multiple versions of pybind11, we want the
-# one we expect.
-add_library(pybind11::python_headers INTERFACE IMPORTED)
-set_property(TARGET pybind11::python_headers PROPERTY INTERFACE_INCLUDE_DIRECTORIES
- "$<BUILD_INTERFACE:${PYTHON_INCLUDE_DIRS}>")
-set_property(
- TARGET pybind11::pybind11
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::python_headers)
-
-set(pybind11_INCLUDE_DIRS
- "${pybind11_INCLUDE_DIR}" "${PYTHON_INCLUDE_DIRS}"
- CACHE INTERNAL "Directories where pybind11 and possibly Python headers are located")
-
-# 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()
-
-# The <3.11 code here does not support release/debug builds at the same time, like on vcpkg
-if(CMAKE_VERSION VERSION_LESS 3.11)
- 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}>>"
- )
-
- set_property(
- TARGET pybind11::embed
- APPEND
- PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11 $<BUILD_INTERFACE:${PYTHON_LIBRARIES}>)
-else()
- # The IMPORTED INTERFACE library here is to ensure that "debug" and "release" get processed outside
- # of a generator expression - https://gitlab.kitware.com/cmake/cmake/-/issues/18424, as they are
- # target_link_library keywords rather than real libraries.
- add_library(pybind11::_ClassicPythonLibraries IMPORTED INTERFACE)
- target_link_libraries(pybind11::_ClassicPythonLibraries INTERFACE ${PYTHON_LIBRARIES})
- target_link_libraries(
- pybind11::module
- INTERFACE
- pybind11::python_link_helper
- "$<$<OR:$<PLATFORM_ID:Windows>,$<PLATFORM_ID:Cygwin>>:pybind11::_ClassicPythonLibraries>")
-
- target_link_libraries(pybind11::embed INTERFACE pybind11::pybind11
- pybind11::_ClassicPythonLibraries)
-endif()
-
-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.
- if(NOT DEFINED CMAKE_CXX_VISIBILITY_PRESET)
- set_target_properties(${target_name} PROPERTIES CXX_VISIBILITY_PRESET "hidden")
- endif()
-
- if(NOT DEFINED CMAKE_CUDA_VISIBILITY_PRESET)
- set_target_properties(${target_name} PROPERTIES CUDA_VISIBILITY_PRESET "hidden")
- 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()
-
- # Use case-insensitive comparison to match the result of $<CONFIG:cfgs>
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- if(NOT MSVC AND NOT "${uppercase_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.10.3/tools/pyproject.toml b/3rdParty/pybind11/pybind11-2.10.3/tools/pyproject.toml
deleted file mode 100644
index 8fe2f47af9a18ad9f272357023d09f78aefebe2d..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/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.10.3/tools/setup_global.py.in b/3rdParty/pybind11/pybind11-2.10.3/tools/setup_global.py.in
deleted file mode 100644
index 885ac5c725771b20ab9b204d03ec05ed98320466..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/setup_global.py.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python3
-
-# 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 glob
-import os
-import re
-
-# 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")
-eigen_headers = glob.glob("pybind11/include/pybind11/eigen/*.h")
-stl_headers = glob.glob("pybind11/include/pybind11/stl/*.h")
-cmake_files = glob.glob("pybind11/share/cmake/pybind11/*.cmake")
-pkgconfig_files = glob.glob("pybind11/share/pkgconfig/*.pc")
-headers = main_headers + detail_headers + stl_headers + eigen_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 + "share/pkgconfig", pkgconfig_files),
- (base + "include/pybind11", main_headers),
- (base + "include/pybind11/detail", detail_headers),
- (base + "include/pybind11/eigen", eigen_headers),
- (base + "include/pybind11/stl", stl_headers),
- ],
- cmdclass=cmdclass,
-)
diff --git a/3rdParty/pybind11/pybind11-2.10.3/tools/setup_main.py.in b/3rdParty/pybind11/pybind11-2.10.3/tools/setup_main.py.in
deleted file mode 100644
index 6358cc7b9beeef865d2207b757c7c6dc9af193b7..0000000000000000000000000000000000000000
--- a/3rdParty/pybind11/pybind11-2.10.3/tools/setup_main.py.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-
-# 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.include.pybind11.eigen",
- "pybind11.include.pybind11.stl",
- "pybind11.share.cmake.pybind11",
- "pybind11.share.pkgconfig",
- ],
- package_data={
- "pybind11": ["py.typed"],
- "pybind11.include.pybind11": ["*.h"],
- "pybind11.include.pybind11.detail": ["*.h"],
- "pybind11.include.pybind11.eigen": ["*.h"],
- "pybind11.include.pybind11.stl": ["*.h"],
- "pybind11.share.cmake.pybind11": ["*.cmake"],
- "pybind11.share.pkgconfig": ["*.pc"],
- },
- extras_require={
- "global": ["pybind11_global==$version"]
- },
- entry_points={
- "console_scripts": [
- "pybind11-config = pybind11.__main__:main",
- ],
- "pipx.run": [
- "pybind11 = 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/cmake_config_files/ARAGORNUBUNTU.config.cmake b/CMake/cmake_config_files/ARAGORNUBUNTU.config.cmake
index 90debb1a4c270109d4dfbb455f21253b3a6754b8..3259e13acaade9b896e5e4a82dec90d3f4eb5e89 100644
--- a/CMake/cmake_config_files/ARAGORNUBUNTU.config.cmake
+++ b/CMake/cmake_config_files/ARAGORNUBUNTU.config.cmake
@@ -14,4 +14,9 @@ list(APPEND USER_APPS
"${GPU_APP}DrivenCavityMultiGPU"
"${GPU_APP}SphereScaling"
# "${GPU_APP}MusselOyster"
- )
\ No newline at end of file
+ )
+
+# add_compile_options(-fsanitize=address)
+# add_link_options(-fsanitize=address)
+# add_compile_options(-fsanitize=undefined)
+# add_link_options(-fsanitize=undefined)
diff --git a/CMake/cmake_config_files/BOMBADIL.config.cmake b/CMake/cmake_config_files/BOMBADIL.config.cmake
index 9c4bd4ecffab1e63161343ecc493eb9d9bc951a4..0534bf1c87cb54bf6d8839b881fe6b772e2b7365 100644
--- a/CMake/cmake_config_files/BOMBADIL.config.cmake
+++ b/CMake/cmake_config_files/BOMBADIL.config.cmake
@@ -48,25 +48,6 @@ set(LIGGGHTS_RELEASE_LIBRARY "d:/Tools/LIGGGHTS/build/Release/liggghts.lib")
# SET(METIS_RELEASE_LIBRARY "/mnt/d/Tools/metis-5.1.0/build/Linux-x86_64/libmetis/libmetis.a")
#ENDIF()
-#################################################################################
-# PE
-#################################################################################
-IF(${USE_DEM_COUPLING})
- SET(PE_BINARY_DIR "d:/Tools/waLBerla/walberlaGit/build" CACHE PATH "pe binary dir")
- SET(PE_ROOT "d:/Tools/waLBerla/walberlaGit" CACHE PATH "pe root")
-
- SET(PE_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/pe/Debug/pe.lib)
- SET(PE_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/pe/Release/pe.lib)
- SET(BLOCKFOREST_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/blockforest/Debug/blockforest.lib)
- SET(BLOCKFOREST_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/blockforest/Release/blockforest.lib)
- SET(DOMAIN_DECOMPOSITION_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/domain_decomposition/Debug/domain_decomposition.lib)
- SET(DOMAIN_DECOMPOSITION_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/domain_decomposition/Release/domain_decomposition.lib)
- SET(GEOMETRY_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/geometry/Debug/geometry.lib)
- SET(GEOMETRY_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/geometry/Release/geometry.lib)
- SET(CORE_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/core/Debug/core.lib)
- SET(CORE_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/core/Release/core.lib)
-
- ENDIF()
##################################################################################
# FETOL
diff --git a/CMake/cmake_config_files/PHOENIX.config.cmake b/CMake/cmake_config_files/PHOENIX.config.cmake
index d31d8684a53a769e48408ad5febe7d2c6b22c623..2112bd6aa50e9335bc6b23bda0f0e9fda3ef7533 100644
--- a/CMake/cmake_config_files/PHOENIX.config.cmake
+++ b/CMake/cmake_config_files/PHOENIX.config.cmake
@@ -4,24 +4,6 @@
# OS: CentOS 7.3
#################################################################################
-#################################################################################
-# PE (legacy)
-#################################################################################
-IF(${USE_DEM_COUPLING})
- SET(PE_BINARY_DIR "/home/irmb/walberla-git/build" CACHE PATH "pe binary dir")
- SET(PE_ROOT "/home/irmb/walberla-git" CACHE PATH "pe root")
-
- SET(PE_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/pe/libpe.a)
- SET(PE_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/pe/libpe.a)
- SET(BLOCKFOREST_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/blockforest/libblockforest.a)
- SET(BLOCKFOREST_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/blockforest/libblockforest.a)
- SET(DOMAIN_DECOMPOSITION_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/domain_decomposition/libdomain_decomposition.a)
- SET(DOMAIN_DECOMPOSITION_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/domain_decomposition/libdomain_decomposition.a)
- SET(GEOMETRY_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/geometry/libgeometry.a)
- SET(GEOMETRY_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/geometry/libgeometry.a)
- SET(CORE_DEBUG_LIBRARY ${PE_BINARY_DIR}/src/core/libcore.a)
- SET(CORE_RELEASE_LIBRARY ${PE_BINARY_DIR}/src/core/libcore.a)
-ENDIF()
## nvidia
set(CMAKE_CUDA_ARCHITECTURES 60) # NVIDIA Tesla P100
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 92d1f10c16fb61052f77659a17f52e45c7d60ae4..8822b504af3ff680f12f6d16e2e4c5b7a615ac00 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)
@@ -219,13 +218,18 @@ if(BUILD_VF_GPU)
endif()
if (BUILD_VF_PYTHON_BINDINGS)
- find_package(pybind11)
- if(NOT pybind11_FOUND)
- message("Did not find pybind in includes, fall back to shipped version.")
- add_subdirectory(${VF_THIRD_DIR}/pybind11/pybind11-2.10.3)
- endif()
+ 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/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 4ffadece29167d42330738e3634cbfd294702096..b8e7efb59673c3b3c9206bfda535bdd1f85e451d 100644
--- a/Python/actuator_line/actuator_line.py
+++ b/Python/actuator_line/actuator_line.py
@@ -46,10 +46,7 @@ output_path.mkdir(exist_ok=True)
#%%
logger.Logger.initialize_logger()
-basics.logger.Logger.add_stdout()
-basics.logger.Logger.set_debug_level(basics.logger.Level.INFO_LOW)
-basics.logger.Logger.time_stamp(basics.logger.TimeStamp.ENABLE)
-basics.logger.Logger.enable_printed_rank_numbers(True)
+
#%%
grid_factory = gpu.grid_generator.GridFactory.make()
grid_builder = gpu.grid_generator.MultipleGridBuilder.make_shared(grid_factory)
diff --git a/Python/boundary_layer/boundary_layer.py b/Python/boundary_layer/boundary_layer.py
index 7a8f1f63125578f2f409253dfed20af1885d7331..0ebdbb43894e6bdae55cca1f788a33c3739fb0c6 100644
--- a/Python/boundary_layer/boundary_layer.py
+++ b/Python/boundary_layer/boundary_layer.py
@@ -46,10 +46,7 @@ output_path.mkdir(exist_ok=True)
#%%
logger.Logger.initialize_logger()
-basics.logger.Logger.add_stdout()
-basics.logger.Logger.set_debug_level(basics.logger.Level.INFO_LOW)
-basics.logger.Logger.time_stamp(basics.logger.TimeStamp.ENABLE)
-basics.logger.Logger.enable_printed_rank_numbers(True)
+
#%%
grid_factory = gpu.grid_generator.GridFactory.make()
grid_builder = gpu.grid_generator.MultipleGridBuilder.make_shared(grid_factory)
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/Applications.cmake b/apps/cpu/Applications.cmake
index 3c71d51344030980071addc6f9831a74d0daa53c..f0ccf3a5796013f92fd85bd7fd77890ad899e1b5 100644
--- a/apps/cpu/Applications.cmake
+++ b/apps/cpu/Applications.cmake
@@ -1,25 +1,31 @@
add_subdirectory(${APPS_ROOT_CPU}/PoiseuilleFlow)
-add_subdirectory(${APPS_ROOT_CPU}/HerschelBulkleySphere)
-add_subdirectory(${APPS_ROOT_CPU}/HerschelBulkleyModel)
-add_subdirectory(${APPS_ROOT_CPU}/rheometer)
add_subdirectory(${APPS_ROOT_CPU}/CouetteFlow)
-add_subdirectory(${APPS_ROOT_CPU}/Multiphase)
-add_subdirectory(${APPS_ROOT_CPU}/ViskomatXL)
add_subdirectory(${APPS_ROOT_CPU}/sphere)
add_subdirectory(${APPS_ROOT_CPU}/FlowAroundCylinder)
add_subdirectory(${APPS_ROOT_CPU}/LaminarTubeFlow)
-add_subdirectory(${APPS_ROOT_CPU}/MultiphaseDropletTest)
-add_subdirectory(${APPS_ROOT_CPU}/RisingBubble2D)
-add_subdirectory(${APPS_ROOT_CPU}/JetBreakup)
-
add_subdirectory(${APPS_ROOT_CPU}/ConvectionOfVortex)
-IF(${USE_LIGGGHTS})
+IF(${VFCPU_ENABLE_LiggghtsCoupling})
add_subdirectory(${APPS_ROOT_CPU}/LiggghtsApp)
add_subdirectory(${APPS_ROOT_CPU}/FallingSphere)
add_subdirectory(${APPS_ROOT_CPU}/Nozzle)
ENDIF()
+IF(${VFCPU_ENABLE_NonNewtonianFluids})
+ add_subdirectory(${APPS_ROOT_CPU}/HerschelBulkleySphere)
+ add_subdirectory(${APPS_ROOT_CPU}/HerschelBulkleyModel)
+ add_subdirectory(${APPS_ROOT_CPU}/rheometer)
+ add_subdirectory(${APPS_ROOT_CPU}/ViskomatXL)
+ENDIF()
+
+IF(${VFCPU_ENABLE_MultiphaseFlow})
+ add_subdirectory(${APPS_ROOT_CPU}/Multiphase)
+ add_subdirectory(${APPS_ROOT_CPU}/MultiphaseDropletTest)
+ add_subdirectory(${APPS_ROOT_CPU}/RisingBubble2D)
+ add_subdirectory(${APPS_ROOT_CPU}/JetBreakup)
+ENDIF()
+
+
#add_subdirectory(tests)
#add_subdirectory(Applications/gridRf)
#add_subdirectory(Applications/greenvortex)
diff --git a/apps/cpu/ConvectionOfVortex/cov.cpp b/apps/cpu/ConvectionOfVortex/cov.cpp
index 45b9489397df760be5d1247f1f2961393b2c22fe..baa136d6a3a96e1e4ce86ce187f116e2c560530c 100644
--- a/apps/cpu/ConvectionOfVortex/cov.cpp
+++ b/apps/cpu/ConvectionOfVortex/cov.cpp
@@ -112,14 +112,14 @@ void run()
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
- SPtr<BCAdapter> outflowBCAdapter(new DensityBCAdapter(rhoLB));
- outflowBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
+ SPtr<BC> outflowBC(new DensityBC(rhoLB));
+ outflowBC->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowBCStrategy()));
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(outflowBCAdapter);
+ bcVisitor.addBC(outflowBC);
- SPtr<BCProcessor> bcProc;
- bcProc = SPtr<BCProcessor>(new BCProcessor());
+ SPtr<BCSet> bcProc;
+ bcProc = SPtr<BCSet>(new BCSet());
SPtr<GbObject3D> refCube(new GbCuboid3D(g_minX1-blockLength,-0.02,-0.02,g_maxX1+blockLength,0.02,0.02));
if (myid==0) GbSystem3D::writeGeoObject(refCube.get(), pathname+"/geo/refCube", WbWriterVtkXmlBinary::getInstance());
@@ -133,24 +133,24 @@ void run()
if (myid==0) UBLOG(logINFO, "Refinement - end");
}
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
//outflow
GbCuboid3DPtr geoOutflow1(new GbCuboid3D(g_minX1-blockLength, g_minX2-blockLength, g_minX3-blockLength, g_minX1, g_maxX2+blockLength, g_maxX3+blockLength));
if (myid==0) GbSystem3D::writeGeoObject(geoOutflow1.get(), pathname+"/geo/geoOutflow1", WbWriterVtkXmlASCII::getInstance());
- SPtr<D3Q27Interactor> outflowIntr1 = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow1, grid, outflowBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowIntr1 = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow1, grid, outflowBC, Interactor3D::SOLID));
GbCuboid3DPtr geoOutflow2(new GbCuboid3D(g_maxX1, g_minX2-blockLength, g_minX3-blockLength, g_maxX1+blockLength, g_maxX2+blockLength, g_maxX3+blockLength));
if (myid==0) GbSystem3D::writeGeoObject(geoOutflow2.get(), pathname+"/geo/geoOutflow2", WbWriterVtkXmlASCII::getInstance());
- SPtr<D3Q27Interactor> outflowIntr2 = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow2, grid, outflowBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowIntr2 = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow2, grid, outflowBC, Interactor3D::SOLID));
GbCuboid3DPtr geoOutflow3(new GbCuboid3D(g_minX1-blockLength, g_minX2-blockLength, g_minX3-blockLength, g_maxX1+blockLength, g_maxX2+blockLength, g_minX3));
if (myid==0) GbSystem3D::writeGeoObject(geoOutflow3.get(), pathname+"/geo/geoOutflow3", WbWriterVtkXmlASCII::getInstance());
- SPtr<D3Q27Interactor> outflowIntr3 = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow3, grid, outflowBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowIntr3 = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow3, grid, outflowBC, Interactor3D::SOLID));
GbCuboid3DPtr geoOutflow4(new GbCuboid3D(g_minX1-blockLength, g_minX2-blockLength, g_maxX3, g_maxX1+blockLength, g_maxX2+blockLength, g_maxX3+blockLength));
if (myid==0) GbSystem3D::writeGeoObject(geoOutflow4.get(), pathname+"/geo/geoOutflow4", WbWriterVtkXmlASCII::getInstance());
- SPtr<D3Q27Interactor> outflowIntr4 = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow4, grid, outflowBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowIntr4 = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow4, grid, outflowBC, Interactor3D::SOLID));
SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, DIR_00M));
InteractorsHelper intHelper(grid, metisVisitor);
@@ -160,7 +160,7 @@ void run()
//intHelper.addInteractor(outflowIntr4);
intHelper.selectBlocks();
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
//set connectors
@@ -211,9 +211,9 @@ void run()
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulantLBMKernel());
//dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->setBulkOmegaToOmega(true);
//
- SPtr<BCProcessor> bcProcessor(new BCProcessor());
+ SPtr<BCSet> bcSet(new BCSet());
- kernel->setBCProcessor(bcProcessor);
+ kernel->setBCSet(bcSet);
SetKernelBlockVisitor kernelVisitor(kernel, nuLB, availMem, needMem);
grid->accept(kernelVisitor);
@@ -264,8 +264,8 @@ void run()
//Postrozess
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<CoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ SPtr<SimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppgeo->update(0);
ppgeo.reset();
if (myid==0) UBLOG(logINFO, "Preprozess - end");
@@ -278,27 +278,27 @@ void run()
}
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
- writeMQCoProcessor->process(0);
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
+ writeMQSimulationObserver->update(0);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- std::shared_ptr<NUPSCounterCoProcessor> nupsCoProcessor(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ std::shared_ptr<NUPSCounterSimulationObserver> nupsSimulationObserver(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
//SPtr<UbScheduler> tavSch(new UbScheduler(1, 0, endTime));
- //SPtr<TimeAveragedValuesCoProcessor> tav(new TimeAveragedValuesCoProcessor(grid, pathname, WbWriterVtkXmlBinary::getInstance(), tavSch, comm,
- // TimeAveragedValuesCoProcessor::Density | TimeAveragedValuesCoProcessor::Velocity | TimeAveragedValuesCoProcessor::Fluctuations));
+ //SPtr<TimeAveragedValuesSimulationObserver> tav(new TimeAveragedValuesSimulationObserver(grid, pathname, WbWriterVtkXmlBinary::getInstance(), tavSch, comm,
+ // TimeAveragedValuesSimulationObserver::Density | TimeAveragedValuesSimulationObserver::Velocity | TimeAveragedValuesSimulationObserver::Fluctuations));
//tav->setWithGhostLayer(true);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(nupsCoProcessor);
- calculator->addCoProcessor(writeMQCoProcessor);
- //calculator->addCoProcessor(tav);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(nupsSimulationObserver);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ //simulation->addSimulationObserver(tav);
//omp_set_num_threads(1);
if (myid==0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid==0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/CouetteFlow/CMakeLists.txt b/apps/cpu/CouetteFlow/CMakeLists.txt
index 56931592d831ded425580f40af35e5f4c4a7c1c2..9f28e30c5aeb0722fb9d0b9b13a135ecae0f9799 100644
--- a/apps/cpu/CouetteFlow/CMakeLists.txt
+++ b/apps/cpu/CouetteFlow/CMakeLists.txt
@@ -3,4 +3,4 @@
########################################################
PROJECT(CouetteFlow)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} FILES cflow.cpp )
\ No newline at end of file
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} NonNewtonianFluids FILES cflow.cpp )
\ No newline at end of file
diff --git a/apps/cpu/CouetteFlow/cflow.cpp b/apps/cpu/CouetteFlow/cflow.cpp
index a60031096a0197e129a6c01c1dd9d5881dc2699f..e81c3bb008948814d79577311498dbfd5f1a76f2 100644
--- a/apps/cpu/CouetteFlow/cflow.cpp
+++ b/apps/cpu/CouetteFlow/cflow.cpp
@@ -1,7 +1,8 @@
#include <iostream>
#include <string>
-#include <VirtualFluids.h>
+#include "VirtualFluids.h"
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
using namespace std;
@@ -112,24 +113,24 @@ void bflow(string configname)
thix->setC(c);
thix->setMu0(mu0);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyHerschelBulkleyModelNoSlipBCAlgorithm()));
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyPowellEyringModelNoSlipBCAlgorithm()));
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyBinghamModelNoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyHerschelBulkleyModelNoSlipBCStrategy()));
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyPowellEyringModelNoSlipBCStrategy()));
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelNoSlipBCStrategy()));
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
+ bcVisitor.addBC(noSlipBC);
- SPtr<BCProcessor> bcProc;
- bcProc = SPtr<BCProcessor>(new BCProcessor());
+ SPtr<BCSet> bcProc;
+ bcProc = SPtr<BCSet>(new BCSet());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new PowellEyringModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new HerschelBulkleyModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyK17LBMKernel());
SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyBinghamModelLBMKernel());
kernel->setForcingX1(forcing);
kernel->setWithForcing(true);
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
SPtr<Grid3D> grid(new Grid3D(comm));
@@ -178,11 +179,11 @@ void bflow(string configname)
if (myid == 0) GbSystem3D::writeGeoObject(addWallYmax.get(), pathname + "/geo/addWallYmax", WbWriterVtkXmlASCII::getInstance());
//wall interactors
- //SPtr<D3Q27Interactor> addWallZminInt(new D3Q27Interactor(addWallZmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- //SPtr<D3Q27Interactor> addWallZmaxInt(new D3Q27Interactor(addWallZmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ //SPtr<D3Q27Interactor> addWallZminInt(new D3Q27Interactor(addWallZmin, grid, noSlipBC, Interactor3D::SOLID));
+ //SPtr<D3Q27Interactor> addWallZmaxInt(new D3Q27Interactor(addWallZmax, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> addWallYminInt(new D3Q27Interactor(addWallYmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> addWallYmaxInt(new D3Q27Interactor(addWallYmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> addWallYminInt(new D3Q27Interactor(addWallYmin, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> addWallYmaxInt(new D3Q27Interactor(addWallYmax, grid, noSlipBC, Interactor3D::SOLID));
////////////////////////////////////////////
//METIS
@@ -199,8 +200,8 @@ void bflow(string configname)
if (myid == 0) UBLOG(logINFO, "deleteSolidBlocks - end");
//////////////////////////////////////
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppblocks->update(0);
unsigned long nob = grid->getNumberOfBlocks();
int gl = 3;
@@ -252,29 +253,29 @@ void bflow(string configname)
grid->accept(bcVisitor);
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- WriteBoundaryConditionsCoProcessor ppgeo = WriteBoundaryConditionsCoProcessor(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm);
- ppgeo.process(1);
+ WriteBoundaryConditionsSimulationObserver ppgeo = WriteBoundaryConditionsSimulationObserver(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm);
+ ppgeo.update(1);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<CoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<SimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
//write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, pathname,
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, pathname,
WbWriterVtkXmlASCII::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
- SPtr<WriteThixotropyQuantitiesCoProcessor> writeThixotropicMQCoProcessor(new WriteThixotropyQuantitiesCoProcessor(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(writeMQCoProcessor);
- calculator->addCoProcessor(writeThixotropicMQCoProcessor);
- //calculator->addCoProcessor(migCoProcessor);
- //calculator->addCoProcessor(restartCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ //simulation->addSimulationObserver(migSimulationObserver);
+ //simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/FallingSphere/FallingSphere.cpp b/apps/cpu/FallingSphere/FallingSphere.cpp
index 5f399c547e697199cbbde82b906169a8c1d5fd59..ba837fcf15b32a65983b633c768aea6250a976a7 100644
--- a/apps/cpu/FallingSphere/FallingSphere.cpp
+++ b/apps/cpu/FallingSphere/FallingSphere.cpp
@@ -4,9 +4,7 @@
#include "VirtualFluids.h"
-#include "LiggghtsCouplingCoProcessor.h"
-#include "LiggghtsCouplingWrapper.h"
-#include "IBcumulantK17LBMKernel.h"
+#include "LiggghtsCoupling/LiggghtsCoupling.h"
using namespace std;
@@ -39,15 +37,15 @@ int main(int argc, char *argv[])
double nuLB = 1e-2;
SPtr<LBMKernel> kernel = make_shared<IBcumulantK17LBMKernel>();
- SPtr<BCProcessor> bcProc = make_shared<BCProcessor>();
- kernel->setBCProcessor(bcProc);
+ SPtr<BCSet> bcProc = make_shared<BCSet>();
+ kernel->setBCSet(bcProc);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
+ bcVisitor.addBC(noSlipBC);
SPtr<Grid3D> grid = make_shared<Grid3D>(comm);
grid->setPeriodicX1(true);
@@ -61,7 +59,7 @@ int main(int argc, char *argv[])
UbSystem::makeDirectory(outputPath);
UbSystem::makeDirectory(outputPath + "/liggghts");
- SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, D3Q27System::DIR_MMM, MetisPartitioner::RECURSIVE));
+ 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)
@@ -70,10 +68,10 @@ int main(int argc, char *argv[])
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
- SPtr<CoProcessor> ppblocks =
- make_shared <WriteBlocksCoProcessor>(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath,
+ SPtr<SimulationObserver> ppblocks =
+ make_shared <WriteBlocksSimulationObserver>(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath,
WbWriterVtkXmlBinary::getInstance(), comm);
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
double dx2 = 2.0 * dx;
@@ -84,8 +82,8 @@ int main(int argc, char *argv[])
new GbCuboid3D(g_minX1 - dx2, g_minX2 - dx2, g_maxX3, g_maxX1 + dx2, g_maxX2 + dx2, g_maxX3 + dx2));
GbSystem3D::writeGeoObject(wallZmax.get(), outputPath + "/geo/wallZmax", WbWriterVtkXmlASCII::getInstance());
- SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ 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);
@@ -136,15 +134,15 @@ int main(int argc, char *argv[])
wrapper.execFile((char *)inFile2.c_str());
wrapper.runUpto(demSubsteps - 1);
- SPtr<LiggghtsCouplingCoProcessor> lcCoProcessor =
- make_shared<LiggghtsCouplingCoProcessor>(grid, lScheduler, comm, wrapper, demSubsteps, units);
+ SPtr<LiggghtsCouplingSimulationObserver> lcSimulationObserver =
+ make_shared<LiggghtsCouplingSimulationObserver>(grid, lScheduler, comm, wrapper, demSubsteps, units);
// boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<WriteBoundaryConditionsCoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(
+ SPtr<WriteBoundaryConditionsSimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(
grid, geoSch, outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ ppgeo->update(0);
ppgeo.reset();
}
@@ -156,17 +154,17 @@ int main(int argc, char *argv[])
// write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(vtkSteps));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(
- new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(),
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(
+ new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(),
SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
int endTime = 3000; //20;
- SPtr<Calculator> calculator(new BasicCalculator(grid, lScheduler, endTime));
- calculator->addCoProcessor(lcCoProcessor);
- calculator->addCoProcessor(writeMQCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, lScheduler, endTime));
+ simulation->addSimulationObserver(lcSimulationObserver);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
diff --git a/apps/cpu/FlowAroundCylinder/cylinder.cpp b/apps/cpu/FlowAroundCylinder/cylinder.cpp
index d66222495986cc6eaa26c078d7eaf225834ffaab..f8c2ac4674a7bfa98d42c0be4ebf20365f579695 100644
--- a/apps/cpu/FlowAroundCylinder/cylinder.cpp
+++ b/apps/cpu/FlowAroundCylinder/cylinder.cpp
@@ -80,29 +80,29 @@ void run(string configname)
SPtr<Grid3D> grid(new Grid3D(comm));
//BC
- SPtr<BCAdapter> noSlipAdapter(new NoSlipBCAdapter());
- noSlipAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
+ SPtr<BC> noSlipAdapter(new NoSlipBC());
+ noSlipAdapter->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
mu::Parser fct;
fct.SetExpr("16*U*x2*x3*(H-x2)*(H-x3)/H^4");
fct.DefineConst("U", uLB);
fct.DefineConst("H", H);
- SPtr<BCAdapter> velBCAdapter(new VelocityBCAdapter(true, false, false, fct, 0, BCFunction::INFCONST));
- velBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
+ SPtr<BC> velBC(new VelocityBC(true, false, false, fct, 0, BCFunction::INFCONST));
+ velBC->setBCStrategy(SPtr<BCStrategy>(new VelocityWithDensityBCStrategy()));
- SPtr<BCAdapter> denBCAdapter(new DensityBCAdapter(rhoLB));
- denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
+ SPtr<BC> denBC(new DensityBC(rhoLB));
+ denBC->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowBCStrategy()));
BoundaryConditionsBlockVisitor bcVisitor;
bcVisitor.addBC(noSlipAdapter);
- bcVisitor.addBC(velBCAdapter);
- bcVisitor.addBC(denBCAdapter);
+ bcVisitor.addBC(velBC);
+ bcVisitor.addBC(denBC);
//////////////////////////////////////////////////////////////////////////
//restart
SPtr<UbScheduler> rSch(new UbScheduler(cpStep, cpStart));
- //RestartCoProcessor rp(grid, rSch, comm, pathOut, RestartCoProcessor::BINARY);
- MPIIORestartCoProcessor rcp(grid, rSch, pathOut, comm);
+ //RestartSimulationObserver rp(grid, rSch, comm, pathOut, RestartSimulationObserver::BINARY);
+ MPIIORestartSimulationObserver rcp(grid, rSch, pathOut, comm);
//////////////////////////////////////////////////////////////////////////
////cylinder
@@ -181,7 +181,7 @@ void run(string configname)
GbCuboid3DPtr geoOutflow(new GbCuboid3D(g_maxX1, g_minX2-blockLength, g_minX3-blockLength, g_maxX1+blockLength, g_maxX2+blockLength, g_maxX3+blockLength));
if (myid==0) GbSystem3D::writeGeoObject(geoOutflow.get(), pathOut+"/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathOut, WbWriterVtkXmlBinary::getInstance(), comm));
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathOut, WbWriterVtkXmlBinary::getInstance(), comm));
if (refineLevel>0)
{
@@ -199,10 +199,10 @@ void run(string configname)
SPtr<D3Q27Interactor> addWallZmaxInt(new D3Q27Interactor(addWallZmax, grid, noSlipAdapter, Interactor3D::SOLID));
//inflow
- SPtr<D3Q27Interactor> inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, velBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, velBC, Interactor3D::SOLID));
//outflow
- SPtr<D3Q27Interactor> outflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow, grid, denBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow, grid, denBC, Interactor3D::SOLID));
SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, DIR_00M));
@@ -217,7 +217,7 @@ void run(string configname)
intHelper.selectBlocks();
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
unsigned long long numberOfBlocks = (unsigned long long)grid->getNumberOfBlocks();
@@ -247,8 +247,8 @@ void run(string configname)
SPtr<LBMKernel> kernel(new CompressibleCumulantLBMKernel());
- SPtr<BCProcessor> bcProc(new BCProcessor());
- kernel->setBCProcessor(bcProc);
+ SPtr<BCSet> bcProc(new BCSet());
+ kernel->setBCSet(bcProc);
SetKernelBlockVisitor kernelVisitor(kernel, nueLB, availMem, needMem);
grid->accept(kernelVisitor);
@@ -275,9 +275,9 @@ void run(string configname)
//Postrozess
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<CoProcessor> ppgeo(
- new WriteBoundaryConditionsCoProcessor(grid, geoSch, pathOut, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ SPtr<SimulationObserver> ppgeo(
+ new WriteBoundaryConditionsSimulationObserver(grid, geoSch, pathOut, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppgeo->update(0);
ppgeo.reset();
if (myid==0) UBLOG(logINFO, "Preprozess - end");
@@ -302,26 +302,26 @@ void run(string configname)
SPtr<UbScheduler> stepSch(new UbScheduler(outTime));
- SPtr<CoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, stepSch, pathOut, WbWriterVtkXmlBinary::getInstance(), conv, comm));
+ SPtr<SimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, stepSch, pathOut, WbWriterVtkXmlBinary::getInstance(), conv, comm));
real area = (2.0*radius*H)/(dx*dx);
real v = 4.0*uLB/9.0;
SPtr<UbScheduler> forceSch(new UbScheduler(100));
- SPtr<CalculateForcesCoProcessor> fp = make_shared<CalculateForcesCoProcessor>(grid, forceSch, pathOut + "/results/forces.txt", comm, v, area);
+ SPtr<CalculateForcesSimulationObserver> fp = make_shared<CalculateForcesSimulationObserver>(grid, forceSch, pathOut + "/results/forces.txt", comm, v, area);
fp->addInteractor(cylinderInt);
SPtr<UbScheduler> nupsSch(new UbScheduler(nupsStep[0], nupsStep[1], nupsStep[2]));
- std::shared_ptr<CoProcessor> nupsCoProcessor(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ std::shared_ptr<SimulationObserver> nupsSimulationObserver(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(nupsCoProcessor);
- calculator->addCoProcessor(fp);
- calculator->addCoProcessor(writeMQCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(nupsSimulationObserver);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
if(myid == 0) UBLOG(logINFO,"Simulation-start");
- calculator->calculate();
+ simulation->run();
if(myid == 0) UBLOG(logINFO,"Simulation-end");
}
catch(std::exception& e)
diff --git a/apps/cpu/HerschelBulkleyModel/CMakeLists.txt b/apps/cpu/HerschelBulkleyModel/CMakeLists.txt
index fe04d5c61fdbf66fb1ab0966745301330ad0866e..537402905309fe65441d9b5fbe2d48523c55947f 100644
--- a/apps/cpu/HerschelBulkleyModel/CMakeLists.txt
+++ b/apps/cpu/HerschelBulkleyModel/CMakeLists.txt
@@ -3,4 +3,4 @@
########################################################
PROJECT(HerschelBulkleyModel)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} FILES hbflow.cpp )
\ No newline at end of file
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} NonNewtonianFluids FILES hbflow.cpp )
\ No newline at end of file
diff --git a/apps/cpu/HerschelBulkleyModel/hbflow.cpp b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
index 567fd661cd2e131e3f4f311285bd636f471dccb6..83686a88495ef5fc2a3ce8529453f2d59d30dab7 100644
--- a/apps/cpu/HerschelBulkleyModel/hbflow.cpp
+++ b/apps/cpu/HerschelBulkleyModel/hbflow.cpp
@@ -1,7 +1,8 @@
#include <iostream>
#include <string>
-#include <VirtualFluids.h>
+#include "VirtualFluids.h"
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
using namespace std;
@@ -132,29 +133,41 @@ void bflow(string configname)
thix->setC(c);
thix->setMu0(mu0);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyHerschelBulkleyModelNoSlipBCAlgorithm()));
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyPowellEyringModelNoSlipBCAlgorithm()));
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyBinghamModelNoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyHerschelBulkleyModelNoSlipBCStrategy()));
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyPowellEyringModelNoSlipBCStrategy()));
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelNoSlipBCStrategy()));
+
+ mu::Parser fctVx;
+ fctVx.SetExpr("u");
+ fctVx.DefineConst("u", 0.001);
+
+
+ SPtr<BC> velocityBC(new VelocityBC(true, false, false, fctVx, 0, BCFunction::INFCONST));
+ //velocityBC->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ velocityBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelVelocityBCStrategy()));
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- //bcVisitor.addBC(noSlipBCAdapter);
+ //bcVisitor.addBC(noSlipBC);
+ //bcVisitor.addBC(velocityBC);
- SPtr<BCProcessor> bcProc;
- bcProc = SPtr<BCProcessor>(new BCProcessor());
+ SPtr<BCSet> bcProc;
+ bcProc = SPtr<BCSet>(new BCSet());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new PowellEyringModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new HerschelBulkleyModelLBMKernel());
- SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyK17LBMKernel());
+ //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyK17LBMKernel());
+ SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyBinghamModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new BinghamModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel());
//double forcingXY = forcing / sqrt(2.0);
//kernel->setForcingX1(forcingXY);
//kernel->setForcingX2(forcingXY);
+
kernel->setForcingX1(forcing);
kernel->setWithForcing(true);
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
SPtr<Grid3D> grid(new Grid3D(comm));
@@ -210,13 +223,13 @@ void bflow(string configname)
//wall interactors
- //SPtr<D3Q27Interactor> addWallZminInt(new D3Q27Interactor(addWallZmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- //SPtr<D3Q27Interactor> addWallZmaxInt(new D3Q27Interactor(addWallZmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ //SPtr<D3Q27Interactor> addWallZminInt(new D3Q27Interactor(addWallZmin, grid, noSlipBC, Interactor3D::SOLID));
+ //SPtr<D3Q27Interactor> addWallZmaxInt(new D3Q27Interactor(addWallZmax, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> addWallYminInt(new D3Q27Interactor(addWallYmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> addWallYmaxInt(new D3Q27Interactor(addWallYmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> addWallYminInt(new D3Q27Interactor(addWallYmin, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> addWallYmaxInt(new D3Q27Interactor(addWallYmax, grid, noSlipBC, Interactor3D::SOLID));
- //SPtr<D3Q27TriFaceMeshInteractor> wall45Int(new D3Q27TriFaceMeshInteractor(wall45, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ //SPtr<D3Q27TriFaceMeshInteractor> wall45Int(new D3Q27TriFaceMeshInteractor(wall45, grid, noSlipBC, Interactor3D::SOLID));
////////////////////////////////////////////
//METIS
@@ -234,8 +247,8 @@ void bflow(string configname)
if (myid == 0) UBLOG(logINFO, "deleteSolidBlocks - end");
//////////////////////////////////////
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppblocks->update(0);
unsigned long nob = grid->getNumberOfBlocks();
int gl = 3;
@@ -287,29 +300,39 @@ void bflow(string configname)
grid->accept(bcVisitor);
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- WriteBoundaryConditionsCoProcessor ppgeo = WriteBoundaryConditionsCoProcessor(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm);
- ppgeo.process(1);
+ WriteBoundaryConditionsSimulationObserver ppgeo = WriteBoundaryConditionsSimulationObserver(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm);
+ ppgeo.update(1);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<CoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<SimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
+
+ SPtr<UbScheduler> forceSch(new UbScheduler(1000));
+ //real dummy = 1;
+ SPtr<CalculateTorqueSimulationObserver> fp = std::make_shared<CalculateTorqueSimulationObserver>(grid, forceSch, pathname + "/forces/forces.csv", comm);
+ fp->addInteractor(addWallYminInt);
+
+ SPtr<CalculateTorqueSimulationObserver> fp2 = std::make_shared<CalculateTorqueSimulationObserver>(grid, forceSch, pathname + "/forces/forces2.csv", comm);
+ fp2->addInteractor(addWallYmaxInt);
//write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, pathname,
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, pathname,
WbWriterVtkXmlASCII::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
- SPtr<WriteThixotropyQuantitiesCoProcessor> writeThixotropicMQCoProcessor(new WriteThixotropyQuantitiesCoProcessor(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(writeMQCoProcessor);
- calculator->addCoProcessor(writeThixotropicMQCoProcessor);
- //calculator->addCoProcessor(migCoProcessor);
- //calculator->addCoProcessor(restartCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(fp2);
+ //simulation->addSimulationObserver(migSimulationObserver);
+ //simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/HerschelBulkleySphere/CMakeLists.txt b/apps/cpu/HerschelBulkleySphere/CMakeLists.txt
index 6902b6c6cca28ff3dccd765d9e16dd5e92a772bd..69fe09a4f0eb5b11ecf15f3bd609c9afbf79cae6 100644
--- a/apps/cpu/HerschelBulkleySphere/CMakeLists.txt
+++ b/apps/cpu/HerschelBulkleySphere/CMakeLists.txt
@@ -3,4 +3,4 @@
########################################################
PROJECT(HerschelBulkleySphere)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} FILES hbsphere.cpp )
\ No newline at end of file
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} NonNewtonianFluids FILES hbsphere.cpp )
\ No newline at end of file
diff --git a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
index ae71a3a44926c52e04eb0df682b0495ce37c173d..221b106123b5fadffcf60427481800ef0d673b76 100644
--- a/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
+++ b/apps/cpu/HerschelBulkleySphere/hbsphere.cpp
@@ -1,7 +1,8 @@
#include <iostream>
#include <string>
-#include <VirtualFluids.h>
+#include "VirtualFluids.h"
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
using namespace std;
@@ -102,13 +103,13 @@ void bflow(string configname)
thix->setYieldStress(tau0);
thix->setOmegaMin(omegaMin);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyHerschelBulkleyModelNoSlipBCAlgorithm()));
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyBinghamModelNoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyHerschelBulkleyModelNoSlipBCStrategy()));
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelNoSlipBCStrategy()));
- SPtr<BCAdapter> slipBCAdapter(new SlipBCAdapter());
- slipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SimpleSlipBCAlgorithm()));
+ SPtr<BC> slipBC(new SlipBC());
+ slipBC->setBCStrategy(SPtr<BCStrategy>(new SimpleSlipBCStrategy()));
mu::Parser fct;
fct.SetExpr("U");
@@ -118,31 +119,31 @@ void bflow(string configname)
//fct.SetExpr("16*U*x2*x3*(H-x2)*(H-x3)/H^4");
//fct.DefineConst("U", U);
//fct.DefineConst("H", H);
- SPtr<BCAdapter> velocityBCAdapter(new VelocityBCAdapter(true, false, false, fct, 0, BCFunction::INFCONST));
- velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SimpleVelocityBCAlgorithm()));
- //velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
+ SPtr<BC> velocityBC(new VelocityBC(true, false, false, fct, 0, BCFunction::INFCONST));
+ velocityBC->setBCStrategy(SPtr<BCStrategy>(new SimpleVelocityBCStrategy()));
+ //velocityBC->setBCStrategy(SPtr<BCStrategy>(new VelocityWithDensityBCStrategy()));
- SPtr<BCAdapter> densityBCAdapter(new DensityBCAdapter());
- densityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
- //densityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
+ SPtr<BC> densityBC(new DensityBC());
+ densityBC->setBCStrategy(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
+ //densityBC->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowBCStrategy()));
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
- bcVisitor.addBC(slipBCAdapter);
- bcVisitor.addBC(velocityBCAdapter);
- bcVisitor.addBC(densityBCAdapter);
+ bcVisitor.addBC(noSlipBC);
+ bcVisitor.addBC(slipBC);
+ bcVisitor.addBC(velocityBC);
+ bcVisitor.addBC(densityBC);
- SPtr<BCProcessor> bcProc;
- bcProc = SPtr<BCProcessor>(new BCProcessor());
+ SPtr<BCSet> bcProc;
+ bcProc = SPtr<BCSet>(new BCSet());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CumulantLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel());
SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyK17LBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new HerschelBulkleyModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new BinghamModelLBMKernel());
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
//kernel->setForcingX1(forcing);
//kernel->setWithForcing(true);
@@ -159,7 +160,7 @@ void bflow(string configname)
//sphere
SPtr<GbObject3D> sphere(new GbSphere3D(sphereCenter[0], sphereCenter[1], sphereCenter[2], radius));
GbSystem3D::writeGeoObject(sphere.get(), outputPath + "/geo/sphere", WbWriterVtkXmlBinary::getInstance());
- SPtr<D3Q27Interactor> sphereInt(new D3Q27Interactor(sphere, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> sphereInt(new D3Q27Interactor(sphere, grid, noSlipBC, Interactor3D::SOLID));
////////////////////////////////////////////
//METIS
@@ -168,10 +169,10 @@ void bflow(string configname)
//////////////////////////////////////////////////////////////////////////
//restart
SPtr<UbScheduler> mSch(new UbScheduler(cpStep, cpStart));
- SPtr<MPIIOMigrationCoProcessor> restartCoProcessor(new MPIIOMigrationCoProcessor(grid, mSch, metisVisitor, outputPath, comm));
- restartCoProcessor->setLBMKernel(kernel);
- restartCoProcessor->setBCProcessor(bcProc);
- //restartCoProcessor->setNu(k);
+ SPtr<MPIIOMigrationSimulationObserver> restartSimulationObserver(new MPIIOMigrationSimulationObserver(grid, mSch, metisVisitor, outputPath, comm));
+ restartSimulationObserver->setLBMKernel(kernel);
+ restartSimulationObserver->setBCSet(bcProc);
+ //restartSimulationObserver->setNu(k);
//////////////////////////////////////////////////////////////////////////
if (myid == 0)
@@ -234,14 +235,14 @@ void bflow(string configname)
if (myid == 0) GbSystem3D::writeGeoObject(wallXmax.get(), outputPath + "/geo/wallXmax", WbWriterVtkXmlASCII::getInstance());
//wall interactors
- SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, slipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, slipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, slipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, slipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYminInt(new D3Q27Interactor(wallYmin, grid, slipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYmaxInt(new D3Q27Interactor(wallYmax, grid, slipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallYminInt(new D3Q27Interactor(wallYmin, grid, slipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallYmaxInt(new D3Q27Interactor(wallYmax, grid, slipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, velocityBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallXmaxInt(new D3Q27Interactor(wallXmax, grid, densityBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, velocityBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallXmaxInt(new D3Q27Interactor(wallXmax, grid, densityBC, Interactor3D::SOLID));
////////////////////////////////////////////
//METIS
@@ -261,8 +262,8 @@ void bflow(string configname)
if (myid == 0) UBLOG(logINFO, "deleteSolidBlocks - end");
//////////////////////////////////////
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppblocks->update(0);
unsigned long nob = grid->getNumberOfBlocks();
int gl = 3;
@@ -310,7 +311,7 @@ void bflow(string configname)
}
else
{
- restartCoProcessor->restart((int)restartStep);
+ restartSimulationObserver->restart((int)restartStep);
grid->setTimeStep(restartStep);
SetBcBlocksBlockVisitor v(sphereInt);
grid->accept(v);
@@ -331,35 +332,35 @@ void bflow(string configname)
grid->accept(bcVisitor);
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- WriteBoundaryConditionsCoProcessor ppgeo = WriteBoundaryConditionsCoProcessor(grid, geoSch, outputPath, WbWriterVtkXmlASCII::getInstance(), comm);
- ppgeo.process(0);
+ WriteBoundaryConditionsSimulationObserver ppgeo = WriteBoundaryConditionsSimulationObserver(grid, geoSch, outputPath, WbWriterVtkXmlASCII::getInstance(), comm);
+ ppgeo.update(0);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<CoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<SimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
//write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
//SPtr<UbScheduler> visSch(new UbScheduler(10,1));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
- //writeMQCoProcessor->process(0);
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ //writeMQSimulationObserver->update(0);
real area = UbMath::PI*radius*radius;
SPtr<UbScheduler> forceSch(new UbScheduler(100));
- SPtr<CalculateForcesCoProcessor> fp = make_shared<CalculateForcesCoProcessor>(grid, forceSch, outputPath + "/forces/forces.txt", comm, velocity, area);
+ SPtr<CalculateForcesSimulationObserver> fp = make_shared<CalculateForcesSimulationObserver>(grid, forceSch, outputPath + "/forces/forces.txt", comm, velocity, area);
fp->addInteractor(sphereInt);
- SPtr<WriteThixotropyQuantitiesCoProcessor> writeThixotropicMQCoProcessor(new WriteThixotropyQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(fp);
- calculator->addCoProcessor(writeMQCoProcessor);
- calculator->addCoProcessor(writeThixotropicMQCoProcessor);
- calculator->addCoProcessor(restartCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/JetBreakup/CMakeLists.txt b/apps/cpu/JetBreakup/CMakeLists.txt
index 19553ec4c1cca9dde298d377f82f8730f48269d0..b5bb536cf0c0b4820953ade37b1b5ccca265d7f2 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} FILES JetBreakup.cpp )
\ No newline at end of file
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} MultiphaseFlow FILES JetBreakup.cpp )
\ No newline at end of file
diff --git a/apps/cpu/JetBreakup/JetBreakup.cpp b/apps/cpu/JetBreakup/JetBreakup.cpp
index 2115b515f1c77cd97b587449ab9881642aa6e1be..f4b74ca379edaf8840cb6875ca0ff9fc7f296509 100644
--- a/apps/cpu/JetBreakup/JetBreakup.cpp
+++ b/apps/cpu/JetBreakup/JetBreakup.cpp
@@ -3,6 +3,7 @@
#include <string>
#include "VirtualFluids.h"
+#include "MultiphaseFlow/MultiphaseFlow.h"
using namespace std;
@@ -209,10 +210,10 @@ void run(string configname)
kernel->setInterfaceWidth(interfaceWidth);
//dynamicPointerCast<MultiphasePressureFilterLBMKernel>(kernel)->setPhaseFieldBC(0.0);
- SPtr<BCProcessor> bcProc(new BCProcessor());
- // BCProcessorPtr bcProc(new ThinWallBCProcessor());
+ SPtr<BCSet> bcProc(new BCSet());
+ // BCSetPtr bcProc(new ThinWallBCSet());
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
SPtr<Grid3D> grid(new Grid3D(comm));
// grid->setPeriodicX1(true);
@@ -226,15 +227,15 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////
// restart
SPtr<UbScheduler> rSch(new UbScheduler(cpStep, cpStart));
- // SPtr<MPIIORestartCoProcessor> rcp(new MPIIORestartCoProcessor(grid, rSch, pathname, comm));
- SPtr<MPIIOMigrationCoProcessor> rcp(new MPIIOMigrationCoProcessor(grid, rSch, metisVisitor, pathname, comm));
- // SPtr<MPIIOMigrationBECoProcessor> rcp(new MPIIOMigrationBECoProcessor(grid, rSch, pathname, comm));
+ // SPtr<MPIIORestartSimulationObserver> rcp(new MPIIORestartSimulationObserver(grid, rSch, pathname, comm));
+ SPtr<MPIIOMigrationSimulationObserver> rcp(new MPIIOMigrationSimulationObserver(grid, rSch, metisVisitor, pathname, comm));
+ // SPtr<MPIIOMigrationBESimulationObserver> rcp(new MPIIOMigrationBESimulationObserver(grid, rSch, pathname, comm));
// rcp->setNu(nuLB);
// rcp->setNuLG(nuL, nuG);
// rcp->setDensityRatio(densityRatio);
rcp->setLBMKernel(kernel);
- rcp->setBCProcessor(bcProc);
+ rcp->setBCSet(bcProc);
//////////////////////////////////////////////////////////////////////////
// BC Adapter
//////////////////////////////////////////////////////////////////////////////
@@ -246,24 +247,24 @@ void run(string configname)
fctF1.DefineConst("R", 8.0);
fctF1.DefineConst("x0", 0.0);
fctF1.DefineConst("z0", 0.0);
- // SPtr<BCAdapter> velBCAdapterF1(
- // new MultiphaseVelocityBCAdapter(false, true, false, fctF1, phiH, 0.0, BCFunction::INFCONST));
+ // SPtr<BC> velBCF1(
+ // new MultiphaseVelocityBC(false, true, false, fctF1, phiH, 0.0, BCFunction::INFCONST));
mu::Parser fctF2;
fctF2.SetExpr("vy1");
fctF2.DefineConst("vy1", U_LB);
real startTime = 1;
- SPtr<BCAdapter> velBCAdapterF1(
- new MultiphaseVelocityBCAdapter(true, false, false, fctF1, phiH, 0.0, startTime));
- SPtr<BCAdapter> velBCAdapterF2(
- new MultiphaseVelocityBCAdapter(true, false, false, fctF2, phiH, startTime, endTime));
+ 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<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseNoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNoSlipBCStrategy()));
- SPtr<BCAdapter> denBCAdapter(new DensityBCAdapter(rhoLB));
- denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseNonReflectingOutflowBCAlgorithm()));
+ SPtr<BC> denBC(new DensityBC(rhoLB));
+ denBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNonReflectingOutflowBCStrategy()));
mu::Parser fctPhi_F1;
fctPhi_F1.SetExpr("phiH");
@@ -277,13 +278,13 @@ void run(string configname)
fctvel_F2_init.SetExpr("U");
fctvel_F2_init.DefineConst("U", 0);
- velBCAdapterF1->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseVelocityBCAlgorithm()));
+ velBCF1->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
- bcVisitor.addBC(denBCAdapter); // Ohne das BB?
- bcVisitor.addBC(velBCAdapterF1);
+ bcVisitor.addBC(noSlipBC);
+ bcVisitor.addBC(denBC); // Ohne das BB?
+ bcVisitor.addBC(velBCF1);
//SPtr<D3Q27Interactor> inflowF1Int;
//SPtr<D3Q27Interactor> cylInt;
@@ -370,17 +371,17 @@ void run(string configname)
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
- SPtr<WriteBlocksCoProcessor> ppblocks(new WriteBlocksCoProcessor(
+ SPtr<WriteBlocksSimulationObserver> ppblocks(new WriteBlocksSimulationObserver(
grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- //SPtr<Interactor3D> tubes(new D3Q27TriFaceMeshInteractor(cylinder, grid, noSlipBCAdapter,
+ //SPtr<Interactor3D> tubes(new D3Q27TriFaceMeshInteractor(cylinder, grid, noSlipBC,
// Interactor3D::SOLID, Interactor3D::POINTS));
// inflowF1Int =
- // SPtr<D3Q27Interactor>(new D3Q27Interactor(cylinder1, grid, noSlipBCAdapter, Interactor3D::SOLID));
- // inflowF1Int->addBCAdapter(velBCAdapterF2);
+ // SPtr<D3Q27Interactor>(new D3Q27Interactor(cylinder1, grid, noSlipBC, Interactor3D::SOLID));
+ // inflowF1Int->addBC(velBCF2);
- SPtr<D3Q27Interactor> outflowInt(new D3Q27Interactor(geoOutflow, grid, denBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowInt(new D3Q27Interactor(geoOutflow, grid, denBC, Interactor3D::SOLID));
// Create boundary conditions geometry
GbCuboid3DPtr wallXmin(
@@ -404,28 +405,28 @@ void run(string configname)
// Add boundary conditions to grid generator
SPtr<D3Q27Interactor> wallXminInt(
- new D3Q27Interactor(wallXmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ new D3Q27Interactor(wallXmin, grid, noSlipBC, Interactor3D::SOLID));
SPtr<D3Q27Interactor> wallXmaxInt(
- new D3Q27Interactor(wallXmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ new D3Q27Interactor(wallXmax, grid, noSlipBC, Interactor3D::SOLID));
SPtr<D3Q27Interactor> wallZminInt(
- new D3Q27Interactor(wallZmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ new D3Q27Interactor(wallZmin, grid, noSlipBC, Interactor3D::SOLID));
SPtr<D3Q27Interactor> wallZmaxInt(
- new D3Q27Interactor(wallZmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ new D3Q27Interactor(wallZmax, grid, noSlipBC, Interactor3D::SOLID));
SPtr<D3Q27Interactor> wallYminInt(
- new D3Q27Interactor(wallYmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ new D3Q27Interactor(wallYmin, grid, noSlipBC, Interactor3D::SOLID));
SPtr<D3Q27Interactor> wallYmaxInt(
- new D3Q27Interactor(wallYmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ new D3Q27Interactor(wallYmax, grid, noSlipBC, Interactor3D::SOLID));
- //cylInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(cylinder1, grid, velBCAdapterF1, Interactor3D::SOLID));
- //cylInt->addBCAdapter(velBCAdapterF2);
- // SPtr<D3Q27Interactor> cyl2Int(new D3Q27Interactor(cylinder2, grid, noSlipBCAdapter,
+ //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, velBCAdapterF1, Interactor3D::SOLID));
- inflowInt->addBCAdapter(velBCAdapterF2);
+ inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, velBCF1, Interactor3D::SOLID));
+ inflowInt->addBC(velBCF2);
SPtr<D3Q27Interactor> solidInt =
- SPtr<D3Q27Interactor>(new D3Q27Interactor(geoSolid, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor>(new D3Q27Interactor(geoSolid, grid, noSlipBC, Interactor3D::SOLID));
InteractorsHelper intHelper(grid, metisVisitor, true);
//intHelper.addInteractor(cylInt);
@@ -444,7 +445,7 @@ void run(string configname)
intHelper.selectBlocks();
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
unsigned long long numberOfBlocks = (unsigned long long)grid->getNumberOfBlocks();
@@ -533,7 +534,7 @@ void run(string configname)
//}
// SPtr<Block3D> block = grid->getBlock(0, 0, 0, 0);
// SPtr<LBMKernel> kernel = dynamicPointerCast<LBMKernel>(block->getKernel());
- // SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ // SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
// for (int ix3 = 0; ix3 <= 13; ix3++) {
// for (int ix2 = 0; ix2 <= 13; ix2++) {
@@ -548,9 +549,9 @@ void run(string configname)
// boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<WriteBoundaryConditionsCoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(
+ SPtr<WriteBoundaryConditionsSimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(
grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ ppgeo->update(0);
ppgeo.reset();
}
@@ -580,15 +581,15 @@ void run(string configname)
t_ast = 7.19;
t = (int)(t_ast/(U_LB/(D_LB)));
visSch->addSchedule(t,t,t); //t=7.19
- SPtr<WriteMultiphaseQuantitiesCoProcessor> pp(new WriteMultiphaseQuantitiesCoProcessor(
+ SPtr<WriteMultiphaseQuantitiesSimulationObserver> pp(new WriteMultiphaseQuantitiesSimulationObserver(
grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
- pp->process(0);
+ pp->update(0);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<NUPSCounterCoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<NUPSCounterSimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
SPtr<UbScheduler> timeBCSch(new UbScheduler(1, startTime, startTime));
- auto timeDepBC = make_shared<TimeDependentBCCoProcessor>(TimeDependentBCCoProcessor(grid, timeBCSch));
+ auto timeDepBC = make_shared<TimeDependentBCSimulationObserver>(TimeDependentBCSimulationObserver(grid, timeBCSch));
timeDepBC->addInteractor(inflowInt);
#ifdef _OPENMP
@@ -596,15 +597,15 @@ void run(string configname)
#endif
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(pp);
- calculator->addCoProcessor(timeDepBC);
- calculator->addCoProcessor(rcp);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(timeDepBC);
+ simulation->addSimulationObserver(rcp);
if (myid == 0)
UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0)
UBLOG(logINFO, "Simulation-end");
} catch (std::exception &e) {
diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp
index cbafef30c489a26b5f8df9610ec3e6ad7aa1da79..c70c2c19e7a02129ff00f8ca3bd0d7e53894831c 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cpp
+++ b/apps/cpu/LaminarTubeFlow/ltf.cpp
@@ -66,60 +66,60 @@ void run(string configname)
//BC Adapter
//////////////////////////////////////////////////////////////////////////////
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new ThinWallNoSlipBCAlgorithm()));
- //SPtr<BCAdapter> denBCAdapter(new DensityBCAdapter(rhoLB));
- //denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new EqDensityBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new ThinWallNoSlipBCStrategy()));
+ //SPtr<BC> denBC(new DensityBC(rhoLB));
+ //denBC->setBCStrategy(SPtr<BCStrategy>(new EqDensityBCStrategy()));
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
- SPtr<BCAdapter> denBCAdapter(new DensityBCAdapter(rhoLB));
- denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
- //denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
+ SPtr<BC> denBC(new DensityBC(rhoLB));
+ denBC->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowBCStrategy()));
+ //denBC->setBCStrategy(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
//double startTime = 5;
mu::Parser fct1;
fct1.SetExpr("U");
fct1.DefineConst("U", uLB);
- SPtr<BCAdapter> velBCAdapter1(new VelocityBCAdapter(true, false, false, fct1, 0, BCFunction::INFCONST));
- //velBCAdapter1->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- velBCAdapter1->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
+ SPtr<BC> velBC1(new VelocityBC(true, false, false, fct1, 0, BCFunction::INFCONST));
+ //velBC1->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ velBC1->setBCStrategy(SPtr<BCStrategy>(new VelocityWithDensityBCStrategy()));
//mu::Parser fct2;
//fct2.SetExpr("U");
//fct2.DefineConst("U", uLB);
- //SPtr<BCAdapter> velBCAdapter2(new VelocityBCAdapter(true, false, false, fct2, startTime, BCFunction::INFCONST));
+ //SPtr<BC> velBC2(new VelocityBC(true, false, false, fct2, startTime, BCFunction::INFCONST));
//////////////////////////////////////////////////////////////////////////////////
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
- bcVisitor.addBC(denBCAdapter);
- //bcVisitor.addBC(velBCAdapter1);
+ bcVisitor.addBC(noSlipBC);
+ bcVisitor.addBC(denBC);
+ //bcVisitor.addBC(velBC1);
SPtr<Grid3D> grid(new Grid3D(comm));
- SPtr<BCProcessor> bcProc;
- bcProc = SPtr<BCProcessor>(new BCProcessor());
+ SPtr<BCSet> bcProc;
+ bcProc = SPtr<BCSet>(new BCSet());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel());
//double bulckViscosity = 3700*nuLB;
//dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->setBulkViscosity(bulckViscosity);
SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CumulantK17LBMKernel());
- kernel->setBCProcessor(bcProc);
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
+ kernel->setBCSet(bcProc);
//////////////////////////////////////////////////////////////////////////
SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, DIR_00M));
//restart
SPtr<UbScheduler> mSch(new UbScheduler(cpStep, cpStart));
- //SPtr<MPIIOMigrationCoProcessor> migCoProcessor(new MPIIOMigrationCoProcessor(grid, mSch, metisVisitor, pathname + "/mig", comm));
- SPtr<MPIIOMigrationBECoProcessor> migCoProcessor(new MPIIOMigrationBECoProcessor(grid, mSch, metisVisitor, pathname + "/mig", comm));
- migCoProcessor->setLBMKernel(kernel);
- migCoProcessor->setBCProcessor(bcProc);
- migCoProcessor->setNu(nuLB);
- migCoProcessor->setNuLG(0.01, 0.01);
- migCoProcessor->setDensityRatio(1);
+ //SPtr<MPIIOMigrationSimulationObserver> migSimulationObserver(new MPIIOMigrationSimulationObserver(grid, mSch, metisVisitor, pathname + "/mig", comm));
+ SPtr<MPIIOMigrationBESimulationObserver> migSimulationObserver(new MPIIOMigrationBESimulationObserver(grid, mSch, metisVisitor, pathname + "/mig", comm));
+ migSimulationObserver->setLBMKernel(kernel);
+ migSimulationObserver->setBCSet(bcProc);
+ migSimulationObserver->setNu(nuLB);
+ migSimulationObserver->setNuLG(0.01, 0.01);
+ migSimulationObserver->setDensityRatio(1);
//////////////////////////////////////////////////////////////////////////
SPtr<D3Q27Interactor> inflowInt;
@@ -189,11 +189,11 @@ void run(string configname)
GbCuboid3DPtr geoOutflow(new GbCuboid3D(g_maxX1, g_minX2-blockLength, g_minX3-blockLength, g_maxX1+blockLength, g_maxX2+blockLength, g_maxX3+blockLength));
if (myid==0) GbSystem3D::writeGeoObject(geoOutflow.get(), pathname+"/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
+ ppblocks->update(0);
- SPtr<D3Q27Interactor> cylinderInt(new D3Q27Interactor(cylinder, grid, noSlipBCAdapter, Interactor3D::INVERSESOLID));
+ SPtr<D3Q27Interactor> cylinderInt(new D3Q27Interactor(cylinder, grid, noSlipBC, Interactor3D::INVERSESOLID));
//double r = dynamicPointerCast<GbCylinder3D>(cylinder)->getRadius();
//double cx1 = g_minX1;
@@ -211,16 +211,16 @@ void run(string configname)
////fct.DefineConst("y0", cx2);
////fct.DefineConst("z0", cx3);
////fct.DefineConst("nue", nuLB);
- //SPtr<BCAdapter> velBCAdapter(new VelocityBCAdapter(true, false, false, fct, 0, BCFunction::INFCONST));
- //velBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- //velBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
+ //SPtr<BC> velBC(new VelocityBC(true, false, false, fct, 0, BCFunction::INFCONST));
+ //velBC->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //velBC->setBCStrategy(SPtr<BCStrategy>(new VelocityWithDensityBCStrategy()));
- inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, velBCAdapter1, Interactor3D::SOLID));
- //inflowInt->addBCAdapter(velBCAdapter2);
+ inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, velBC1, Interactor3D::SOLID));
+ //inflowInt->addBC(velBC2);
//outflow
- SPtr<D3Q27Interactor> outflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow, grid, denBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow, grid, denBC, Interactor3D::SOLID));
//SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, D3Q27System::DIR_00M));
InteractorsHelper intHelper(grid, metisVisitor);
@@ -229,7 +229,7 @@ void run(string configname)
intHelper.addInteractor(outflowInt);
intHelper.selectBlocks();
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
unsigned long long numberOfBlocks = (unsigned long long)grid->getNumberOfBlocks();
@@ -268,7 +268,7 @@ void run(string configname)
intHelper.setBC();
- bcVisitor.addBC(velBCAdapter1);
+ bcVisitor.addBC(velBC1);
grid->accept(bcVisitor);
//initialization of distributions
@@ -280,8 +280,8 @@ void run(string configname)
//boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<CoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ SPtr<SimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppgeo->update(0);
ppgeo.reset();
}
@@ -302,7 +302,7 @@ void run(string configname)
VF_LOG_INFO("path = {}", pathname);
}
- migCoProcessor->restart((int)restartStep);
+ migSimulationObserver->restart((int)restartStep);
grid->setTimeStep(restartStep);
if (myid == 0) VF_LOG_INFO("Restart - end");
@@ -316,26 +316,26 @@ void run(string configname)
grid->accept(setInterConnsVisitor);
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
- SPtr<CoProcessor> pp(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
+ SPtr<SimulationObserver> pp(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
SPtr<UbScheduler> nupsSch(new UbScheduler(100, 100, 100000000));
- SPtr<CoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<SimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
//SPtr<UbScheduler> timeBCSch(new UbScheduler(1, startTime, startTime));
- //auto timeDepBC = make_shared<TimeDependentBCCoProcessor>(TimeDependentBCCoProcessor(grid, timeBCSch));
+ //auto timeDepBC = make_shared<TimeDependentBCSimulationObserver>(TimeDependentBCSimulationObserver(grid, timeBCSch));
//timeDepBC->addInteractor(inflowInt);
omp_set_num_threads(numOfThreads);
numOfThreads = 1;
SPtr<UbScheduler> stepGhostLayer(visSch);
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, int(endTime)));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(pp);
- calculator->addCoProcessor(migCoProcessor);
- //calculator->addCoProcessor(timeDepBC);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, int(endTime)));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(migSimulationObserver);
+ //simulation->addSimulationObserver(timeDepBC);
if (myid == 0) VF_LOG_INFO("Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) VF_LOG_INFO("Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/LiggghtsApp/LiggghtsApp.cpp b/apps/cpu/LiggghtsApp/LiggghtsApp.cpp
index b3c49ccaec94747efea9c28a1b1cb8a937c03444..969243a0516871033c9c4d001d92468dc0164e8c 100644
--- a/apps/cpu/LiggghtsApp/LiggghtsApp.cpp
+++ b/apps/cpu/LiggghtsApp/LiggghtsApp.cpp
@@ -10,9 +10,7 @@
//#include "modify.h"
//#include "fix_lb_coupling_onetoone.h"
-#include "LiggghtsCouplingCoProcessor.h"
-#include "LiggghtsCouplingWrapper.h"
-#include "IBcumulantK17LBMKernel.h"
+#include "LiggghtsCoupling/LiggghtsCoupling.h"
using namespace std;
@@ -53,15 +51,15 @@ int main(int argc, char *argv[])
double nuLB = 1e-2; // 5e-5;
SPtr<LBMKernel> kernel = make_shared<IBcumulantK17LBMKernel>();
- SPtr<BCProcessor> bcProc = make_shared<BCProcessor>();
- kernel->setBCProcessor(bcProc);
+ SPtr<BCSet> bcProc = make_shared<BCSet>();
+ kernel->setBCSet(bcProc);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
+ bcVisitor.addBC(noSlipBC);
@@ -77,7 +75,7 @@ int main(int argc, char *argv[])
UbSystem::makeDirectory(outputPath);
UbSystem::makeDirectory(outputPath + "/liggghts");
- SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, D3Q27System::DIR_MMM, MetisPartitioner::RECURSIVE));
+ 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)
@@ -86,10 +84,10 @@ int main(int argc, char *argv[])
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
- SPtr<CoProcessor> ppblocks =
- make_shared <WriteBlocksCoProcessor>(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath,
+ SPtr<SimulationObserver> ppblocks =
+ make_shared <WriteBlocksSimulationObserver>(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath,
WbWriterVtkXmlBinary::getInstance(), comm);
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
double dx2 = 2.0 * dx;
@@ -100,8 +98,8 @@ int main(int argc, char *argv[])
new GbCuboid3D(g_minX1 - dx2, g_minX2 - dx2, g_maxX3, g_maxX1 + dx2, g_maxX2 + dx2, g_maxX3 + dx2));
GbSystem3D::writeGeoObject(wallZmax.get(), outputPath + "/geo/wallZmax", WbWriterVtkXmlASCII::getInstance());
- SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ 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);
@@ -148,15 +146,15 @@ int main(int argc, char *argv[])
wrapper.runUpto(demSubsteps - 1);
- SPtr<LiggghtsCouplingCoProcessor> lcCoProcessor =
- make_shared<LiggghtsCouplingCoProcessor>(grid, lScheduler, comm, wrapper, demSubsteps, units);
+ SPtr<LiggghtsCouplingSimulationObserver> lcSimulationObserver =
+ make_shared<LiggghtsCouplingSimulationObserver>(grid, lScheduler, comm, wrapper, demSubsteps, units);
// boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<WriteBoundaryConditionsCoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(
+ SPtr<WriteBoundaryConditionsSimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(
grid, geoSch, outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ ppgeo->update(0);
ppgeo.reset();
}
@@ -168,17 +166,17 @@ int main(int argc, char *argv[])
// write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(vtkSteps));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(
- new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(),
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(
+ new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(),
SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
int endTime = 3000; //20;
- SPtr<Calculator> calculator(new BasicCalculator(grid, lScheduler, endTime));
- calculator->addCoProcessor(lcCoProcessor);
- calculator->addCoProcessor(writeMQCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, lScheduler, endTime));
+ simulation->addSimulationObserver(lcSimulationObserver);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
//MPI_Init(&argc, &argv);
diff --git a/apps/cpu/Multiphase/CMakeLists.txt b/apps/cpu/Multiphase/CMakeLists.txt
index 3daebaf854a900fa1fdb9bc31b015969167de15d..0c7e43dcaf2185360c49ee78b86f34840b06b4df 100644
--- a/apps/cpu/Multiphase/CMakeLists.txt
+++ b/apps/cpu/Multiphase/CMakeLists.txt
@@ -1,3 +1,3 @@
PROJECT(Multiphase)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} FILES Multiphase.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} MultiphaseFlow FILES Multiphase.cpp )
diff --git a/apps/cpu/Multiphase/Multiphase.cpp b/apps/cpu/Multiphase/Multiphase.cpp
index 4d4bc9cf82afe16309f22b69c0973acb3f96324c..79d969dd93c5bd87b0d327f5275d2c6b9a8a1448 100644
--- a/apps/cpu/Multiphase/Multiphase.cpp
+++ b/apps/cpu/Multiphase/Multiphase.cpp
@@ -3,6 +3,7 @@
#include <memory>
#include "VirtualFluids.h"
+#include "MultiphaseFlow/MultiphaseFlow.h"
using namespace std;
@@ -112,10 +113,10 @@ void run(string configname)
kernel->setContactAngle(theta);
kernel->setInterfaceWidth(interfaceWidth);
- SPtr<BCProcessor> bcProc(new BCProcessor());
- // BCProcessorPtr bcProc(new ThinWallBCProcessor());
+ SPtr<BCSet> bcProc(new BCSet());
+ // BCSetPtr bcProc(new ThinWallBCSet());
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
SPtr<Grid3D> grid(new Grid3D(comm));
//grid->setPeriodicX1(true);
@@ -129,15 +130,15 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////
// restart
SPtr<UbScheduler> rSch(new UbScheduler(cpStep, cpStart));
- //SPtr<MPIIORestartCoProcessor> rcp(new MPIIORestartCoProcessor(grid, rSch, pathname, comm));
- SPtr<MPIIOMigrationCoProcessor> rcp(new MPIIOMigrationCoProcessor(grid, rSch, metisVisitor, pathname, comm));
- //SPtr<MPIIOMigrationBECoProcessor> rcp(new MPIIOMigrationBECoProcessor(grid, rSch, pathname, comm));
+ //SPtr<MPIIORestartSimulationObserver> rcp(new MPIIORestartSimulationObserver(grid, rSch, pathname, comm));
+ SPtr<MPIIOMigrationSimulationObserver> rcp(new MPIIOMigrationSimulationObserver(grid, rSch, metisVisitor, pathname, comm));
+ //SPtr<MPIIOMigrationBESimulationObserver> rcp(new MPIIOMigrationBESimulationObserver(grid, rSch, pathname, comm));
//rcp->setNu(nuLB);
//rcp->setNuLG(nuL, nuG);
//rcp->setDensityRatio(densityRatio);
rcp->setLBMKernel(kernel);
- rcp->setBCProcessor(bcProc);
+ rcp->setBCSet(bcProc);
//////////////////////////////////////////////////////////////////////////
// BC Adapter
//////////////////////////////////////////////////////////////////////////////
@@ -149,22 +150,22 @@ void run(string configname)
fctF1.DefineConst("R", 8.0);
fctF1.DefineConst("x0", 0.0);
fctF1.DefineConst("z0", 0.0);
- //SPtr<BCAdapter> velBCAdapterF1(
- // new MultiphaseVelocityBCAdapter(false, true, false, fctF1, phiH, 0.0, BCFunction::INFCONST));
+ //SPtr<BC> velBCF1(
+ // new MultiphaseVelocityBC(false, true, false, fctF1, phiH, 0.0, BCFunction::INFCONST));
mu::Parser fctF2;
fctF2.SetExpr("vy1");
fctF2.DefineConst("vy1", uLB);
real startTime = 30;
- SPtr<BCAdapter> velBCAdapterF1(new MultiphaseVelocityBCAdapter(true, false, false, fctF1, phiH, 0.0, startTime));
- SPtr<BCAdapter> velBCAdapterF2(new MultiphaseVelocityBCAdapter(true, false, false, fctF2, phiH, startTime, endTime));
+ 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<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseNoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNoSlipBCStrategy()));
- SPtr<BCAdapter> denBCAdapter(new DensityBCAdapter(rhoLB));
- denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseNonReflectingOutflowBCAlgorithm()));
+ SPtr<BC> denBC(new DensityBC(rhoLB));
+ denBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNonReflectingOutflowBCStrategy()));
mu::Parser fctPhi_F1;
fctPhi_F1.SetExpr("phiH");
@@ -178,13 +179,13 @@ void run(string configname)
fctvel_F2_init.SetExpr("U");
fctvel_F2_init.DefineConst("U", 0);
- velBCAdapterF1->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseVelocityBCAlgorithm()));
+ velBCF1->setBCStrategy(SPtr<BCStrategy>(new MultiphaseVelocityBCStrategy()));
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
- bcVisitor.addBC(denBCAdapter); //Ohne das BB?
- bcVisitor.addBC(velBCAdapterF1);
+ bcVisitor.addBC(noSlipBC);
+ bcVisitor.addBC(denBC); //Ohne das BB?
+ bcVisitor.addBC(velBCF1);
SPtr<D3Q27Interactor> inflowF1Int;
SPtr<D3Q27Interactor> cylInt;
@@ -265,16 +266,16 @@ void run(string configname)
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
- SPtr<WriteBlocksCoProcessor> ppblocks(new WriteBlocksCoProcessor(
+ SPtr<WriteBlocksSimulationObserver> ppblocks(new WriteBlocksSimulationObserver(
grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- SPtr<Interactor3D> tubes(new D3Q27TriFaceMeshInteractor(cylinder, grid, noSlipBCAdapter, Interactor3D::SOLID, Interactor3D::POINTS));
+ SPtr<Interactor3D> tubes(new D3Q27TriFaceMeshInteractor(cylinder, grid, noSlipBC, Interactor3D::SOLID, Interactor3D::POINTS));
//inflowF1Int =
- // SPtr<D3Q27Interactor>(new D3Q27Interactor(cylinder1, grid, noSlipBCAdapter, Interactor3D::SOLID));
- //inflowF1Int->addBCAdapter(velBCAdapterF2);
+ // SPtr<D3Q27Interactor>(new D3Q27Interactor(cylinder1, grid, noSlipBC, Interactor3D::SOLID));
+ //inflowF1Int->addBC(velBCF2);
- SPtr<D3Q27Interactor> outflowInt(new D3Q27Interactor(geoOutflow, grid, denBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowInt(new D3Q27Interactor(geoOutflow, grid, denBC, Interactor3D::SOLID));
// Create boundary conditions geometry
GbCuboid3DPtr wallXmin(new GbCuboid3D(g_minX1 - dx, g_minX2 - dx, g_minX3 - dx, g_minX1, g_maxX2 + dx, g_maxX3));
@@ -291,17 +292,17 @@ void run(string configname)
GbSystem3D::writeGeoObject(wallYmax.get(), pathname + "/geo/wallYmax", WbWriterVtkXmlASCII::getInstance());
// Add boundary conditions to grid generator
- SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallXmaxInt(new D3Q27Interactor(wallXmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYminInt(new D3Q27Interactor(wallYmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYmaxInt(new D3Q27Interactor(wallYmax, grid, noSlipBCAdapter, 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, velBCAdapterF1, Interactor3D::SOLID));
- cylInt->addBCAdapter(velBCAdapterF2);
- //SPtr<D3Q27Interactor> cyl2Int(new D3Q27Interactor(cylinder2, grid, noSlipBCAdapter, 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));
InteractorsHelper intHelper(grid, metisVisitor, true);
@@ -322,7 +323,7 @@ void run(string configname)
intHelper.selectBlocks();
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
unsigned long long numberOfBlocks = (unsigned long long)grid->getNumberOfBlocks();
@@ -400,7 +401,7 @@ void run(string configname)
//}
// SPtr<Block3D> block = grid->getBlock(0, 0, 0, 0);
// SPtr<LBMKernel> kernel = dynamicPointerCast<LBMKernel>(block->getKernel());
- // SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ // SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
// for (int ix3 = 0; ix3 <= 13; ix3++) {
// for (int ix2 = 0; ix2 <= 13; ix2++) {
@@ -415,9 +416,9 @@ void run(string configname)
// boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<WriteBoundaryConditionsCoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(
+ SPtr<WriteBoundaryConditionsSimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(
grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ ppgeo->update(0);
ppgeo.reset();
}
@@ -455,16 +456,16 @@ void run(string configname)
grid->accept(setConnsVisitor);
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
- SPtr<WriteMultiphaseQuantitiesCoProcessor> pp(new WriteMultiphaseQuantitiesCoProcessor(
- //SPtr<WriteMacroscopicQuantitiesCoProcessor> pp(new WriteMacroscopicQuantitiesCoProcessor(
+ SPtr<WriteMultiphaseQuantitiesSimulationObserver> pp(new WriteMultiphaseQuantitiesSimulationObserver(
+ //SPtr<WriteMacroscopicQuantitiesSimulationObserver> pp(new WriteMacroscopicQuantitiesSimulationObserver(
grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
- pp->process(0);
+ pp->update(0);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<NUPSCounterCoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<NUPSCounterSimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
SPtr<UbScheduler> timeBCSch(new UbScheduler(1, startTime, startTime));
- auto timeDepBC = make_shared<TimeDependentBCCoProcessor>(TimeDependentBCCoProcessor(grid, timeBCSch));
+ auto timeDepBC = make_shared<TimeDependentBCSimulationObserver>(TimeDependentBCSimulationObserver(grid, timeBCSch));
timeDepBC->addInteractor(cylInt);
#ifdef _OPENMP
@@ -472,18 +473,18 @@ void run(string configname)
#endif
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(pp);
- calculator->addCoProcessor(timeDepBC);
- calculator->addCoProcessor(rcp);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(timeDepBC);
+ simulation->addSimulationObserver(rcp);
if (myid == 0)
UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0)
UBLOG(logINFO, "Simulation-end");
} catch (std::exception &e) {
diff --git a/apps/cpu/MultiphaseDropletTest/CMakeLists.txt b/apps/cpu/MultiphaseDropletTest/CMakeLists.txt
index 3f01ad73a0b28f7050667dde7b9408ac00b76e42..b70fdf8fb1e93807e7812988374b28a4f9a969b4 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} FILES droplet.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} MultiphaseFlow FILES droplet.cpp )
diff --git a/apps/cpu/MultiphaseDropletTest/droplet.cpp b/apps/cpu/MultiphaseDropletTest/droplet.cpp
index a9d561930a77cc447bbe6c959bd7e8464f314d69..eaa3e550f873113bf2ffdeba4ed8a962ccae5046 100644
--- a/apps/cpu/MultiphaseDropletTest/droplet.cpp
+++ b/apps/cpu/MultiphaseDropletTest/droplet.cpp
@@ -8,6 +8,7 @@
#endif
#include "VirtualFluids.h"
+#include "MultiphaseFlow/MultiphaseFlow.h"
using namespace std;
@@ -169,17 +170,17 @@ void run(string configname)
kernel->setMultiphaseModelParameters(beta, kappa);
kernel->setContactAngle(theta);
- SPtr<BCProcessor> bcProc(new BCProcessor());
- // BCProcessorPtr bcProc(new ThinWallBCProcessor());
+ SPtr<BCSet> bcProc(new BCSet());
+ // BCSetPtr bcProc(new ThinWallBCSet());
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseNoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNoSlipBCStrategy()));
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
+ bcVisitor.addBC(noSlipBC);
SPtr<Grid3D> grid(new Grid3D(comm));
grid->setDeltaX(dx);
@@ -194,15 +195,15 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////
// restart
SPtr<UbScheduler> rSch(new UbScheduler(cpStep, cpStart));
- //SPtr<MPIIORestartCoProcessor> rcp(new MPIIORestartCoProcessor(grid, rSch, pathname, comm));
- SPtr<MPIIOMigrationCoProcessor> rcp(new MPIIOMigrationCoProcessor(grid, rSch, metisVisitor, pathname, comm));
- //SPtr<MPIIOMigrationBECoProcessor> rcp(new MPIIOMigrationBECoProcessor(grid, rSch, pathname, comm));
+ //SPtr<MPIIORestartSimulationObserver> rcp(new MPIIORestartSimulationObserver(grid, rSch, pathname, comm));
+ SPtr<MPIIOMigrationSimulationObserver> rcp(new MPIIOMigrationSimulationObserver(grid, rSch, metisVisitor, pathname, comm));
+ //SPtr<MPIIOMigrationBESimulationObserver> rcp(new MPIIOMigrationBESimulationObserver(grid, rSch, pathname, comm));
// rcp->setNu(nuLB);
// rcp->setNuLG(nuL, nuG);
// rcp->setDensityRatio(densityRatio);
rcp->setLBMKernel(kernel);
- rcp->setBCProcessor(bcProc);
+ rcp->setBCSet(bcProc);
//////////////////////////////////////////////////////////////////////////
if (newStart) {
@@ -233,10 +234,10 @@ void run(string configname)
GbCuboid3DPtr wallYmax(new GbCuboid3D(g_minX1 - dx2, g_maxX2, g_minX3 - dx2, g_maxX1 + dx2, g_maxX2 + dx2, g_maxX3 + dx2));
GbSystem3D::writeGeoObject(wallYmax.get(), pathname + "/geo/wallYmax", WbWriterVtkXmlASCII::getInstance());
- SPtr<D3Q27Interactor> wallYminInt(new D3Q27Interactor(wallYmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYmaxInt(new D3Q27Interactor(wallYmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallYminInt(new D3Q27Interactor(wallYmin, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallYmaxInt(new D3Q27Interactor(wallYmax, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<WriteBlocksCoProcessor> ppblocks(new WriteBlocksCoProcessor(
+ SPtr<WriteBlocksSimulationObserver> ppblocks(new WriteBlocksSimulationObserver(
grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname, WbWriterVtkXmlBinary::getInstance(), comm));
InteractorsHelper intHelper(grid, metisVisitor, true);
@@ -244,7 +245,7 @@ void run(string configname)
intHelper.addInteractor(wallYmaxInt);
intHelper.selectBlocks();
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
unsigned long long numberOfBlocks = (unsigned long long)grid->getNumberOfBlocks();
@@ -317,9 +318,9 @@ void run(string configname)
// boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<WriteBoundaryConditionsCoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(
+ SPtr<WriteBoundaryConditionsSimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(
grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ ppgeo->update(0);
ppgeo.reset();
}
@@ -380,26 +381,26 @@ void run(string configname)
t = (int)(t_ast/std::sqrt(g_y/D));
visSch->addSchedule(t,t,t); //t=9
- SPtr<WriteMultiphaseQuantitiesCoProcessor> pp(new WriteMultiphaseQuantitiesCoProcessor(
+ SPtr<WriteMultiphaseQuantitiesSimulationObserver> pp(new WriteMultiphaseQuantitiesSimulationObserver(
grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
if(grid->getTimeStep() == 0)
- pp->process(0);
+ pp->update(0);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<NUPSCounterCoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<NUPSCounterSimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(pp);
- calculator->addCoProcessor(rcp);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ simulation->addSimulationObserver(rcp);
if (myid == 0)
UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0)
UBLOG(logINFO, "Simulation-end");
diff --git a/apps/cpu/Nozzle/CMakeLists.txt b/apps/cpu/Nozzle/CMakeLists.txt
index b653be79cefa91cb64408bdb7e7507bd79a57b26..f9e90c7e95115d4b4dfc436721a192100ad95e98 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 FILES nozzle.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} LiggghtsCoupling MultiphaseFlow NonNewtonianFluids FILES nozzle.cpp )
diff --git a/apps/cpu/Nozzle/nozzle.cpp b/apps/cpu/Nozzle/nozzle.cpp
index 54a306729006a60ec02c04cf029f529163acbe0f..babee1900c0bd9bb10bca3bccd790e83d25d14b8 100644
--- a/apps/cpu/Nozzle/nozzle.cpp
+++ b/apps/cpu/Nozzle/nozzle.cpp
@@ -1,544 +1,762 @@
#include <iostream>
-#include <string>
#include <memory>
+#include <string>
#include "VirtualFluids.h"
-#include "LiggghtsCouplingCoProcessor.h"
-#include "LiggghtsCouplingWrapper.h"
-#include "IBcumulantK17LBMKernel.h"
+#include "LiggghtsCoupling/LiggghtsCoupling.h"
-using namespace std;
+#include "MultiphaseFlow/MultiphaseFlow.h"
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
+
+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();
-
-
- // 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;
+ // Sleep(30000);
- //int blockNX[3] = { 10, 10, 10 };
+ try {
- double g_minX1 = -1.31431;
- double g_minX2 = 0.375582;
- double g_minX3 = -210e-3 - 1e-3;
+ std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
+ int myid = comm->getProcessID();
- double g_maxX1 = -1.28831;
- double g_maxX2 = 0.401582;
- double g_maxX3 = 0.206;
+ // bounding box
+ // double g_minX1 = -1341.81e-3;
+ // double g_minX2 = 348.087e-3;
+ // double g_minX3 = -210e-3;
- int blockNX[3] = { 26, 26, 26 };
+ // double g_maxX1 = -1260.81e-3;
+ // double g_maxX2 = 429.087e-3;
+ // double g_maxX3 = 214.5e-3;
- double dx = 1e-3;
+ // double g_minX1 = -1341.81e-3 + 10e-3;
+ // double g_minX2 = 0.360872;
+ // double g_minX3 = -210e-3;
- double uLB = 0.00001;
- //double rhoLB = 0.0;
+ // double g_maxX1 = -1260.81e-3 - 10e-3;
+ // double g_maxX2 = 0.416302;
+ // double g_maxX3 = 210e-3;
- // concrete
- double d_part = 1e-3;
- double V = 0.4; // 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; //
- double rhoConcrete = 2400; // [kg/m^3]
- double nu = muConcrete / rhoConcrete;
+ // int blockNX[3] = { 10, 10, 10 };
- //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);
- if (myid == 0) std::cout << units->toString() << std::endl;
+ double g_minX1 = -1.31431;
+ double g_minX2 = 0.375582;
+ double g_minX3 = 0.1; //-210e-3 - 0.2 - 6e-3; //- 1e-3;
- double interfaceThickness = 4.096;
- double sigma = 0.03;
- double Re = rhoConcrete * u * d_part / muConcrete;
- double We = rhoConcrete * u * u * d_part / sigma;
+ double g_maxX1 = -1.28831;
+ double g_maxX2 = 0.401582;
+ double g_maxX3 = 0.206;
-
+ int blockNX[3] = { 26, 26, 35 };
- double nu_h_LB = uLB * d_part * units->getFactorLentghWToLb() / Re;
- double nu_l_LB = 0;// = nu_h_LB;
-
+ double dx = 1e-3;
- double rho_h_LB = 1;
-
- // surface tension
- double sigma_LB = rho_h_LB * uLB * uLB * d_part * units->getFactorLentghWToLb() / We;
-
-
- // LBMReal dLB = 0; // = length[1] / dx;
- LBMReal rhoLB = 0.0;
- //LBMReal nuLB = nu_l; //(uLB*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));
- //SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(d_part, 1., 1000, d_part / dx, std::abs(uLB));
- //SPtr<LBMUnitConverter> units = std::make_shared<LBMUnitConverter>(d_part, 1., 2400, d_part / dx, uRef);
-
-
- //SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseNoSlipBCAlgorithm()));
+ double uLB_ref = 0.001;
+ // double rhoLB = 0.0;
+ // concrete
+ double d_part = 1e-3;
+ double V = 0.4; // 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()));
-
- // concrete inflow boundary condition
- mu::Parser fct;
- fct.SetExpr("U");
- fct.DefineConst("U", -u*units->getFactorVelocityWToLb());
- if (myid == 0) VF_LOG_INFO("Concrete inflow velocity = {} m/s", u);
- if (myid == 0) VF_LOG_INFO("Concrete inflow velocity = {} dx/dt", u * units->getFactorVelocityWToLb());
- 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 * (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 * ((N + 3) / (N + 1)));
- // fct.DefineConst("NplusOne", N + 1.0);
-
-
- //SPtr<BCAdapter> inflowConcreteBCAdapter(new VelocityBCAdapter(false, false, true, fct, 0, BCFunction::INFCONST));
- //inflowConcreteBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- SPtr<BCAdapter> inflowConcreteBCAdapter(new MultiphaseVelocityBCAdapter(false, false, true, fct, phiH, 0, BCFunction::INFCONST));
- inflowConcreteBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseVelocityBCAlgorithm()));
-
-
// 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);
- //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 = u * unitsAir->getFactorVelocityWToLb();
+ // 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);
+ // 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 / 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);
- double V_air = 40; // flow rate [m^3/h]
- 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 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 = 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);
-
-
-
- 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);
-
- fctVx1.SetExpr("U*(1-(((((x2-y0)^2+(x3-z0)^2)^0.5)/R)^NplusOne))");
- //fct.DefineConst("x0", cx1);
- fctVx1.DefineConst("y0", cx2);
- fctVx1.DefineConst("z0", cx3);
- fctVx1.DefineConst("R", R);
- fctVx1.DefineConst("U", uLB_air * ((N + 3) / (N + 1)));
- fctVx1.DefineConst("NplusOne", N + 1.0);
-
- fctVx3.SetExpr("U*(1-(((((x2-y0)^2+(x3-z0)^2)^0.5)/R)^NplusOne))");
- // fc3.DefineConst("x0", cx1);
- fctVx3.DefineConst("y0", cx2);
- fctVx3.DefineConst("z0", cx3);
- fctVx3.DefineConst("R", R);
- fctVx3.DefineConst("U", -uLB_air * ((N + 3) / (N + 1)));
- fctVx3.DefineConst("NplusOne", N + 1.0);
-
-
- //SPtr<BCAdapter> inflowAirBCAdapter(new VelocityBCAdapter(true, false, false, fct, 0, BCFunction::INFCONST));
- //inflowAirBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- SPtr<BCAdapter> inflowAirBCAdapter(new MultiphaseVelocityBCAdapter(true, false, true, fctVx1, fctVx3, fctVx3, phiL, 0, BCFunction::INFCONST));
- inflowAirBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseVelocityBCAlgorithm()));
-
- SPtr<BCAdapter> outflowBCAdapter(new DensityBCAdapter(rhoLB));
- //outflowBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
- //SPtr<BCAdapter> outflowBCAdapter(new DensityBCAdapter(rhoLB));
- outflowBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseNonReflectingOutflowBCAlgorithm()));
- //////////////////////////////////////////////////////////////////////////////////
- // BC visitor
- //BoundaryConditionsBlockVisitor bcVisitor;♣
- MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
- bcVisitor.addBC(inflowConcreteBCAdapter);
- bcVisitor.addBC(inflowAirBCAdapter);
- bcVisitor.addBC(outflowBCAdapter);
-
- // SPtr<LBMKernel> kernel = make_shared<IBcumulantK17LBMKernel>();
- // SPtr<LBMKernel> kernel = make_shared<CumulantK17LBMKernel>();
- // SPtr<LBMKernel> kernel = make_shared<MultiphaseTwoPhaseFieldsPressureFilterLBMKernel>();
- SPtr<LBMKernel> kernel = make_shared<MultiphaseSimpleVelocityBaseExternalPressureLBMKernel>();
-
- kernel->setWithForcing(true);
- 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);
-
- SPtr<BCProcessor> bcProc = make_shared<BCProcessor>();
- kernel->setBCProcessor(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(2);
-
- string geoPath = "d:/Projects/TRR277/Project/WP4/NozzleGeo";
-
- string outputPath = "d:/temp/NozzleFlowTest_Multiphase2";
- 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());
- //}
-
- 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, noSlipBCAdapter, 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, noSlipBCAdapter, 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, noSlipBCAdapter, 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, noSlipBCAdapter, 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, noSlipBCAdapter, 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, noSlipBCAdapter, 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, noSlipBCAdapter, Interactor3D::SOLID, Interactor3D::POINTS);
- ///////////////////////////////////////////////////////////
- //box
- SPtr<D3Q27Interactor> intrBox = SPtr<D3Q27Interactor>(new D3Q27Interactor(gridCube, grid, noSlipBCAdapter, 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));
- if (myid == 0) GbSystem3D::writeGeoObject(geoInflow.get(), outputPath + "/geo/geoInflow", WbWriterVtkXmlBinary::getInstance());
- SPtr<D3Q27Interactor> intrInflow = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, inflowConcreteBCAdapter, 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, g_minX3, -1.30181+0.0005, 0.390872-0.00229, -0.21, 0.013));
- if (myid == 0) GbSystem3D::writeGeoObject(geoOutflow.get(), outputPath + "/geo/geoOutflow", WbWriterVtkXmlBinary::getInstance());
- SPtr<D3Q27Interactor> intrOutflow = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow, grid, outflowBCAdapter, 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, inflowAirBCAdapter, 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, noSlipBCAdapter, 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, inflowAirBCAdapter, Interactor3D::SOLID, Interactor3D::EDGES);
- ///////////////////////////////////////////////////////////
-
- InteractorsHelper intHelper(grid, metisVisitor, true);
-
- intHelper.addInteractor(intrFluidArea);
- intHelper.addInteractor(intrNozzleVolcanNozzle2);
- //intHelper.addInteractor(intrBox);
- intHelper.addInteractor(intrInflow);
- intHelper.addInteractor(intrAirInflow);
- intHelper.addInteractor(intrOutflow);
-
-
- //intHelper.addInteractor(intrNozzleAirDistributor);
- //intHelper.addInteractor(intrNozzleAirInlet);
- //intHelper.addInteractor(intrNozzleSpacer);
- //intHelper.addInteractor(intrNozzleAccDistributor);
- //intHelper.addInteractor(intrNozzleAccInlet);
- //intHelper.addInteractor(intrNozzleVolcanNozzle1);
-
-
-
- intHelper.selectBlocks();
-
- SPtr<CoProcessor> ppblocks = make_shared<WriteBlocksCoProcessor>(
- grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm);
- ppblocks->process(0);
- ppblocks.reset();
-
- if (myid == 0) UBLOG(logINFO, Utilities::toString(grid, comm->getNumberOfProcesses()));
-
-
- //SetKernelBlockVisitor kernelVisitor(kernel, nuLB, 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 x3c = 0.20105;
-
- 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", R);
- fct1.DefineConst("interfaceThickness", interfaceThickness * dx);
-
- MultiphaseVelocityFormInitDistributionsBlockVisitor initVisitor;
- initVisitor.setPhi(fct1);
- grid->accept(initVisitor);
+ // 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;
- 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 = 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);
-
- SPtr<UbScheduler> lScheduler = make_shared<UbScheduler>(1);
- SPtr<LiggghtsCouplingCoProcessor> lcCoProcessor =
- make_shared<LiggghtsCouplingCoProcessor>(grid, lScheduler, comm, wrapper, demSubsteps, units);
-
- // boundary conditions grid
- {
- SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<WriteBoundaryConditionsCoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(grid, geoSch, outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
- ppgeo.reset();
+ 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./10.; // flow rate [m^3/h]
+ 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 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);
+
+ 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 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 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 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 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 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>();
+
+ 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(2);
+
+ string geoPath = "d:/Projects/TRR277/Project/WP4/NozzleGeo";
+
+ string outputPath = "f:/temp/NozzleFlowTest_SharpInterface_OutflowPress";
+ 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());
+ // }
+
+ 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));
+ 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, metisVisitor, true);
+
+ 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, nuLB, 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 x3c = 0.20105;
+
+ 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", R);
+ 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);
+
+ // 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 = 18;
+ 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, WbWriterVtkXmlASCII::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+
+ 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;
}
-
- grid->accept(bcVisitor);
-
- //OneDistributionSetConnectorsBlockVisitor setConnsVisitor(comm);
- //TwoDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
- ThreeDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
- grid->accept(setConnsVisitor);
-
- int numOfThreads = 18;
- omp_set_num_threads(numOfThreads);
-
- SPtr<UbScheduler> nupsSch = std::make_shared<UbScheduler>(10, 10, 100);
- SPtr<NUPSCounterCoProcessor> nupsCoProcessor = make_shared<NUPSCounterCoProcessor>(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<WriteMultiphaseQuantitiesCoProcessor> writeMQCoProcessor(
- new WriteMultiphaseQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlASCII::getInstance(),
- SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
- writeMQCoProcessor->process(0);
-
- int endTime = 1000000;
- SPtr<Calculator> calculator(new BasicCalculator(grid, lScheduler, endTime));
- calculator->addCoProcessor(nupsCoProcessor);
- // calculator->addCoProcessor(lcCoProcessor);
- calculator->addCoProcessor(writeMQCoProcessor);
-
- if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
- if (myid == 0) UBLOG(logINFO, "Simulation-end");
-
-
return 0;
}
diff --git a/apps/cpu/PoiseuilleFlow/pf1.cpp b/apps/cpu/PoiseuilleFlow/pf1.cpp
index 93680117551c13a23ecc08c5dc4731d92ec78b77..0e21dea4d252dc141fa5fd75feebe24c0b80042d 100644
--- a/apps/cpu/PoiseuilleFlow/pf1.cpp
+++ b/apps/cpu/PoiseuilleFlow/pf1.cpp
@@ -68,24 +68,24 @@ void pf1()
//boundary conditions definition
//boundary conditions adapters
//////////////////////////////////////////////////////////////////////////////
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
//boundary conditions visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
+ bcVisitor.addBC(noSlipBC);
//////////////////////////////////////////////////////////////////////////////////
//set boundary conditions for blocks and create process decomposition for MPI
- SPtr<D3Q27Interactor> cylinderInt(new D3Q27Interactor(cylinder, grid, noSlipBCAdapter, Interactor3D::INVERSESOLID));
+ SPtr<D3Q27Interactor> cylinderInt(new D3Q27Interactor(cylinder, grid, noSlipBC, Interactor3D::INVERSESOLID));
SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, DIR_00M));
InteractorsHelper intHelper(grid, metisVisitor);
intHelper.addInteractor(cylinderInt);
intHelper.selectBlocks();
//write data for visualization of block grid
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathOut, WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathOut, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppblocks->update(0);
//ppblocks.reset();
unsigned long long numberOfBlocks = (unsigned long long)grid->getNumberOfBlocks();
@@ -116,8 +116,8 @@ void pf1()
//LBM kernel definition
SPtr<LBMKernel> kernel;
kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
- SPtr<BCProcessor> bcProc(new BCProcessor());
- kernel->setBCProcessor(bcProc);
+ SPtr<BCSet> bcProc(new BCSet());
+ kernel->setBCSet(bcProc);
//set forcing
mu::Parser fctForcingX1;
@@ -143,18 +143,18 @@ void pf1()
grid->accept(setConnsVisitor);
SPtr<UbScheduler> mSch(new UbScheduler(cpStep, cpStart));
- //SPtr<MPIIORestartCoProcessor> restartCoProcessor(new MPIIORestartCoProcessor(grid, mSch, pathOut, comm));
- //restartCoProcessor->setLBMKernel(kernel);
- //restartCoProcessor->setBCProcessor(bcProc);
+ //SPtr<MPIIORestartSimulationObserver> restartSimulationObserver(new MPIIORestartSimulationObserver(grid, mSch, pathOut, comm));
+ //restartSimulationObserver->setLBMKernel(kernel);
+ //restartSimulationObserver->setBCSet(bcProc);
- /*SPtr<MPIIOMigrationCoProcessor> migCoProcessor(new MPIIOMigrationCoProcessor(grid, mSch, pathOut + "/mig", comm));
- migCoProcessor->setLBMKernel(kernel);
- migCoProcessor->setBCProcessor(bcProc);*/
+ /*SPtr<MPIIOMigrationSimulationObserver> migSimulationObserver(new MPIIOMigrationSimulationObserver(grid, mSch, pathOut + "/mig", comm));
+ migSimulationObserver->setLBMKernel(kernel);
+ migSimulationObserver->setBCSet(bcProc);*/
- //SPtr<MPIIOMigrationBECoProcessor> migCoProcessor(new MPIIOMigrationBECoProcessor(grid, mSch, pathOut + "/mig", comm));
- //migCoProcessor->setLBMKernel(kernel);
- //migCoProcessor->setBCProcessor(bcProc);
- //migCoProcessor->setNu(nuLB);
+ //SPtr<MPIIOMigrationBESimulationObserver> migSimulationObserver(new MPIIOMigrationBESimulationObserver(grid, mSch, pathOut + "/mig", comm));
+ //migSimulationObserver->setLBMKernel(kernel);
+ //migSimulationObserver->setBCSet(bcProc);
+ //migSimulationObserver->setNu(nuLB);
//SPtr<UtilConvertor> convertProcessor(new UtilConvertor(grid, pathOut, comm));
//convertProcessor->convert(300, 4);
@@ -163,45 +163,45 @@ void pf1()
//write data for visualization of boundary conditions
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- WriteBoundaryConditionsCoProcessor ppgeo(grid, geoSch, pathOut, WbWriterVtkXmlBinary::getInstance(), /*SPtr<LBMUnitConverter>(new LBMUnitConverter()),*/ comm);
- ppgeo.process(0);
+ WriteBoundaryConditionsSimulationObserver ppgeo(grid, geoSch, pathOut, WbWriterVtkXmlBinary::getInstance(), /*SPtr<LBMUnitConverter>(new LBMUnitConverter()),*/ comm);
+ ppgeo.update(0);
}
if (myid == 0) UBLOG(logINFO, "Preprocess - end");
//grid=SPtr<Grid3D>(new Grid3D(comm));
- //restartCoProcessor->restart(200);
- //SPtr<MPIIOMigrationBECoProcessor> migCoProcessor(new MPIIOMigrationBECoProcessor(grid, mSch, metisVisitor, pathOut + "/mig", comm));
- //migCoProcessor->setLBMKernel(kernel);
- //migCoProcessor->setBCProcessor(bcProc);
- //migCoProcessor->setNu(nuLB);
- //migCoProcessor->restart(10);
+ //restartSimulationObserver->restart(200);
+ //SPtr<MPIIOMigrationBESimulationObserver> migSimulationObserver(new MPIIOMigrationBESimulationObserver(grid, mSch, metisVisitor, pathOut + "/mig", comm));
+ //migSimulationObserver->setLBMKernel(kernel);
+ //migSimulationObserver->setBCSet(bcProc);
+ //migSimulationObserver->setNu(nuLB);
+ //migSimulationObserver->restart(10);
- ppblocks->process(1);
+ ppblocks->update(1);
//write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, pathOut,
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, pathOut,
WbWriterVtkXmlASCII::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
//performance control
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<NUPSCounterCoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<NUPSCounterSimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
//start simulation
//omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(outTime));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(writeMQCoProcessor);
- //calculator->addCoProcessor(migCoProcessor);
- //calculator->addCoProcessor(restartCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ //simulation->addSimulationObserver(migSimulationObserver);
+ //simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
- ppblocks->process(10);
+ ppblocks->update(10);
}
diff --git a/apps/cpu/RisingBubble2D/CMakeLists.txt b/apps/cpu/RisingBubble2D/CMakeLists.txt
index 5741f1441d806d59a9efd1dd689e5ddba0e5eafc..3f8f3e56cd7ab41979f72121a405b93c862dcce2 100644
--- a/apps/cpu/RisingBubble2D/CMakeLists.txt
+++ b/apps/cpu/RisingBubble2D/CMakeLists.txt
@@ -1,3 +1,3 @@
PROJECT(RisingBubble2D)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} FILES RisingBubble2D.cpp )
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} MultiphaseFlow NonNewtonianFluids FILES RisingBubble2D.cpp )
diff --git a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
index 92495242f11659b3a90b30f4df836642dee5aea8..c9a28efc4033ceb0be8cbabc4976055f994c1932 100644
--- a/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
+++ b/apps/cpu/RisingBubble2D/RisingBubble2D.cpp
@@ -1,6 +1,6 @@
#include <iostream>
-#include <string>
#include <memory>
+#include <string>
#if defined(__unix__)
#include <stdio.h>
@@ -8,6 +8,8 @@
#endif
#include "VirtualFluids.h"
+#include "MultiphaseFlow/MultiphaseFlow.h"
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
using namespace std;
@@ -16,45 +18,44 @@ void run(string configname)
using namespace vf::lbm::dir;
try {
- vf::basics::ConfigurationFile config;
+ vf::basics::ConfigurationFile config;
config.load(configname);
- string pathname = config.getValue<string>("pathname");
- int numOfThreads = config.getValue<int>("numOfThreads");
- vector<int> blocknx = config.getVector<int>("blocknx");
+ string pathname = config.getValue<string>("pathname");
+ int numOfThreads = config.getValue<int>("numOfThreads");
+ vector<int> blocknx = config.getVector<int>("blocknx");
vector<real> boundingBox = config.getVector<real>("boundingBox");
- real uLB = config.getValue<real>("uLB");
- real nuL = config.getValue<real>("nuL");
- real nuG = config.getValue<real>("nuG");
- real densityRatio = config.getValue<real>("densityRatio");
- //double sigma = config.getValue<double>("sigma");
+ real uLB = config.getValue<real>("uLB");
+ real nuL = config.getValue<real>("nuL");
+ real nuG = config.getValue<real>("nuG");
+ real densityRatio = config.getValue<real>("densityRatio");
+ // double sigma = config.getValue<double>("sigma");
int interfaceThickness = config.getValue<int>("interfaceThickness");
- real radius = config.getValue<real>("radius");
- real theta = config.getValue<real>("contactAngle");
- real phiL = config.getValue<real>("phi_L");
- real phiH = config.getValue<real>("phi_H");
- real tauH = config.getValue<real>("Phase-field Relaxation");
- real mob = config.getValue<real>("Mobility");
-
- real endTime = config.getValue<real>("endTime");
- real outTime = config.getValue<real>("outTime");
- real availMem = config.getValue<real>("availMem");
- int refineLevel = config.getValue<int>("refineLevel");
- real Re = config.getValue<real>("Re");
- real Eo = config.getValue<real>("Eo");
- real dx = config.getValue<real>("dx");
- bool logToFile = config.getValue<bool>("logToFile");
+ real radius = config.getValue<real>("radius");
+ real theta = config.getValue<real>("contactAngle");
+ real phiL = config.getValue<real>("phi_L");
+ real phiH = config.getValue<real>("phi_H");
+ real tauH = config.getValue<real>("Phase-field Relaxation");
+ real mob = config.getValue<real>("Mobility");
+
+ real endTime = config.getValue<real>("endTime");
+ real outTime = config.getValue<real>("outTime");
+ real availMem = config.getValue<real>("availMem");
+ int refineLevel = config.getValue<int>("refineLevel");
+ real Re = config.getValue<real>("Re");
+ real Eo = config.getValue<real>("Eo");
+ real dx = config.getValue<real>("dx");
+ 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");
- //double rStep = config.getValue<double>("rStep");
+ real cpStart = config.getValue<real>("cpStart");
+ real cpStep = config.getValue<real>("cpStep");
+ bool newStart = config.getValue<bool>("newStart");
+ // double rStep = config.getValue<double>("rStep");
std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
- int myid = comm->getProcessID();
+ int myid = comm->getProcessID();
- if (myid == 0)
- UBLOG(logINFO, "2D Rising Bubble: Start!");
+ if (myid == 0) UBLOG(logINFO, "2D Rising Bubble: Start!");
if (logToFile) {
#if defined(__unix__)
@@ -70,83 +71,84 @@ void run(string configname)
UbLog::output_policy::setStream(logFilename.str());
}
}
-
+
std::string fileName = "./LastTimeStep" + std::to_string((int)boundingBox[1]) + ".txt";
-//#if defined(__unix__)
-// double lastTimeStep = 0;
-// if (!newStart)
-// {
-// std::ifstream ifstr(fileName);
-// ifstr >> lastTimeStep;
-// restartStep = lastTimeStep;
-// if(endTime >= lastTimeStep)
-// endTime = lastTimeStep + rStep;
-// else
-// return;
-// }
-//#endif
-
- //Sleep(20000);
+ // #if defined(__unix__)
+ // double lastTimeStep = 0;
+ // if (!newStart)
+ // {
+ // std::ifstream ifstr(fileName);
+ // ifstr >> lastTimeStep;
+ // restartStep = lastTimeStep;
+ // if(endTime >= lastTimeStep)
+ // endTime = lastTimeStep + rStep;
+ // else
+ // return;
+ // }
+ // #endif
+
+ // Sleep(20000);
// LBMReal dLB = 0; // = length[1] / dx;
real rhoLB = 0.0;
- real nuLB = nuL; //(uLB*dLB) / Re;
+ real nuLB = nuL; //(uLB*dLB) / Re;
- //diameter of circular droplet
- real D = 2.0*radius;
+ // diameter of circular droplet
+ real D = 2.0 * radius;
- //density retio
- //LBMReal r_rho = densityRatio;
+ // density retio
+ // LBMReal r_rho = densityRatio;
- //density of heavy fluid
+ // density of heavy fluid
real rho_h = 1.0;
- //density of light fluid
- //LBMReal rho_l = rho_h / r_rho;
+ // density of light fluid
+ // LBMReal rho_l = rho_h / r_rho;
- //kinimatic viscosity
+ // kinimatic viscosity
real nu_h = nuL;
- //LBMReal nu_l = nuG;
- //#dynamic viscosity
- //LBMReal mu_h = rho_h * nu_h;
-
- //gravity
- real g_y = Re * Re * nu_h * nu_h / (D*D*D);
- //Eotvos number
- //LBMReal Eo = 100;
- //surface tension
+ // LBMReal nu_l = nuG;
+ // #dynamic viscosity
+ // LBMReal mu_h = rho_h * nu_h;
+
+ // gravity
+ real g_y = Re * Re * nu_h * nu_h / (D * D * D);
+ // Eotvos number
+ // LBMReal Eo = 100;
+ // surface tension
real sigma = rho_h * g_y * D * D / Eo;
- //g_y = 0;
+ // g_y = 0;
- real beta = 12.0 * sigma / interfaceThickness;
+ real beta = 12.0 * sigma / interfaceThickness;
real kappa = 1.5 * interfaceThickness * sigma;
if (myid == 0) {
- //UBLOG(logINFO, "uLb = " << uLB);
- //UBLOG(logINFO, "rho = " << rhoLB);
- UBLOG(logINFO, "D = " << D);
- UBLOG(logINFO, "nuL = " << nuL);
- UBLOG(logINFO, "nuG = " << nuG);
- UBLOG(logINFO, "Re = " << Re);
- UBLOG(logINFO, "Eo = " << Eo);
- UBLOG(logINFO, "g_y = " << g_y);
- UBLOG(logINFO, "sigma = " << sigma);
- UBLOG(logINFO, "dx = " << dx);
- UBLOG(logINFO, "Preprocess - start");
+ // UBLOG(logINFO, "uLb = " << uLB);
+ // UBLOG(logINFO, "rho = " << rhoLB);
+ UBLOG(logINFO, "D = " << D);
+ UBLOG(logINFO, "nuL = " << nuL);
+ UBLOG(logINFO, "nuG = " << nuG);
+ UBLOG(logINFO, "Re = " << Re);
+ UBLOG(logINFO, "Eo = " << Eo);
+ UBLOG(logINFO, "g_y = " << g_y);
+ UBLOG(logINFO, "sigma = " << sigma);
+ UBLOG(logINFO, "dx = " << dx);
+ UBLOG(logINFO, "Preprocess - start");
}
SPtr<LBMUnitConverter> conv(new LBMUnitConverter());
- //const int baseLevel = 0;
+ // const int baseLevel = 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 MultiphaseScratchCumulantLBMKernel());
+ // kernel = SPtr<LBMKernel>(new MultiphaseCumulantLBMKernel());
+ // kernel = SPtr<LBMKernel>(new MultiphaseTwoPhaseFieldsPressureFilterLBMKernel());
+ //kernel = SPtr<LBMKernel>(new MultiphasePressureFilterLBMKernel());
+ //kernel = make_shared<MultiphaseScaleDistributionLBMKernel>();
+ kernel = make_shared<MultiphaseSharpInterfaceLBMKernel>();
mu::Parser fgr;
fgr.SetExpr("-rho*g_y");
fgr.DefineConst("g_y", g_y);
@@ -162,26 +164,25 @@ void run(string configname)
kernel->setMobility(mob);
kernel->setInterfaceWidth(interfaceThickness);
-
kernel->setCollisionFactorMultiphase(nuL, nuG);
kernel->setDensityRatio(densityRatio);
kernel->setMultiphaseModelParameters(beta, kappa);
kernel->setContactAngle(theta);
- dynamicPointerCast<MultiphasePressureFilterLBMKernel>(kernel)->setPhaseFieldBC(1.0);
-
- SPtr<BCProcessor> bcProc(new BCProcessor());
+ //dynamicPointerCast<MultiphasePressureFilterLBMKernel>(kernel)->setPhaseFieldBC(1.0);
+ kernel->setSigma(sigma);
+ SPtr<BCSet> bcProc(new BCSet());
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseNoSlipBCAlgorithm()));
- SPtr<BCAdapter> slipBCAdapter(new SlipBCAdapter());
- slipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new MultiphaseSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseNoSlipBCStrategy()));
+ //SPtr<BC> slipBC(new SlipBC());
+ //slipBC->setBCStrategy(SPtr<BCStrategy>(new MultiphaseSlipBCStrategy()));
//////////////////////////////////////////////////////////////////////////////////
// BC visitor
MultiphaseBoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
- bcVisitor.addBC(slipBCAdapter);
+ bcVisitor.addBC(noSlipBC);
+ //bcVisitor.addBC(slipBC);
SPtr<Grid3D> grid(new Grid3D(comm));
grid->setDeltaX(dx);
@@ -196,15 +197,15 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////
// restart
SPtr<UbScheduler> rSch(new UbScheduler(cpStep, cpStart));
- SPtr<MPIIORestartCoProcessor> rcp(new MPIIORestartCoProcessor(grid, rSch, pathname, comm));
- //SPtr<MPIIOMigrationCoProcessor> rcp(new MPIIOMigrationCoProcessor(grid, rSch, metisVisitor, pathname, comm));
- //SPtr<MPIIOMigrationBECoProcessor> rcp(new MPIIOMigrationBECoProcessor(grid, rSch, pathname, comm));
- // rcp->setNu(nuLB);
- // rcp->setNuLG(nuL, nuG);
- //rcp->setDensityRatio(densityRatio);
+ SPtr<MPIIORestartSimulationObserver> rcp(new MPIIORestartSimulationObserver(grid, rSch, pathname, comm));
+ // SPtr<MPIIOMigrationSimulationObserver> rcp(new MPIIOMigrationSimulationObserver(grid, rSch, metisVisitor, pathname, comm));
+ // SPtr<MPIIOMigrationBESimulationObserver> rcp(new MPIIOMigrationBESimulationObserver(grid, rSch, pathname, comm));
+ // rcp->setNu(nuLB);
+ // rcp->setNuLG(nuL, nuG);
+ // rcp->setDensityRatio(densityRatio);
rcp->setLBMKernel(kernel);
- rcp->setBCProcessor(bcProc);
+ rcp->setBCSet(bcProc);
//////////////////////////////////////////////////////////////////////////
if (newStart) {
@@ -220,11 +221,7 @@ void run(string configname)
// 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) GbSystem3D::writeGeoObject(gridCube.get(), pathname + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
@@ -240,14 +237,13 @@ void run(string configname)
GbCuboid3DPtr wallYmax(new GbCuboid3D(g_minX1 - dx2, g_maxX2, g_minX3 - dx2, g_maxX1 + dx2, g_maxX2 + dx2, g_maxX3 + dx2));
GbSystem3D::writeGeoObject(wallYmax.get(), pathname + "/geo/wallYmax", WbWriterVtkXmlASCII::getInstance());
- SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, slipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallXmaxInt(new D3Q27Interactor(wallXmax, grid, slipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallXmaxInt(new D3Q27Interactor(wallXmax, grid, noSlipBC, Interactor3D::SOLID));
+
+ SPtr<D3Q27Interactor> wallYminInt(new D3Q27Interactor(wallYmin, grid, noSlipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallYmaxInt(new D3Q27Interactor(wallYmax, grid, noSlipBC, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYminInt(new D3Q27Interactor(wallYmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallYmaxInt(new D3Q27Interactor(wallYmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
-
- SPtr<WriteBlocksCoProcessor> ppblocks(new WriteBlocksCoProcessor(
- 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));
InteractorsHelper intHelper(grid, metisVisitor, true);
intHelper.addInteractor(wallXminInt);
@@ -256,18 +252,15 @@ void run(string configname)
intHelper.addInteractor(wallYmaxInt);
intHelper.selectBlocks();
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
unsigned long long numberOfBlocks = (unsigned long long)grid->getNumberOfBlocks();
- int ghostLayer = 5;
- unsigned long long numberOfNodesPerBlock =
- (unsigned long long)(blocknx[0]) * (unsigned long long)(blocknx[1]) * (unsigned long long)(blocknx[2]);
+ int ghostLayer = 5;
+ 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) {
@@ -294,16 +287,15 @@ void run(string configname)
grid->accept(undefNodesVisitor);
}
-
intHelper.setBC();
// initialization of distributions
- real x1c = D;
- real x2c = D;
- real x3c = 1.5;
- //LBMReal x3c = 2.5 * D;
+ real x1c = D;
+ real x2c = D;
+ real x3c = 1.5;
+ // 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((x1-x1c)^2+(x2-x2c)^2+0*(x3-x3c)^2)-radius)/interfaceThickness)");
fct1.DefineConst("x1c", x1c);
fct1.DefineConst("x2c", x2c);
fct1.DefineConst("x3c", x3c);
@@ -311,8 +303,8 @@ 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("uLB");
+ fct2.SetExpr("0.5*uLB+uLB*0.5*tanh(2*(sqrt((x1-x1c)^2+(x2-x2c)^2+0*(x3-x3c)^2)-radius)/interfaceThickness)");
+ // fct2.SetExpr("uLB");
fct2.DefineConst("uLB", uLB);
fct2.DefineConst("x1c", x1c);
fct2.DefineConst("x2c", x2c);
@@ -320,23 +312,21 @@ void run(string configname)
fct2.DefineConst("radius", radius);
fct2.DefineConst("interfaceThickness", interfaceThickness);
- //MultiphaseInitDistributionsBlockVisitor initVisitor(densityRatio);
+ // MultiphaseInitDistributionsBlockVisitor initVisitor(densityRatio);
MultiphaseVelocityFormInitDistributionsBlockVisitor initVisitor;
initVisitor.setPhi(fct1);
- initVisitor.setVx1(fct2);
+ //initVisitor.setVx1(fct2);
grid->accept(initVisitor);
// boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<WriteBoundaryConditionsCoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(
- grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ 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 {
if (myid == 0) {
UBLOG(logINFO, "Parameters:");
@@ -353,88 +343,83 @@ void run(string configname)
rcp->restart((int)restartStep);
grid->setTimeStep(restartStep);
- if (myid == 0)
- UBLOG(logINFO, "Restart - end");
+ if (myid == 0) UBLOG(logINFO, "Restart - end");
}
grid->accept(bcVisitor);
- //TwoDistributionsSetConnectorsBlockVisitor setConnsVisitor(comm);
- //grid->accept(setConnsVisitor);
+ // TwoDistributionsSetConnectorsBlockVisitor setConnsVisitor(comm);
+ // grid->accept(setConnsVisitor);
- //ThreeDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
- //grid->accept(setConnsVisitor);
+ // ThreeDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
+ // grid->accept(setConnsVisitor);
TwoDistributionsDoubleGhostLayerSetConnectorsBlockVisitor setConnsVisitor(comm);
grid->accept(setConnsVisitor);
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
- //visSch->addSchedule(307200,307200,307200); //t=2
- visSch->addSchedule(1228185,1228185,1228185);
- //double t_ast, t;
- //t_ast = 2;
- //t = (int)(t_ast/std::sqrt(g_y/D));
- //visSch->addSchedule(t,t,t); //t=2
- //t_ast = 3;
- //t = (int)(t_ast/std::sqrt(g_y/D));
- //visSch->addSchedule(t,t,t); //t=3
- //t_ast = 4;
- //t = (int)(t_ast/std::sqrt(g_y/D));
- //visSch->addSchedule(t,t,t); //t=4
- //t_ast = 5;
- //t = (int)(t_ast/std::sqrt(g_y/D));
- //visSch->addSchedule(t,t,t); //t=5
- //t_ast = 6;
- //t = (int)(t_ast/std::sqrt(g_y/D));
- //visSch->addSchedule(t,t,t); //t=6
- //t_ast = 7;
- //t = (int)(t_ast/std::sqrt(g_y/D));
- //visSch->addSchedule(t,t,t); //t=7
- //t_ast = 9;
- //t = (int)(t_ast/std::sqrt(g_y/D));
- //visSch->addSchedule(t,t,t); //t=9
-
-
- SPtr<WriteMultiphaseQuantitiesCoProcessor> pp(new WriteMultiphaseQuantitiesCoProcessor(
- grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
- if(grid->getTimeStep() == 0)
- pp->process(0);
+ // visSch->addSchedule(307200,307200,307200); //t=2
+ // visSch->addSchedule(1228185,1228185,1228185);
+ double t_ast, t;
+ t_ast = 2;
+ t = (int)(t_ast / std::sqrt(g_y / D));
+ visSch->addSchedule(t, t, t); // t=2
+ t_ast = 3;
+ t = (int)(t_ast / std::sqrt(g_y / D));
+ visSch->addSchedule(t, t, t); // t=3
+ // t_ast = 4;
+ // t = (int)(t_ast/std::sqrt(g_y/D));
+ // visSch->addSchedule(t,t,t); //t=4
+ // t_ast = 5;
+ // t = (int)(t_ast/std::sqrt(g_y/D));
+ // visSch->addSchedule(t,t,t); //t=5
+ // t_ast = 6;
+ // t = (int)(t_ast/std::sqrt(g_y/D));
+ // visSch->addSchedule(t,t,t); //t=6
+ // t_ast = 7;
+ // t = (int)(t_ast/std::sqrt(g_y/D));
+ // visSch->addSchedule(t,t,t); //t=7
+ // t_ast = 9;
+ // t = (int)(t_ast/std::sqrt(g_y/D));
+ // visSch->addSchedule(t,t,t); //t=9
+
+ //SPtr<WriteMultiphaseQuantitiesSimulationObserver> pp(new WriteMultiphaseQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
+
+ SPtr<WriteSharpInterfaceQuantitiesSimulationObserver> pp(new WriteSharpInterfaceQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
+ if (grid->getTimeStep() == 0) pp->update(0);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<NUPSCounterCoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<NUPSCounterSimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
- //omp_set_num_threads(numOfThreads);
+ // omp_set_num_threads(numOfThreads);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(pp);
- calculator->addCoProcessor(rcp);
-
-
- if (myid == 0)
- UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
- if (myid == 0)
- UBLOG(logINFO, "Simulation-end");
-
-//#if defined(__unix__)
-// //if (!newStart)
-// //{
-// if (myid == 0)
-// {
-// std::ofstream ostr(fileName);
-// ostr << endTime;
-// cout << "start sbatch\n";
-// //system("./start.sh");
-// //system("echo test!");
-// std::string str = "sbatch startJob" + std::to_string((int)boundingBox[1]) + ".sh";
-// //system("sbatch startJob512.sh");
-// system(str.c_str());
-// }
-// //MPI_Barrier((MPI_Comm)comm->getNativeCommunicator());
-// //}
-//#endif
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(pp);
+ //simulation->addSimulationObserver(rcp);
+
+ if (myid == 0) UBLOG(logINFO, "Simulation-start");
+ simulation->run();
+ if (myid == 0) UBLOG(logINFO, "Simulation-end");
+
+ // #if defined(__unix__)
+ // //if (!newStart)
+ // //{
+ // if (myid == 0)
+ // {
+ // std::ofstream ostr(fileName);
+ // ostr << endTime;
+ // cout << "start sbatch\n";
+ // //system("./start.sh");
+ // //system("echo test!");
+ // std::string str = "sbatch startJob" + std::to_string((int)boundingBox[1]) + ".sh";
+ // //system("sbatch startJob512.sh");
+ // system(str.c_str());
+ // }
+ // //MPI_Barrier((MPI_Comm)comm->getNativeCommunicator());
+ // //}
+ // #endif
} catch (std::exception &e) {
cerr << e.what() << endl << flush;
diff --git a/apps/cpu/TPMSRow/TPMSRow.cpp b/apps/cpu/TPMSRow/TPMSRow.cpp
index 15df6e24316a0f00407218a04df4a7b48293d637..9adcaadde90454a64221d04e55712ff12c175e54 100644
--- a/apps/cpu/TPMSRow/TPMSRow.cpp
+++ b/apps/cpu/TPMSRow/TPMSRow.cpp
@@ -78,46 +78,46 @@ void run(string configname)
////////////////////////////////////////////////////////////////////////
// BC Adapter
- // BCAdapterPtr gradientAdapter(new VelocityBCAdapter(true, true, true, pdxC, pdyC, pdzC, 0.0,
+ // BCPtr gradientAdapter(new VelocityBC(true, true, true, pdxC, pdyC, pdzC, 0.0,
// BCFunction::INFCONST));
- // gradientAdapter->setBcAlgorithm(BCAlgorithmPtr(new FluxBCAlgorithm()));
- // BCAdapterPtr cubeNoslipAdapter(new NoSlipBCAdapter(1));
- SPtr<BCAdapter> tpmsNoslipAdapter(new NoSlipBCAdapter());
- //SPtr<BCAdapter> funnelNoslipAdapter(new NoSlipBCAdapter(1));
-
- // SPtr<BCAdapter> xMinApr(new DensityBCAdapter(0.0000001));
- SPtr<BCAdapter> xMinApr(new DensityBCAdapter());
- // SPtr<BCAdapter> xMinApr(new VelocityBCAdapter(vx, 0., BCFunction::INFCONST, 0., 0., BCFunction::INFCONST,
+ // gradientAdapter->setBcAlgorithm(BCStrategyPtr(new FluxBCStrategy()));
+ // BCPtr cubeNoslipAdapter(new NoSlipBC(1));
+ SPtr<BC> tpmsNoslipAdapter(new NoSlipBC());
+ //SPtr<BC> funnelNoslipAdapter(new NoSlipBC(1));
+
+ // SPtr<BC> xMinApr(new DensityBC(0.0000001));
+ SPtr<BC> xMinApr(new DensityBC());
+ // SPtr<BC> xMinApr(new VelocityBC(vx, 0., BCFunction::INFCONST, 0., 0., BCFunction::INFCONST,
// 0.,0., BCFunction::INFCONST));
- SPtr<BCAdapter> xMaxApr(new DensityBCAdapter(0.));
- //SPtr<BCAdapter> yMinApr(new NoSlipBCAdapter(1));
- //SPtr<BCAdapter> yMaxApr(new NoSlipBCAdapter(1));
- SPtr<BCAdapter> zMinApr(new NoSlipBCAdapter());
- SPtr<BCAdapter> zMaxApr(new NoSlipBCAdapter());
+ SPtr<BC> xMaxApr(new DensityBC(0.));
+ //SPtr<BC> yMinApr(new NoSlipBC(1));
+ //SPtr<BC> yMaxApr(new NoSlipBC(1));
+ SPtr<BC> zMinApr(new NoSlipBC());
+ SPtr<BC> zMaxApr(new NoSlipBC());
- //SPtr<BCAdapter> zMinFunnelApr(new NoSlipBCAdapter(1));
- //SPtr<BCAdapter> zMaxFunnelApr(new NoSlipBCAdapter(1));
+ //SPtr<BC> zMinFunnelApr(new NoSlipBC(1));
+ //SPtr<BC> zMaxFunnelApr(new NoSlipBC(1));
- //tpmsNoslipAdapter->setBcAlgorithm(BCAlgorithmPtr(new NoSlipBCAlgorithm()));
- //tpmsNoslipAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new ThinWallNoSlipBCAlgorithm()));
+ //tpmsNoslipAdapter->setBcAlgorithm(BCStrategyPtr(new NoSlipBCStrategy()));
+ //tpmsNoslipAdapter->setBcAlgorithm(SPtr<BCStrategy>(new ThinWallNoSlipBCStrategy()));
- tpmsNoslipAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- //funnelNoslipAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
+ tpmsNoslipAdapter->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ //funnelNoslipAdapter->setBcAlgorithm(SPtr<BCStrategy>(new NoSlipBCStrategy()));
- //xMinApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
- // xMinApr->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- xMinApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingInflowBCAlgorithm()));
- // xMinApr->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
- //xMaxApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
- xMaxApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithmWithRelaxation()));
- //yMinApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- //yMaxApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- zMinApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- zMaxApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
+ //xMinApr->setBcAlgorithm(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
+ // xMinApr->setBcAlgorithm(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ xMinApr->setBCStrategy(SPtr<BCStrategy>(new NonReflectingInflowBCStrategy()));
+ // xMinApr->setBcAlgorithm(SPtr<BCStrategy>(new VelocityWithDensityBCStrategy()));
+ //xMaxApr->setBcAlgorithm(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
+ xMaxApr->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowWithRelaxationBCStrategy()));
+ //yMinApr->setBcAlgorithm(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ //yMaxApr->setBcAlgorithm(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ zMinApr->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ zMaxApr->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
- //zMinFunnelApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- //zMaxFunnelApr->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
+ //zMinFunnelApr->setBcAlgorithm(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ //zMaxFunnelApr->setBcAlgorithm(SPtr<BCStrategy>(new NoSlipBCStrategy()));
////////////////////////////////////////////////////////////////////////
// BC visitor
@@ -160,8 +160,8 @@ void run(string configname)
// kernel->setWithForcing(true);
//
// SPtr<ThinWallBCProcessor> bcProc(new ThinWallBCProcessor());
- SPtr<BCProcessor> bcProc(new BCProcessor());
- kernel->setBCProcessor(bcProc);
+ SPtr<BCSet> bcProc(new BCSet());
+ kernel->setBCSet(bcProc);
SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(
@@ -170,10 +170,10 @@ void run(string configname)
//////////////////////////////////////////////////////////////////////////
// restart
SPtr<UbScheduler> mSch(new UbScheduler(cpStep, cpStart));
- SPtr<MPIIOMigrationCoProcessor> migCoProcessor(
- new MPIIOMigrationCoProcessor(grid, mSch,metisVisitor, pathname + "/mig", comm));
- migCoProcessor->setLBMKernel(kernel);
- migCoProcessor->setBCProcessor(bcProc);
+ SPtr<MPIIOMigrationSimulationObserver> migSimulationObserver(
+ new MPIIOMigrationSimulationObserver(grid, mSch,metisVisitor, pathname + "/mig", comm));
+ migSimulationObserver->setLBMKernel(kernel);
+ migSimulationObserver->setBCSet(bcProc);
//////////////////////////////////////////////////////////////////////////
if (newStart) {
@@ -247,10 +247,10 @@ void run(string configname)
GenBlocksGridVisitor genBlocks(gridCube);
grid->accept(genBlocks);
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname,
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathname,
WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
+ ppblocks->update(0);
// GbObject3DPtr solidcube(new GbCuboid3D(0, g_minX2, g_minX3, TPMSL[0], g_maxX2, g_maxX3));
// if (myid == 0) GbSystem3D::writeGeoObject(solidcube.get(), pathname + "/geo/solidcube",
@@ -363,7 +363,7 @@ void run(string configname)
PQueuePartitioningGridVisitor pqPartVisitor(numOfThreads);
grid->accept(pqPartVisitor);
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
//////////////////////////////////////////////////////////////////////////
@@ -419,8 +419,8 @@ void run(string configname)
// boundary conditions grid
{
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<CoProcessor> ppgeo(new WriteBoundaryConditionsCoProcessor(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ SPtr<SimulationObserver> ppgeo(new WriteBoundaryConditionsSimulationObserver(grid, geoSch, pathname, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppgeo->update(0);
ppgeo.reset();
}
if (myid == 0)
@@ -440,7 +440,7 @@ void run(string configname)
UBLOG(logINFO, "path = " << pathname);
}
- migCoProcessor->restart((int)restartStep);
+ migSimulationObserver->restart((int)restartStep);
grid->setTimeStep(restartStep);
if (myid == 0)
@@ -456,11 +456,11 @@ void run(string configname)
SPtr<UbScheduler> visSch(new UbScheduler(outTime/*,beginTime,endTime*/));
- SPtr<CoProcessor> pp(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
+ SPtr<SimulationObserver> pp(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, pathname, WbWriterVtkXmlBinary::getInstance(), conv, comm));
SPtr<UbScheduler> tavSch(new UbScheduler(100, timeAvStart, timeAvStop));
- SPtr<TimeAveragedValuesCoProcessor> tav(new TimeAveragedValuesCoProcessor(grid, pathname, WbWriterVtkXmlBinary::getInstance(), tavSch, comm,
- TimeAveragedValuesCoProcessor::Density | TimeAveragedValuesCoProcessor::Velocity | TimeAveragedValuesCoProcessor::Fluctuations));
+ SPtr<TimeAveragedValuesSimulationObserver> tav(new TimeAveragedValuesSimulationObserver(grid, pathname, WbWriterVtkXmlBinary::getInstance(), tavSch, comm,
+ TimeAveragedValuesSimulationObserver::Density | TimeAveragedValuesSimulationObserver::Velocity | TimeAveragedValuesSimulationObserver::Fluctuations));
tav->setWithGhostLayer(true);
SPtr<UbScheduler> nuSch(new UbScheduler(100, 0, endTime / 2));
@@ -471,25 +471,25 @@ void run(string configname)
fnu.DefineConst("T", endTime);
fnu.DefineConst("L", (UnitEdgeLength / dx));
fnu.DefineConst("u", vx);
- SPtr<CoProcessor> nupr(new DecreaseViscosityCoProcessor(grid, nuSch, &fnu, comm));
+ SPtr<SimulationObserver> nupr(new DecreaseViscositySimulationObserver(grid, nuSch, &fnu, comm));
SPtr<UbScheduler> nupsSch(new UbScheduler(100, 100, 100000000));
- SPtr<CoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<SimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
//omp_set_num_threads(numOfThreads);
numOfThreads = 1;
SPtr<UbScheduler> stepGhostLayer(visSch);
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, int(endTime)));
+ SPtr<Simulation> calculator(new Simulation(grid, stepGhostLayer, int(endTime)));
- //calculator->addCoProcessor(nupr);
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(pp);
- calculator->addCoProcessor(migCoProcessor);
- calculator->addCoProcessor(tav);
+ //calculator->addSimulationObserver(nupr);
+ calculator->addSimulationObserver(npr);
+ calculator->addSimulationObserver(pp);
+ calculator->addSimulationObserver(migSimulationObserver);
+ calculator->addSimulationObserver(tav);
if (myid == 0)
UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ calculator->run();
if (myid == 0)
UBLOG(logINFO, "Simulation-end");
} catch (std::exception &e) {
diff --git a/apps/cpu/Thermoplast/CMakeLists.txt b/apps/cpu/Thermoplast/CMakeLists.txt
deleted file mode 100644
index 5624b03136a7c901d1fe69fa224464104d3a08a6..0000000000000000000000000000000000000000
--- a/apps/cpu/Thermoplast/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
-########################################################
-## C++ PROJECT ###
-########################################################
-PROJECT(thermoplast)
-IF(${USE_DEM_COUPLING})
- INCLUDE(${APPS_ROOT}/IncludsList.cmake)
- INCLUDE(${SOURCE_ROOT}/DemCoupling/IncludsList.cmake)
-
- #################################################################
- ### LOCAL FILES ###
- #################################################################
- FILE(GLOB SPECIFIC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h
- ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp )
-
- SET(ALL_SOURCES ${ALL_SOURCES} ${SPECIFIC_FILES})
- SOURCE_GROUP(src FILES ${SPECIFIC_FILES})
-
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} VirtualFluids)
-
- #message("CAB_ADDITIONAL_LINK_LIBRARIES: " ${CAB_ADDITIONAL_LINK_LIBRARIES})
-
- #################################################################
- ### CREATE PROJECT ###
- #################################################################
- CREATE_CAB_PROJECT(thermoplast BINARY)
-ENDIF()
\ No newline at end of file
diff --git a/apps/cpu/Thermoplast/config.txt b/apps/cpu/Thermoplast/config.txt
deleted file mode 100644
index 18e7e7ea896acdc20527de1d6af9154fbac16e6b..0000000000000000000000000000000000000000
--- a/apps/cpu/Thermoplast/config.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-#simulation parameters
-
-#x1min x2min x3min x1max x2max x3max
-#boundingBox = 0 0 0 300 1520 2320
-
-#boundingBox = 60 1370 130 190 1530 320 #test bb
-
-boundingBox = 60 20 130 190 170 320 #test bb
-
-#boundingBox = 60 0 10 190 1530 750 #test bb 2
-
-#boundingBox = 60 0 10 190 1530 2320 #production bb
-
-blocknx = 10 10 10
-#blocknx = 300 420 320
-availMem = 25e9
-#uLB = 0.1
-uLB = 0.03
-Re = 300
-
-#PE parameters
-#test pe offset
-peMinOffset = 46 2 2
-peMaxOffset = -8 -25 -2
-
-#production pe offset
-#peMinOffset = 46 18 14
-#peMaxOffset = -8 -25 -23
-
-sphereTime = 10
-
-#geometry files
-pathGeo = d:/Projects/ThermoPlast/SimPerfMS
-michel = /Werkzeug_Michel_MS.stl
-plexiglas = /plexiglas.stl
-
-#obstacle
-obstacle = true
-obstacleGeo1 = /QuaderMS.stl #/DreieckMS_2.stl # DreieckSchoen.iges.stl #/QuaderMS.stl
-obstacleGeo2 = /KugelMS_2.stl
-obstacleGeo3 = /DreieckMS.stl
-
-pathOut = g:/temp/thermoplastObst
-
-logToFile = false
-
-#restart
-restart = false
-restartStep = 1000
-
-#timing
-nupsTime = 100 100 1000000
-cpStart = 1000
-cpStep = 1000
-outTime = 1000
-endTime = 100000
-
diff --git a/apps/cpu/Thermoplast/thermoplast.cpp b/apps/cpu/Thermoplast/thermoplast.cpp
deleted file mode 100644
index b004543254e4788ffa6a7314536b1811c217700b..0000000000000000000000000000000000000000
--- a/apps/cpu/Thermoplast/thermoplast.cpp
+++ /dev/null
@@ -1,763 +0,0 @@
-#include <iostream>
-#include <string>
-
-#include "PointerDefinitions.h"
-
-#include <iostream>
-#include <string>
-#include <memory>
-#include <array>
-
-#include "VirtualFluids.h"
-#include <muParser.h>
-#include "ForceCalculator.h"
-
-
-#include <MovableObjectInteractor.h>
-#include <DemCoProcessor.h>
-#include <PePartitioningGridVisitor.h>
-
-#include <PePhysicsEngineMaterialAdapter.h>
-#include <PePhysicsEngineGeometryAdapter.h>
-#include <PePhysicsEngineSolverAdapter.h>
-#include "PeLoadBalancerAdapter.h"
-
-#include <VelocityBcReconstructor.h>
-#include <EquilibriumReconstructor.h>
-#include <ExtrapolationReconstructor.h>
-
-#include <DummyPhysicsEngineSolverAdapter.h>
-#include <DummyPhysicsEngineMaterialAdapter.h>
-#include <DummyPhysicsEngineGeometryAdapter.h>
-#include <WriteDemObjectsCoProcessor.h>
-#include <WritePeBlocksCoProcessor.h>
-
-#include "CreateDemObjectsCoProcessor.h"
-#include "RestartDemObjectsCoProcessor.h"
-
-using namespace std;
-
-//simulation bounding box
-double g_minX1 = 0;
-double g_minX2 = 0;
-double g_minX3 = 0;
-
-double g_maxX1 = 0;
-double g_maxX2 = 0;
-double g_maxX3 = 0;
-
-vector<double> peMinOffset;
-vector<double> peMaxOffset;
-
-string pathOut;// = "d:/temp/thermoplastCluster";
-string pathGeo;// = "d:/Projects/ThermoPlast/Geometrie";
-
-void addNozzle(SPtr<Grid3D> grid, SPtr<vf::mpi::Communicator> comm, SPtr<BCAdapter> noSlipBCAdapter/*, InteractorsHelper& intHelper*/)
-{
- int myid = comm->getProcessID();
- if (myid==0) UBLOG(logINFO, "Add nozzles:start");
-
- SPtr<UbScheduler> sch(new UbScheduler(1));
- WriteGbObjectsCoProcessor gbObjectsCoProcessor(grid, sch, pathOut, WbWriterVtkXmlBinary::getInstance(), comm);
-
- std::vector< SPtr<Interactor3D> > interactors;
-
- for (int i = 0; i <= 55; i++)
- {
- SPtr<GbTriFaceMesh3D> bbGeo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+"/n_bb_new/bb_new"+UbSystem::toString(i)+".stl", "bb", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- SPtr<Interactor3D> bbInt = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(bbGeo, grid, noSlipBCAdapter, Interactor3D::SOLID, Interactor3D::EDGES));
- //GbSystem3D::writeGeoObject(bbGeo.get(), pathOut+"/ns/bbGeo"+UbSystem::toString(i), WbWriterVtkXmlBinary::getInstance());
- //intHelper.addInteractor(bbInt);
- if (myid==0) gbObjectsCoProcessor.addGbObject(bbGeo);
- interactors.push_back(bbInt);
- }
-
- for (int i = 0; i <= 334; i++)
- {
- SPtr<GbTriFaceMesh3D> bbGeo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+"/n_bb/bb"+UbSystem::toString(i)+".stl", "bb", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- SPtr<Interactor3D> bbInt = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(bbGeo, grid, noSlipBCAdapter, Interactor3D::SOLID, Interactor3D::EDGES));
- //GbSystem3D::writeGeoObject(bbGeo.get(), pathOut+"/ns/bbGeo"+UbSystem::toString(i), WbWriterVtkXmlBinary::getInstance());
- //intHelper.addInteractor(bbInt);
- if (myid==0) gbObjectsCoProcessor.addGbObject(bbGeo);
- interactors.push_back(bbInt);
- }
-
- for (int i = 0; i <= 51; i++)
- {
- SPtr<GbTriFaceMesh3D> bsGeo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+"/n_bs/bs"+UbSystem::toString(i)+".stl", "bs", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- SPtr<Interactor3D> bsInt = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(bsGeo, grid, noSlipBCAdapter, Interactor3D::SOLID, Interactor3D::EDGES));
- //intHelper.addInteractor(bsInt);
- if (myid==0) gbObjectsCoProcessor.addGbObject(bsGeo);
- interactors.push_back(bsInt);
- }
-
- std::array<int, 6> n ={ 0,1,3,4,6,7 };
-
- for (int i = 0; i < n.size(); i++)
- {
- SPtr<GbTriFaceMesh3D> biGeo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+"/n_bi/bi"+UbSystem::toString(n[i])+".stl", "bi", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- SPtr<Interactor3D> biInt = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(biGeo, grid, noSlipBCAdapter, Interactor3D::SOLID, Interactor3D::EDGES));
- //intHelper.addInteractor(biInt);
- if (myid==0) gbObjectsCoProcessor.addGbObject(biGeo);
- interactors.push_back(biInt);
- }
-
- if (myid==0) gbObjectsCoProcessor.process(0);
-
-
- for (SPtr<Interactor3D> interactor : interactors)
- {
- std::vector< std::shared_ptr<Block3D> > blockVector;
- UbTupleInt3 blockNX=grid->getBlockNX();
- SPtr<GbObject3D> geoObject(interactor->getGbObject3D());
- double ext = 0.0;
- std::array<double, 6> AABB ={ geoObject->getX1Minimum(),geoObject->getX2Minimum(),geoObject->getX3Minimum(),geoObject->getX1Maximum(),geoObject->getX2Maximum(),geoObject->getX3Maximum() };
- grid->getBlocksByCuboid(AABB[0]-(double)val<1>(blockNX)*ext, AABB[1]-(double)val<2>(blockNX)*ext, AABB[2]-(double)val<3>(blockNX)*ext, AABB[3]+(double)val<1>(blockNX)*ext, AABB[4]+(double)val<2>(blockNX)*ext, AABB[5]+(double)val<3>(blockNX)*ext, blockVector);
- for (std::shared_ptr<Block3D> block : blockVector)
- {
- if (block->getKernel())
- {
- interactor->setBCBlock(block);
- }
- }
- interactor->initInteractor();
- }
-
- if (myid==0) UBLOG(logINFO, "Add nozzles:end");
-}
-
-std::shared_ptr<DemCoProcessor> makePeCoProcessor(SPtr<Grid3D> grid, SPtr<vf::mpi::Communicator> comm, const SPtr<UbScheduler> peScheduler, const std::shared_ptr<LBMUnitConverter> lbmUnitConverter, int maxpeIterations)
-{
- double peRelaxtion = 0.7;
- //int maxpeIterations = 10000;
- //Beschleunigung g
- double g = 9.81 * lbmUnitConverter->getFactorAccWToLb();
- //Vector3D globalLinearAcc(0.0, -g, 0.0);
- //Vector3D globalLinearAcc(0.0, 0.0, -g);
- Vector3D globalLinearAcc(0.0, 0.0, 0.0);
-
- std::shared_ptr<PePhysicsEngineMaterialAdapter> planeMaterial = std::make_shared<PePhysicsEngineMaterialAdapter>("granular", 1.0, 0, 0.1 / 2, 0.1 / 2, 0.5, 1, 1, 0, 0);
-
- const int gridNX1 = val<1>(grid->getBlockNX()) * grid->getNX1();
- const int gridNX2 = val<2>(grid->getBlockNX()) * grid->getNX2();
- const int gridNX3 = val<3>(grid->getBlockNX()) * grid->getNX3();
-
- //UbTupleInt3 simulationDomain(gridNx, gridNy, gridNz);
- //std::array<double, 6> simulationDomain = {1, 1, 1, 30, 30, 30};
- std::array<double, 6> simulationDomain ={ g_minX1, g_minX2, g_minX3, g_minX1+gridNX1, g_minX2+gridNX2, g_minX3+gridNX3 };
- UbTupleInt3 numberOfBlocks(grid->getNX1(), grid->getNX2(), grid->getNX3());
- //UbTupleInt3 numberOfBlocks((simulationDomain[3]-simulationDomain[0])/val<1>(grid->getBlockNX()), (simulationDomain[4]-simulationDomain[1])/val<2>(grid->getBlockNX()), (simulationDomain[5]-simulationDomain[2])/val<3>(grid->getBlockNX()));
- UbTupleBool3 isPeriodic(grid->isPeriodicX1(), grid->isPeriodicX2(), grid->isPeriodicX3());
- Vector3D minOffset(peMinOffset[0], peMinOffset[1], peMinOffset[2]);
- Vector3D maxOffset(peMaxOffset[0], peMaxOffset[1], peMaxOffset[2]);
-
- SPtr<GbObject3D> boxPE(new GbCuboid3D(simulationDomain[0]+minOffset[0], simulationDomain[1]+minOffset[1], simulationDomain[2]+minOffset[2], simulationDomain[3]+maxOffset[0], simulationDomain[4]+maxOffset[1], simulationDomain[5]+maxOffset[2]));
- GbSystem3D::writeGeoObject(boxPE.get(), pathOut + "/geo/boxPE", WbWriterVtkXmlBinary::getInstance());
-
- std::shared_ptr<PeParameter> peParamter = std::make_shared<PeParameter>(peRelaxtion, maxpeIterations, globalLinearAcc,
- planeMaterial, simulationDomain, numberOfBlocks, isPeriodic, minOffset, maxOffset);
- std::shared_ptr<PeLoadBalancerAdapter> loadBalancer(new PeLoadBalancerAdapter(grid, comm->getNumberOfProcesses(), comm->getProcessID()));
- std::shared_ptr<PhysicsEngineSolverAdapter> peSolver = std::make_shared<PePhysicsEngineSolverAdapter>(peParamter, loadBalancer);
- //create obstacle
- //test
- std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(peSolver)->createObstacle(Vector3D( 90, 260, 472), Vector3D( 115, 320, 460));
- //production
- //std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(peSolver)->createObstacle(Vector3D( 90, 430, 472), Vector3D( 115, 320, 460));
- //std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(peSolver)->createObstacle(Vector3D( 100, 430, 1840), Vector3D( 130, 320, 470));
- //std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(peSolver)->createObstacle(Vector3D( 100, 821, 1159), Vector3D( 125, 625, 625));
- //walberla::pe::createSphere(*globalBodyStorage, *forest, *storageId, 0, walberla::pe::Vec3( -720, 820, 1150), 900, global, communicating, infiniteMass);
- //walberla::pe::createSphere(*globalBodyStorage, *forest, *storageId, 0, walberla::pe::Vec3( -720, 220, 472), 900, material, global, communicating, infiniteMass);
-
- SPtr<CoProcessor> peblocks(new WritePeBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathOut, WbWriterVtkXmlBinary::getInstance(), comm, std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(peSolver)->getBlockForest()));
- peblocks->process(0);
- peblocks.reset();
-
- const std::shared_ptr<ForceCalculator> forceCalculator = std::make_shared<ForceCalculator>(comm);
-
- return std::make_shared<DemCoProcessor>(grid, peScheduler, comm, forceCalculator, peSolver);
-}
-
-void createSpheres(double radius, Vector3D origin, int maxX2, int maxX3, double uLB, SPtr<CreateDemObjectsCoProcessor> createSphereCoProcessor)
-{
- double d = 2.0*radius;
- double dividerX2 = (double)maxX2/2.0;
- double dividerX3 = (double)maxX3/2.0;
- for (int x3 = 0; x3 < maxX3; x3++)
- for (int x2 = 0; x2 < maxX2; x2++)
- //for (int x1 = 0; x1 < 1; x1++)
- {
- //SPtr<GbObject3D> sphere(new GbSphere3D(origin[0]+2.0*d*(double)x1, origin[1]+(double)x2*1.0*d, origin[2]+(double)x3*1.0*d, radius));
- SPtr<GbObject3D> sphere(new GbSphere3D(origin[0]+2.0*d, origin[1]+(double)x2*1.0*d, origin[2]+(double)x3*1.0*d, radius));
- createSphereCoProcessor->addGeoObject(sphere, Vector3D(uLB, -uLB+uLB/dividerX2*(double)x2, -uLB+uLB/dividerX3*(double)x3));
- }
-}
-
-void thermoplast(string configname)
-{
- SPtr<vf::mpi::Communicator> comm = vf::mpi::MPICommunicator::getInstance();
- int myid = comm->getProcessID();
-
- vf::basics::ConfigurationFile config;
- config.load(configname);
-
- vector<int> blocknx = config.getVector<int>("blocknx");
- vector<double> boundingBox = config.getVector<double>("boundingBox");
-
- int endTime = config.getValue<int>("endTime");
- double outTime = config.getValue<double>("outTime");
- double availMem = config.getValue<double>("availMem");
- double uLB = config.getValue<double>("uLB");
- double Re = config.getValue<double>("Re");
-
- string michel = config.getValue<string>("michel");
- string plexiglas = config.getValue<string>("plexiglas");
- double sphereTime = config.getValue<double>("sphereTime");
-
- double cpStart = config.getValue<double>("cpStart");
- double cpStep = config.getValue<double>("cpStep");
- bool restart = config.getValue<bool>("restart");
- int restartStep = config.getValue<int>("restartStep");
-
- peMinOffset = config.getVector<double>("peMinOffset");
- peMaxOffset = config.getVector<double>("peMaxOffset");
-
- pathOut = config.getValue<string>("pathOut");
- pathGeo = config.getValue<string>("pathGeo");
-
- vector<int> nupsTime = config.getVector<int>("nupsTime");
-
- bool logToFile = config.getValue<bool>("logToFile");
- if (logToFile)
- {
-#if defined(__unix__)
- if (myid==0)
- {
- const char* str = pathOut.c_str();
- mkdir(str, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH);
- }
-#endif
-
- if (myid==0)
- {
- stringstream logFilename;
- logFilename<<pathOut+"/logfile"+UbSystem::getTimeStamp()+".txt";
- UbLog::output_policy::setStream(logFilename.str());
- }
- }
-
- bool obstacle = config.getValue<bool>("obstacle");
- string obstacleGeo1 = config.getValue<string>("obstacleGeo1");
- string obstacleGeo2 = config.getValue<string>("obstacleGeo2");
- string obstacleGeo3 = config.getValue<string>("obstacleGeo3");
-
- if (myid==0) UBLOG(logINFO, "BEGIN LOGGING - " << UbSystem::getTimeStamp());
-
- //parameters
- //string pathOut = "d:/temp/thermoplast3";
- //string pathGeo = "d:/Projects/ThermoPlast/Geometrie";
- int numOfThreads = 1;
- //int blocknx[3] ={ 10,10,10 };
- //double endTime = 1000000;
- //double outTime = 300;
- //double availMem = 8e9;
- double deltax = 1;
- double rhoLB = 0.0;
- //double uLB = 0.1;
- double radiusLB = 7.5;
- double radiusWorld = 1.5e-3;
- //double nuLB = 0.000333333;
- //double Re = (uLB*2.0*radiusLB)/nuLB;
- //double Re = 900;
- double nuLB = (uLB*2.0*radiusLB)/Re;
-
- //geometry definition
-
- //simulation bounding box
- g_minX1 = boundingBox[0];
- g_minX2 = boundingBox[1];
- g_minX3 = boundingBox[2];
-
- g_maxX1 = boundingBox[3];
- g_maxX2 = boundingBox[4];
- g_maxX3 = boundingBox[5];
-
- double blockLength = blocknx[0]*deltax;
-
- //Grid definition
- SPtr<Grid3D> grid(new Grid3D(comm));
- grid->setDeltaX(deltax);
- grid->setBlockNX(blocknx[0], blocknx[1], blocknx[2]);
- grid->setPeriodicX1(false);
- grid->setPeriodicX2(false);
- grid->setPeriodicX3(false);
-
- //boundary conditions definition
- //////////////////////////////////////////////////////////////////////////////
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new ThinWallNoSlipBCAlgorithm()));
-
- mu::Parser fct;
- fct.SetExpr("U");
- fct.DefineConst("U", uLB);
- SPtr<BCAdapter> inflowAdapter(new VelocityBCAdapter(true, false, false, fct, 0, BCFunction::INFCONST));
- inflowAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- //inflowAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
-
- SPtr<BCAdapter> outflowAdapter(new DensityBCAdapter(rhoLB));
- outflowAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new EqDensityBCAlgorithm()));
- //outflowAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
- //outflowAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
-
- //sphere BC
- mu::Parser fct2;
- fct2.SetExpr("U");
- fct2.DefineConst("U", 0.0);
- SPtr<BCAdapter> velocityBcParticleAdapter(new VelocityBCAdapter(true, false, false, fct2, 0, BCFunction::INFCONST));
- velocityBcParticleAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
-
- //boundary conditions visitor
- SPtr<BoundaryConditionsBlockVisitor> bcVisitor(new BoundaryConditionsBlockVisitor());
- bcVisitor->addBC(noSlipBCAdapter);
- bcVisitor->addBC(inflowAdapter);
- bcVisitor->addBC(outflowAdapter);
- bcVisitor->addBC(velocityBcParticleAdapter);
- //////////////////////////////////////////////////////////////////////////////////
-
- //LBM kernel definition
- SPtr<LBMKernel> kernel;
- kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
- //SPtr<BCProcessor> bcProc(new BCProcessor());
- SPtr<BCProcessor> bcProc(new ThinWallBCProcessor());
- kernel->setBCProcessor(bcProc);
-
- //if (myid==0) UBLOG(logINFO, "Read obstacleGeo1:start");
- //SPtr<GbTriFaceMesh3D> obstacleGeo1geo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+obstacleGeo1, "michelGeo", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- //if (myid==0) UBLOG(logINFO, "Read obstacleGeo1:end");
- //if (myid==0) GbSystem3D::writeGeoObject(obstacleGeo1geo.get(), pathOut+"/geo/obstacleGeo1", WbWriterVtkXmlBinary::getInstance());
- //g_minX1 = obstacleGeo1geo->getX1Minimum();
- //g_minX2 = obstacleGeo1geo->getX2Minimum();
- //g_minX3 = obstacleGeo1geo->getX3Minimum();
- //g_maxX1 = obstacleGeo1geo->getX1Maximum();
- //g_maxX2 = obstacleGeo1geo->getX2Maximum();
- //g_maxX3 = obstacleGeo1geo->getX3Maximum();
-
-
-
- //blocks generating
- SPtr<GbObject3D> gridCube(new GbCuboid3D(g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3));
- if (myid == 0) GbSystem3D::writeGeoObject(gridCube.get(), pathOut + "/geo/gridCube", WbWriterVtkXmlBinary::getInstance());
- GenBlocksGridVisitor genBlocks(gridCube);
- grid->accept(genBlocks);
-
-
- //{
- //SPtr<Interactor3D> obstacleGeo1int = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(obstacleGeo1geo, grid, noSlipBCAdapter, Interactor3D::SOLID));
- //SPtr<Grid3DVisitor> peVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, D3Q27System::BSW, MetisPartitioner::KWAY));
- //InteractorsHelper intHelper(grid, peVisitor, true);
- //intHelper.addInteractor(obstacleGeo1int);
- //intHelper.selectBlocks();
-
- ////create LBM kernel
- ////SetKernelBlockVisitor kernelVisitor(kernel, nuLB, availMem, 1);
- ////grid->accept(kernelVisitor);
-
- ////SPtr<Interactor3D> obstacleGeo1int = SPtr<D3Q27Interactor>(new D3Q27Interactor(obstacleGeo1geo, grid, noSlipBCAdapter, Interactor3D::SOLID));
- ////UBLOG(logINFO, "Obst: start");
- ////std::vector< std::shared_ptr<Block3D> > blockVector;
- ////UbTupleInt3 blockNX=grid->getBlockNX();
- ////SPtr<GbObject3D> geoObject(obstacleGeo1int->getGbObject3D());
- ////double ext = 0.0;
- ////std::array<double, 6> AABB ={ geoObject->getX1Minimum(),geoObject->getX2Minimum(),geoObject->getX3Minimum(),geoObject->getX1Maximum(),geoObject->getX2Maximum(),geoObject->getX3Maximum() };
- ////grid->getBlocksByCuboid(AABB[0]-(double)val<1>(blockNX)*ext, AABB[1]-(double)val<2>(blockNX)*ext, AABB[2]-(double)val<3>(blockNX)*ext, AABB[3]+(double)val<1>(blockNX)*ext, AABB[4]+(double)val<2>(blockNX)*ext, AABB[5]+(double)val<3>(blockNX)*ext, blockVector);
- ////for (std::shared_ptr<Block3D> block : blockVector)
- ////{
- ////if (block->getKernel())
- ////{
- ////obstacleGeo1int->setBCBlock(block);
- ////}
- ////}
- ////UBLOG(logINFO, "Obst: select blocks");
- ////obstacleGeo1int->initInteractor();
- ////UBLOG(logINFO, "Obst: end");
-
- //SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathOut, WbWriterVtkXmlBinary::getInstance(), comm));
- //ppblocks->process(0);
- //ppblocks.reset();
- //}
-
- //return;
-
-
- /////////////////////////////////////////////////////
- ////PE domain test
- //std::array<double, 6> simulationDomain ={ g_minX1, g_minX2, g_minX3, g_maxX1, g_maxX2, g_maxX3 };
- //Vector3D minOffset(peMinOffset[0], peMinOffset[1], peMinOffset[2]);
- //Vector3D maxOffset(peMaxOffset[0], peMaxOffset[1], peMaxOffset[2]);
- //SPtr<GbObject3D> boxPE(new GbCuboid3D(simulationDomain[0]+minOffset[0], simulationDomain[1]+minOffset[1], simulationDomain[2]+minOffset[2], simulationDomain[3]+maxOffset[0], simulationDomain[4]+maxOffset[1], simulationDomain[5]+maxOffset[2]));
- //GbSystem3D::writeGeoObject(boxPE.get(), pathOut + "/geo/boxPE", WbWriterVtkXmlBinary::getInstance());
- //return;
- //////////////////////////////////////////////////////
-
-
- if (myid == 0)
- {
- UBLOG(logINFO, "Parameters:");
- UBLOG(logINFO, "* uLB = " << uLB);
- UBLOG(logINFO, "* rhoLB = " << rhoLB);
- UBLOG(logINFO, "* nuLB = " << nuLB);
- UBLOG(logINFO, "* deltaX = " << deltax);
- UBLOG(logINFO, "* radius = " << radiusLB);
- UBLOG(logINFO, "* Re = " << Re);
- UBLOG(logINFO, "* number of threads = "<<numOfThreads);
- UBLOG(logINFO, "* number of processes = "<<comm->getNumberOfProcesses());
- UBLOG(logINFO, "* path = "<<pathOut);
- UBLOG(logINFO, "Preprocess - start");
- }
-
- //GbCuboid3DPtr geoInjector2(new GbCuboid3D(-12, -5, 1210, 64, 105, 1320));
- //if (myid == 0) GbSystem3D::writeGeoObject(geoInjector2.get(), pathOut + "/geo/geoInjector2", WbWriterVtkXmlASCII::getInstance());
-
- //GbCuboid3DPtr geoInjector5(new GbCuboid3D(-12, 1415, 205, 64, 1525, 315));
- //if (myid == 0) GbSystem3D::writeGeoObject(geoInjector5.get(), pathOut + "/geo/geoInjector5", WbWriterVtkXmlASCII::getInstance());
-
- GbCuboid3DPtr geoInjector4(new GbCuboid3D(-12, -5, 205, 64, 105, 315));
- if (myid == 0) GbSystem3D::writeGeoObject(geoInjector4.get(), pathOut + "/geo/geoInjector4", WbWriterVtkXmlASCII::getInstance());
-
- //GbCuboid3DPtr geoInjector7(new GbCuboid3D(28, 705, 542, 103, 815, 652));
- //if (myid == 0) GbSystem3D::writeGeoObject(geoInjector7.get(), pathOut + "/geo/geoInjector7", WbWriterVtkXmlASCII::getInstance());
-
- GbCuboid3DPtr testWallGeo(new GbCuboid3D(g_minX1-blockLength, g_minX2 - blockLength, g_maxX3, g_maxX1 + blockLength, g_maxX2 + blockLength, g_maxX3 + blockLength));
- if (myid == 0) GbSystem3D::writeGeoObject(testWallGeo.get(), pathOut + "/geo/testWallGeo", WbWriterVtkXmlASCII::getInstance());
-
- if (!restart)
- {
- //box
- SPtr<GbObject3D> box(new GbCuboid3D(g_minX1-blockLength, g_minX2, g_minX3, g_maxX1+blockLength, g_maxX2, g_maxX3));
- GbSystem3D::writeGeoObject(box.get(), pathOut + "/geo/box", WbWriterVtkXmlBinary::getInstance());
-
- //michel
- if (myid==0) UBLOG(logINFO, "Read michelGeo:start");
- SPtr<GbTriFaceMesh3D> michelGeo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+michel, "michelGeo", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- if (myid==0) UBLOG(logINFO, "Read michelGeo:end");
- if (myid==0) GbSystem3D::writeGeoObject(michelGeo.get(), pathOut+"/geo/michelGeo", WbWriterVtkXmlBinary::getInstance());
-
- //plexiglas
- if (myid==0) UBLOG(logINFO, "Read plexiglasGeo:start");
- SPtr<GbTriFaceMesh3D> plexiglasGeo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+plexiglas, "plexiglasGeo", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- if (myid==0) UBLOG(logINFO, "Read plexiglasGeo:end");
- if (myid==0) GbSystem3D::writeGeoObject(plexiglasGeo.get(), pathOut+"/geo/plexiglasGeo", WbWriterVtkXmlBinary::getInstance());
-
- //inflow
- GbCuboid3DPtr geoOutflowMichel(new GbCuboid3D(g_minX1-blockLength, g_minX2 - blockLength, g_minX3 - blockLength, g_minX1, g_maxX2 + blockLength, g_maxX3 + blockLength));
- if (myid == 0) GbSystem3D::writeGeoObject(geoOutflowMichel.get(), pathOut + "/geo/geoOutflowMichel", WbWriterVtkXmlASCII::getInstance());
-
- //outflow
- GbCuboid3DPtr geoOutflowPlexiglas(new GbCuboid3D(g_maxX1, g_minX2 - blockLength, g_minX3 - blockLength, g_maxX1 + blockLength, g_maxX2 + blockLength, g_maxX3 + blockLength));
- if (myid == 0) GbSystem3D::writeGeoObject(geoOutflowPlexiglas.get(), pathOut + "/geo/geoOutflowPlexiglas", WbWriterVtkXmlASCII::getInstance());
-
- //set boundary conditions for blocks and create process decomposition for MPI
- SPtr<D3Q27Interactor> boxInt(new D3Q27Interactor(box, grid, noSlipBCAdapter, Interactor3D::INVERSESOLID));
-
- //inflow
- //SPtr<D3Q27Interactor> inflowInjector2Int = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInjector2, grid, inflowAdapter, Interactor3D::SOLID));
- //SPtr<D3Q27Interactor> inflowInjector5Int = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInjector5, grid, inflowAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> inflowInjector4Int = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInjector4, grid, inflowAdapter, Interactor3D::SOLID));
- //SPtr<D3Q27Interactor> inflowInjector7Int = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInjector7, grid, inflowAdapter, Interactor3D::SOLID));
-
- SPtr<D3Q27Interactor> outflowMichelInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflowMichel, grid, outflowAdapter, Interactor3D::SOLID));
-
- //outflow
- SPtr<D3Q27Interactor> outflowPlexiglasInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflowPlexiglas, grid, outflowAdapter, Interactor3D::SOLID));
-
- //michel
- SPtr<Interactor3D> michelInt = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(michelGeo, grid, noSlipBCAdapter, Interactor3D::SOLID));
-
- //plexiglas
- SPtr<Interactor3D> plexiglasInt = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(plexiglasGeo, grid, noSlipBCAdapter, Interactor3D::SOLID));
-
- SPtr<D3Q27Interactor> testWallInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(testWallGeo, grid, inflowAdapter, Interactor3D::SOLID));
-
- SPtr<Interactor3D> obstacleGeo1int, obstacleGeo2int, obstacleGeo3int;
- if (obstacle)
- {
- //obstacleGeo1
- if (myid==0) UBLOG(logINFO, "Read obstacleGeo1:start");
- SPtr<GbTriFaceMesh3D> obstacleGeo1geo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+obstacleGeo1, "michelGeo", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- if (myid==0) UBLOG(logINFO, "Read obstacleGeo1:end");
- if (myid==0) GbSystem3D::writeGeoObject(obstacleGeo1geo.get(), pathOut+"/geo/obstacleGeo1", WbWriterVtkXmlBinary::getInstance());
- obstacleGeo1int = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(obstacleGeo1geo, grid, noSlipBCAdapter, Interactor3D::SOLID));
- //obstacleGeo2
- if (myid==0) UBLOG(logINFO, "Read obstacleGeo2:start");
- SPtr<GbTriFaceMesh3D> obstacleGeo2geo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+obstacleGeo2, "michelGeo", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- if (myid==0) UBLOG(logINFO, "Read obstacleGeo2:end");
- if (myid==0) GbSystem3D::writeGeoObject(obstacleGeo2geo.get(), pathOut+"/geo/obstacleGeo2", WbWriterVtkXmlBinary::getInstance());
- obstacleGeo2int = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(obstacleGeo2geo, grid, noSlipBCAdapter, Interactor3D::SOLID));
- //obstacleGeo3
- if (myid==0) UBLOG(logINFO, "Read obstacleGeo3:start");
- SPtr<GbTriFaceMesh3D> obstacleGeo3geo = SPtr<GbTriFaceMesh3D>(GbTriFaceMesh3DCreator::getInstance()->readMeshFromSTLFile2(pathGeo+obstacleGeo3, "michelGeo", GbTriFaceMesh3D::KDTREE_SAHPLIT, false));
- if (myid==0) UBLOG(logINFO, "Read obstacleGeo3:end");
- if (myid==0) GbSystem3D::writeGeoObject(obstacleGeo3geo.get(), pathOut+"/geo/obstacleGeo3", WbWriterVtkXmlBinary::getInstance());
- obstacleGeo3int = SPtr<D3Q27TriFaceMeshInteractor>(new D3Q27TriFaceMeshInteractor(obstacleGeo3geo, grid, noSlipBCAdapter, Interactor3D::SOLID));
- }
-
- //////////////////////////////////////////////////////////////////////////
- //SPtr<Grid3DVisitor> peVisitor(new PePartitioningGridVisitor(comm, demCoProcessor));
- SPtr<Grid3DVisitor> peVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, D3Q27System::BSW, MetisPartitioner::KWAY));
- InteractorsHelper intHelper(grid, peVisitor, true);
-
- //intHelper.addInteractor(obstacleGeo1int);
-
- intHelper.addInteractor(boxInt);
- intHelper.addInteractor(michelInt);
- intHelper.addInteractor(plexiglasInt);
- //intHelper.addInteractor(inflowInjector2Int);
- //intHelper.addInteractor(inflowInjector5Int);
- intHelper.addInteractor(inflowInjector4Int);
- //intHelper.addInteractor(inflowInjector7Int);
- intHelper.addInteractor(outflowPlexiglasInt);
- intHelper.addInteractor(outflowMichelInt);
- intHelper.addInteractor(obstacleGeo1int);
- intHelper.addInteractor(obstacleGeo2int);
- intHelper.addInteractor(obstacleGeo3int);
- //intHelper.addInteractor(testWallInt);
- intHelper.selectBlocks();
-
- //write data for visualization of block grid
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), pathOut, WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
- ppblocks.reset();
-
- 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 numberOfNodes = numberOfBlocks * numberOfNodesPerBlock;
- unsigned long long numberOfNodesPerBlockWithGhostLayer = numberOfBlocks * (blocknx[0] + ghostLayer) * (blocknx[1] + ghostLayer) * (blocknx[2] + ghostLayer);
- double needMemAll = double(numberOfNodesPerBlockWithGhostLayer*(27 * sizeof(double) + sizeof(int) + sizeof(float) * 4));
- double needMem = needMemAll / double(comm->getNumberOfProcesses());
-
- if (myid == 0)
- {
- UBLOG(logINFO, "Number of blocks = " << numberOfBlocks);
- UBLOG(logINFO, "Number of nodes = " << numberOfNodes);
- int minInitLevel = grid->getCoarsestInitializedLevel();
- int maxInitLevel = grid->getFinestInitializedLevel();
- for (int level = minInitLevel; level <= maxInitLevel; level++)
- {
- int nobl = grid->getNumberOfBlocks(level);
- UBLOG(logINFO, "Number of blocks for level " << level << " = " << nobl);
- UBLOG(logINFO, "Number of nodes for level " << level << " = " << nobl*numberOfNodesPerBlock);
- }
- UBLOG(logINFO, "Necessary memory = " << needMemAll << " bytes");
- UBLOG(logINFO, "Necessary memory per process = " << needMem << " bytes");
- UBLOG(logINFO, "Available memory per process = " << availMem << " bytes");
- }
-
- //create LBM kernel
- SetKernelBlockVisitor kernelVisitor(kernel, nuLB, availMem, needMem);
- grid->accept(kernelVisitor);
-
- addNozzle(grid, comm, noSlipBCAdapter/*,intHelper*/);
-
- intHelper.setBC();
-
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////
- //{
- ////UBLOG(logINFO, "Obst: start, rank="<<myid);
- //std::vector< std::shared_ptr<Block3D> > blockVector;
- //UbTupleInt3 blockNX=grid->getBlockNX();
- //SPtr<GbObject3D> geoObject(obstacleGeo3int->getGbObject3D());
- //double ext = 0.0;
- //std::array<double, 6> AABB ={ geoObject->getX1Minimum(),geoObject->getX2Minimum(),geoObject->getX3Minimum(),geoObject->getX1Maximum(),geoObject->getX2Maximum(),geoObject->getX3Maximum() };
- //grid->getBlocksByCuboid(AABB[0]-(double)val<1>(blockNX)*ext, AABB[1]-(double)val<2>(blockNX)*ext, AABB[2]-(double)val<3>(blockNX)*ext, AABB[3]+(double)val<1>(blockNX)*ext, AABB[4]+(double)val<2>(blockNX)*ext, AABB[5]+(double)val<3>(blockNX)*ext, blockVector);
- //for (std::shared_ptr<Block3D> block : blockVector)
- //{
- //if (block->getKernel())
- //{
- //obstacleGeo3int->setBCBlock(block);
- //}
- //}
- //UBLOG(logINFO, "Obst: select blocks, number of blocks="<<blockVector.size()<<", rank="<<myid);
- //obstacleGeo3int->initInteractor();
- //UBLOG(logINFO, "Obst: end, rank="<<myid);
- //}
- //////////////////////////////////////////////////////////////////////////////////////////////////////
- //initialization of distributions
- InitDistributionsBlockVisitor initVisitor;
- //initVisitor.setVx1(uLB);
- grid->accept(initVisitor);
-
- //write data for visualization of boundary conditions
- {
- //SPtr<UbScheduler> geoSch(new UbScheduler(1));
- //WriteBoundaryConditionsCoProcessor ppgeo(grid, geoSch, pathOut, WbWriterVtkXmlBinary::getInstance(), comm);
- //ppgeo.process(0);
-
- //WriteMacroscopicQuantitiesCoProcessor ppInit(grid, geoSch, pathOut, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm);
- //ppInit.process(0);
- }
-
- if (myid == 0) UBLOG(logINFO, "Preprocess - end");
- }
- //restart
- //UBLOG(logINFO, "restart definition - start, rank="<<myid);
- SPtr<UbScheduler> restartSch(new UbScheduler(cpStep, cpStart));
- //SPtr<MPIIORestartCoProcessor> restartCoProcessor(new MPIIORestartCoProcessor(grid, restartSch, pathOut, comm));
- SPtr<MPIIOMigrationCoProcessor> restartCoProcessor(new MPIIOMigrationCoProcessor(grid, restartSch, pathOut, comm));
- restartCoProcessor->setLBMKernel(kernel);
- restartCoProcessor->setBCProcessor(bcProc);
-
- if (restart)
- {
- //restartStep = restartCoProcessor->readCpTimeStep();
- restartCoProcessor->restart(restartStep);
- }
-
- //PE initialization
- double refLengthLb = radiusLB*2.0;
- double refLengthWorld = radiusWorld*2.0;
- const std::shared_ptr<LBMUnitConverter> lbmUnitConverter = std::make_shared<LBMUnitConverter>(refLengthWorld, LBMUnitConverter::WORLD_MATERIAL::AIR_20C, refLengthLb);
- if (myid == 0) std::cout << lbmUnitConverter->toString() << std::endl;
- double rhoSphere = 915 * lbmUnitConverter->getFactorDensityWToLb(); // kg/m^3
- if (myid == 0) UBLOG(logINFO, "rhoSphere = "<<rhoSphere);
- SPtr<PhysicsEngineMaterialAdapter> sphereMaterial(new PePhysicsEngineMaterialAdapter("Polypropylen", rhoSphere, 0, 0.15, 0.1, 0.45, 0.5, 1, 0, 0));
- const int timestep = 2;
- const SPtr<UbScheduler> peScheduler(new UbScheduler(timestep));
- int maxpeIterations = 10;//endTime/2;
- SPtr<DemCoProcessor> demCoProcessor = makePeCoProcessor(grid, comm, peScheduler, lbmUnitConverter, maxpeIterations);
- demCoProcessor->setBlockVisitor(bcVisitor);
-
- ////////////////////////////////////////////////////////////////////////////
- ////generating spheres
- //UBLOG(logINFO, "generating spheres - start, rank="<<myid);
- SPtr<UbScheduler> sphereScheduler(new UbScheduler(sphereTime/*10,10,10*/));
- double toleranz = 0.0;//0.05;
- SPtr<CreateDemObjectsCoProcessor> createSphereCoProcessor(new CreateDemObjectsCoProcessor(grid, sphereScheduler, comm, demCoProcessor, sphereMaterial, toleranz));
- //UBLOG(logINFO, "generating spheres - stop, rank="<<myid);
-
- ////restart
- ////UBLOG(logINFO, "restart definition - start, rank="<<myid);
- //SPtr<UbScheduler> restartSch(new UbScheduler(cpStep, cpStart));
- ////SPtr<MPIIORestartCoProcessor> restartCoProcessor(new MPIIORestartCoProcessor(grid, restartSch, pathOut, comm));
- //SPtr<MPIIOMigrationCoProcessor> restartCoProcessor(new MPIIOMigrationCoProcessor(grid, restartSch, pathOut, comm));
- //restartCoProcessor->setLBMKernel(kernel);
- //restartCoProcessor->setBCProcessor(bcProc);
- SPtr<RestartDemObjectsCoProcessor> restartDemObjectsCoProcessor(new RestartDemObjectsCoProcessor(grid, restartSch, pathOut, demCoProcessor, createSphereCoProcessor, radiusLB, comm));
- //UBLOG(logINFO, "restart definition - stop, rank="<<myid);
-
- if (restart)
- {
- createSphereCoProcessor->setToleranz(0.05);
- restartDemObjectsCoProcessor->restart(restartStep);
- createSphereCoProcessor->setToleranz(toleranz);
- }
-
- //set connectors
- //UBLOG(logINFO, "set connectors - start, rank="<<myid);
- InterpolationProcessorPtr iProcessor(new IncompressibleOffsetInterpolationProcessor());
- SetConnectorsBlockVisitor setConnsVisitor(comm, true, D3Q27System::ENDDIR, nuLB, iProcessor);
- grid->accept(setConnsVisitor);
- //UBLOG(logINFO, "set connectors - stop, rank="<<myid);
-
- //BC visitor
- //UBLOG(logINFO, "BC visitor - start, rank="<<myid);
- grid->accept(*bcVisitor.get());
- //UBLOG(logINFO, "BC visitor - stop, rank="<<myid);
-
- //sphere prototypes
- //UBLOG(logINFO, "sphere prototypes - start, rank="<<myid);
- double d = 2.0*radiusLB;
- int maxX2 = 5;
- int maxX3 = 5;
- //Vector3D origin1(g_minX1+peMinOffset[0]-1.5*d, geoInjector5->getX2Minimum()+1.4*d-6.0, geoInjector5->getX3Minimum()+1.5*d);
- //createSpheres(radiusLB, origin1, maxX2, maxX3, uLB, createSphereCoProcessor);
- //Vector3D origin2(g_minX1+peMinOffset[0]-1.5*d, geoInjector2->getX2Minimum()+2.2*d, geoInjector2->getX3Minimum()+1.5*d);
- //createSpheres(radiusLB, origin2, maxX2, maxX3, uLB, createSphereCoProcessor);
-
- Vector3D origin2(g_minX1+peMinOffset[0]-1.5*d, geoInjector4->getX2Minimum()+2.4*d, geoInjector4->getX3Minimum()+1.5*d);
- createSpheres(radiusLB,origin2,maxX2,maxX3,uLB,createSphereCoProcessor);
-
- //maxX2 = 7;
- //maxX3 = 7;
- //Vector3D origin3(g_minX1+peMinOffset[0]-1.5*d, geoInjector7->getX2Minimum()+0.5*d, geoInjector7->getX3Minimum()+0.5*d);
- //createSpheres(radiusLB,origin3,maxX2,maxX3,uLB,createSphereCoProcessor);
-
-
- createSphereCoProcessor->process(0);
-
- //write data for visualization of macroscopic quantities
- SPtr<UbScheduler> visSch(new UbScheduler(outTime));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, pathOut,
- WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
-
- SPtr<WriteBoundaryConditionsCoProcessor> writeBCCoProcessor(new WriteBoundaryConditionsCoProcessor(grid, visSch, pathOut,
- WbWriterVtkXmlBinary::getInstance(), comm));
-
- SPtr<WriteDemObjectsCoProcessor> writeDemObjectsCoProcessor(new WriteDemObjectsCoProcessor(grid, visSch, pathOut, WbWriterVtkXmlBinary::getInstance(), demCoProcessor, comm));
-
- if (!restart)
- {
- writeMQCoProcessor->process(0);
- writeBCCoProcessor->process(0);
- writeDemObjectsCoProcessor->process(0);
- }
- ////performance control
- SPtr<UbScheduler> nupsSch(new UbScheduler(nupsTime[0], nupsTime[1], nupsTime[2]));
- SPtr<NUPSCounterCoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
-
- //start simulation
- //omp_set_num_threads(numOfThreads);
- SPtr<UbScheduler> stepGhostLayer(peScheduler);
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
-
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(createSphereCoProcessor);
- calculator->addCoProcessor(demCoProcessor);
- ////calculator->addCoProcessor(writeBCCoProcessor);
- calculator->addCoProcessor(writeDemObjectsCoProcessor);
- calculator->addCoProcessor(writeMQCoProcessor);
- calculator->addCoProcessor(restartDemObjectsCoProcessor);
- calculator->addCoProcessor(restartCoProcessor);
-
- if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
- if (myid == 0) UBLOG(logINFO, "Simulation-end");
- if (myid==0) UBLOG(logINFO, "END LOGGING - " << UbSystem::getTimeStamp());
-}
-
-//////////////////////////////////////////////////////////////////////////
-int main(int argc, char* argv[])
-{
- try
- {
- //Sleep(30000);
- walberla::Environment env(argc, argv);
-
- if (argv!=NULL)
- {
- //if (argv[1]!=NULL)
- //{
- //thermoplast(string("thermoplast.cfg"));
- thermoplast(string("d:/Projects/VirtualFluidsGit/source/Applications/Thermoplast/config.txt"));
- //}
- //else
- //{
- //cout<<"Configuration file must be set!: "<<argv[0]<<" <config file>"<<endl<<std::flush;
- //}
- }
- return 0;
- }
- catch (std::exception& e)
- {
- UBLOG(logERROR, e.what());
- }
- catch (std::string& s)
- {
- UBLOG(logERROR, s);
- }
- catch (...)
- {
- UBLOG(logERROR, "unknown exception");
- }
-}
diff --git a/apps/cpu/ViskomatXL/CMakeLists.txt b/apps/cpu/ViskomatXL/CMakeLists.txt
index 1b72b8765177c13a3f747b5f03e80f0ef5823ae1..6dcfeabc73259c72138c2c4ac84c017c6e96463a 100644
--- a/apps/cpu/ViskomatXL/CMakeLists.txt
+++ b/apps/cpu/ViskomatXL/CMakeLists.txt
@@ -3,4 +3,4 @@
########################################################
PROJECT(viskomat)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} FILES viskomat.cpp )
\ No newline at end of file
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} NonNewtonianFluids FILES viskomat.cpp )
\ No newline at end of file
diff --git a/apps/cpu/ViskomatXL/viskomat.cpp b/apps/cpu/ViskomatXL/viskomat.cpp
index be1f8bab3f99f5577e5a9ca0b426572a87c5a6af..327f25e599c80b059fe273cfd2a0c526ed4279f7 100644
--- a/apps/cpu/ViskomatXL/viskomat.cpp
+++ b/apps/cpu/ViskomatXL/viskomat.cpp
@@ -1,7 +1,8 @@
#include <iostream>
#include <string>
-#include <VirtualFluids.h>
+#include "VirtualFluids.h"
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
using namespace std;
@@ -106,14 +107,14 @@ void bflow(string configname)
thix->setYieldStress(tau0LB);
//thix->setOmegaMin(omegaMin);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyHerschelBulkleyModelNoSlipBCAlgorithm()));
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyBinghamModelNoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyHerschelBulkleyModelNoSlipBCStrategy()));
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelNoSlipBCStrategy()));
- SPtr<BCAdapter> slipBCAdapter(new SlipBCAdapter());
- slipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SimpleSlipBCAlgorithm()));
- //slipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SlipBCAlgorithm()));
+ SPtr<BC> slipBC(new SlipBC());
+ slipBC->setBCStrategy(SPtr<BCStrategy>(new SimpleSlipBCStrategy()));
+ //slipBC->setBCStrategy(SPtr<BCStrategy>(new SlipBCStrategy()));
//// rotation around X-axis
mu::Parser fctVy;
@@ -148,26 +149,26 @@ void bflow(string configname)
//mu::Parser fctVy;
//fctVy.SetExpr("0.0");
- SPtr<BCAdapter> velocityBCAdapter(new VelocityBCAdapter(true, true, true, fctVx, fctVy, fctVz, 0, BCFunction::INFCONST));
- //velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SimpleVelocityBCAlgorithm()));
- //velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
- //velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyBinghamModelVelocityBCAlgorithm()));
+ SPtr<BC> velocityBC(new VelocityBC(true, true, true, fctVx, fctVy, fctVz, 0, BCFunction::INFCONST));
+ //velocityBC->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ velocityBC->setBCStrategy(SPtr<BCStrategy>(new SimpleVelocityBCStrategy()));
+ //velocityBC->setBCStrategy(SPtr<BCStrategy>(new VelocityWithDensityBCStrategy()));
+ //velocityBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelVelocityBCStrategy()));
- //SPtr<BCAdapter> densityBCAdapter(new DensityBCAdapter());
- //densityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
- ////densityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
+ //SPtr<BC> densityBC(new DensityBC());
+ //densityBC->setBCStrategy(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
+ ////densityBC->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowBCStrategy()));
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- //bcVisitor.addBC(noSlipBCAdapter);
- bcVisitor.addBC(slipBCAdapter);
- bcVisitor.addBC(velocityBCAdapter);
- //bcVisitor.addBC(densityBCAdapter);
+ //bcVisitor.addBC(noSlipBC);
+ bcVisitor.addBC(slipBC);
+ bcVisitor.addBC(velocityBC);
+ //bcVisitor.addBC(densityBC);
- SPtr<BCProcessor> bcProc;
- bcProc = SPtr<BCProcessor>(new BCProcessor());
+ SPtr<BCSet> bcProc;
+ bcProc = SPtr<BCSet>(new BCSet());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new BGKLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CumulantLBMKernel());
@@ -177,7 +178,7 @@ void bflow(string configname)
SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyBinghamModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new HerschelBulkleyModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new BinghamModelLBMKernel());
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
//kernel->setForcingX1(forcing);
//kernel->setWithForcing(true);
@@ -198,11 +199,11 @@ void bflow(string configname)
//////////////////////////////////////////////////////////////////////////
//restart
SPtr<UbScheduler> mSch(new UbScheduler(cpStep, cpStart));
- SPtr<MPIIOMigrationCoProcessor> restartCoProcessor(new MPIIOMigrationCoProcessor(grid, mSch, metisVisitor, outputPath, comm));
- //SPtr<MPIIORestartCoProcessor> restartCoProcessor(new MPIIORestartCoProcessor(grid, mSch, outputPath, comm));
- restartCoProcessor->setLBMKernel(kernel);
- restartCoProcessor->setBCProcessor(bcProc);
- //restartCoProcessor->setNu(k);
+ SPtr<MPIIOMigrationSimulationObserver> restartSimulationObserver(new MPIIOMigrationSimulationObserver(grid, mSch, metisVisitor, outputPath, comm));
+ //SPtr<MPIIORestartSimulationObserver> restartSimulationObserver(new MPIIORestartSimulationObserver(grid, mSch, outputPath, comm));
+ restartSimulationObserver->setLBMKernel(kernel);
+ restartSimulationObserver->setBCSet(bcProc);
+ //restartSimulationObserver->setNu(k);
//////////////////////////////////////////////////////////////////////////
////stator
@@ -222,7 +223,7 @@ void bflow(string configname)
//// // 0.5 * (g_maxX3 - g_minX3) * 0.5));
// SPtr<D3Q27Interactor> statorInt =
- // SPtr<D3Q27Interactor>(new D3Q27Interactor(stator, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ // SPtr<D3Q27Interactor>(new D3Q27Interactor(stator, grid, noSlipBC, Interactor3D::SOLID));
SPtr<GbTriFaceMesh3D> stator = make_shared<GbTriFaceMesh3D>();
stator->readMeshFromSTLFileBinary(geoPath + "/" + geoFile, false);
@@ -231,7 +232,7 @@ void bflow(string configname)
//stator->translate(4.0, -73.0, -6.0);
SPtr<D3Q27Interactor> statorInt = SPtr<D3Q27TriFaceMeshInteractor>(
- new D3Q27TriFaceMeshInteractor(stator, grid, noSlipBCAdapter, Interactor3D::SOLID, Interactor3D::EDGES));
+ new D3Q27TriFaceMeshInteractor(stator, grid, noSlipBC, Interactor3D::SOLID, Interactor3D::EDGES));
GbSystem3D::writeGeoObject(stator.get(), outputPath + "/geo/stator", WbWriterVtkXmlBinary::getInstance());
@@ -250,7 +251,7 @@ void bflow(string configname)
GbSystem3D::writeGeoObject(rotor.get(), outputPath + "/geo/rotor", WbWriterVtkXmlBinary::getInstance());
SPtr<D3Q27Interactor> rotorInt =
- SPtr<D3Q27Interactor>(new D3Q27Interactor(rotor, grid, velocityBCAdapter, Interactor3D::INVERSESOLID));
+ SPtr<D3Q27Interactor>(new D3Q27Interactor(rotor, grid, velocityBC, Interactor3D::INVERSESOLID));
//walls
GbCuboid3DPtr wallXmin(new GbCuboid3D(g_minX1 - deltax, g_minX2 - deltax, g_minX3 - deltax, g_minX1,
@@ -262,8 +263,8 @@ void bflow(string configname)
if (myid == 0) GbSystem3D::writeGeoObject(wallXmax.get(), outputPath + "/geo/wallXmax", WbWriterVtkXmlASCII::getInstance());
//wall interactors
- SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, slipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> wallXmaxInt(new D3Q27Interactor(wallXmax, grid, slipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallXminInt(new D3Q27Interactor(wallXmin, grid, slipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> wallXmaxInt(new D3Q27Interactor(wallXmax, grid, slipBC, Interactor3D::SOLID));
if (myid == 0)
{
@@ -320,8 +321,8 @@ void bflow(string configname)
if (myid == 0) UBLOG(logINFO, "deleteSolidBlocks - end");
//////////////////////////////////////
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppblocks->update(0);
unsigned long nob = grid->getNumberOfBlocks();
int gl = 3;
@@ -365,18 +366,18 @@ void bflow(string configname)
grid->accept(initVisitor);
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- WriteBoundaryConditionsCoProcessor ppgeo = WriteBoundaryConditionsCoProcessor(grid, geoSch, outputPath, WbWriterVtkXmlBinary::getInstance(), comm);
- ppgeo.process(0);
+ WriteBoundaryConditionsSimulationObserver ppgeo = WriteBoundaryConditionsSimulationObserver(grid, geoSch, outputPath, WbWriterVtkXmlBinary::getInstance(), comm);
+ ppgeo.update(0);
if (myid == 0) UBLOG(logINFO, "Preprozess - end");
}
else
{
- restartCoProcessor->restart((int)restartStep);
+ restartSimulationObserver->restart((int)restartStep);
- //restartCoProcessor->readBlocks((int)restartStep);
- //restartCoProcessor->readDataSet((int)restartStep);
- ////restartCoProcessor->readBoundaryConds((int)restartStep);
+ //restartSimulationObserver->readBlocks((int)restartStep);
+ //restartSimulationObserver->readDataSet((int)restartStep);
+ ////restartSimulationObserver->readBoundaryConds((int)restartStep);
//grid->setTimeStep((int)restartStep);
SetBcBlocksBlockVisitor v2(wallXmaxInt);
@@ -395,9 +396,9 @@ void bflow(string configname)
grid->accept(v1);
wallXminInt->initInteractor();
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath,
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath,
WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(1);
+ ppblocks->update(1);
}
//omp_set_num_threads(numOfThreads);
@@ -414,33 +415,33 @@ void bflow(string configname)
grid->accept(bcVisitor);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<CoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<SimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
//write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
//SPtr<UbScheduler> visSch(new UbScheduler(10,1));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
- //writeMQCoProcessor->process(100);
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ //writeMQSimulationObserver->update(100);
SPtr<UbScheduler> forceSch(new UbScheduler(100));
- SPtr<CalculateTorqueCoProcessor> fp = make_shared<CalculateTorqueCoProcessor>(grid, forceSch, outputPath + "/torque/TorqueRotor.csv", comm);
+ SPtr<CalculateTorqueSimulationObserver> fp = make_shared<CalculateTorqueSimulationObserver>(grid, forceSch, outputPath + "/torque/TorqueRotor.csv", comm);
fp->addInteractor(rotorInt);
- SPtr<CalculateTorqueCoProcessor> fp2 = make_shared<CalculateTorqueCoProcessor>(grid, forceSch, outputPath + "/torque/TorqueStator.csv", comm);
+ SPtr<CalculateTorqueSimulationObserver> fp2 = make_shared<CalculateTorqueSimulationObserver>(grid, forceSch, outputPath + "/torque/TorqueStator.csv", comm);
fp2->addInteractor(statorInt);
- //SPtr<WriteThixotropyQuantitiesCoProcessor> writeThixotropicMQCoProcessor(new WriteThixotropyQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ //SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- //calculator->addCoProcessor(fp);
- calculator->addCoProcessor(fp2);
- //calculator->addCoProcessor(writeMQCoProcessor);
- //calculator->addCoProcessor(writeThixotropicMQCoProcessor);
- calculator->addCoProcessor(restartCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ //simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(fp2);
+ //simulation->addSimulationObserver(writeMQSimulationObserver);
+ //simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/rheometer/CMakeLists.txt b/apps/cpu/rheometer/CMakeLists.txt
index d8a534096569e7c70ad4db41e0bb72decfcc5a8c..58177bdd14a1c55985818bd70e336072c62f6dc5 100644
--- a/apps/cpu/rheometer/CMakeLists.txt
+++ b/apps/cpu/rheometer/CMakeLists.txt
@@ -3,4 +3,4 @@
########################################################
PROJECT(rheometer)
-vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} FILES rheometer.cpp )
\ No newline at end of file
+vf_add_library(BUILDTYPE binary PRIVATE_LINK VirtualFluidsCore basics ${MPI_CXX_LIBRARIES} NonNewtonianFluids FILES rheometer.cpp )
\ No newline at end of file
diff --git a/apps/cpu/rheometer/rheometer.cpp b/apps/cpu/rheometer/rheometer.cpp
index 1506bde80f21bce580c6aa781d1075fdc86bcd62..ca3378bd5d6a4322b66877b25fca89d5ae478aac 100644
--- a/apps/cpu/rheometer/rheometer.cpp
+++ b/apps/cpu/rheometer/rheometer.cpp
@@ -1,7 +1,8 @@
#include <iostream>
#include <string>
-#include <VirtualFluids.h>
+#include "VirtualFluids.h"
+#include "NonNewtonianFluids/NonNewtonianFluids.h"
using namespace std;
@@ -141,13 +142,13 @@ void bflow(string configname)
thix->setYieldStress(tau0);
//thix->setOmegaMin(omegaMin);
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyHerschelBulkleyModelNoSlipBCAlgorithm()));
- //noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyBinghamModelNoSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ //noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyHerschelBulkleyModelNoSlipBCStrategy()));
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelNoSlipBCStrategy()));
- //SPtr<BCAdapter> slipBCAdapter(new SlipBCAdapter());
- //slipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SimpleSlipBCAlgorithm()));
+ //SPtr<BC> slipBC(new SlipBC());
+ //slipBC->setBCStrategy(SPtr<BCStrategy>(new SimpleSlipBCStrategy()));
mu::Parser fctVx;
//fctVx.SetExpr("omega*(r-x2)");
@@ -180,36 +181,36 @@ void bflow(string configname)
//mu::Parser fctVx;
//fctVx.SetExpr("0.0");
- SPtr<BCAdapter> velocityBCAdapter(new VelocityBCAdapter(true, true, true, fctVx, fctVy, fctVz, 0, BCFunction::INFCONST));
- velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- //velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SimpleVelocityBCAlgorithm()));
- //velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
- //velocityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new RheologyBinghamModelVelocityBCAlgorithm()));
+ SPtr<BC> velocityBC(new VelocityBC(true, true, true, fctVx, fctVy, fctVz, 0, BCFunction::INFCONST));
+ //velocityBC->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ //velocityBC->setBCStrategy(SPtr<BCStrategy>(new SimpleVelocityBCStrategy()));
+ //velocityBC->setBCStrategy(SPtr<BCStrategy>(new VelocityWithDensityBCStrategy()));
+ velocityBC->setBCStrategy(SPtr<BCStrategy>(new RheologyBinghamModelVelocityBCStrategy()));
- //SPtr<BCAdapter> densityBCAdapter(new DensityBCAdapter());
- //densityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
- ////densityBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonReflectingOutflowBCAlgorithm()));
+ //SPtr<BC> densityBC(new DensityBC());
+ //densityBC->setBCStrategy(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
+ ////densityBC->setBCStrategy(SPtr<BCStrategy>(new NonReflectingOutflowBCStrategy()));
//BS visitor
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
- //bcVisitor.addBC(slipBCAdapter);
- bcVisitor.addBC(velocityBCAdapter);
- //bcVisitor.addBC(densityBCAdapter);
+ bcVisitor.addBC(noSlipBC);
+ //bcVisitor.addBC(slipBC);
+ bcVisitor.addBC(velocityBC);
+ //bcVisitor.addBC(densityBC);
- SPtr<BCProcessor> bcProc;
- bcProc = SPtr<BCProcessor>(new BCProcessor());
+ SPtr<BCSet> bcProc;
+ bcProc = SPtr<BCSet>(new BCSet());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new BGKLBMKernel());
- SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
+ //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new IncompressibleCumulantLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CumulantLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CompressibleCumulant4thOrderViscosityLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new CumulantK17LBMKernel());
- //SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyBinghamModelLBMKernel());
+ SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new RheologyBinghamModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new HerschelBulkleyModelLBMKernel());
//SPtr<LBMKernel> kernel = SPtr<LBMKernel>(new BinghamModelLBMKernel());
- kernel->setBCProcessor(bcProc);
+ kernel->setBCSet(bcProc);
//kernel->setForcingX1(forcing);
//kernel->setWithForcing(true);
@@ -230,10 +231,10 @@ void bflow(string configname)
//////////////////////////////////////////////////////////////////////////
//restart
SPtr<UbScheduler> mSch(new UbScheduler(cpStep, cpStart));
- SPtr<MPIIOMigrationCoProcessor> restartCoProcessor(new MPIIOMigrationCoProcessor(grid, mSch, metisVisitor, outputPath, comm));
- restartCoProcessor->setLBMKernel(kernel);
- restartCoProcessor->setBCProcessor(bcProc);
- //restartCoProcessor->setNu(k);
+ SPtr<MPIIOMigrationSimulationObserver> restartSimulationObserver(new MPIIOMigrationSimulationObserver(grid, mSch, metisVisitor, outputPath, comm));
+ restartSimulationObserver->setLBMKernel(kernel);
+ restartSimulationObserver->setBCSet(bcProc);
+ //restartSimulationObserver->setNu(k);
//////////////////////////////////////////////////////////////////////////
////stator
@@ -243,10 +244,10 @@ void bflow(string configname)
//around x
//SPtr<GbObject3D> stator(new GbCylinder3D(g_minX1 - 3.0 * deltax, 0.5 * g_maxX2, 0.5 * g_maxX3, g_maxX1 + 3.0 * deltax, 0.5 * g_maxX2, 0.5 * g_maxX3, 0.5 * g_maxX3));
- GbSystem3D::writeGeoObject(rotor.get(), outputPath + "/geo/stator", WbWriterVtkXmlBinary::getInstance());
+ GbSystem3D::writeGeoObject(rotor.get(), outputPath + "/geo/rotor", WbWriterVtkXmlBinary::getInstance());
SPtr<D3Q27Interactor> rotorInt =
- SPtr<D3Q27Interactor>(new D3Q27Interactor(rotor, grid, velocityBCAdapter, Interactor3D::INVERSESOLID));
+ SPtr<D3Q27Interactor>(new D3Q27Interactor(rotor, grid, velocityBC, Interactor3D::INVERSESOLID));
////rotor (cylinder)
SPtr<GbObject3D> stator(new GbCylinder3D(0.5 * g_maxX1, 0.5 * g_maxX2, g_minX3- 2.0 * deltax, 0.5 * g_maxX1, 0.5 * g_maxX2, g_maxX3+ 2.0 * deltax, 0.25 * g_maxX1));
@@ -254,9 +255,9 @@ void bflow(string configname)
//around x
//SPtr<GbObject3D> rotor(new GbCylinder3D(g_minX1 - 3.0 * deltax, 0.5 * g_maxX2, 0.5 * g_maxX3, g_maxX1 + 3.0 * deltax, 0.5 * g_maxX2, 0.5 * g_maxX3, 0.25 * g_maxX3));
- GbSystem3D::writeGeoObject(stator.get(), outputPath + "/geo/rotor", WbWriterVtkXmlBinary::getInstance());
+ GbSystem3D::writeGeoObject(stator.get(), outputPath + "/geo/stator", WbWriterVtkXmlBinary::getInstance());
- SPtr<D3Q27Interactor> statorInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(stator, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> statorInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(stator, grid, noSlipBC, Interactor3D::SOLID));
if (myid == 0)
{
@@ -310,8 +311,8 @@ void bflow(string configname)
//if (myid == 0) GbSystem3D::writeGeoObject(wallZmax.get(), outputPath + "/geo/wallZmax", WbWriterVtkXmlASCII::getInstance());
////wall interactors
- //SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, noSlipBCAdapter, Interactor3D::SOLID));
- //SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ //SPtr<D3Q27Interactor> wallZminInt(new D3Q27Interactor(wallZmin, grid, noSlipBC, Interactor3D::SOLID));
+ //SPtr<D3Q27Interactor> wallZmaxInt(new D3Q27Interactor(wallZmax, grid, noSlipBC, Interactor3D::SOLID));
////////////////////////////////////////////
//METIS
@@ -328,8 +329,8 @@ void bflow(string configname)
if (myid == 0) UBLOG(logINFO, "deleteSolidBlocks - end");
//////////////////////////////////////
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
- ppblocks->process(0);
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppblocks->update(0);
unsigned long nob = grid->getNumberOfBlocks();
int gl = 3;
@@ -377,7 +378,7 @@ void bflow(string configname)
}
else
{
- restartCoProcessor->restart((int)restartStep);
+ restartSimulationObserver->restart((int)restartStep);
grid->setTimeStep(restartStep);
SetBcBlocksBlockVisitor v1(rotorInt);
grid->accept(v1);
@@ -401,37 +402,37 @@ void bflow(string configname)
grid->accept(bcVisitor);
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- WriteBoundaryConditionsCoProcessor ppgeo = WriteBoundaryConditionsCoProcessor(grid, geoSch, outputPath, WbWriterVtkXmlASCII::getInstance(), comm);
- ppgeo.process(0);
+ WriteBoundaryConditionsSimulationObserver ppgeo = WriteBoundaryConditionsSimulationObserver(grid, geoSch, outputPath, WbWriterVtkXmlASCII::getInstance(), comm);
+ ppgeo.update(0);
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<CoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<SimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
//write data for visualization of macroscopic quantities
SPtr<UbScheduler> visSch(new UbScheduler(outTime));
//SPtr<UbScheduler> visSch(new UbScheduler(10,1));
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
- //writeMQCoProcessor->process(0);
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ //writeMQSimulationObserver->update(0);
SPtr<UbScheduler> forceSch(new UbScheduler(100));
- SPtr<CalculateTorqueCoProcessor> fp = make_shared<CalculateTorqueCoProcessor>(grid, forceSch, outputPath + "/torque/TorqueRotor.txt", comm);
+ SPtr<CalculateTorqueSimulationObserver> fp = make_shared<CalculateTorqueSimulationObserver>(grid, forceSch, outputPath + "/torque/TorqueRotor.txt", comm);
fp->addInteractor(rotorInt);
- SPtr<CalculateTorqueCoProcessor> fp2 = make_shared<CalculateTorqueCoProcessor>(grid, forceSch, outputPath + "/torque/TorqueStator.txt", comm);
+ SPtr<CalculateTorqueSimulationObserver> fp2 = make_shared<CalculateTorqueSimulationObserver>(grid, forceSch, outputPath + "/torque/TorqueStator.txt", comm);
fp2->addInteractor(statorInt);
- SPtr<WriteThixotropyQuantitiesCoProcessor> writeThixotropicMQCoProcessor(new WriteThixotropyQuantitiesCoProcessor(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
+ SPtr<WriteThixotropyQuantitiesSimulationObserver> writeThixotropicMQSimulationObserver(new WriteThixotropyQuantitiesSimulationObserver(grid, visSch, outputPath, WbWriterVtkXmlBinary::getInstance(), SPtr<LBMUnitConverter>(new LBMUnitConverter()), comm));
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endTime));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(fp);
- calculator->addCoProcessor(fp2);
- calculator->addCoProcessor(writeMQCoProcessor);
- //calculator->addCoProcessor(writeThixotropicMQCoProcessor);
- //calculator->addCoProcessor(restartCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endTime));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(fp2);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
+ simulation->addSimulationObserver(writeThixotropicMQSimulationObserver);
+ //simulation->addSimulationObserver(restartSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
catch (std::exception& e)
diff --git a/apps/cpu/sphere/sphere.cpp b/apps/cpu/sphere/sphere.cpp
index 70dcc0ddd189f3906575e92877800ec709199a78..8a5ef89b8bf09e765236153f37cb259e075bf15e 100644
--- a/apps/cpu/sphere/sphere.cpp
+++ b/apps/cpu/sphere/sphere.cpp
@@ -43,10 +43,10 @@ void run(string configname)
real dp_LB = 1e-6;
// double rhoLBinflow = dp_LB*3.0;
- SPtr<BCAdapter> noSlipBCAdapter(new NoSlipBCAdapter());
- noSlipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NoSlipBCAlgorithm()));
- SPtr<BCAdapter> slipBCAdapter(new SlipBCAdapter());
- slipBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SimpleSlipBCAlgorithm()));
+ SPtr<BC> noSlipBC(new NoSlipBC());
+ noSlipBC->setBCStrategy(SPtr<BCStrategy>(new NoSlipBCStrategy()));
+ SPtr<BC> slipBC(new SlipBC());
+ slipBC->setBCStrategy(SPtr<BCStrategy>(new SimpleSlipBCStrategy()));
real H = 50;
mu::Parser fct;
@@ -56,18 +56,18 @@ void run(string configname)
//fct.SetExpr("16*U*x2*x3*(H-x2)*(H-x3)/H^4");
//fct.DefineConst("U", uLB);
//fct.DefineConst("H", H);
- SPtr<BCAdapter> velBCAdapter(new VelocityBCAdapter(true, false, false, fct, 0, BCFunction::INFCONST));
- //velBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityBCAlgorithm()));
- velBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new SimpleVelocityBCAlgorithm()));
+ SPtr<BC> velBC(new VelocityBC(true, false, false, fct, 0, BCFunction::INFCONST));
+ //velBC->setBCStrategy(SPtr<BCStrategy>(new VelocityBCStrategy()));
+ velBC->setBCStrategy(SPtr<BCStrategy>(new SimpleVelocityBCStrategy()));
- SPtr<BCAdapter> denBCAdapter(new DensityBCAdapter(rhoLB));
- denBCAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new NonEqDensityBCAlgorithm()));
+ SPtr<BC> denBC(new DensityBC(rhoLB));
+ denBC->setBCStrategy(SPtr<BCStrategy>(new NonEqDensityBCStrategy()));
BoundaryConditionsBlockVisitor bcVisitor;
- bcVisitor.addBC(noSlipBCAdapter);
- bcVisitor.addBC(slipBCAdapter);
- bcVisitor.addBC(velBCAdapter);
- bcVisitor.addBC(denBCAdapter);
+ bcVisitor.addBC(noSlipBC);
+ bcVisitor.addBC(slipBC);
+ bcVisitor.addBC(velBC);
+ bcVisitor.addBC(denBC);
real dx = 1;
@@ -94,7 +94,7 @@ void run(string configname)
//SPtr<GbObject3D> sphere(new GbSphere3D(L1 * 0.5, L2 * 0.5, L3 * 0.5, radius));
SPtr<GbObject3D> sphere(new GbSphere3D(75, 25, 25, radius));
GbSystem3D::writeGeoObject(sphere.get(), outputPath + "/geo/sphere", WbWriterVtkXmlBinary::getInstance());
- SPtr<D3Q27Interactor> sphereInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(sphere, grid, noSlipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> sphereInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(sphere, grid, noSlipBC, Interactor3D::SOLID));
if (true)
{
@@ -164,23 +164,23 @@ void run(string configname)
GbCuboid3DPtr geoOutflow(new GbCuboid3D(d_maxX1, d_minX2 - 4.0*blockLength, d_minX3 - 4.0*blockLength, d_maxX1 + 4.0*blockLength, d_maxX2 + 4.0*blockLength, d_maxX3 + 4.0*blockLength));
if (myid == 0) GbSystem3D::writeGeoObject(geoOutflow.get(), outputPath + "/geo/geoOutflow", WbWriterVtkXmlASCII::getInstance());
- SPtr<CoProcessor> ppblocks(new WriteBlocksCoProcessor(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
+ SPtr<SimulationObserver> ppblocks(new WriteBlocksSimulationObserver(grid, SPtr<UbScheduler>(new UbScheduler(1)), outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
//walls
- SPtr<D3Q27Interactor> addWallYminInt(new D3Q27Interactor(addWallYmin, grid, slipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> addWallZminInt(new D3Q27Interactor(addWallZmin, grid, slipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> addWallYmaxInt(new D3Q27Interactor(addWallYmax, grid, slipBCAdapter, Interactor3D::SOLID));
- SPtr<D3Q27Interactor> addWallZmaxInt(new D3Q27Interactor(addWallZmax, grid, slipBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> addWallYminInt(new D3Q27Interactor(addWallYmin, grid, slipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> addWallZminInt(new D3Q27Interactor(addWallZmin, grid, slipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> addWallYmaxInt(new D3Q27Interactor(addWallYmax, grid, slipBC, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> addWallZmaxInt(new D3Q27Interactor(addWallZmax, grid, slipBC, Interactor3D::SOLID));
//inflow
- SPtr<D3Q27Interactor> inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, velBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, velBC, Interactor3D::SOLID));
- //D3Q27BoundaryConditionAdapterPtr denBCAdapterInflow(new D3Q27DensityBCAdapter(rhoLBinflow));
- //denBCAdapterInflow->setSecondaryBcOption(0);
- //SPtr<D3Q27Interactor> inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, denBCAdapterInflow, Interactor3D::SOLID));
+ //D3Q27BoundaryConditionAdapterPtr denBCInflow(new D3Q27DensityBC(rhoLBinflow));
+ //denBCInflow->setSecondaryBcOption(0);
+ //SPtr<D3Q27Interactor> inflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoInflow, grid, denBCInflow, Interactor3D::SOLID));
//outflow
- SPtr<D3Q27Interactor> outflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow, grid, denBCAdapter, Interactor3D::SOLID));
+ SPtr<D3Q27Interactor> outflowInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(geoOutflow, grid, denBC, Interactor3D::SOLID));
SPtr<Grid3DVisitor> metisVisitor(new MetisPartitioningGridVisitor(comm, MetisPartitioningGridVisitor::LevelBased, DIR_00M));
InteractorsHelper intHelper(grid, metisVisitor);
@@ -197,7 +197,7 @@ void run(string configname)
//PQueuePartitioningGridVisitor pqPartVisitor(numOfThreads);
//grid->accept(pqPartVisitor);
- ppblocks->process(0);
+ ppblocks->update(0);
ppblocks.reset();
unsigned long nob = grid->getNumberOfBlocks();
@@ -219,10 +219,10 @@ void run(string configname)
SPtr<LBMKernel> kernel(new IncompressibleCumulantLBMKernel());
//SPtr<LBMKernel> kernel(new CompressibleCumulantLBMKernel());
- SPtr<BCProcessor> bcProcessor(new BCProcessor());
+ SPtr<BCSet> bcSet(new BCSet());
- kernel->setBCProcessor(bcProcessor);
+ kernel->setBCSet(bcSet);
SetKernelBlockVisitor kernelVisitor(kernel, nuLB, availMem, needMem);
grid->accept(kernelVisitor);
@@ -251,9 +251,9 @@ void run(string configname)
//Postrozess
SPtr<UbScheduler> geoSch(new UbScheduler(1));
- SPtr<CoProcessor> ppgeo(
- new WriteBoundaryConditionsCoProcessor(grid, geoSch, outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
- ppgeo->process(0);
+ SPtr<SimulationObserver> ppgeo(
+ new WriteBoundaryConditionsSimulationObserver(grid, geoSch, outputPath, WbWriterVtkXmlBinary::getInstance(), comm));
+ ppgeo->update(0);
ppgeo.reset();
if (myid == 0) UBLOG(logINFO, "Preprozess - end");
@@ -282,25 +282,25 @@ void run(string configname)
SPtr<UbScheduler> stepSch(new UbScheduler(outstep));
//stepSch->addSchedule(10000, 0, 1000000);
- SPtr<WriteMacroscopicQuantitiesCoProcessor> writeMQCoProcessor(new WriteMacroscopicQuantitiesCoProcessor(grid, stepSch, outputPath, WbWriterVtkXmlBinary::getInstance(), conv,comm));
+ SPtr<WriteMacroscopicQuantitiesSimulationObserver> writeMQSimulationObserver(new WriteMacroscopicQuantitiesSimulationObserver(grid, stepSch, outputPath, WbWriterVtkXmlBinary::getInstance(), conv,comm));
SPtr<UbScheduler> nupsSch(new UbScheduler(10, 30, 100));
- SPtr<CoProcessor> npr(new NUPSCounterCoProcessor(grid, nupsSch, numOfThreads, comm));
+ SPtr<SimulationObserver> npr(new NUPSCounterSimulationObserver(grid, nupsSch, numOfThreads, comm));
real area = UbMath::PI * radius * radius;
SPtr<UbScheduler> forceSch(new UbScheduler(100));
- SPtr<CalculateForcesCoProcessor> fp = make_shared<CalculateForcesCoProcessor>(grid, forceSch, outputPath + "/forces/forces.txt", comm, uLB, area);
+ SPtr<CalculateForcesSimulationObserver> fp = make_shared<CalculateForcesSimulationObserver>(grid, forceSch, outputPath + "/forces/forces.txt", comm, uLB, area);
fp->addInteractor(sphereInt);
SPtr<UbScheduler> stepGhostLayer(new UbScheduler(1));
- SPtr<Calculator> calculator(new BasicCalculator(grid, stepGhostLayer, endstep));
- calculator->addCoProcessor(npr);
- calculator->addCoProcessor(fp);
- calculator->addCoProcessor(writeMQCoProcessor);
+ SPtr<Simulation> simulation(new Simulation(grid, stepGhostLayer, endstep));
+ simulation->addSimulationObserver(npr);
+ simulation->addSimulationObserver(fp);
+ simulation->addSimulationObserver(writeMQSimulationObserver);
if (myid == 0) UBLOG(logINFO, "Simulation-start");
- calculator->calculate();
+ simulation->run();
if (myid == 0) UBLOG(logINFO, "Simulation-end");
}
diff --git a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
index 046e20bb84d4d39b839847d2f90d7e935722a619..9c7394951e795055d22be9b155166464c998c098 100644
--- a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
+++ b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
@@ -42,12 +42,12 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "PointerDefinitions.h"
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
+
-#include "Core/VectorTypes.h"
#include <basics/config/ConfigurationFile.h>
@@ -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,13 +107,7 @@ std::string simulationName("ActuatorLine");
void multipleLevel(const std::string& configPath)
{
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- 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);
@@ -159,8 +153,8 @@ void multipleLevel(const std::string& configPath)
L_x, L_y, L_z, dx);
gridBuilder->setNumberOfLayers(4,0);
- gridBuilder->addGrid( new Cuboid( turbPos[0]-1.5*reference_diameter, turbPos[1]-1.5*reference_diameter, turbPos[2]-1.5*reference_diameter,
- turbPos[0]+10.0*reference_diameter, turbPos[1]+1.5*reference_diameter, turbPos[2]+1.5*reference_diameter) , 1 );
+ gridBuilder->addGrid( std::make_shared<Cuboid>( turbPos[0]-1.5*reference_diameter, turbPos[1]-1.5*reference_diameter, turbPos[2]-1.5*reference_diameter,
+ turbPos[0]+10.0*reference_diameter, turbPos[1]+1.5*reference_diameter, turbPos[2]+1.5*reference_diameter) , 1 );
para->setMaxLevel(2);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
diff --git a/apps/gpu/LBM/Basel/main.cpp b/apps/gpu/LBM/Basel/main.cpp
index ad6458f256e71c21bf18010bc5d5c2c46242c0b2..16161dc6a83846f2730c5920dfd64363b6e77b30 100644
--- a/apps/gpu/LBM/Basel/main.cpp
+++ b/apps/gpu/LBM/Basel/main.cpp
@@ -14,12 +14,12 @@
#define _USE_MATH_DEFINES
#include <math.h>
-#include "Core/Input/Input.h"
-#include "Core/StringUtilities/StringUtil.h"
-#include "Core/Input/ConfigFileReader/ConfigFileReader.h"
+#include "Input/Input.h"
+#include "StringUtilities/StringUtil.h"
+#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"
@@ -60,17 +60,6 @@
void multipleLevel(const std::string& configPath)
{
- //std::ofstream logFile( "F:/Work/Computations/gridGenerator/grid/gridGeneratorLog.txt" );
- //std::ofstream logFile("F:/Basel2019/log/gridGeneratorLog.txt");
- //logging::Logger::addStream(&logFile);
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- //UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
-
auto gridFactory = GridFactory::make();
gridFactory->setGridStrategy(Device::CPU);
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::RAYCASTING);
@@ -112,10 +101,10 @@ void multipleLevel(const std::string& configPath)
#ifdef _WIN32
//Baumbart
- TriangularMesh* BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl");
+ auto BaselSTL = std::make_shared<TriangularMesh>("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl");
#else
//Phoenix
- TriangularMesh* BaselSTL = TriangularMesh::make(gridpath + "/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl");
+ auto BaselSTL = std::make_shared<TriangularMesh>(gridpath + "/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl");
#endif
@@ -229,7 +218,6 @@ int main(int argc, char* argv[])
}
catch (const std::exception& e)
{
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
@@ -249,22 +237,17 @@ int main(int argc, char* argv[])
}
catch (const std::exception& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (const std::bad_alloc e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << "Bad Alloc:" << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
{
- *logging::out << logging::Logger::LOGGER_ERROR << "Unknown exception!\n";
- //std::cout << "unknown exeption" << std::endl;
+ std::cout << "unknown exeption" << std::endl;
}
std::cout << "\nConfiguration file must be set!: lbmgm <config file>" << std::endl << std::flush;
diff --git a/apps/gpu/LBM/BaselMultiGPU/main.cpp b/apps/gpu/LBM/BaselMultiGPU/main.cpp
index ed4549c64465816ecdca31f0ab94affd43ae07c7..346ab7ca36ccd147d1f8427974ce2510b5d637fb 100644
--- a/apps/gpu/LBM/BaselMultiGPU/main.cpp
+++ b/apps/gpu/LBM/BaselMultiGPU/main.cpp
@@ -14,12 +14,12 @@
#define _USE_MATH_DEFINES
#include <math.h>
-#include "Core/Input/Input.h"
-#include "Core/StringUtilities/StringUtil.h"
-#include "Core/Input/ConfigFileReader/ConfigFileReader.h"
+#include "Input/Input.h"
+#include "StringUtilities/StringUtil.h"
+#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"
@@ -57,14 +57,6 @@
void multipleLevel(const std::string& configPath)
{
- //std::ofstream logFile( "F:/Work/Computations/gridGenerator/grid/gridGeneratorLog.txt" );
- //std::ofstream logFile( "grid/gridGeneratorLog.txt" );
- //logging::Logger::addStream(&logFile);
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
//UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
@@ -95,28 +87,26 @@ void multipleLevel(const std::string& configPath)
logFile2.open(gridpath + std::to_string(generatePart) + "/gridGeneratorLog.txt");//Phoenix
//logFile2.open(std::string("M:/Basel2019/grids4/") + std::to_string(generatePart) + "/gridGeneratorLog.txt");//Baumbart
- logging::Logger::addStream(&logFile2);
-
bool useGridGenerator = false;
if(useGridGenerator){
real dx = 1.0;
real vx = 0.05;
- TriangularMesh* BaselSTL;
+ SPtr<TriangularMesh> BaselSTL;
if (generatePart == 0)
- BaselSTL = TriangularMesh::make("/work/marschoe/Basel4GPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl"); //Phoenix
- //BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl"); //Baumbart
+ BaselSTL = std::make_shared<TriangularMesh>("/work/marschoe/Basel4GPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl"); //Phoenix
+ //BaselSTL = std::make_shared<TriangularMesh>("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl"); //Baumbart
if (generatePart == 1)
- BaselSTL = TriangularMesh::make("/work/marschoe/Basel4GPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_X.stl"); //Phoenix
- //BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_X.stl"); //Baumbart
+ BaselSTL = std::make_shared<TriangularMesh>("/work/marschoe/Basel4GPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_X.stl"); //Phoenix
+ //BaselSTL = std::make_shared<TriangularMesh>("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_X.stl"); //Baumbart
if (generatePart == 2)
- BaselSTL = TriangularMesh::make("/work/marschoe/Basel4GPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_X_Y.stl"); //Phoenix
- //BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_X_Y.stl"); //Baumbart
+ BaselSTL = std::make_shared<TriangularMesh>("/work/marschoe/Basel4GPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_X_Y.stl"); //Phoenix
+ //BaselSTL = std::make_shared<TriangularMesh>("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_X_Y.stl"); //Baumbart
if (generatePart == 3)
- BaselSTL = TriangularMesh::make("/work/marschoe/Basel4GPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_Y.stl"); //Phoenix
- //BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_Y.stl"); //Baumbart
+ BaselSTL = std::make_shared<TriangularMesh>("/work/marschoe/Basel4GPU/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_Y.stl"); //Phoenix
+ //BaselSTL = std::make_shared<TriangularMesh>("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND_MIRROR_Y.stl"); //Baumbart
real lengthInXDirection = 512.0;
real lengthInYDirection = 512.0;
@@ -249,7 +239,6 @@ int main( int argc, char* argv[])
}
catch (const std::exception& e)
{
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
@@ -268,22 +257,17 @@ int main( int argc, char* argv[])
}
catch (const std::exception& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (const std::bad_alloc e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << "Bad Alloc:" << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
{
- *logging::out << logging::Logger::LOGGER_ERROR << "Unknown exception!\n";
- //std::cout << "unknown exeption" << std::endl;
+ std::cout << "unknown exeption" << std::endl;
}
std::cout << "\nConfiguration file must be set!: lbmgm <config file>" << std::endl << std::flush;
diff --git a/apps/gpu/LBM/BaselNU/main.cpp b/apps/gpu/LBM/BaselNU/main.cpp
index 3c9baa7bace463b07cc5640475bf27248adbca08..97c4c48afb5caffb89bad89e3f3fe99670c889bc 100644
--- a/apps/gpu/LBM/BaselNU/main.cpp
+++ b/apps/gpu/LBM/BaselNU/main.cpp
@@ -14,12 +14,12 @@
#define _USE_MATH_DEFINES
#include <math.h>
-#include "Core/Input/Input.h"
-#include "Core/StringUtilities/StringUtil.h"
-#include "Core/Input/ConfigFileReader/ConfigFileReader.h"
+#include "Input/Input.h"
+#include "StringUtilities/StringUtil.h"
+#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"
@@ -57,16 +57,6 @@
void multipleLevel(const std::string& configPath)
{
- std::ofstream logFile("F:/Basel2019NU/grid/gridGeneratorLog.txt");
- logging::Logger::addStream(&logFile);
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- //UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
-
auto gridFactory = GridFactory::make();
gridFactory->setGridStrategy(Device::CPU);
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::RAYCASTING);
@@ -95,7 +85,7 @@ void multipleLevel(const std::string& configPath)
real dx = 4.0;
real vx = 0.05;
- TriangularMesh* BaselSTL = TriangularMesh::make("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl");
+ auto BaselSTL = std::make_shared<TriangularMesh>("M:/Basel2019/stl/BaselUrbanProfile_066_deg_bridge_3_All_CLOSED_WIDE_GROUND.stl");
gridBuilder->addCoarseGrid(-256.0, -256.0, -8.0,
256.0, 256.0, 160.0, dx);
@@ -104,14 +94,14 @@ void multipleLevel(const std::string& configPath)
//////////////////////////////////////////////////////////////////////////
- Cuboid* refBoxMX = new Cuboid( -300, -300, - 20,
- -254, 300, 200 );
- Cuboid* refBoxPX = new Cuboid( 254, -300, - 20,
- 300, 300, 200 );
- Cuboid* refBoxMY = new Cuboid( -300, -300, - 20,
- 300, -254, 200 );
- Cuboid* refBoxPY = new Cuboid( -300, 254, - 20,
- 300, 300, 200 );
+ Cuboid* refBoxMX = std::make_shared<Cuboid>( -300, -300, - 20,
+ -254, 300, 200 );
+ Cuboid* refBoxPX = std::make_shared<Cuboid>( 254, -300, - 20,
+ 300, 300, 200 );
+ Cuboid* refBoxMY = std::make_shared<Cuboid>( -300, -300, - 20,
+ 300, -254, 200 );
+ Cuboid* refBoxPY = std::make_shared<Cuboid>( -300, 254, - 20,
+ 300, 300, 200 );
Conglomerate* refRegion = new Conglomerate();
@@ -222,7 +212,6 @@ int main(int argc, char* argv[])
}
catch (const std::exception& e)
{
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
@@ -242,22 +231,17 @@ int main(int argc, char* argv[])
}
catch (const std::exception& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (const std::bad_alloc e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << "Bad Alloc:" << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
{
- *logging::out << logging::Logger::LOGGER_ERROR << "Unknown exception!\n";
- //std::cout << "unknown exeption" << std::endl;
+ std::cout << "unknown exeption" << std::endl;
}
std::cout << "\nConfiguration file must be set!: lbmgm <config file>" << std::endl << std::flush;
diff --git a/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp b/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
index a49b6bc76dd1c0a9482f40e6cdb893a10dcbe1cc..1c5f8ac0318f00a6bb819b016ff11925b2ff2da5 100644
--- a/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
+++ b/apps/gpu/LBM/BoundaryLayer/BoundaryLayer.cpp
@@ -43,12 +43,10 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "PointerDefinitions.h"
-#include "Core/StringUtilities/StringUtil.h"
-
-#include "Core/VectorTypes.h"
+#include "StringUtilities/StringUtil.h"
#include <basics/config/ConfigurationFile.h>
#include "basics/constants/NumericConstants.h"
@@ -75,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"
@@ -105,18 +103,12 @@ using namespace vf::basics::constant;
void multipleLevel(const std::string& configPath)
{
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
auto gridFactory = GridFactory::make();
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);
@@ -127,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);
@@ -281,7 +273,7 @@ void multipleLevel(const std::string& configPath)
{
gridBuilder->setNumberOfLayers(4,0);
real xMaxRefinement = readPrecursor? xGridMax-H: xGridMax; //Stop refinement some distance before outlet if domain ist not periodic
- gridBuilder->addGrid( new Cuboid( xGridMin, 0.f, 0.f, xMaxRefinement, L_y, 0.5*L_z) , 1 );
+ gridBuilder->addGrid( std::make_shared<Cuboid>( xGridMin, 0.f, 0.f, xMaxRefinement, L_y, 0.5*L_z) , 1 );
para->setMaxLevel(2);
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
}
diff --git a/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp b/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
index 80e1040525ad65ea6ac4a17f356ccc9bf1e07e9f..1482adf275da6dabae7bdde7647ac374a0d66bb1 100644
--- a/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
+++ b/apps/gpu/LBM/ChannelFlow/ChannelFlow.cpp
@@ -45,12 +45,11 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
-#include "Core/Logger/Logger.h"
-#include "Core/VectorTypes.h"
+#include "DataTypes.h"
+
#include "PointerDefinitions.h"
#include "config/ConfigurationFile.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
@@ -66,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"
@@ -96,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,16 +108,8 @@ int main(int argc, char *argv[])
// setup logger
//////////////////////////////////////////////////////////////////////////
- std::ofstream logFile("output/log_process" + std::to_string(vf::gpu::Communicator::getInstance().getPID()) +
- ".txt");
- logging::Logger::addStream(&logFile);
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
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();
//////////////////////////////////////////////////////////////////////////
@@ -168,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 43bdb0c1a88c3ce40084f3285cdf4f8ca80ba097..245d1c052c909cef7c1ab948ca55d104419fa8cd 100644
--- a/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
+++ b/apps/gpu/LBM/DrivenCavity/DrivenCavity.cpp
@@ -41,9 +41,7 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
-#include "Core/Logger/Logger.h"
-#include "Core/VectorTypes.h"
+#include "DataTypes.h"
#include "PointerDefinitions.h"
#include <logger/Logger.h>
@@ -60,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"
@@ -91,15 +89,6 @@ int main()
const uint timeStepOut = 1000;
const uint timeStepEnd = 10000;
- //////////////////////////////////////////////////////////////////////////
- // setup logger
- //////////////////////////////////////////////////////////////////////////
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
//////////////////////////////////////////////////////////////////////////
// setup gridGenerator
//////////////////////////////////////////////////////////////////////////
@@ -126,7 +115,7 @@ int main()
gridBuilder->addCoarseGrid(-0.5 * L, -0.5 * L, -0.5 * L, 0.5 * L, 0.5 * L, 0.5 * L, dx);
- gridBuilder->addGrid(new Cuboid(-0.25, -0.25, -0.25, 0.25, 0.25, 0.25), 1); // add fine grid
+ gridBuilder->addGrid(std::make_shared<Cuboid>(-0.25, -0.25, -0.25, 0.25, 0.25, 0.25), 1); // add fine grid
GridScalingFactory scalingFactory = GridScalingFactory();
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
@@ -175,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 92077acd3b5164e26f338a1848d4b1aa9874ea1a..d6b6703659aaca6d254a1fc2f7692be4e9f22593 100755
--- a/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
+++ b/apps/gpu/LBM/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp
@@ -12,14 +12,12 @@
//////////////////////////////////////////////////////////////////////////
-#include "basics/Core/DataTypes.h"
-#include "basics/Core/VectorTypes.h"
+#include "basics/DataTypes.h"
#include "basics/PointerDefinitions.h"
-#include "basics/Core/Logger/Logger.h"
-#include "basics/Core/StringUtilities/StringUtil.h"
+#include "basics/StringUtilities/StringUtil.h"
#include "basics/config/ConfigurationFile.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
@@ -38,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,22 +60,14 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void multipleLevel(std::filesystem::path& configPath)
+void runVirtualFluids(const vf::basics::ConfigurationFile& config)
{
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- 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);
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
- vf::basics::ConfigurationFile config;
- std::cout << configPath << std::endl;
- config.load(configPath.string());
SPtr<Parameter> para = std::make_shared<Parameter>(communicator.getNumberOfProcess(), communicator.getPID(), &config);
BoundaryConditionFactory bcFactory = BoundaryConditionFactory();
GridScalingFactory scalingFactory = GridScalingFactory();
@@ -149,13 +139,13 @@ void multipleLevel(std::filesystem::path& configPath)
const real zGridMin = -0.5 * L;
const real zGridMax = 0.5 * L;
- Cuboid *level1 = nullptr;
+ SPtr<Cuboid> level1 = nullptr;
if (useLevels)
- level1 = new Cuboid(-0.25 * L, -0.25 * L, -0.25 * L, 0.25 * L, 0.25 * L, 0.25 * L);
+ level1 = std::make_shared<Cuboid>(-0.25 * L, -0.25 * L, -0.25 * L, 0.25 * L, 0.25 * L, 0.25 * L);
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);
@@ -190,12 +180,12 @@ void multipleLevel(std::filesystem::path& configPath)
gridBuilder->buildGrids(true); // buildGrids() has to be called before setting the BCs!!!!
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 1);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
@@ -249,27 +239,27 @@ void multipleLevel(std::filesystem::path& configPath)
gridBuilder->buildGrids(true); // buildGrids() has to be called before setting the BCs!!!!
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 2);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 3);
}
if (generatePart == 2) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
if (generatePart == 3) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 1);
}
@@ -362,67 +352,67 @@ void multipleLevel(std::filesystem::path& configPath)
gridBuilder->setPeriodicBoundaryCondition(false, false, false);
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 4);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 5);
}
if (generatePart == 2) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 6);
}
if (generatePart == 3) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 7);
}
if (generatePart == 4) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 5);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 6);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
if (generatePart == 5) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 4);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 7);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 1);
}
if (generatePart == 6) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 7);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 4);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 2);
}
if (generatePart == 7) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 6);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 5);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 3);
}
@@ -526,20 +516,9 @@ int main(int argc, char *argv[])
if (argv != NULL) {
try {
- //////////////////////////////////////////////////////////////////////////
- // assuming that a config files is stored parallel to this file.
- std::filesystem::path configPath = __FILE__;
-
- // the config file's default name can be replaced by passing a command line argument
- std::string configName("configDrivenCavityMultiGPU.txt");
- if (argc == 2) {
- configName = argv[1];
- std::cout << "Using configFile command line argument: " << configName << std::endl;
- }
-
- configPath.replace_filename(configName);
-
- multipleLevel(configPath);
+ VF_LOG_TRACE("For the default config path to work, execute the app from the project root.");
+ vf::basics::ConfigurationFile config = vf::basics::loadConfig(argc, argv, "./apps/gpu/LBM/DrivenCavityMultiGPU/configDrivenCavityMultiGPU.txt");
+ runVirtualFluids(config);
//////////////////////////////////////////////////////////////////////////
} catch (const spdlog::spdlog_ex &ex) {
diff --git a/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp b/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
index 1f36783ee1735f17fd1964a16e6ccd11a0bac378..05c164ea82790c4a26c5c65538d944f46d1c969c 100644
--- a/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
+++ b/apps/gpu/LBM/DrivenCavityUniform/DrivenCavity.cpp
@@ -41,9 +41,9 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
-#include "Core/Logger/Logger.h"
-#include "Core/VectorTypes.h"
+#include "DataTypes.h"
+#include <logger/Logger.h>
+
#include "PointerDefinitions.h"
#include <logger/Logger.h>
@@ -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"
@@ -91,15 +91,6 @@ int main()
const uint timeStepOut = 1000;
const uint timeStepEnd = 10000;
- //////////////////////////////////////////////////////////////////////////
- // setup logger
- //////////////////////////////////////////////////////////////////////////
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
//////////////////////////////////////////////////////////////////////////
// setup gridGenerator
//////////////////////////////////////////////////////////////////////////
@@ -116,7 +107,7 @@ int main()
gridBuilder->addCoarseGrid(-0.5 * L, -0.5 * L, -0.5 * L, 0.5 * L, 0.5 * L, 0.5 * L, dx);
- // gridBuilder->addGrid(new Cuboid(-0.25, -0.25, -0.25, 0.25, 0.25, 0.25), 1); // add fine grid
+ // gridBuilder->addGrid(std::make_shared<Cuboid>(-0.25, -0.25, -0.25, 0.25, 0.25, 0.25), 1); // add fine grid
GridScalingFactory scalingFactory = GridScalingFactory();
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
@@ -176,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 ac96ea91f0492512f756db52c8eec369d9891d21..5a5830d442ff83e33208ddee226e9ea34c84a2ef 100644
--- a/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
+++ b/apps/gpu/LBM/MusselOyster/MusselOyster.cpp
@@ -13,14 +13,12 @@
//////////////////////////////////////////////////////////////////////////
-#include "basics/Core/DataTypes.h"
-#include "basics/Core/VectorTypes.h"
+#include "basics/DataTypes.h"
#include "basics/PointerDefinitions.h"
-#include "basics/Core/Logger/Logger.h"
-#include "basics/Core/StringUtilities/StringUtil.h"
+#include "basics/StringUtilities/StringUtil.h"
#include "basics/config/ConfigurationFile.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
@@ -39,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,21 +84,14 @@ const std::string simulationName("MusselOyster");
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void multipleLevel(std::filesystem::path &configPath)
+void runVirtualFluids(const vf::basics::ConfigurationFile& config)
{
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- 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);
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
- vf::basics::ConfigurationFile config;
- config.load(configPath.string());
SPtr<Parameter> para =
std::make_shared<Parameter>(communicator.getNumberOfProcess(), communicator.getPID(), &config);
BoundaryConditionFactory bcFactory = BoundaryConditionFactory();
@@ -194,13 +185,13 @@ void multipleLevel(std::filesystem::path &configPath)
// height MUSSEL = 35.0
// height Oyster = 72.0
- TriangularMesh *bivalveSTL = TriangularMesh::make(stlPath + bivalveType + ".stl");
- TriangularMesh *bivalveRef_1_STL = nullptr;
+ SPtr<TriangularMesh> bivalveSTL = std::make_shared<TriangularMesh>(stlPath + bivalveType + ".stl");
+ SPtr<TriangularMesh> bivalveRef_1_STL = nullptr;
if (useLevels)
- bivalveRef_1_STL = TriangularMesh::make(stlPath + bivalveType + "_Level1.stl");
+ 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);
@@ -235,12 +226,12 @@ void multipleLevel(std::filesystem::path &configPath)
gridBuilder->buildGrids(true); // buildGrids() has to be called before setting the BCs!!!!
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 1);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
@@ -300,27 +291,27 @@ void multipleLevel(std::filesystem::path &configPath)
gridBuilder->buildGrids(true); // buildGrids() has to be called before setting the BCs!!!!
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 2);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 3);
}
if (generatePart == 2) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
if (generatePart == 3) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 1);
}
@@ -419,67 +410,67 @@ void multipleLevel(std::filesystem::path &configPath)
gridBuilder->setPeriodicBoundaryCondition(false, false, false);
if (generatePart == 0) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 4);
}
if (generatePart == 1) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 5);
}
if (generatePart == 2) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 3);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 0);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 6);
}
if (generatePart == 3) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 2);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 1);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::PZ, 7);
}
if (generatePart == 4) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 5);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 6);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 0);
}
if (generatePart == 5) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 4);
- gridBuilder->findCommunicationIndices(CommunicationDirections::PX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PX);
gridBuilder->setCommunicationProcess(CommunicationDirections::PX, 7);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 1);
}
if (generatePart == 6) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::PY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::PY);
gridBuilder->setCommunicationProcess(CommunicationDirections::PY, 7);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 4);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 2);
}
if (generatePart == 7) {
- gridBuilder->findCommunicationIndices(CommunicationDirections::MY, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MY);
gridBuilder->setCommunicationProcess(CommunicationDirections::MY, 6);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MX, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MX);
gridBuilder->setCommunicationProcess(CommunicationDirections::MX, 5);
- gridBuilder->findCommunicationIndices(CommunicationDirections::MZ, LBM);
+ gridBuilder->findCommunicationIndices(CommunicationDirections::MZ);
gridBuilder->setCommunicationProcess(CommunicationDirections::MZ, 3);
}
@@ -592,20 +583,9 @@ int main(int argc, char *argv[])
if (argv != NULL) {
try {
- //////////////////////////////////////////////////////////////////////////
- // assuming that a config files is stored parallel to this file.
- std::filesystem::path configPath = __FILE__;
-
- // the config file's default name can be replaced by passing a command line argument
- std::string configName("configMusselOyster.txt");
- if (argc == 2) {
- configName = argv[1];
- std::cout << "Using configFile command line argument: " << configName << std::endl;
- }
-
- configPath.replace_filename(configName);
-
- multipleLevel(configPath);
+ VF_LOG_TRACE("For the default config path to work, execute the app from the project root.");
+ vf::basics::ConfigurationFile config = vf::basics::loadConfig(argc, argv, "./apps/gpu/LBM/MusselOyster/configMusselOyster.txt");
+ runVirtualFluids(config);
//////////////////////////////////////////////////////////////////////////
} catch (const spdlog::spdlog_ex &ex) {
diff --git a/apps/gpu/LBM/SphereGPU/Sphere.cpp b/apps/gpu/LBM/SphereGPU/Sphere.cpp
index 52c532a4ef183933b605022b75b6042a3c8d39b3..7794217f4e42f79070b1037c86b3e74b1f94d967 100644
--- a/apps/gpu/LBM/SphereGPU/Sphere.cpp
+++ b/apps/gpu/LBM/SphereGPU/Sphere.cpp
@@ -42,12 +42,10 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
-#include "Core/Logger/Logger.h"
-#include "Core/VectorTypes.h"
+#include "DataTypes.h"
+#include <logger/Logger.h>
#include "PointerDefinitions.h"
#include "config/ConfigurationFile.h"
-#include "logger/Logger.h"
//////////////////////////////////////////////////////////////////////////
@@ -64,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"
@@ -86,50 +84,26 @@ int main(int argc, char *argv[])
const real L = 1.0;
const real dSphere = 0.2;
- const real Re = 1000.0; // related to the sphere's diameter
+ const real Re = 300.0; // related to the sphere's diameter
const real velocity = 1.0;
const real dt = (real)0.5e-3;
- const uint nx = 64;
+ const uint nx = 50;
- const uint timeStepOut = 1000;
+ const uint timeStepOut = 10000;
const uint timeStepEnd = 10000;
- //////////////////////////////////////////////////////////////////////////
- // setup logger
- //////////////////////////////////////////////////////////////////////////
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
//////////////////////////////////////////////////////////////////////////
// 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) {
- //////////////////////////////////////////////////////////////////////////
- // read simulation parameters from config file
- //////////////////////////////////////////////////////////////////////////
-
- // assuming that a config files is stored parallel to this file.
- std::filesystem::path configPath = __FILE__;
-
- // the config file's default name can be replaced by passing a command line argument
- std::string configName("config.txt");
- if (argc == 2) {
- configName = argv[1];
- std::cout << "Using configFile command line argument: " << configName << std::endl;
- }
-
- configPath.replace_filename(configName);
- config.load(configPath.string());
-
+ VF_LOG_TRACE("For the default config path to work, execute the app from the project root.");
+ 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>();
@@ -149,10 +123,10 @@ int main(int argc, char *argv[])
real dx = L / real(nx);
gridBuilder->addCoarseGrid(-1.0 * L, -0.6 * L, -0.6 * L,
- 8.0 * L, 0.6 * L, 0.6 * L, dx);
+ 3.0 * L, 0.6 * L, 0.6 * L, dx);
// use primitive
- // Object *sphere = new Sphere(0.0, 0.0, 0.0, dSphere / 2.0);
+ // auto sphere = std::make_shared<Sphere>(0.0, 0.0, 0.0, dSphere / 2.0);
// use stl
std::string stlPath = "./apps/gpu/LBM/SphereGPU/sphere02.stl";
@@ -160,7 +134,7 @@ int main(int argc, char *argv[])
stlPath = config.getValue<std::string>("STLPath");
}
std::cout << "Reading stl from " << stlPath << "." << std::endl;
- Object *sphere = TriangularMesh::make(stlPath);
+ auto sphere = std::make_shared<TriangularMesh>(stlPath);
gridBuilder->addGeometry(sphere);
gridBuilder->setPeriodicBoundaryCondition(false, false, false);
@@ -170,7 +144,7 @@ int main(int argc, char *argv[])
//////////////////////////////////////////////////////////////////////////
// gridBuilder->setNumberOfLayers(10, 8);
- // gridBuilder->addGrid(new Sphere(0.0, 0.0, 0.0, 2.0 * dSphere), 1);
+ // gridBuilder->addGrid(std::make_shared<Sphere>(0.0, 0.0, 0.0, 2.0 * dSphere), 1);
// para->setMaxLevel(2);
// scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleK17);
diff --git a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
index 5bbb28c1ae8f1815022cb890bc3b144d31d8b4c3..a5ed466c94cb8a3c40e8dcb87cc6a15b843a3d2c 100755
--- a/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
+++ b/apps/gpu/LBM/SphereScaling/SphereScaling.cpp
@@ -13,14 +13,12 @@
//////////////////////////////////////////////////////////////////////////
-#include "basics/Core/DataTypes.h"
-#include "basics/Core/VectorTypes.h"
+#include "basics/DataTypes.h"
#include "basics/PointerDefinitions.h"
-#include "basics/Core/Logger/Logger.h"
-#include "basics/Core/StringUtilities/StringUtil.h"
+#include "basics/StringUtilities/StringUtil.h"
#include "basics/config/ConfigurationFile.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
@@ -41,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,21 +63,14 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void multipleLevel(std::filesystem::path& configPath)
+void runVirtualFluids(const vf::basics::ConfigurationFile& config)
{
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- 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);
auto gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
- vf::basics::ConfigurationFile config;
- config.load(configPath.string());
SPtr<Parameter> para = std::make_shared<Parameter>(communicator.getNumberOfProcess(), communicator.getPID(), &config);
BoundaryConditionFactory bcFactory = BoundaryConditionFactory();
GridScalingFactory scalingFactory = GridScalingFactory();
@@ -179,7 +170,7 @@ void multipleLevel(std::filesystem::path& configPath)
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);
@@ -204,10 +195,10 @@ void multipleLevel(std::filesystem::path& configPath)
if (useLevels) {
if (scalingType == "strong") {
gridBuilder->addGrid(
- new Sphere(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphereLev1),
+ std::make_shared<Sphere>(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphereLev1),
1);
} else if (scalingType == "weak") {
- gridBuilder->addGrid(new Cuboid(-0.5 * dCubeLev1, -0.5 * dCubeLev1,
+ gridBuilder->addGrid(std::make_shared<Cuboid>(-0.5 * dCubeLev1, -0.5 * dCubeLev1,
sideLengthCube - 0.5 * dCubeLev1, 0.5 * dCubeLev1,
0.5 * dCubeLev1, sideLengthCube + 0.5 * dCubeLev1),
1);
@@ -216,14 +207,14 @@ void multipleLevel(std::filesystem::path& configPath)
if (scalingType == "weak") {
if (useLevels) {
- gridBuilder->addGeometry(new Sphere(0.0, 0.0, sideLengthCube, dSphere));
+ gridBuilder->addGeometry(std::make_shared<Sphere>(0.0, 0.0, sideLengthCube, dSphere));
} else {
- TriangularMesh *sphereSTL = TriangularMesh::make(stlPath + "Spheres_2GPU.stl");
+ auto sphereSTL = std::make_shared<TriangularMesh>(stlPath + "Spheres_2GPU.stl");
gridBuilder->addGeometry(sphereSTL);
}
} else if (scalingType == "strong") {
gridBuilder->addGeometry(
- new Sphere(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphere));
+ std::make_shared<Sphere>(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphere));
}
if (generatePart == 0)
@@ -289,10 +280,10 @@ void multipleLevel(std::filesystem::path& configPath)
if (useLevels) {
if (scalingType == "strong") {
gridBuilder->addGrid(
- new Sphere(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphereLev1),
+ std::make_shared<Sphere>(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphereLev1),
1);
} else if (scalingType == "weak") {
- gridBuilder->addGrid(new Cuboid(-0.5 * dCubeLev1, sideLengthCube - 0.5 * dCubeLev1,
+ gridBuilder->addGrid(std::make_shared<Cuboid>(-0.5 * dCubeLev1, sideLengthCube - 0.5 * dCubeLev1,
sideLengthCube - 0.5 * dCubeLev1, 0.5 * dCubeLev1,
sideLengthCube + 0.5 * dCubeLev1,
sideLengthCube + 0.5 * dCubeLev1),
@@ -302,14 +293,14 @@ void multipleLevel(std::filesystem::path& configPath)
if (scalingType == "weak") {
if (useLevels) {
- gridBuilder->addGeometry(new Sphere(0.0, sideLengthCube, sideLengthCube, dSphere));
+ gridBuilder->addGeometry(std::make_shared<Sphere>(0.0, sideLengthCube, sideLengthCube, dSphere));
} else {
- TriangularMesh *sphereSTL = TriangularMesh::make(stlPath + "Spheres_4GPU.stl");
+ auto sphereSTL = std::make_shared<TriangularMesh>(stlPath + "Spheres_4GPU.stl");
gridBuilder->addGeometry(sphereSTL);
}
} else if (scalingType == "strong") {
gridBuilder->addGeometry(
- new Sphere(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphere));
+ std::make_shared<Sphere>(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphere));
}
if (generatePart == 0)
@@ -424,11 +415,11 @@ void multipleLevel(std::filesystem::path& configPath)
if (useLevels) {
if (scalingType == "strong") {
gridBuilder->addGrid(
- new Sphere(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphereLev1),
+ std::make_shared<Sphere>(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphereLev1),
1);
} else if (scalingType == "weak") {
gridBuilder->addGrid(
- new Cuboid(sideLengthCube - 0.5 * dCubeLev1, sideLengthCube - 0.5 * dCubeLev1,
+ std::make_shared<Cuboid>(sideLengthCube - 0.5 * dCubeLev1, sideLengthCube - 0.5 * dCubeLev1,
sideLengthCube - 0.5 * dCubeLev1, sideLengthCube + 0.5 * dCubeLev1,
sideLengthCube + 0.5 * dCubeLev1, sideLengthCube + 0.5 * dCubeLev1),
1);
@@ -437,14 +428,14 @@ void multipleLevel(std::filesystem::path& configPath)
if (scalingType == "weak") {
if (useLevels) {
- gridBuilder->addGeometry(new Sphere(sideLengthCube, sideLengthCube, sideLengthCube, dSphere));
+ gridBuilder->addGeometry(std::make_shared<Sphere>(sideLengthCube, sideLengthCube, sideLengthCube, dSphere));
} else {
- TriangularMesh *sphereSTL = TriangularMesh::make(stlPath + "Spheres_8GPU.stl");
+ auto sphereSTL = std::make_shared<TriangularMesh>(stlPath + "Spheres_8GPU.stl");
gridBuilder->addGeometry(sphereSTL);
}
} else if (scalingType == "strong") {
gridBuilder->addGeometry(
- new Sphere(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphere));
+ std::make_shared<Sphere>(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphere));
}
if (generatePart == 0)
@@ -598,9 +589,9 @@ void multipleLevel(std::filesystem::path& configPath)
gridBuilder->setNumberOfLayers(10, 8);
if (scalingType == "strong") {
gridBuilder->addGrid(
- new Sphere(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphereLev1), 1);
+ std::make_shared<Sphere>(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphereLev1), 1);
} else if (scalingType == "weak")
- gridBuilder->addGrid(new Cuboid(sideLengthCube - 0.5 * dCubeLev1, sideLengthCube - 0.5 * dCubeLev1,
+ gridBuilder->addGrid(std::make_shared<Cuboid>(sideLengthCube - 0.5 * dCubeLev1, sideLengthCube - 0.5 * dCubeLev1,
sideLengthCube - 0.5 * dCubeLev1, sideLengthCube + 0.5 * dCubeLev1,
sideLengthCube + 0.5 * dCubeLev1, sideLengthCube + 0.5 * dCubeLev1),
1);
@@ -608,14 +599,14 @@ void multipleLevel(std::filesystem::path& configPath)
if (scalingType == "weak") {
if (useLevels) {
- gridBuilder->addGeometry(new Sphere(sideLengthCube, sideLengthCube, sideLengthCube, dSphere));
+ gridBuilder->addGeometry(std::make_shared<Sphere>(sideLengthCube, sideLengthCube, sideLengthCube, dSphere));
} else {
- TriangularMesh *sphereSTL = TriangularMesh::make(stlPath + "Spheres_1GPU.stl");
+ auto sphereSTL = std::make_shared<TriangularMesh>(stlPath + "Spheres_1GPU.stl");
gridBuilder->addGeometry(sphereSTL);
}
} else {
gridBuilder->addGeometry(
- new Sphere(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphere));
+ std::make_shared<Sphere>(0.5 * sideLengthCube, 0.5 * sideLengthCube, 0.5 * sideLengthCube, dSphere));
}
gridBuilder->buildGrids(true); // buildGrids() has to be called before setting the BCs!!!!
@@ -666,20 +657,9 @@ int main(int argc, char *argv[])
if (argv != NULL) {
try {
- //////////////////////////////////////////////////////////////////////////
- // assuming that a config files is stored parallel to this file.
- std::filesystem::path configPath = __FILE__;
-
- // the config file's default name can be replaced by passing a command line argument
- std::string configName("config.txt");
- if (argc == 2) {
- configName = argv[1];
- std::cout << "Using configFile command line argument: " << configName << std::endl;
- }
-
- configPath.replace_filename(configName);
-
- multipleLevel(configPath);
+ VF_LOG_INFO("For the default config path to work, execute the app from the project root.");
+ vf::basics::ConfigurationFile config = vf::basics::loadConfig(argc, argv, "./apps/gpu/LBM/SphereScaling/config.txt");
+ runVirtualFluids(config);
//////////////////////////////////////////////////////////////////////////
} catch (const spdlog::spdlog_ex &ex) {
diff --git a/apps/gpu/LBM/TGV_3D/TGV_3D.cpp b/apps/gpu/LBM/TGV_3D/TGV_3D.cpp
index f7964f38272b23fa460eaac1ad6c5c5e743e0573..c813bc319c085506420638dac3ef623b110dc771 100644
--- a/apps/gpu/LBM/TGV_3D/TGV_3D.cpp
+++ b/apps/gpu/LBM/TGV_3D/TGV_3D.cpp
@@ -45,9 +45,9 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
-#include "Core/Logger/Logger.h"
-#include "Core/VectorTypes.h"
+#include "DataTypes.h"
+#include <logger/Logger.h>
+
#include "PointerDefinitions.h"
//////////////////////////////////////////////////////////////////////////
@@ -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"
@@ -77,7 +77,6 @@
#include "VirtualFluids_GPU/Output/FileWriter.h"
#include "VirtualFluids_GPU/Parameter/Parameter.h"
-#include <logger/Logger.h>
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -133,16 +132,7 @@ std::string simulationName("TGV_3D");
void multipleLevel(const std::string& configPath)
{
- //std::ofstream logFile( "F:/Work/Computations/gridGenerator/grid/gridGeneratorLog.txt" );
- //std::ofstream logFile( "grid/gridGeneratorLog.txt" );
- //logging::Logger::addStream(&logFile);
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
//UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
@@ -170,9 +160,8 @@ void multipleLevel(const std::string& configPath)
const real viscosity = nx / ( 2.0 * PI ) * velocity / Re;
- *logging::out << logging::Logger::INFO_HIGH << "velocity = " << velocity << " s\n";
-
- *logging::out << logging::Logger::INFO_HIGH << "viscosity = " << viscosity << "\n";
+ VF_LOG_INFO("velocity = {}", velocity);
+ VF_LOG_INFO("viscosity = {}", viscosity);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -342,22 +331,17 @@ int main( int argc, char* argv[])
}
catch (const std::bad_alloc& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << "Bad Alloc:" << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (const std::exception& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
{
- *logging::out << logging::Logger::LOGGER_ERROR << "Unknown exception!\n";
- //std::cout << "unknown exeption" << std::endl;
+ std::cout << "unknown exeption" << std::endl;
}
//std::cout << "\nConfiguration file must be set!: lbmgm <config file>" << std::endl << std::flush;
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 66c0644e1e5ee184eb4dd9b8f2a6dc7c71bbf84d..876496783e61867a45843b0aa871bbc794eca73f 100644
--- a/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
+++ b/apps/gpu/LBM/TGV_3D_GridRef/TGV_3D_GridRef.cpp
@@ -45,9 +45,9 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
-#include "Core/Logger/Logger.h"
-#include "Core/VectorTypes.h"
+#include "DataTypes.h"
+#include <logger/Logger.h>
+
#include "PointerDefinitions.h"
//////////////////////////////////////////////////////////////////////////
@@ -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"
@@ -78,8 +78,6 @@
#include "VirtualFluids_GPU/Output/FileWriter.h"
#include "VirtualFluids_GPU/Parameter/Parameter.h"
-#include <logger/Logger.h>
-
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -133,12 +131,7 @@ std::string simulationName("TGV_3D_Gridref_noSqPress");
void multipleLevel(const std::string& configPath)
{
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- vf::gpu::Communicator& communicator = vf::gpu::Communicator::getInstance();
+ vf::gpu::Communicator& communicator = vf::gpu::MpiCommunicator::getInstance();
auto gridFactory = GridFactory::make();
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::RAYCASTING);
@@ -178,7 +171,7 @@ void multipleLevel(const std::string& configPath)
gridBuilder->setNumberOfLayers(0, 0);
- auto fineGrid = new Cuboid(-PI * 0.5, -PI * 0.5, -PI * 0.5,
+ auto fineGrid = std::make_shared<Cuboid>(-PI * 0.5, -PI * 0.5, -PI * 0.5,
0.0, PI * 0.5, 0.0);
gridBuilder->addGrid(fineGrid, 1);
@@ -352,22 +345,17 @@ int main( int argc, char* argv[])
}
catch (const std::bad_alloc& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << "Bad Alloc:" << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << "Bad alloc: " << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (const std::exception& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
{
- *logging::out << logging::Logger::LOGGER_ERROR << "Unknown exception!\n";
- //std::cout << "unknown exeption" << std::endl;
+ std::cout << "unknown exeption" << std::endl;
}
//std::cout << "\nConfiguration file must be set!: lbmgm <config file>" << std::endl << std::flush;
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 c36fc0cb30b2767aa52e3870d1293f6a459ee63a..e643c4f72019c681bc7ae4b2711d46e3399dad71 100644
--- a/apps/gpu/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp
+++ b/apps/gpu/LBM/TGV_3D_MultiGPU/TGV_3D_MultiGPU.cpp
@@ -50,11 +50,11 @@
//#include "metis.h"
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#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,18 +156,7 @@ void multipleLevel(const std::string& configPath)
rankY = ( mpirank % ( sideLengthX * sideLengthY ) ) / sideLengthX;
rankZ = mpirank / ( sideLengthY * sideLengthX );
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- logging::Logger::addStream(&std::cout);
-
- std::ofstream logFile( path + simulationName + "_rank_" + std::to_string(mpirank) + ".log" );
- logging::Logger::addStream(&logFile);
-
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- 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 935647ef53c3b4861b30d656454042ea85b9795a..00fe00a24eb454c9aa0973d6ebe20f22c6a52369 100644
--- a/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
+++ b/apps/gpu/LBM/WTG_RUB/WTG_RUB.cpp
@@ -45,10 +45,10 @@
//////////////////////////////////////////////////////////////////////////
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "PointerDefinitions.h"
-#include "Core/VectorTypes.h"
-#include "Core/Logger/Logger.h"
+
+#include <logger/Logger.h>
//////////////////////////////////////////////////////////////////////////
@@ -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"
@@ -77,7 +77,6 @@
#include "VirtualFluids_GPU/GPU/CudaMemoryManager.h"
#include "VirtualFluids_GPU/Factories/BoundaryConditionFactory.h"
-#include <logger/Logger.h>
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -130,12 +129,7 @@ std::string chooseVariation();
void multipleLevel(const std::string& configPath)
{
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- 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);
@@ -173,8 +167,8 @@ void multipleLevel(const std::string& configPath)
real z_min = 0.0 + z_offset;
real z_max = 160.0 + z_offset;
- //TriangularMesh *RubSTL = TriangularMesh::make(inputPath + "stl/Var02_0deg_FD_b.stl");
- TriangularMesh *RubSTL = TriangularMesh::make(inputPath + "stl/" + chooseVariation() + ".stl");
+ //auto RubSTL = std::make_shared<TriangularMesh>(inputPath + "stl/Var02_0deg_FD_b.stl");
+ auto RubSTL = std::make_shared<TriangularMesh>(inputPath + "stl/" + chooseVariation() + ".stl");
std::vector<real> originOfCityXY = { 600.0, y_max / 2, z_offset };
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -233,8 +227,8 @@ void multipleLevel(const std::string& configPath)
//const real vx = velocityLB / (real)sqrt(2.0); // LB units
//const real vy = velocityLB / (real)sqrt(2.0); // LB units
- *logging::out << logging::Logger::INFO_HIGH << "velocity [dx/dt] = " << velocityLB << " \n";
- *logging::out << logging::Logger::INFO_HIGH << "viscosity [dx^2/dt] = " << viscosityLB << "\n";
+ VF_LOG_INFO("velocityLB [dx/dt] = " << velocityLB);
+ VF_LOG_INFO("viscosityLB [dx^2/dt] = " << viscosityLB);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -407,18 +401,18 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
// FG5 -> dx = 1,25 mm; lvl 5
//
// FineGrid Level 1 ->dx = 2 cm; lvl 1
- auto FG1 = new Cuboid(-20, -20, -5 + z_offset, 800, 200, 75 + z_offset);
+ auto FG1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 800, 200, 75 + z_offset);
// FineGrid Level 2 -> dx = 1 cm; lvl 2
- auto FG2_1 = new Cuboid(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
- auto FG2_2 = new Cuboid(500, -20, 5 + z_offset, 680, 210, 50 + z_offset);
+ auto FG2_1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
+ auto FG2_2 = std::make_shared<Cuboid>(500, -20, 5 + z_offset, 680, 210, 50 + z_offset);
auto FG2 = new Conglomerate();
FG2->add(FG2_1);
FG2->add(FG2_2);
// FineGrid Level 3 ->dx = 5 mm; lvl 3
- auto FG3_1 = new Cuboid(517, -20, -5 + z_offset, 665, 200, 30 + z_offset);
- auto FG3_2 = new Cuboid(550, 58, -5 + z_offset, 650, 132, 40 + z_offset);
+ auto FG3_1 = std::make_shared<Cuboid>(517, -20, -5 + z_offset, 665, 200, 30 + z_offset);
+ auto FG3_2 = std::make_shared<Cuboid>(550, 58, -5 + z_offset, 650, 132, 40 + z_offset);
auto FG3 = new Conglomerate();
FG3->add(FG3_1);
FG3->add(FG3_2);
@@ -433,19 +427,19 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
gridBuilder->addGrid(FG3, 3);
if (maxLevel >= 4) {
if (rotationOfCity == 0.0) {
- TriangularMesh *FG4 = TriangularMesh::make(inputPath + "stl/FG4_0deg.stl");
+ auto FG4 = std::make_shared<TriangularMesh>(inputPath + "stl/FG4_0deg.stl");
gridBuilder->addGrid(FG4, 4);
} else {
- TriangularMesh *FG4 = TriangularMesh::make(inputPath + "stl/FG4_63deg.stl");
+ auto FG4 = std::make_shared<TriangularMesh>(inputPath + "stl/FG4_63deg.stl");
gridBuilder->addGrid(FG4, 4);
}
if (maxLevel == 5) {
if (rotationOfCity == 0.0) {
- TriangularMesh *FG5 = TriangularMesh::make(inputPath + "stl/FG5_0deg.stl");
+ auto FG5 = std::make_shared<TriangularMesh>(inputPath + "stl/FG5_0deg.stl");
gridBuilder->addGrid(FG5, 5);
} else {
- TriangularMesh *FG5 = TriangularMesh::make(inputPath + "stl/FG5_63deg.stl");
+ auto FG5 = std::make_shared<TriangularMesh>(inputPath + "stl/FG5_63deg.stl");
gridBuilder->addGrid(FG5, 5);
}
}
@@ -466,9 +460,9 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
// FG3 -> dx = 1,25 mm; lvl 3
//
// FineGrid Level 1 -> dx = 5 mm; lvl 1
- //auto FG1_1 = new Cuboid(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
- auto FG1_1 = new Cuboid(-20, -20, -5 + z_offset, 760, 200, 20 + z_offset);
- auto FG1_2 = new Cuboid(500, -20, 5 + z_offset, 680, 210, 50 + z_offset);
+ //auto FG1_1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
+ auto FG1_1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 760, 200, 20 + z_offset);
+ auto FG1_2 = std::make_shared<Cuboid>(500, -20, 5 + z_offset, 680, 210, 50 + z_offset);
auto FG1 = new Conglomerate();
FG1->add(FG1_1);
FG1->add(FG1_2);
@@ -479,19 +473,19 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
gridBuilder->addGrid(FG1, 1);
if (maxLevel >= 2) {
if (rotationOfCity == 0.0) {
- TriangularMesh *FG2 = TriangularMesh::make(inputPath + "stl/FG4_0deg.stl");
+ auto FG2 = std::make_shared<TriangularMesh>(inputPath + "stl/FG4_0deg.stl");
gridBuilder->addGrid(FG2, 2);
} else {
- TriangularMesh *FG2 = TriangularMesh::make(inputPath + "stl/FG4_63deg.stl");
+ auto FG2 = std::make_shared<TriangularMesh>(inputPath + "stl/FG4_63deg.stl");
gridBuilder->addGrid(FG2, 2);
}
if (maxLevel == 3) {
if (rotationOfCity == 0.0) {
- TriangularMesh *FG3 = TriangularMesh::make(inputPath + "stl/FG5_0deg.stl");
+ auto FG3 = std::make_shared<TriangularMesh>(inputPath + "stl/FG5_0deg.stl");
gridBuilder->addGrid(FG3, 3);
} else {
- TriangularMesh *FG3 = TriangularMesh::make(inputPath + "stl/FG5_63deg.stl");
+ auto FG3 = std::make_shared<TriangularMesh>(inputPath + "stl/FG5_63deg.stl");
gridBuilder->addGrid(FG3, 3);
}
}
@@ -511,18 +505,18 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
// FG4 -> dx = 1.0 mm; lvl 4
//
//// FineGrid Level 1 ->dx = 8.0 mm; lvl 1
- // auto FG1 = new Cuboid(-20, -20, -5 + z_offset, 800, 200, 75 + z_offset);
+ // auto FG1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 800, 200, 75 + z_offset);
// FineGrid Level 1 -> dx = 8.0 mm; lvl 1
- auto FG1_1 = new Cuboid(-20, -20, -5 + z_offset, 780, 200, 30 + z_offset);
- auto FG1_2 = new Cuboid(500, -20, 5 + z_offset, 720, 210, 75 + z_offset);
+ auto FG1_1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 780, 200, 30 + z_offset);
+ auto FG1_2 = std::make_shared<Cuboid>(500, -20, 5 + z_offset, 720, 210, 75 + z_offset);
auto FG1 = new Conglomerate();
FG1->add(FG1_1);
FG1->add(FG1_2);
// FineGrid Level 2 -> dx = 4.0 mm; lvl 2
- auto FG2_1 = new Cuboid(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
- auto FG2_2 = new Cuboid(520, -20, 5 + z_offset, 700, 210, 50 + z_offset);
+ auto FG2_1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
+ auto FG2_2 = std::make_shared<Cuboid>(520, -20, 5 + z_offset, 700, 210, 50 + z_offset);
auto FG2 = new Conglomerate();
FG2->add(FG2_1);
FG2->add(FG2_2);
@@ -535,19 +529,19 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
gridBuilder->addGrid(FG2, 2);
if (maxLevel >= 3) {
if (rotationOfCity == 0.0) {
- TriangularMesh *FG3 = TriangularMesh::make(inputPath + "stl/FG4_0deg.stl");
+ auto FG3 = std::make_shared<TriangularMesh>(inputPath + "stl/FG4_0deg.stl");
gridBuilder->addGrid(FG3, 3);
} else {
- TriangularMesh *FG3 = TriangularMesh::make(inputPath + "stl/FG4_63deg.stl");
+ auto FG3 = std::make_shared<TriangularMesh>(inputPath + "stl/FG4_63deg.stl");
gridBuilder->addGrid(FG3, 3);
}
if (maxLevel == 4) {
if (rotationOfCity == 0.0) {
- TriangularMesh *FG4 = TriangularMesh::make(inputPath + "stl/FG5_0deg.stl");
+ auto FG4 = std::make_shared<TriangularMesh>(inputPath + "stl/FG5_0deg.stl");
gridBuilder->addGrid(FG4, 4);
} else {
- TriangularMesh *FG4 = TriangularMesh::make(inputPath + "stl/FG5_63deg.stl");
+ auto FG4 = std::make_shared<TriangularMesh>(inputPath + "stl/FG5_63deg.stl");
gridBuilder->addGrid(FG4, 4);
}
}
@@ -566,11 +560,11 @@ void addFineGrids(SPtr<MultipleGridBuilder> gridBuilder, uint &maxLevel, real &r
// FG2 -> dx = 1 cm; lvl 2
//
// FineGrid Level 1 ->dx = 2 cm; lvl 1
- auto FG1 = new Cuboid(-20, -20, -5 + z_offset, 800, 200, 75 + z_offset);
+ auto FG1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 800, 200, 75 + z_offset);
// FineGrid Level 2 -> dx = 1 cm; lvl 2
- auto FG2_1 = new Cuboid(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
- auto FG2_2 = new Cuboid(500, -20, 5 + z_offset, 680, 210, 50 + z_offset);
+ auto FG2_1 = std::make_shared<Cuboid>(-20, -20, -5 + z_offset, 760, 200, 10 + z_offset);
+ auto FG2_2 = std::make_shared<Cuboid>(500, -20, 5 + z_offset, 680, 210, 50 + z_offset);
auto FG2 = new Conglomerate();
FG2->add(FG2_1);
FG2->add(FG2_2);
diff --git a/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp b/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
index 75e3265b24e59c63bbc7405a7e9e8886d56f0d38..90cc4c0ab33745c65688db4bf170b25a9099da51 100644
--- a/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
+++ b/apps/gpu/LBM/gridGeneratorTest/gridGenerator.cpp
@@ -14,11 +14,11 @@
#define _USE_MATH_DEFINES
#include <math.h>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#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"
@@ -58,17 +58,6 @@
void multipleLevel(const std::string& configPath)
{
- std::ofstream logFile( "F:/Work/Computations/out/Sphere/gridGeneratorLog.txt" );
- //std::ofstream logFile( "grid/gridGeneratorLog.txt" );
- logging::Logger::addStream(&logFile);
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- //UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
-
auto gridFactory = GridFactory::make();
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::RAYCASTING);
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
@@ -76,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);
@@ -195,13 +184,13 @@ void multipleLevel(const std::string& configPath)
//////////////////////////////////////////////////////////////////////////
- // TriangularMesh* sphereSTL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/Sphere/SphereNotOptimal.stl");
+ // auto sphereSTL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/Sphere/SphereNotOptimal.stl");
- TriangularMesh* sphereRef_1_STL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/Sphere/SphereRef_1.stl");
+ auto sphereRef_1_STL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/Sphere/SphereRef_1.stl");
- // TriangularMesh* sphereRef_2_STL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/Sphere/SphereRef_2.stl");
+ // auto sphereRef_2_STL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/Sphere/SphereRef_2.stl");
- Object* sphere = new Sphere( 0, 0, 0, 0.5*D );
+ auto sphere = std::make_shared<Sphere>( 0, 0, 0, 0.5*D );
gridBuilder->addCoarseGrid(-2.0*D, -2.5*D, -2.5*D,
9.0*D, 2.5*D, 2.5*D, dx); // DrivAer
@@ -280,21 +269,21 @@ void multipleLevel(const std::string& configPath)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- TriangularMesh* DrivAerSTL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/DrivAer_Fastback_Coarse.stl");
- //TriangularMesh* triangularMesh = TriangularMesh::make("M:/TestGridGeneration/STL/DrivAer_NoSTLGroups.stl");
- //TriangularMesh* triangularMesh = TriangularMesh::make("M:/TestGridGeneration/STL/DrivAer_Coarse.stl");
- //TriangularMesh* DrivAerSTL = TriangularMesh::make("stl/DrivAer_Fastback_Coarse.stl");
+ auto DrivAerSTL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/DrivAer_Fastback_Coarse.stl");
+ //auto triangularMesh = std::make_shared<TriangularMesh>("M:/TestGridGeneration/STL/DrivAer_NoSTLGroups.stl");
+ //auto triangularMesh = std::make_shared<TriangularMesh>("M:/TestGridGeneration/STL/DrivAer_Coarse.stl");
+ //auto DrivAerSTL = std::make_shared<TriangularMesh>("stl/DrivAer_Fastback_Coarse.stl");
- TriangularMesh* DrivAerRefBoxSTL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/DrivAer_REF_BOX_Adrea.stl");
- //TriangularMesh* DrivAerRefBoxSTL = TriangularMesh::make("stl/DrivAer_REF_BOX_Adrea.stl");
+ auto DrivAerRefBoxSTL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/DrivAer_REF_BOX_Adrea.stl");
+ //auto DrivAerRefBoxSTL = std::make_shared<TriangularMesh>("stl/DrivAer_REF_BOX_Adrea.stl");
real z0 = 0.318;
gridBuilder->addCoarseGrid(- 5.0, -5.0, 0.0 - z0,
15.0, 5.0, 5.0 - z0, dx); // DrivAer
- //Object* floorBox = new Cuboid( -0.3, -1, -1, 4.0, 1, 0.2 );
- //Object* wakeBox = new Cuboid( 3.5, -1, -1, 5.5, 1, 0.8 );
+ //auto floorBox = std::make_shared<Cuboid>( -0.3, -1, -1, 4.0, 1, 0.2 );
+ //auto wakeBox = std::make_shared<Cuboid>( 3.5, -1, -1, 5.5, 1, 0.8 );
//Conglomerate* refRegion = new Conglomerate();
@@ -383,11 +372,11 @@ void multipleLevel(const std::string& configPath)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- TriangularMesh* STL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/PaperPlane_1.stl");
- //TriangularMesh* STL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/PaperPlane_1_winglet.stl");
+ auto STL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/PaperPlane_1.stl");
+ //auto STL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/PaperPlane_1_winglet.stl");
- TriangularMesh* RefBoxSTL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/PaperPlane_1_ref.stl");
- //TriangularMesh* RefBoxSTL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/PaperPlane_1_winglet_ref.stl");
+ auto RefBoxSTL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/PaperPlane_1_ref.stl");
+ //auto RefBoxSTL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/PaperPlane_1_winglet_ref.stl");
gridBuilder->addCoarseGrid(- 0.5, -0.3, -0.3,
1.0, 0.3, 0.3, dx);
@@ -462,7 +451,7 @@ void multipleLevel(const std::string& configPath)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- TriangularMesh* STL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/STL_Group_Test_2_Cylinders.stl");
+ auto STL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/STL_Group_Test_2_Cylinders.stl");
gridBuilder->addCoarseGrid(- 2.0, -4.5, -2.0,
4.0, 4.5, 2.0, dx);
@@ -518,34 +507,34 @@ void multipleLevel(const std::string& configPath)
std::vector<uint> ignorePatches = { 152, 153, 154 };
- //TriangularMesh* VW370_SERIE_STL = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/VW370_SERIE.stl", ignorePatches);
- TriangularMesh* VW370_SERIE_STL = TriangularMesh::make("stl/VW370_SERIE.stl", ignorePatches);
+ //auto VW370_SERIE_STL = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/VW370_SERIE.stl", ignorePatches);
+ auto VW370_SERIE_STL = std::make_shared<TriangularMesh>("stl/VW370_SERIE.stl", ignorePatches);
- //TriangularMesh* DLC_RefBox = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox.stl");
+ //auto DLC_RefBox = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox.stl");
- //TriangularMesh* DLC_RefBox_1 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_4m.stl");
- //TriangularMesh* DLC_RefBox_2 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_3m.stl");
- //TriangularMesh* DLC_RefBox_3 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_2m.stl");
- //TriangularMesh* DLC_RefBox_4 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_1m.stl");
+ //auto DLC_RefBox_1 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_4m.stl");
+ //auto DLC_RefBox_2 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_3m.stl");
+ //auto DLC_RefBox_3 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_2m.stl");
+ //auto DLC_RefBox_4 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_1m.stl");
- //TriangularMesh* DLC_RefBox_Level_3 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_3.stl");
- //TriangularMesh* DLC_RefBox_Level_4 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_4.stl");
- //TriangularMesh* DLC_RefBox_Level_5 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_5.stl");
+ //auto DLC_RefBox_Level_3 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_3.stl");
+ //auto DLC_RefBox_Level_4 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_4.stl");
+ //auto DLC_RefBox_Level_5 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_5.stl");
- TriangularMesh* DLC_RefBox_Level_3 = TriangularMesh::make("stl/DLC/DLC_RefBox_Level_3.stl");
- TriangularMesh* DLC_RefBox_Level_4 = TriangularMesh::make("stl/DLC/DLC_RefBox_Level_4.stl");
- TriangularMesh* DLC_RefBox_Level_5 = TriangularMesh::make("stl/DLC/DLC_RefBox_Level_5.stl");
+ auto DLC_RefBox_Level_3 = std::make_shared<TriangularMesh>("stl/DLC/DLC_RefBox_Level_3.stl");
+ auto DLC_RefBox_Level_4 = std::make_shared<TriangularMesh>("stl/DLC/DLC_RefBox_Level_4.stl");
+ auto DLC_RefBox_Level_5 = std::make_shared<TriangularMesh>("stl/DLC/DLC_RefBox_Level_5.stl");
- //TriangularMesh* VW370_SERIE_STL = TriangularMesh::make("stl/VW370_SERIE.stl", ignorePatches);
- //TriangularMesh* DLC_RefBox = TriangularMesh::make("stl/DLC_RefBox.lnx.stl");
- //TriangularMesh* DLC_RefBox_4 = TriangularMesh::make("stl/DLC_RefBox_withWake/DLC_RefBox_withWake_1m.lnx.stl");
+ //auto VW370_SERIE_STL = std::make_shared<TriangularMesh>("stl/VW370_SERIE.stl", ignorePatches);
+ //auto DLC_RefBox = std::make_shared<TriangularMesh>("stl/DLC_RefBox.lnx.stl");
+ //auto DLC_RefBox_4 = std::make_shared<TriangularMesh>("stl/DLC_RefBox_withWake/DLC_RefBox_withWake_1m.lnx.stl");
gridBuilder->addCoarseGrid(-30.0, -20.0, 0.0 - z0,
50.0, 20.0, 25.0 - z0, dx);
gridBuilder->setNumberOfLayers(10,8);
- gridBuilder->addGrid( new Cuboid( - 6.6, -6, -0.7, 20.6 , 6, 5.3 ), 1 );
- gridBuilder->addGrid( new Cuboid( -3.75, -3, -0.7, 11.75, 3, 2.65 ), 2 );
+ gridBuilder->addGrid( std::make_shared<Cuboid>( - 6.6, -6, -0.7, 20.6 , 6, 5.3 ), 1 );
+ gridBuilder->addGrid( std::make_shared<Cuboid>( -3.75, -3, -0.7, 11.75, 3, 2.65 ), 2 );
gridBuilder->setNumberOfLayers(10,8);
gridBuilder->addGrid(DLC_RefBox_Level_3, 3);
@@ -672,10 +661,9 @@ void multipleLevel(const std::string& configPath)
logFile2.open( "F:/Work/Computations/gridGenerator/grid/1/gridGeneratorLog.txt" );
//logFile2.open( "grid/1/gridGeneratorLog.txt" );
- logging::Logger::addStream(&logFile2);
- TriangularMesh* triangularMesh = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/Sphere/SphereNotOptimal.stl");
- //TriangularMesh* triangularMesh = TriangularMesh::make("stl/ShpereNotOptimal.lnx.stl");
+ auto triangularMesh = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/Sphere/SphereNotOptimal.stl");
+ //auto triangularMesh = std::make_shared<TriangularMesh>("stl/ShpereNotOptimal.lnx.stl");
// all
//gridBuilder->addCoarseGrid(-2, -2, -2,
@@ -820,18 +808,17 @@ int main( int argc, char* argv[])
}
catch (const std::bad_alloc& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << "Bad Alloc:" << e.what() << "\n";
+ std::cout << "Bad alloc: " << e.what() << std::flush;
}
catch (const std::exception& e)
{
-
- *logging::out << logging::Logger::LOGGER_ERROR << e.what() << "\n";
+ std::cout << e.what() << std::flush;
}
catch (...)
{
- *logging::out << logging::Logger::LOGGER_ERROR << "Unknown exception!\n";
+ std::cout << "unknown exeption" << std::endl;
}
+
}
MPI_Finalize();
diff --git a/apps/gpu/LBM/lbmTest/main.cpp b/apps/gpu/LBM/lbmTest/main.cpp
index cd04d1dbf8bbfdc199e131ffdaa7963aa9db1717..90640a3813a25e8249c7668a6e6c7779b0f01e4d 100644
--- a/apps/gpu/LBM/lbmTest/main.cpp
+++ b/apps/gpu/LBM/lbmTest/main.cpp
@@ -16,11 +16,11 @@
#include "metis.h"
-#include "Core/Input/Input.h"
-#include "Core/StringUtilities/StringUtil.h"
+#include "Input/Input.h"
+#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"
@@ -262,17 +262,6 @@ void setParameters(std::shared_ptr<Parameter> para, std::unique_ptr<input::Input
void multipleLevel(const std::string& configPath)
{
- //std::ofstream logFile( "F:/Work/Computations/gridGenerator/grid/gridGeneratorLog.txt" );
- std::ofstream logFile( "grid/gridGeneratorLog.txt" );
- logging::Logger::addStream(&logFile);
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- //UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
-
auto gridFactory = GridFactory::make();
gridFactory->setGridStrategy(Device::CPU);
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::RAYCASTING);
@@ -372,7 +361,7 @@ void multipleLevel(const std::string& configPath)
real dx = 0.2;
real vx = 0.05;
- TriangularMesh* SphereSTL = TriangularMesh::make("E:/temp/GridSphere/2018/STL/SphereNotOptimal.stl");
+ auto SphereSTL = std::make_shared<TriangularMesh>("E:/temp/GridSphere/2018/STL/SphereNotOptimal.stl");
gridBuilder->addCoarseGrid(- 5.0, -5.0, -5.0,
10.0, 5.0, 5.0, dx); // DrivAer
@@ -420,21 +409,21 @@ void multipleLevel(const std::string& configPath)
real dx = 0.2;
real vx = 0.05;
- TriangularMesh* DrivAerSTL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/DrivAer_Fastback_Coarse.stl");
- //TriangularMesh* triangularMesh = TriangularMesh::make("M:/TestGridGeneration/STL/DrivAer_NoSTLGroups.stl");
- //TriangularMesh* triangularMesh = TriangularMesh::make("M:/TestGridGeneration/STL/DrivAer_Coarse.stl");
- //TriangularMesh* DrivAerSTL = TriangularMesh::make("stl/DrivAer_Fastback_Coarse.stl");
+ auto DrivAerSTL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/DrivAer_Fastback_Coarse.stl");
+ //auto triangularMesh = std::make_shared<TriangularMesh>("M:/TestGridGeneration/STL/DrivAer_NoSTLGroups.stl");
+ //auto triangularMesh = std::make_shared<TriangularMesh>("M:/TestGridGeneration/STL/DrivAer_Coarse.stl");
+ //auto DrivAerSTL = std::make_shared<TriangularMesh>("stl/DrivAer_Fastback_Coarse.stl");
- TriangularMesh* DrivAerRefBoxSTL = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/DrivAer_REF_BOX_Adrea.stl");
- //TriangularMesh* DrivAerRefBoxSTL = TriangularMesh::make("stl/DrivAer_REF_BOX_Adrea.stl");
+ auto DrivAerRefBoxSTL = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/DrivAer_REF_BOX_Adrea.stl");
+ //auto DrivAerRefBoxSTL = std::make_shared<TriangularMesh>("stl/DrivAer_REF_BOX_Adrea.stl");
real z0 = 0.318+0.5*dx;
gridBuilder->addCoarseGrid(- 5.0, -5.0, 0.0 - z0,
15.0, 5.0, 5.0 - z0, dx); // DrivAer
- //Object* floorBox = new Cuboid( -0.3, -1, -1, 4.0, 1, 0.2 );
- //Object* wakeBox = new Cuboid( 3.5, -1, -1, 5.5, 1, 0.8 );
+ //Object* floorBox = std::make_shared<Cuboid>( -0.3, -1, -1, 4.0, 1, 0.2 );
+ //Object* wakeBox = std::make_shared<Cuboid>( 3.5, -1, -1, 5.5, 1, 0.8 );
//Conglomerate* refRegion = new Conglomerate();
@@ -507,34 +496,34 @@ void multipleLevel(const std::string& configPath)
std::vector<uint> ignorePatches = { 152, 153, 154 };
- //TriangularMesh* VW370_SERIE_STL = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/VW370_SERIE.stl", ignorePatches);
- TriangularMesh* VW370_SERIE_STL = TriangularMesh::make("stl/VW370_SERIE.stl", ignorePatches);
+ //auto VW370_SERIE_STL = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/VW370_SERIE.stl", ignorePatches);
+ auto VW370_SERIE_STL = std::make_shared<TriangularMesh>("stl/VW370_SERIE.stl", ignorePatches);
- //TriangularMesh* DLC_RefBox = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox.stl");
+ //auto DLC_RefBox = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox.stl");
- //TriangularMesh* DLC_RefBox_1 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_4m.stl");
- //TriangularMesh* DLC_RefBox_2 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_3m.stl");
- //TriangularMesh* DLC_RefBox_3 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_2m.stl");
- //TriangularMesh* DLC_RefBox_4 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_1m.stl");
+ //auto DLC_RefBox_1 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_4m.stl");
+ //auto DLC_RefBox_2 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_3m.stl");
+ //auto DLC_RefBox_3 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_2m.stl");
+ //auto DLC_RefBox_4 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC_RefBox_withWake/DLC_RefBox_withWake_1m.stl");
- //TriangularMesh* DLC_RefBox_Level_3 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_3.stl");
- //TriangularMesh* DLC_RefBox_Level_4 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_4.stl");
- //TriangularMesh* DLC_RefBox_Level_5 = TriangularMesh::make("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_5.stl");
+ //auto DLC_RefBox_Level_3 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_3.stl");
+ //auto DLC_RefBox_Level_4 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_4.stl");
+ //auto DLC_RefBox_Level_5 = std::make_shared<TriangularMesh>("C:/Users/lenz/Desktop/Work/gridGenerator/stl/DLC/DLC_RefBox_Level_5.stl");
- TriangularMesh* DLC_RefBox_Level_3 = TriangularMesh::make("stl/DLC/DLC_RefBox_Level_3.stl");
- TriangularMesh* DLC_RefBox_Level_4 = TriangularMesh::make("stl/DLC/DLC_RefBox_Level_4.stl");
- TriangularMesh* DLC_RefBox_Level_5 = TriangularMesh::make("stl/DLC/DLC_RefBox_Level_5.stl");
+ auto DLC_RefBox_Level_3 = std::make_shared<TriangularMesh>("stl/DLC/DLC_RefBox_Level_3.stl");
+ auto DLC_RefBox_Level_4 = std::make_shared<TriangularMesh>("stl/DLC/DLC_RefBox_Level_4.stl");
+ auto DLC_RefBox_Level_5 = std::make_shared<TriangularMesh>("stl/DLC/DLC_RefBox_Level_5.stl");
- //TriangularMesh* VW370_SERIE_STL = TriangularMesh::make("stl/VW370_SERIE.stl", ignorePatches);
- //TriangularMesh* DLC_RefBox = TriangularMesh::make("stl/DLC_RefBox.lnx.stl");
- //TriangularMesh* DLC_RefBox_4 = TriangularMesh::make("stl/DLC_RefBox_withWake/DLC_RefBox_withWake_1m.lnx.stl");
+ //auto VW370_SERIE_STL = std::make_shared<TriangularMesh>("stl/VW370_SERIE.stl", ignorePatches);
+ //auto DLC_RefBox = std::make_shared<TriangularMesh>("stl/DLC_RefBox.lnx.stl");
+ //auto DLC_RefBox_4 = std::make_shared<TriangularMesh>("stl/DLC_RefBox_withWake/DLC_RefBox_withWake_1m.lnx.stl");
gridBuilder->addCoarseGrid(-30.0, -20.0, 0.0 - z0,
50.0, 20.0, 25.0 - z0, dx);
gridBuilder->setNumberOfLayers(10,8);
- gridBuilder->addGrid( new Cuboid( - 6.6, -6, -0.7, 20.6 , 6, 5.3 ), 1 );
- gridBuilder->addGrid( new Cuboid( -3.75, -3, -0.7, 11.75, 3, 2.65 ), 2 );
+ gridBuilder->addGrid( std::make_shared<Cuboid>( - 6.6, -6, -0.7, 20.6 , 6, 5.3 ), 1 );
+ gridBuilder->addGrid( std::make_shared<Cuboid>( -3.75, -3, -0.7, 11.75, 3, 2.65 ), 2 );
gridBuilder->setNumberOfLayers(10,8);
gridBuilder->addGrid(DLC_RefBox_Level_3, 3);
@@ -632,13 +621,11 @@ void multipleLevel(const std::string& configPath)
logFile2.open( "F:/Work/Computations/gridGenerator/grid/1/gridGeneratorLog.txt" );
//logFile2.open( "grid/1/gridGeneratorLog.txt" );
- logging::Logger::addStream(&logFile2);
-
real dx = 1.0 / 40.0;
real vx = 0.05;
- TriangularMesh* triangularMesh = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/ShpereNotOptimal.stl");
- //TriangularMesh* triangularMesh = TriangularMesh::make("stl/ShpereNotOptimal.lnx.stl");
+ auto triangularMesh = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/ShpereNotOptimal.stl");
+ //auto triangularMesh = std::make_shared<TriangularMesh>("stl/ShpereNotOptimal.lnx.stl");
// all
//gridBuilder->addCoarseGrid(-2, -2, -2,
@@ -774,7 +761,6 @@ int main( int argc, char* argv[])
}
catch (const std::exception& e)
{
- *logging::out << logging::Logger::ERROR << e.what() << "\n";
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
@@ -791,22 +777,17 @@ int main( int argc, char* argv[])
}
catch (const std::exception& e)
{
-
- *logging::out << logging::Logger::ERROR << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (const std::bad_alloc e)
{
-
- *logging::out << logging::Logger::ERROR << "Bad Alloc:" << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
{
- *logging::out << logging::Logger::ERROR << "Unknown exception!\n";
- //std::cout << "unknown exeption" << std::endl;
+ std::cout << "unknown exeption" << std::endl;
}
std::cout << "\nConfiguration file must be set!: lbmgm <config file>" << std::endl << std::flush;
diff --git a/apps/gpu/LBM/metisTest/main.cpp b/apps/gpu/LBM/metisTest/main.cpp
index 2627e5e0ea63bc2c5a2730704c52633ae09db073..9edfb9e853f1c4fff6872b15e93d4de94bd35095 100644
--- a/apps/gpu/LBM/metisTest/main.cpp
+++ b/apps/gpu/LBM/metisTest/main.cpp
@@ -15,11 +15,11 @@
#include "metis.h"
-#include "Core/Input/Input.h"
-#include "Core/StringUtilities/StringUtil.h"
+#include "Input/Input.h"
+#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"
@@ -262,17 +262,6 @@ void setParameters(std::shared_ptr<Parameter> para, std::unique_ptr<input::Input
void multipleLevel(const std::string& configPath)
{
- //std::ofstream logFile( "F:/Work/Computations/gridGenerator/grid/gridGeneratorLog.txt" );
- std::ofstream logFile( "grid/gridGeneratorLog.txt" );
- logging::Logger::addStream(&logFile);
-
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::INFO_LOW);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
-
- //UbLog::reportingLevel() = UbLog::logLevelFromString("DEBUG5");
-
auto gridFactory = GridFactory::make();
gridFactory->setGridStrategy(Device::CPU);
//gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::RAYCASTING);
@@ -298,8 +287,8 @@ void multipleLevel(const std::string& configPath)
real dx = 1.0 / 20.0;
real vx = 0.05;
- TriangularMesh* triangularMesh = TriangularMesh::make("F:/Work/Computations/gridGenerator/stl/ShpereNotOptimal.stl");
- //TriangularMesh* triangularMesh = TriangularMesh::make("stl/ShpereNotOptimal.lnx.stl");
+ auto triangularMesh = std::make_shared<TriangularMesh>("F:/Work/Computations/gridGenerator/stl/ShpereNotOptimal.stl");
+ //auto triangularMesh = std::make_shared<TriangularMesh>("stl/ShpereNotOptimal.lnx.stl");
// all
//gridBuilder->addCoarseGrid(-2, -2, -2,
@@ -783,7 +772,6 @@ int main( int argc, char* argv[])
}
catch (const std::exception& e)
{
- *logging::out << logging::Logger::ERROR << e.what() << "\n";
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
@@ -799,22 +787,17 @@ int main( int argc, char* argv[])
}
catch (const std::exception& e)
{
-
- *logging::out << logging::Logger::ERROR << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (const std::bad_alloc e)
{
-
- *logging::out << logging::Logger::ERROR << "Bad Alloc:" << e.what() << "\n";
- //std::cout << e.what() << std::flush;
+ std::cout << e.what() << std::flush;
//MPI_Abort(MPI_COMM_WORLD, -1);
}
catch (...)
{
- *logging::out << logging::Logger::ERROR << "Unknown exception!\n";
- //std::cout << "unknown exeption" << std::endl;
+ std::cout << "unknown exeption" << std::endl;
}
std::cout << "\nConfiguration file must be set!: lbmgm <config file>" << std::endl << std::flush;
diff --git a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
index 5a469b44ab21c9a0fc3850baf9f1a82c1f3a0314..580aab90988215ef010de23b47946158e69fb88e 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/LogFileReader/LogFileReader.cpp
@@ -12,7 +12,7 @@
#include "Utilities/LogFileData/LogFileDataImp.h"
#include <basics/config/ConfigurationFile.h>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include "Utilities/AlmostEquals.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 7bff82d2118e449ea19a1cfd56ff261b730ff0d4..968af578a868b9e2655f4062d89fda8fed37941b 100644
--- a/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
+++ b/apps/gpu/tests/NumericalTestPostProcessing/Utilities/PostProcessingConfigFileReader/PostProcessingConfigFileReaderImp.cpp
@@ -1,7 +1,7 @@
#include "PostProcessingConfigFileReaderImp.h"
#include <basics/config/ConfigurationFile.h>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include "Utilities/PostProcessingConfigData/PostProcessingConfigDataImp.h"
@@ -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/ConfigFileReaderNT/ConfigFileReaderNT.cpp b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
index 5507c32f64eea8bb6c5e5e3c835aa5ae223b33cd..0d0dc94a911acb7c3f3f995922e5ce34ddffa303 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/ConfigFileReaderNT/ConfigFileReaderNT.cpp
@@ -1,7 +1,7 @@
#include "ConfigFileReaderNT.h"
#include <basics/config/ConfigurationFile.h>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include <memory>
#include <fstream>
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 b9b4dd3a8d13ddcce87c555312c0d0a422de5a05..126ff07a31c4f434cc82b4bb8b7e1d944b22cae1 100644
--- a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp
+++ b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/AnalyticalResults2DToVTKWriter/AnalyticalResults2DToVTKWriterImp.cpp
@@ -5,7 +5,7 @@
#include <sstream>
#include <stdio.h>
-#include <Core/StringUtilities/StringUtil.h>
+#include <StringUtilities/StringUtil.h>
#include "Parameter/Parameter.h"
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/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/cpu.cmake b/cpu.cmake
index 13f216203bfeefb9c550b8be470af4cf181a44b4..78034bc927f8c01ce25d882e7d04f9f5e278ba01 100644
--- a/cpu.cmake
+++ b/cpu.cmake
@@ -22,14 +22,19 @@
#SET(CMAKE_BUILD_TYPE DEBUG)
#ENDIF()
-SET(USE_METIS ON CACHE BOOL "include METIS library support")
-SET(USE_VTK OFF CACHE BOOL "include VTK library support")
-SET(USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
+SET(VFCPU_USE_METIS ON CACHE BOOL "include METIS library support")
+SET(VFCPU_USE_VTK OFF CACHE BOOL "include VTK library support")
+SET(VFCPU_USE_CATALYST OFF CACHE BOOL "include Paraview Catalyst support")
+SET(VFCPU_USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
-SET(USE_HLRN_LUSTRE OFF CACHE BOOL "include HLRN Lustre support")
-SET(USE_DEM_COUPLING OFF CACHE BOOL "PE plugin")
+SET(VFCPU_ENABLE_LiggghtsCoupling OFF CACHE BOOL "enable coupling with LIGGGHTS library")
+SET(VFCPU_ENABLE_NonNewtonianFluids ON CACHE BOOL "enable non-Newtonian fluids module")
+SET(VFCPU_ENABLE_MultiphaseFlow ON CACHE BOOL "enable multiphase flow module")
-SET(USE_LIGGGHTS OFF CACHE BOOL "include LIGGGHTS library support")
+if(BUILD_VF_ALL_SAMPLES)
+ set(VFCPU_ENABLE_NonNewtonianFluids ON)
+ set(VFCPU_ENABLE_MultiphaseFlow ON)
+endif()
#MPI
IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MATCHES mpiicpc))# OR NOT ${CMAKE_CXX_COMPILER} MATCHES cc OR NOT ${CMAKE_CXX_COMPILER} MATCHES mpiCC)
@@ -37,32 +42,38 @@ IF((NOT ${CMAKE_CXX_COMPILER} MATCHES mpicxx) AND (NOT ${CMAKE_CXX_COMPILER} MAT
ENDIF()
#SET(MPI_CXX_LINK_FLAGS -mpe=mpilog)
+if(VFCPU_ENABLE_LiggghtsCoupling)
+ add_subdirectory(src/cpu/LiggghtsCoupling)
+ SET(VFCPU_USE_VTK ON CACHE BOOL "include VTK library support" FORCE)
+endif()
+
+
#VTK
-IF(${USE_VTK})
+IF(${VFCPU_USE_VTK})
FIND_PACKAGE(VTK REQUIRED)
INCLUDE_DIRECTORIES(${VTK_INCLUDE_DIRS})
ENDIF()
-IF(${USE_CATALYST})
+IF(${VFCPU_USE_CATALYST})
find_package(ParaView 4.3 REQUIRED COMPONENTS vtkPVPythonCatalyst)
include("${PARAVIEW_USE_FILE}")
ENDIF()
-IF(${USE_METIS})
+IF(${VFCPU_USE_METIS})
list(APPEND VF_COMPILER_DEFINITION VF_METIS)
ENDIF()
-IF(${USE_VTK})
+IF(${VFCPU_USE_VTK})
list(APPEND VF_COMPILER_DEFINITION VF_VTK)
ENDIF()
-IF(${USE_CATALYST})
+IF(${VFCPU_USE_CATALYST})
list(APPEND VF_COMPILER_DEFINITION VF_CATALYST)
ENDIF()
-IF(${USE_BOOST})
+IF(${VFCPU_USE_BOOST})
list(APPEND VF_COMPILER_DEFINITION VF_BOOST)
ENDIF()
-IF(${USE_HLRN_LUSTRE})
+IF(${VFCPU_USE_HLRN_LUSTRE})
list(APPEND VF_COMPILER_DEFINITION HLRN_LUSTRE)
ENDIF()
@@ -71,12 +82,10 @@ IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ia64")
LIST(APPEND VF_COMPILER_DEFINITION _M_IA64)
ENDIF()
-if(${USE_METIS} AND NOT METIS_INCLUDEDIR)
+if(${VFCPU_USE_METIS} AND NOT METIS_INCLUDEDIR)
add_subdirectory(${VF_THIRD_DIR}/metis/metis-5.1.0)
endif()
-
-
add_subdirectory(${VF_THIRD_DIR}/MuParser)
add_subdirectory(src/cpu/VirtualFluidsCore)
@@ -85,8 +94,12 @@ if(BUILD_VF_PYTHON_BINDINGS)
add_subdirectory(src/cpu/simulationconfig)
endif()
-if(USE_LIGGGHTS)
- add_subdirectory(src/cpu/LiggghtsCoupling)
+if(VFCPU_ENABLE_NonNewtonianFluids)
+ add_subdirectory(src/cpu/NonNewtonianFluids)
+endif()
+
+if(VFCPU_ENABLE_MultiphaseFlow)
+ add_subdirectory(src/cpu/MultiphaseFlow)
endif()
set (APPS_ROOT_CPU "${VF_ROOT_DIR}/apps/cpu/")
diff --git a/pythonbindings/pyfluids-stubs/bindings/basics/logger.pyi b/pythonbindings/pyfluids-stubs/bindings/basics/logger.pyi
deleted file mode 100644
index 876c7037b74f5d467ad6686db89b8d6529068609..0000000000000000000000000000000000000000
--- a/pythonbindings/pyfluids-stubs/bindings/basics/logger.pyi
+++ /dev/null
@@ -1,85 +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 logger.pyi
-! \ingroup basics
-! \author Henry Korb
-=======================================================================================
-"""
-from __future__ import annotations
-
-from typing import ClassVar
-
-log: None
-
-class Level:
- __members__: ClassVar[dict] = ... # read-only
- INFO_HIGH: ClassVar[Level] = ...
- INFO_INTERMEDIATE: ClassVar[Level] = ...
- INFO_LOW: ClassVar[Level] = ...
- LOGGER_ERROR: ClassVar[Level] = ...
- WARNING: ClassVar[Level] = ...
- __entries: ClassVar[dict] = ...
- def __init__(self, arg0: int) -> None: ...
- def __eq__(self, arg0: object) -> bool: ...
- def __getstate__(self) -> int: ...
- def __hash__(self) -> int: ...
- def __index__(self) -> int: ...
- def __int__(self) -> int: ...
- def __ne__(self, arg0: object) -> bool: ...
- def __setstate__(self, arg0: int) -> None: ...
- @property
- def name(self) -> str: ...
-
-class Logger:
- def __init__(self, *args, **kwargs) -> None: ...
- @staticmethod
- def add_stdout() -> None: ...
- @staticmethod
- def enable_printed_rank_numbers(print: bool) -> None: ...
- @staticmethod
- def set_debug_level(level: Level) -> None: ...
- @staticmethod
- def time_stamp(time_stemp: TimeStamp) -> None: ...
-
-class TimeStamp:
- __members__: ClassVar[dict] = ... # read-only
- DISABLE: ClassVar[TimeStamp] = ...
- ENABLE: ClassVar[TimeStamp] = ...
- __entries: ClassVar[dict] = ...
- def __init__(self, arg0: int) -> None: ...
- def __eq__(self, arg0: object) -> bool: ...
- def __getstate__(self) -> int: ...
- def __hash__(self) -> int: ...
- def __index__(self) -> int: ...
- def __int__(self) -> int: ...
- def __ne__(self, arg0: object) -> bool: ...
- def __setstate__(self, arg0: int) -> None: ...
- @property
- def name(self) -> str: ...
diff --git a/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi b/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi
index 7de6e0b9f529924d64e6ef26f206cf5d04b32947..d31c6b464de55cedd1e241c4d2b5175ab9752e8c 100644
--- a/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi
+++ b/pythonbindings/pyfluids-stubs/bindings/gpu/__init__.pyi
@@ -145,10 +145,10 @@ class BoundaryConditionFactory:
def set_velocity_boundary_condition(self, boundary_condition_type: VelocityBC) -> None: ...
-class Communicator:
+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: ...
diff --git a/pythonbindings/src/VirtualFluids.cpp b/pythonbindings/src/VirtualFluids.cpp
index 20e5012e0af325440e502c704d6f372100306ab1..91682b79e8125a7513565b28e2e22e74e0b2dac1 100644
--- a/pythonbindings/src/VirtualFluids.cpp
+++ b/pythonbindings/src/VirtualFluids.cpp
@@ -49,7 +49,8 @@ namespace py_bindings
PYBIND11_MODULE(bindings, m)
{
- py::add_ostream_redirect(m, "ostream_redirect");
+ // because we do not use the old logger (src/basics/logger) anymore and cout is not passed anymore to the old logger, we probably do not need this anymore
+ // pybind11::add_ostream_redirect(m, "ostream_redirect");
basics::makeModule(m);
lbm::makeModule(m);
logging::makeModule(m);
@@ -60,4 +61,4 @@ namespace py_bindings
cpu::makeModule(m);
#endif
}
-}
\ No newline at end of file
+}
diff --git a/pythonbindings/src/basics/basics.cpp b/pythonbindings/src/basics/basics.cpp
index daba29cdc53e193b4698d9fbbd45763c763c42fc..0b294b7a8de2f4f396dac418b0544b5f99ecec3d 100644
--- a/pythonbindings/src/basics/basics.cpp
+++ b/pythonbindings/src/basics/basics.cpp
@@ -31,7 +31,6 @@
//! \author Henry Korb
//=======================================================================================
#include <pybind11/pybind11.h>
-#include "submodules/logger.cpp"
#include "submodules/configuration_file.cpp"
namespace basics
@@ -42,9 +41,8 @@ namespace basics
{
py::module basicsModule = parentModule.def_submodule("basics");
- logger::makeModule(basicsModule);
configuration::makeModule(basicsModule);
-
+
return basicsModule;
}
}
\ 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/basics/submodules/logger.cpp b/pythonbindings/src/basics/submodules/logger.cpp
deleted file mode 100644
index fa7e00e4dca06581b7a14d2bcf2628ed6af60001..0000000000000000000000000000000000000000
--- a/pythonbindings/src/basics/submodules/logger.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 logger.cpp
-//! \ingroup submodules
-//! \author Henry Korb
-//=======================================================================================
-#include <pybind11/pybind11.h>
-#include <pybind11/iostream.h>
-#include <basics/Core/Logger/Logger.h>
-#include <basics/Core/Logger/implementations/LoggerImp.h>
-
-namespace logger
-{
- namespace py = pybind11;
-
- py::module makeModule(py::module_ &parentModule)
- {
- py::module loggerModule = parentModule.def_submodule("logger");
-
- py::class_<logging::Logger>(loggerModule, "Logger")
- .def_static("add_stdout", [](){
- logging::Logger::addStream(&std::cout);
- })
- .def_static("set_debug_level", &logging::Logger::setDebugLevel)
- .def_static("time_stamp", &logging::Logger::timeStamp, py::arg("time_stamp"))
- .def_static("enable_printed_rank_numbers", &logging::Logger::enablePrintedRankNumbers, py::arg("print"));
-
- loggerModule.attr("log") = logging::out;
- py::enum_<logging::Logger::Level>(loggerModule, "Level")
- .value("INFO_LOW", logging::Logger::Level::INFO_LOW)
- .value("INFO_INTERMEDIATE", logging::Logger::Level::INFO_INTERMEDIATE)
- .value("INFO_HIGH", logging::Logger::Level::INFO_HIGH)
- .value("WARNING", logging::Logger::Level::WARNING)
- .value("LOGGER_ERROR", logging::Logger::Level::LOGGER_ERROR);
-
- py::enum_<logging::Logger::TimeStamp>(loggerModule, "TimeStamp")
- .value("ENABLE", logging::Logger::TimeStamp::ENABLE)
- .value("DISABLE", logging::Logger::TimeStamp::DISABLE);
-
- return loggerModule;
- }
-}
\ No newline at end of file
diff --git a/pythonbindings/src/cpu/submodules/boundaryconditions.cpp b/pythonbindings/src/cpu/submodules/boundaryconditions.cpp
index d7cd0b578a52c369923db0e31b01200f0389c9eb..8ab64a7a5037d134563eaac4e836f72e89c4ec77 100644
--- a/pythonbindings/src/cpu/submodules/boundaryconditions.cpp
+++ b/pythonbindings/src/cpu/submodules/boundaryconditions.cpp
@@ -30,16 +30,17 @@
//! \ingroup submodules
//! \author Sven Marcus, Henry Korb
//=======================================================================================
+#include "BCStrategy.h"
#include <pybind11/pybind11.h>
#include <pybind11/stl.h>
-#include <BoundaryConditions/DensityBCAdapter.h>
-#include <BoundaryConditions/NonReflectingOutflowBCAlgorithm.h>
-#include <BoundaryConditions/BCAdapter.h>
-#include <BoundaryConditions/NoSlipBCAdapter.h>
-#include <BoundaryConditions/VelocityBCAdapter.h>
-#include <BoundaryConditions/NoSlipBCAlgorithm.h>
-#include <BoundaryConditions/VelocityBCAlgorithm.h>
-#include <BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h>
+#include <BoundaryConditions/DensityBC.h>
+#include <BoundaryConditions/NonReflectingOutflowBCStrategy.h>
+#include <BoundaryConditions/BC.h>
+#include <BoundaryConditions/NoSlipBC.h>
+#include <BoundaryConditions/VelocityBC.h>
+#include <BoundaryConditions/NoSlipBCStrategy.h>
+#include <BoundaryConditions/VelocityBCStrategy.h>
+#include <BoundaryConditions/HighViscosityNoSlipBCStrategy.h>
namespace boundaryconditions
{
@@ -47,35 +48,35 @@ namespace boundaryconditions
using namespace py::literals;
template<class adapter, class algorithm,
- class = std::enable_if_t<std::is_base_of<BCAdapter, adapter>::value>,
- class = std::enable_if_t<std::is_base_of<BCAlgorithm, algorithm>::value>>
+ class = std::enable_if_t<std::is_base_of<BC, adapter>::value>,
+ class = std::enable_if_t<std::is_base_of<BCStrategy, algorithm>::value>>
class PyBoundaryCondition : public adapter
{
public:
template<typename ...Args>
PyBoundaryCondition(Args &&... args) : adapter(std::forward<Args>(args)...)
{
- this->setBcAlgorithm(std::make_shared<algorithm>());
+ this->setBCStrategy(std::make_shared<algorithm>());
}
};
template<class adapter, class algorithm>
- using bc_class = py::class_<PyBoundaryCondition<adapter, algorithm>, BCAdapter,
+ using bc_class = py::class_<PyBoundaryCondition<adapter, algorithm>, BC,
std::shared_ptr<PyBoundaryCondition<adapter, algorithm>>>;
void makeModule(py::module_ &parentModule)
{
py::module_ bcModule = parentModule.def_submodule("boundaryconditions");
- auto _ = py::class_<BCAdapter, std::shared_ptr<BCAdapter>>(bcModule, "BCAdapter");
+ auto _ = py::class_<BC, std::shared_ptr<BC>>(bcModule, "BC");
- bc_class<NoSlipBCAdapter, NoSlipBCAlgorithm>(bcModule, "NoSlipBoundaryCondition")
+ bc_class<NoSlipBC, NoSlipBCStrategy>(bcModule, "NoSlipBoundaryCondition")
.def(py::init());
- bc_class<NoSlipBCAdapter, HighViscosityNoSlipBCAlgorithm>(bcModule, "HighViscosityNoSlipBoundaryCondition")
+ bc_class<NoSlipBC, HighViscosityNoSlipBCStrategy>(bcModule, "HighViscosityNoSlipBoundaryCondition")
.def(py::init());
- bc_class<VelocityBCAdapter, VelocityBCAlgorithm>(bcModule, "VelocityBoundaryCondition")
+ bc_class<VelocityBC, VelocityBCStrategy>(bcModule, "VelocityBoundaryCondition")
.def(py::init())
.def(py::init<bool &, bool &, bool &, mu::Parser &, real &, real &>(),
"vx1"_a, "vx2"_a, "vx3"_a,
@@ -89,7 +90,7 @@ namespace boundaryconditions
"vx2"_a, "vx2_start_time"_a, "vx2_end_time"_a,
"vx3"_a, "vx3_start_time"_a, "vx3_end_time"_a);
- bc_class<DensityBCAdapter, NonReflectingOutflowBCAlgorithm>(bcModule, "NonReflectingOutflow")
+ bc_class<DensityBC, NonReflectingOutflowBCStrategy>(bcModule, "NonReflectingOutflow")
.def(py::init());
}
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/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/regression-tests/README.md b/regression-tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..471ce331cc90dbfcfa323011419f201031bc48bd
--- /dev/null
+++ b/regression-tests/README.md
@@ -0,0 +1,3 @@
+# Adding Regression Tests.
+
+How to add regression test is described in [this document](https://git.rz.tu-bs.de/irmb/virtualfluids/-/wikis/Regression-Tests).
\ No newline at end of file
diff --git a/regression-tests/__regression_test_executer.sh b/regression-tests/__regression_test_executer.sh
new file mode 100644
index 0000000000000000000000000000000000000000..2541619299110bfcb872e48035c6e5e9fb8d7672
--- /dev/null
+++ b/regression-tests/__regression_test_executer.sh
@@ -0,0 +1,29 @@
+
+
+download_reference_data () {
+ rm -rf reference_data && mkdir -p reference_data
+ git clone --depth 1 --filter=blob:none --sparse https://github.com/irmb/test_data reference_data
+ cd reference_data
+ git sparse-checkout add $1
+ cd ..
+}
+
+
+# run regression test - arguments:
+# 1. REFERENCE_DATA_DIR - to download the reference data and compare against
+# 2. CMAKE_FLAGS - cmake flags for the build of VirtualFluids
+# 3. APPLICATION - the application to be executed
+# 4. RESULT_DATA_DIR - the path to the produced data to be compared
+run_regression_test () {
+ download_reference_data $1
+
+ rm -rf build && mkdir -p build
+ cmake -B build $2
+ cmake --build build --parallel 8
+
+ # execute the application
+ $3
+
+ # execute fieldcompare (A more comprehensive manual can be found here https://gitlab.com/dglaeser/fieldcompare)
+ fieldcompare dir $4 reference_data/$1 --include-files "*.vtu"
+}
\ No newline at end of file
diff --git a/regression-tests/driven_cavity_test.sh b/regression-tests/driven_cavity_test.sh
index b8998e309a4553cba96c015c83d45e35274e3e56..e4a7dcf050c81ea7f3ccd99cffd58edab80959bd 100755
--- a/regression-tests/driven_cavity_test.sh
+++ b/regression-tests/driven_cavity_test.sh
@@ -1,24 +1,19 @@
#!/bin/bash
+source ./regression-tests/__regression_test_executer.sh
-#################################
-# Driven Cavity Regression Test
-#################################
-# build VirtualFluids accordingly to our specific test scenario.
-# in this case adding -DUSER_APPS="apps/gpu/LBM/DrivenCavity to the cmake command is not necessary, because the DrivenCavity is added to VirtualFluids by default.
-mkdir -p build
-cmake -B build --preset=make_gpu -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_ARCHITECTURES=75 #-DUSER_APPS="apps/gpu/LBM/DrivenCavity"
-cmake --build build --parallel 8
+# 1. set reference data directory (must match the folder structure in https://github.com/irmb/test_data)
+REFERENCE_DATA_DIR=regression_tests/gpu/DrivenCavity_2Levels
-# execute VirtualFluids
-./build/bin/DrivenCavity
+# 2. set cmake flags for the build of VirtualFluids
+CMAKE_FLAGS="--preset=make_gpu -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_ARCHITECTURES=75"
-# set the path to the produced data
-PATH_TO_DIR=output/DrivenCavity
+# 3. define the application to be executed
+APPLICATION=./build/bin/DrivenCavity
-# set the path to the reference data.
-# `regression-tests/reference_data` is fix `regression_tests/gpu/DrivenCavity_2Levels` must match the structure in https://github.com/irmb/test_data:
-PATH_TO_REFERENCE_DIR=reference_data/regression_tests/gpu/DrivenCavity_2Levels
+# 4. set the path to the produced data
+RESULT_DATA_DIR=output/DrivenCavity
+
+
+run_regression_test "$REFERENCE_DATA_DIR" "$CMAKE_FLAGS" "$APPLICATION" "$RESULT_DATA_DIR"
-# execute fieldcompare (A more comprehensive manual can be found here https://gitlab.com/dglaeser/fieldcompare)
-fieldcompare dir $PATH_TO_DIR $PATH_TO_REFERENCE_DIR --include-files "*.vtu"
diff --git a/regression-tests/driven_cavity_uniform_test.sh b/regression-tests/driven_cavity_uniform_test.sh
index ae47c98af85252fb61aeb5fb7e4315692ab4b866..deb1300cad5914e69a4f2c01428bbef31d7af6d3 100755
--- a/regression-tests/driven_cavity_uniform_test.sh
+++ b/regression-tests/driven_cavity_uniform_test.sh
@@ -1,25 +1,19 @@
#!/bin/bash
-#################################
-# Driven Cavity Regression Test
-#################################
+source ./regression-tests/__regression_test_executer.sh
-# build VirtualFluids accordingly to our specific test scenario.
-# in this case adding -DUSER_APPS="apps/gpu/LBM/DrivenCavity to the cmake command is not necessary, because the DrivenCavity is added to VirtualFluids by default.
-mkdir -p build
-cmake -B build --preset=make_gpu -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_ARCHITECTURES=75 -DUSER_APPS="apps/gpu/LBM/DrivenCavityUniform"
-cmake --build build --parallel 8
-# execute VirtualFluids
-./build/bin/DrivenCavityUniform
+# 1. set reference data directory (must match the folder structure in https://github.com/irmb/test_data)
+REFERENCE_DATA_DIR=regression_tests/gpu/DrivenCavity_uniform
+# 2. set cmake flags for the build of VirtualFluids
+CMAKE_FLAGS="--preset=make_gpu -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_ARCHITECTURES=75 -DUSER_APPS="apps/gpu/LBM/DrivenCavityUniform""
-# set the path to the produced data
-PATH_TO_DIR=output/DrivenCavity_uniform
+# 3. define the application to be executed
+APPLICATION=./build/bin/DrivenCavityUniform
-# set the path to the reference data.
-# `regression-tests/reference_data` is fix `regression_tests/gpu/DrivenCavity_uniform_2022_12_16` must match the structure in https://github.com/irmb/test_data:
-PATH_TO_REFERENCE_DIR=reference_data/regression_tests/gpu/DrivenCavity_uniform
+# 4. set the path to the produced data
+RESULT_DATA_DIR=output/DrivenCavity_uniform
-# execute fieldcompare (A more comprehensive manual can be found here https://gitlab.com/dglaeser/fieldcompare)
-fieldcompare dir $PATH_TO_DIR $PATH_TO_REFERENCE_DIR --include-files "*.vtu"
+
+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..33b7178372f0ce869565e8eee567a75ac8759ee4 100755
--- a/regression-tests/multigpu_test/rocket4GPU.yml
+++ b/regression-tests/multigpu_test/rocket4GPU.yml
@@ -46,6 +46,7 @@ collect:
clean:
- multigpu_test/output/*
+ - multigpu_test/src/*
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..9c59b4ce52984ad552bb3d32233a4d694589721f 100755
--- a/regression-tests/multigpu_test/rocket8GPU.yml
+++ b/regression-tests/multigpu_test/rocket8GPU.yml
@@ -46,6 +46,7 @@ collect:
clean:
- multigpu_test/output/*
+ - multigpu_test/src/*
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..70b33f07f4a4a7be7f5b50990098f3322238af4a 100755
--- a/regression-tests/multigpu_test/slurm4GPU.job
+++ b/regression-tests/multigpu_test/slurm4GPU.job
@@ -10,8 +10,8 @@
##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
+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 +19,7 @@ PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
module list
cd multigpu_test
-mkdir -p build
+rm -r 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 +27,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..b91d7d473d935d4d0fbe8deba344dbaa58cf5080 100755
--- a/regression-tests/multigpu_test/slurm8GPU.job
+++ b/regression-tests/multigpu_test/slurm8GPU.job
@@ -10,8 +10,8 @@
##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
+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 +19,7 @@ PATH=/home/irmb/tools/cmake-3.20.3-linux-x86_64/bin:$PATH
module list
cd multigpu_test
-mkdir -p build
+rm -r 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 +27,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/regression-tests.sh b/regression-tests/regression-tests.sh
deleted file mode 100755
index e4cb07c63369cd1c1743e7e223812830caafe02f..0000000000000000000000000000000000000000
--- a/regression-tests/regression-tests.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-#################################
-# VirtualFludis regression tests
-#################################
-
-
-# 1. Cloning the reference data from github
-rm -r reference_data && mkdir -p reference_data
-git clone https://github.com/irmb/test_data reference_data
-
-# 2. set up the python environnement
-# by cloning our meshio patch and fieldcompare into a venv
-python3 -m venv .venv
-source .venv/bin/activate
-pip install fieldcompare
-
-# 3. Running the specific tests
-./regression-tests/driven_cavity_uniform_test.sh
-./regression-tests/driven_cavity_test.sh
-
-
-
-# How to add a new regression test?
-# 1. setup the specfic simulation and run it to create reference data.
-# 2. fork https://github.com/irmb/test_data and create a pull request containing the reference data.
-# 3. copy ./regression-tests/driven_cavity_test.sh and adjust the file accordingly to the new test scenario.
-# 4. execute this file from here accordingly to #3.
\ No newline at end of file
diff --git a/regression-tests/sphere_in_channel_test.sh b/regression-tests/sphere_in_channel_test.sh
new file mode 100644
index 0000000000000000000000000000000000000000..e416d535d274537d008a442435f66a38dd69fac1
--- /dev/null
+++ b/regression-tests/sphere_in_channel_test.sh
@@ -0,0 +1,20 @@
+#!/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/gpu/SphereInChannel
+
+# 2. set cmake flags for the build of VirtualFluids
+CMAKE_FLAGS="--preset=make_gpu -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_ARCHITECTURES=75"
+
+# 3. define the application to be executed
+APPLICATION=./build/bin/SphereGPU
+
+# 4. set the path to the produced data
+RESULT_DATA_DIR=output/Sphere
+
+
+run_regression_test "$REFERENCE_DATA_DIR" "$CMAKE_FLAGS" "$APPLICATION" "$RESULT_DATA_DIR"
+
+# fieldcompare dir output/Sphere reference_data/regression_tests/gpu/SphereInChannel --include-files "*.vtu"
\ No newline at end of file
diff --git a/src/basics/CMakeLists.txt b/src/basics/CMakeLists.txt
index 14e1760fe3cb6f9b1e122f4adc5adbfb3e30b5c7..7e4cccf26f0c54a47d720f8d33fad435800838b7 100644
--- a/src/basics/CMakeLists.txt
+++ b/src/basics/CMakeLists.txt
@@ -1,19 +1,18 @@
-include(Core/buildInfo.cmake)
+include(buildInfo.cmake)
vf_add_library(PUBLIC_LINK logger MPI::MPI_CXX EXCLUDE buildInfo.in.cpp)
vf_get_library_name (library_name)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Core)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/geometry3d)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/geometry3d/KdTree)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/basics/container)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/basics/memory)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/basics/objects)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/basics/parallel)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/basics/transmitter)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/basics/utilities)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/basics/writer)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/container)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/memory)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/objects)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/parallel)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/transmitter)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/utilities)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/writer)
diff --git a/src/basics/Core/ArrayTypes.h b/src/basics/Core/ArrayTypes.h
deleted file mode 100644
index f899c92a7be4f29065b55b13fb1a1181da0eaf7e..0000000000000000000000000000000000000000
--- a/src/basics/Core/ArrayTypes.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 ArrayTypes.h
-//! \ingroup Core
-//! \author Konstantin Kutscher, Soeren Textor, Sebastian Geller
-//=======================================================================================
-#ifndef ARRAYTYPES_H
-#define ARRAYTYPES_H
-
-#include <array>
-
-#include "DataTypes.h"
-
-typedef std::array<uint, 2> uint_2;
-typedef std::array<uint, 3> uint_3;
-typedef std::array<uint, 4> uint_4;
-typedef std::array<uint, 5> uint_5;
-typedef std::array<uint, 6> uint_6;
-typedef std::array<uint, 7> uint_7;
-typedef std::array<uint, 8> uint_8;
-typedef std::array<uint, 9> uint_9;
-typedef std::array<uint, 10> uint_10;
-typedef std::array<uint, 11> uint_11;
-typedef std::array<uint, 12> uint_12;
-typedef std::array<uint, 13> uint_13;
-typedef std::array<uint, 14> uint_14;
-typedef std::array<uint, 15> uint_15;
-typedef std::array<uint, 16> uint_16;
-typedef std::array<uint, 17> uint_17;
-typedef std::array<uint, 18> uint_18;
-typedef std::array<uint, 19> uint_19;
-typedef std::array<uint, 20> uint_20;
-typedef std::array<uint, 21> uint_21;
-typedef std::array<uint, 22> uint_22;
-typedef std::array<uint, 23> uint_23;
-typedef std::array<uint, 24> uint_24;
-typedef std::array<uint, 25> uint_25;
-typedef std::array<uint, 26> uint_26;
-typedef std::array<uint, 27> uint_27;
-
-typedef std::array<bool, 2> bool_2;
-typedef std::array<bool, 3> bool_3;
-typedef std::array<bool, 4> bool_4;
-typedef std::array<bool, 5> bool_5;
-typedef std::array<bool, 6> bool_6;
-typedef std::array<bool, 7> bool_7;
-typedef std::array<bool, 8> bool_8;
-typedef std::array<bool, 9> bool_9;
-typedef std::array<bool, 10> bool_10;
-typedef std::array<bool, 11> bool_11;
-typedef std::array<bool, 12> bool_12;
-typedef std::array<bool, 13> bool_13;
-typedef std::array<bool, 14> bool_14;
-typedef std::array<bool, 15> bool_15;
-typedef std::array<bool, 16> bool_16;
-typedef std::array<bool, 17> bool_17;
-typedef std::array<bool, 18> bool_18;
-typedef std::array<bool, 19> bool_19;
-typedef std::array<bool, 20> bool_20;
-typedef std::array<bool, 21> bool_21;
-typedef std::array<bool, 22> bool_22;
-typedef std::array<bool, 23> bool_23;
-typedef std::array<bool, 24> bool_24;
-typedef std::array<bool, 25> bool_25;
-typedef std::array<bool, 26> bool_26;
-typedef std::array<bool, 27> bool_27;
-
-#endif
diff --git a/src/basics/Core/Logger/Logger.cpp b/src/basics/Core/Logger/Logger.cpp
deleted file mode 100644
index 1a27ef6f2a33bf46b9f488a4cf8d17705c2a64e6..0000000000000000000000000000000000000000
--- a/src/basics/Core/Logger/Logger.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 Logger.cpp
-//! \ingroup Logger
-//! \author Stephan Lenz
-//=======================================================================================
-#include "Logger.h"
-#include <iostream>
-#include <memory>
-
-#include "implementations/LoggerImp.h"
-
-namespace logging
-{
-
-std::shared_ptr<Logger> out = nullptr;
-
-logging::Logger::Level logging::Logger::globalLogLevel = logging::Logger::INFO_LOW;
-logging::Logger::Level logging::Logger::localLogLevel = logging::Logger::INFO_LOW;
-bool logging::Logger::printRankNumber = false;
-bool logging::Logger::timeStampEnabled = false;
-
-logging::Logger::Logger(std::ostream *stream) { streams.push_back(stream); }
-
-logging::Logger::~Logger() = default;
-
-void Logger::addStreamToList(std::ostream *stream) { streams.push_back(stream); }
-
-void Logger::resetStreamList() { streams.clear(); }
-
-//-----------static methods----------------//
-void logging::Logger::resetStreams()
-{
- if (!out)
- out = std::make_shared<LoggerImp>(&std::cout);
-
- out->resetStreamList();
-}
-
-void logging::Logger::setStream(std::ostream *stream) { out = std::make_shared<LoggerImp>(stream); }
-
-void logging::Logger::addStream(std::ostream *stream)
-{
- if (!out)
- out = std::make_shared<LoggerImp>(stream);
- else
- out->addStreamToList(stream);
-}
-
-void logging::Logger::timeStamp(TimeStamp timeStamp)
-{
- switch (timeStamp) {
- case ENABLE:
- timeStampEnabled = true;
- break;
- case DISABLE:
- timeStampEnabled = false;
- break;
- }
-}
-
-void logging::Logger::setDebugLevel(const Level &level) { globalLogLevel = level; }
-
-void logging::Logger::enablePrintedRankNumbers(bool print) { printRankNumber = print; }
-
-} // namespace logging
diff --git a/src/basics/Core/Logger/Logger.h b/src/basics/Core/Logger/Logger.h
deleted file mode 100644
index 53cb974b8e409a8ba6eb555abac41ca99eb2bbcf..0000000000000000000000000000000000000000
--- a/src/basics/Core/Logger/Logger.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 Logger.h
-//! \ingroup Logger
-//! \author Stephan Lenz
-//=======================================================================================
-#ifndef Logger_H
-#define Logger_H
-
-#include "basics_export.h"
-
-#include <memory>
-#include <ostream>
-#include <string>
-#include <vector>
-
-namespace logging
-{
-class BASICS_EXPORT Logger
-{
-protected:
- Logger(std::ostream *stream);
-
-public:
- virtual ~Logger();
-
- enum Level { INFO_LOW = 3, INFO_INTERMEDIATE = 2, INFO_HIGH = 1, WARNING = 0, LOGGER_ERROR = -1 };
-
- enum TimeStamp { ENABLE, DISABLE };
-
- static void setStream(std::ostream *stream);
- static void addStream(std::ostream *stream);
- static void resetStreams();
-
- static void timeStamp(TimeStamp timeStamp);
-
- static void setDebugLevel(const Level &level = Level::LOGGER_ERROR);
- static void enablePrintedRankNumbers(bool printRankNumbers);
-
- virtual Logger &operator<<(const Level &level) = 0;
- virtual Logger &operator<<(const std::string &log) = 0;
- virtual Logger &operator<<(const int &log) = 0;
- virtual Logger &operator<<(const unsigned int &log) = 0;
- virtual Logger &operator<<(const unsigned long &log) = 0;
- virtual Logger &operator<<(const float &log) = 0;
- virtual Logger &operator<<(const double &log) = 0;
-
-protected:
- void addStreamToList(std::ostream *stream);
- void resetStreamList();
-
- std::vector<std::ostream *> streams;
-
- static Level globalLogLevel;
- static Level localLogLevel;
- static bool printRankNumber;
- static bool timeStampEnabled;
-};
-extern BASICS_EXPORT std::shared_ptr<Logger> out;
-} // namespace logging
-
-#endif
diff --git a/src/basics/Core/Logger/implementations/LoggerImp.cpp b/src/basics/Core/Logger/implementations/LoggerImp.cpp
deleted file mode 100644
index 086c0e3aa5153f017905cd8476248ea7a7434335..0000000000000000000000000000000000000000
--- a/src/basics/Core/Logger/implementations/LoggerImp.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 LoggerImp.cpp
-//! \ingroup Logger
-//! \author Stephan Lenz
-//=======================================================================================
-#include "LoggerImp.h"
-
-#include <chrono>
-#include <iomanip>
-#include <iostream>
-#include <mpi.h>
-#include <sstream>
-
-logging::LoggerImp::LoggerImp(std::ostream *stream) : logging::Logger(stream)
-{
- levelString[Level::WARNING] = "[WARNING] ";
- levelString[Level::LOGGER_ERROR] = "[ERROR] ";
- levelString[Level::INFO_LOW] = "[INFO_LOW] ";
- levelString[Level::INFO_INTERMEDIATE] = "[INFO_INTERMEDIATE]";
- levelString[Level::INFO_HIGH] = "[INFO_HIGH] ";
-}
-
-logging::LoggerImp::~LoggerImp() = default;
-
-logging::Logger &logging::LoggerImp::operator<<(const Level &level)
-{
- localLogLevel = level;
- return *this;
-}
-
-logging::Logger &logging::LoggerImp::operator<<(const std::string &message) { return this->log(message); }
-
-logging::Logger &logging::LoggerImp::operator<<(const int &message) { return this->log(std::to_string(message)); }
-
-logging::Logger &logging::LoggerImp::operator<<(const unsigned int &message)
-{
- return this->log(std::to_string(message));
-}
-
-logging::Logger &logging::LoggerImp::operator<<(const unsigned long &message)
-{
- return this->log(std::to_string(message));
-}
-
-logging::Logger &logging::LoggerImp::operator<<(const float &message) { return this->log(std::to_string(message)); }
-
-logging::Logger &logging::LoggerImp::operator<<(const double &message) { return this->log(std::to_string(message)); }
-
-logging::Logger &logging::LoggerImp::log(const std::string &message)
-{
- if (shouldBeLogged()) {
- std::string modifiedMessage = message;
- addDebugInformation(modifiedMessage);
- for (auto stream : streams)
- *stream << modifiedMessage << std::flush;
- }
- std::size_t found = message.find(std::string("\n"));
- if (found != std::string::npos)
- newLoggingLine = true;
- else
- newLoggingLine = false;
-
- return *this;
-}
-
-bool logging::LoggerImp::shouldBeLogged() { return localLogLevel <= globalLogLevel; }
-
-void logging::LoggerImp::addDebugInformation(std::string &message)
-{
- if (newLoggingLine) {
- std::stringstream os;
- os << levelString[localLogLevel] << getTimeStamp() << " " << message;
- message = os.str();
- }
-}
-
-std::string logging::LoggerImp::getTimeStamp()
-{
- if (!timeStampEnabled)
- return "";
-
- const auto now = std::chrono::system_clock::now();
- time_t tt = std::chrono::system_clock::to_time_t(now);
- // const tm utc_tm = *gmtime(&tt);
- const tm local_tm = *localtime(&tt);
-
- std::stringstream os;
- os << " [" << std::setw(2) << std::setfill('0') << local_tm.tm_hour << ":";
- os << std::setw(2) << std::setfill('0') << local_tm.tm_min << ":";
- os << std::setw(2) << std::setfill('0') << local_tm.tm_sec << "]";
- return os.str();
-}
-
-std::string logging::LoggerImp::getRankString()
-{
- int rank;
- MPI_Comm_rank(MPI_COMM_WORLD, &rank);
- return printRankNumber ? "[" + std::to_string(rank) + "] " : "";
-}
diff --git a/src/basics/Core/Logger/implementations/LoggerImp.h b/src/basics/Core/Logger/implementations/LoggerImp.h
deleted file mode 100644
index 070b06a23ee59a1d387f09fc86960dd3083c4e61..0000000000000000000000000000000000000000
--- a/src/basics/Core/Logger/implementations/LoggerImp.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 LoggerImp.h
-//! \ingroup Logger
-//! \author Stephan Lenz
-//=======================================================================================
-#ifndef LoggerImp_H
-#define LoggerImp_H
-
-#include "basics_export.h"
-
-#include <string>
-
-#include "../Logger.h"
-#include <map>
-
-namespace logging
-{
-
-class BASICS_EXPORT LoggerImp : public Logger
-{
-public:
- LoggerImp(std::ostream *stream);
- ~LoggerImp() override;
-
- Logger &operator<<(const Level &level) override;
- Logger &operator<<(const std::string &message) override;
- Logger &operator<<(const int &message) override;
- Logger &operator<<(const unsigned int &message) override;
- Logger &operator<<(const unsigned long &log) override;
- Logger &operator<<(const float &message) override;
- Logger &operator<<(const double &message) override;
-
-private:
- std::string getRankString();
- static bool shouldBeLogged();
-
- static std::string getTimeStamp();
- void addDebugInformation(std::string &message);
- logging::Logger &log(const std::string &message);
-
-private:
- std::map<Logger::Level, std::string> levelString;
- bool newLoggingLine = true;
-};
-
-} // namespace logging
-
-#endif
diff --git a/src/basics/Core/Logger/implementations/LoggerTest.cpp b/src/basics/Core/Logger/implementations/LoggerTest.cpp
deleted file mode 100644
index 2c4e4e6819a19497c3061caddbfa4c2a54953054..0000000000000000000000000000000000000000
--- a/src/basics/Core/Logger/implementations/LoggerTest.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include "gmock/gmock.h"
-#include <fstream>
-#include <memory>
-
-#include "../Logger.h"
-
-TEST(DISABLED_LoggerTest, logStringWithoutSettingLevels_WillPutTheLogMesssageIntoTheStream)
-{
- std::ostringstream stream;
- logging::Logger::setStream(&stream);
-
- *logging::out << logging::Logger::INFO_LOW << "Hello World\n";
-
- EXPECT_THAT(stream.str(), "[LOW] Hello World\n");
-}
-
-TEST(DISABLED_LoggerTest, logStringWithHighDebugLevel_logOnlyHighLevelMessages)
-{
- std::ostringstream stream;
- logging::Logger::setStream(&stream);
-
- logging::Logger::setDebugLevel(logging::Logger::INFO_HIGH);
- *logging::out << logging::Logger::INFO_LOW << "Low Debug Message\n"
- << logging::Logger::INFO_HIGH << "HIGH Debug Message\n";
-
- EXPECT_THAT(stream.str(), "[HIGH] HIGH Debug Message\n");
-}
-
-TEST(DISABLED_LoggerTest, addTwoStreams_shouldWriteToBoth)
-{
- logging::Logger::resetStreams();
-
- std::ostringstream stream1, stream2;
- logging::out->addStream(&stream1);
- logging::out->addStream(&stream2);
- logging::Logger::setDebugLevel(logging::Logger::INFO_LOW);
-
- *logging::out << logging::Logger::INFO_LOW << "Hello World\n";
-
- EXPECT_THAT(stream1.str(), "[LOW] Hello World\n");
- EXPECT_THAT(stream2.str(), "[LOW] Hello World\n");
-}
-
-TEST(DISABLED_LoggerTest, splittetOutputShouldHaveDebugInformationOnce)
-{
- std::ostringstream stream;
- logging::Logger::setStream(&stream);
-
- *logging::out << logging::Logger::INFO_LOW << "Hello"
- << " World\n";
-
- EXPECT_THAT(stream.str(), "[LOW] Hello World\n");
-}
-
-TEST(DISABLED_LoggerTest, enableTimeStampInOutput)
-{
- std::ostringstream stream;
- logging::Logger::setStream(&stream);
- logging::Logger::timeStamp(logging::Logger::TimeStamp::ENABLE);
-
- *logging::out << logging::Logger::INFO_LOW << "Hello"
- << " World\n";
-
- EXPECT_THAT(stream.str(), testing::StrNe("[LOW] Hello World\n"));
-}
diff --git a/src/basics/Core/RealConstants.h b/src/basics/Core/RealConstants.h
deleted file mode 100644
index 5cb42584e29d0e0a1a9cf1b40f50736dd13169f0..0000000000000000000000000000000000000000
--- a/src/basics/Core/RealConstants.h
+++ /dev/null
@@ -1,255 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 RealConstants.h
-//! \ingroup Core
-//! \author Martin Schoenherr
-//=======================================================================================
-//#ifndef REAL_CONSTANT_H
-//#define REAL_CONSTANT_H
-//
-//#ifdef VF_DOUBLE_ACCURACY
-//#define c1o2 0.5
-//#define c3o2 1.5
-//#define c1o3 0.333333333333333
-//#define c2o3 0.666666666666667
-//#define c1o4 0.25
-//#define c3o4 0.75
-//#define c1o6 0.166666666666667
-//#define c1o7 0.142857142857143
-//#define c1o8 0.125
-//#define c1o9 0.111111111111111
-//#define c2o9 0.222222222222222
-//#define c4o9 0.444444444444444
-//#define c1o10 0.1
-//#define c1o12 0.083333333333333
-//#define c1o16 0.0625
-//#define c3o16 0.1875
-//#define c9o16 0.5625
-//#define c1o18 0.055555555555556
-//#define c1o20 0.05
-//#define c19o20 0.95
-//#define c21o20 1.05
-//#define c1o24 0.041666666666667
-//#define c1o27 0.037037037037037
-//#define c3o32 0.09375
-//#define c4o32 0.125
-//#define c1o36 0.027777777777778
-//#define c1o48 0.020833333333333
-//#define c1o64 0.015625
-//#define c3o64 0.046875
-//#define c9o64 0.140625
-//#define c27o64 0.421875
-//#define c1o66 0.015151515151515
-//#define c1o72 0.013888888888889
-//#define c1o264 0.003787878787879
-//#define c8o27 0.296296296296296
-//#define c2o27 0.074074074074074
-//#define c1o54 0.018518518518519
-//#define c1o100 0.01
-//#define c99o100 0.99
-//#define c1o126 0.007936507936508
-//#define c1o216 0.004629629629630
-//#define c5o4 1.25
-//#define c9o4 2.25
-//#define c5o2 2.5
-//#define c9o2 4.5
-//
-//#define c0o1 0.
-//#define c1o1 1.
-//#define c2o1 2.
-//#define c3o1 3.
-//#define c4o1 4.
-//#define c5o1 5.
-//#define c6o1 6.
-//#define c7o1 7.
-//#define c8o1 8.
-//#define c9o1 9.
-//#define c10o1 10.
-//#define c11o1 11.
-//#define c12o1 12.
-//#define c13o1 13.
-//#define c14o1 14.
-//#define c15o1 15.
-//#define c16o1 16.
-//#define c17o1 17.
-//#define c18o1 18.
-//#define c21o1 21.
-//#define c24o1 24.
-//#define c25o1 25.
-//#define c26o1 26.
-//#define c27o1 27.
-//#define c28o1 28.
-//#define c29o1 29.
-//#define c30o1 30.
-//#define c32o1 32.
-//#define c33o1 33.
-//#define c34o1 34.
-//#define c36o1 36.
-//#define c40o1 40.
-//#define c42o1 42.
-//#define c46o1 46.
-//#define c48o1 48.
-//#define c50o1 50.
-//#define c52o1 52.
-//#define c54o1 54.
-//#define c56o1 56.
-//#define c64o1 64.
-//#define c66o1 66.
-//#define c68o1 68.
-//#define c69o1 69.
-//#define c72o1 72.
-//#define c84o1 84.
-//#define c88o1 88.
-//#define c96o1 96.
-//#define c100o1 100.0
-//#define c130o1 130.0
-//#define c152o1 152.0
-//#define c166o1 166.0
-//#define c195o1 195.0
-//#define c216o1 216.0
-//#define c264o1 264.0
-//#define c290o1 290.0
-//#define c367o1 367.0
-//
-//#define Op0000002 0.0000002
-//#define c10eM30 1e-30
-//#define c10eM10 1e-10
-//#define smallSingle 0.0000000002
-//
-//#else
-//#define c1o2 0.5f
-//#define c3o2 1.5f
-//#define c1o3 (1.0f / 3.0f)
-//#define c2o3 (2.0f / 3.0f)
-//#define c1o4 0.25f
-//#define c3o4 0.75f
-//#define c1o6 (1.0f / 6.0f)
-//#define c1o7 (1.0f / 7.0f)
-//#define c1o8 0.125f
-//#define c1o9 (1.0f / 9.0f)
-//#define c2o9 (2.0f / 9.0f)
-//#define c4o9 (4.0f / 9.0f)
-//#define c1o10 0.1f
-//#define c1o12 (1.0f / 12.0f)
-//#define c1o16 0.0625f
-//#define c3o16 0.1875f
-//#define c9o16 0.5625f
-//#define c1o18 (1.0f / 18.0f)
-//#define c1o20 0.05f
-//#define c19o20 0.95f
-//#define c21o20 1.05f
-//#define c1o24 (1.0f / 24.0f)
-//#define c1o27 (1.0f / 27.0f)
-//#define c3o32 0.09375f
-//#define c4o32 0.125f
-//#define c1o36 (1.0f / 36.0f)
-//#define c1o48 (1.0f / 48.0f)
-//#define c1o64 0.015625f
-//#define c3o64 0.046875f
-//#define c9o64 0.140625f
-//#define c27o64 0.421875f
-//#define c1o66 (1.0f / 66.0f)
-//#define c1o72 (1.0f / 72.0f)
-//#define c1o264 (1.0f / 264.0f)
-//#define c8o27 (8.0f / 27.0f)
-//#define c2o27 (2.0f / 27.0f)
-//#define c1o54 (1.0f / 54.0f)
-//#define c1o100 0.01f
-//#define c99o100 0.99f
-//#define c1o126 (1.0f / 126.0f)
-//#define c1o216 (1.0f / 216.0f)
-//#define c5o4 1.25f
-//#define c9o4 2.25f
-//#define c5o2 2.5f
-//#define c9o2 4.5f
-//
-//#define c0o1 0.f
-//#define c1o1 1.f
-//#define c2o1 2.f
-//#define c3o1 3.f
-//#define c4o1 4.f
-//#define c5o1 5.f
-//#define c6o1 6.f
-//#define c7o1 7.f
-//#define c8o1 8.f
-//#define c9o1 9.f
-//#define c10o1 10.f
-//#define c11o1 11.f
-//#define c12o1 12.f
-//#define c13o1 13.f
-//#define c14o1 14.f
-//#define c15o1 15.f
-//#define c16o1 16.f
-//#define c17o1 17.f
-//#define c18o1 18.f
-//#define c21o1 21.f
-//#define c24o1 24.f
-//#define c25o1 25.f
-//#define c26o1 26.f
-//#define c27o1 27.f
-//#define c28o1 28.f
-//#define c29o1 29.f
-//#define c30o1 30.f
-//#define c32o1 32.f
-//#define c33o1 33.f
-//#define c34o1 34.f
-//#define c36o1 36.f
-//#define c40o1 40.f
-//#define c42o1 42.f
-//#define c46o1 46.f
-//#define c48o1 48.f
-//#define c50o1 50.f
-//#define c52o1 52.f
-//#define c54o1 54.f
-//#define c56o1 56.f
-//#define c64o1 64.f
-//#define c66o1 66.f
-//#define c68o1 68.f
-//#define c69o1 69.f
-//#define c72o1 72.f
-//#define c84o1 84.f
-//#define c88o1 88.f
-//#define c96o1 96.f
-//#define c100o1 100.0f
-//#define c130o1 130.0f
-//#define c152o1 152.0f
-//#define c166o1 166.0f
-//#define c195o1 195.0f
-//#define c216o1 216.0f
-//#define c264o1 264.0f
-//#define c290o1 290.0f
-//#define c367o1 367.0f
-//
-//#define Op0000002 0.0000002f
-//#define c10eM30 1e-30
-//#define c10eM10 1e-10
-//#define smallSingle 0.0000000002f
-//#endif
-//
-//#endif
\ No newline at end of file
diff --git a/src/basics/Core/VectorTypes.cpp b/src/basics/Core/VectorTypes.cpp
deleted file mode 100644
index ecc986be836cb3c85d760f4db408707bfb1180b4..0000000000000000000000000000000000000000
--- a/src/basics/Core/VectorTypes.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 VectorTypes.cpp
-//! \ingroup Core
-//! \author Soeren Peters
-//=======================================================================================
-#include "VectorTypes.h"
-
-// Vec3 Vec3::operator+( Vec3& left, Vec3& right ){
-Vec3 Vec3::operator+(Vec3 &right) { return { this->x + right.x, this->y + right.y, this->z + right.z }; }
-
-Vec3 Vec3::operator-(Vec3 &right) { return { this->x - right.x, this->y - right.y, this->z - right.z }; }
-
-Vec3 operator*(real scalar, Vec3 &vec) { return { scalar * vec.x, scalar * vec.y, scalar * vec.z }; }
diff --git a/src/basics/Core/VectorTypes.h b/src/basics/Core/VectorTypes.h
deleted file mode 100644
index 2ca45b359397c712b8b8695b9a99b4c5f8c324d1..0000000000000000000000000000000000000000
--- a/src/basics/Core/VectorTypes.h
+++ /dev/null
@@ -1,70 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 VectorTypes.h
-//! \ingroup Core
-//! \author Soeren Peters
-//=======================================================================================
-#ifndef VECTORTYPES_H
-#define VECTORTYPES_H
-
-#ifdef __CUDACC__
-#include <cuda_runtime.h>
-#else
-#ifndef __host__
-#define __host__
-#endif
-#ifndef __device__
-#define __device__
-#endif
-#endif
-
-#include <cmath>
-
-#include "basics_export.h"
-
-#include "DataTypes.h"
-#include "RealConstants.h"
-
-struct BASICS_EXPORT Vec3 {
- real x{ 0. }, y{ 0. }, z{ 0. };
-
- __host__ __device__ Vec3(real x, real y, real z) : x(x), y(y), z(z) {}
- Vec3() = default;
-
- __host__ __device__ real length() { return std::sqrt(x * x + y * y + z * z); }
-
- Vec3 operator+(Vec3 &right);
- Vec3 operator-(Vec3 &right);
-};
-
-// BASICS_EXPORT Vec3 operator+( Vec3& left, Vec3& right );
-// BASICS_EXPORT Vec3 operator-( Vec3& left, Vec3& right );
-BASICS_EXPORT Vec3 operator*(real scalar, Vec3 &vec);
-
-#endif
diff --git a/src/basics/Core/DataTypes.h b/src/basics/DataTypes.h
similarity index 100%
rename from src/basics/Core/DataTypes.h
rename to src/basics/DataTypes.h
diff --git a/src/basics/Singelton.h b/src/basics/Singelton.h
deleted file mode 100644
index f0979b5dd3d89e26ebbe4b4e82d2336e1f59a07e..0000000000000000000000000000000000000000
--- a/src/basics/Singelton.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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/>.
-//
-//! \author Soeren Peters
-//=======================================================================================
-
-#ifndef BASICS_SINGELTON_H
-#define BASICS_SINGELTON_H
-
-namespace vf::basics
-{
-
-template<typename T>
-class Singleton
-{
-public:
- Singleton(const Singleton&) = delete;
- Singleton & operator=(const Singleton& rhs) = delete;
-
-protected:
- Singleton() = default;
-
-public:
- static std::shared_ptr<Singleton> getInstance()
- {
- static std::shared_ptr<Singleton> s{new T};
- return s;
- }
-};
-
-}
-
-#endif
\ No newline at end of file
diff --git a/src/basics/Core/StringUtilities/StringUtil.cpp b/src/basics/StringUtilities/StringUtil.cpp
similarity index 100%
rename from src/basics/Core/StringUtilities/StringUtil.cpp
rename to src/basics/StringUtilities/StringUtil.cpp
diff --git a/src/basics/Core/StringUtilities/StringUtil.h b/src/basics/StringUtilities/StringUtil.h
similarity index 100%
rename from src/basics/Core/StringUtilities/StringUtil.h
rename to src/basics/StringUtilities/StringUtil.h
diff --git a/src/basics/Core/StringUtilities/StringUtilTest.cpp b/src/basics/StringUtilities/StringUtilTest.cpp
similarity index 90%
rename from src/basics/Core/StringUtilities/StringUtilTest.cpp
rename to src/basics/StringUtilities/StringUtilTest.cpp
index 52f9511b3774a03f6d6f1e19536839825eff1394..0b229dfd8696490a02f01c0ed3f4fac859c6157c 100644
--- a/src/basics/Core/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/Core/Timer/Timer.cpp b/src/basics/Timer/Timer.cpp
similarity index 100%
rename from src/basics/Core/Timer/Timer.cpp
rename to src/basics/Timer/Timer.cpp
diff --git a/src/basics/Core/Timer/Timer.h b/src/basics/Timer/Timer.h
similarity index 100%
rename from src/basics/Core/Timer/Timer.h
rename to src/basics/Timer/Timer.h
diff --git a/src/basics/Core/Timer/TimerImp.cpp b/src/basics/Timer/TimerImp.cpp
similarity index 100%
rename from src/basics/Core/Timer/TimerImp.cpp
rename to src/basics/Timer/TimerImp.cpp
diff --git a/src/basics/Core/Timer/TimerImp.h b/src/basics/Timer/TimerImp.h
similarity index 100%
rename from src/basics/Core/Timer/TimerImp.h
rename to src/basics/Timer/TimerImp.h
diff --git a/src/basics/Core/buildInfo.cmake b/src/basics/buildInfo.cmake
similarity index 100%
rename from src/basics/Core/buildInfo.cmake
rename to src/basics/buildInfo.cmake
diff --git a/src/basics/Core/buildInfo.h b/src/basics/buildInfo.h
similarity index 100%
rename from src/basics/Core/buildInfo.h
rename to src/basics/buildInfo.h
diff --git a/src/basics/Core/buildInfo.in.cpp b/src/basics/buildInfo.in.cpp
similarity index 100%
rename from src/basics/Core/buildInfo.in.cpp
rename to src/basics/buildInfo.in.cpp
diff --git a/src/basics/config/ConfigurationFile.cpp b/src/basics/config/ConfigurationFile.cpp
index 026d13e15486c46a7056e061ea075a03c9c06f9f..b714203913b739998cce007d98dccacb1cc99a4e 100644
--- a/src/basics/config/ConfigurationFile.cpp
+++ b/src/basics/config/ConfigurationFile.cpp
@@ -8,8 +8,9 @@
#include <fstream>
#include <iostream>
#include <stdlib.h>
+#include <filesystem>
-#include <basics/basics/utilities/UbException.h>
+#include <basics/utilities/UbException.h>
namespace vf::basics
@@ -26,7 +27,7 @@ bool ConfigurationFile::load(const std::string& file)
if (!inFile.good())
{
- UB_THROW(UbException(UB_EXARGS, "Cannot read configuration file "+file+"!"));
+ UB_THROW(UbException(UB_EXARGS, "Cannot read configuration file " + file + "! Your current directory is " + std::filesystem::current_path().string() + "."));
}
while (inFile.good() && ! inFile.eof())
@@ -66,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 4a53f7add85b9c6461fda0bab20fa6656eebc5d3..6c651b7039d91c7312c4b98f32e1a97b8b6433de 100644
--- a/src/basics/config/ConfigurationFile.h
+++ b/src/basics/config/ConfigurationFile.h
@@ -1,15 +1,18 @@
#ifndef BASICS_CONFIGURATIONFILE_H
#define BASICS_CONFIGURATIONFILE_H
+#include <logger/Logger.h>
+
+#include <filesystem>
#include <map>
#include <vector>
#include <sstream>
#include <string>
#include <fstream>
#include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
-#include <basics/basics/utilities/UbException.h>
+#include <basics/utilities/UbException.h>
//! \brief Simple configuration file
//! \details The Configuration class presented here can read and keep values of any configuration file written in a format like this:
@@ -36,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
@@ -68,19 +71,20 @@ public:
template<class T>
T getValue(const std::string& key, T defaultValue) const;
-private:
- //! the container
+ //! the container is public to test this class
std::map<std::string, std::string> data;
+private:
+ //! the container
//! 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;
};
@@ -90,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::string value = getValue(key);
- 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()) + ">"));
-
- if (bFlag)
- {
- bool value = (str == "true");
- x = value;
- }
-
- return x;
+ return convert_to<T>(value);
}
template<class T>
@@ -155,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/basics/container/CbArray2D.h b/src/basics/container/CbArray2D.h
similarity index 100%
rename from src/basics/basics/container/CbArray2D.h
rename to src/basics/container/CbArray2D.h
diff --git a/src/basics/basics/container/CbArray3D.h b/src/basics/container/CbArray3D.h
similarity index 100%
rename from src/basics/basics/container/CbArray3D.h
rename to src/basics/container/CbArray3D.h
diff --git a/src/basics/basics/container/CbArray4D.h b/src/basics/container/CbArray4D.h
similarity index 100%
rename from src/basics/basics/container/CbArray4D.h
rename to src/basics/container/CbArray4D.h
diff --git a/src/basics/basics/container/CbVector.h b/src/basics/container/CbVector.h
similarity index 100%
rename from src/basics/basics/container/CbVector.h
rename to src/basics/container/CbVector.h
diff --git a/src/basics/basics/container/CbVectorPool.h b/src/basics/container/CbVectorPool.h
similarity index 100%
rename from src/basics/basics/container/CbVectorPool.h
rename to src/basics/container/CbVectorPool.h
diff --git a/src/basics/geometry3d/CoordinateTransformation3D.h b/src/basics/geometry3d/CoordinateTransformation3D.h
index a0f88c1f6b22bfe0655736802c423a00ee2357e2..d5560e84c6c18b1878d236b06dff688bcc709451 100644
--- a/src/basics/geometry3d/CoordinateTransformation3D.h
+++ b/src/basics/geometry3d/CoordinateTransformation3D.h
@@ -137,10 +137,10 @@ private:
bool active;
bool transformation;
- friend class MPIIOCoProcessor;
- friend class MPIIORestartCoProcessor;
- friend class MPIIOMigrationCoProcessor;
- friend class MPIIOMigrationBECoProcessor;
+ friend class MPIIOSimulationObserver;
+ friend class MPIIORestartSimulationObserver;
+ friend class MPIIOMigrationSimulationObserver;
+ friend class MPIIOMigrationBESimulationObserver;
friend class CheckpointConverter;
};
diff --git a/src/basics/basics/memory/MbSmartPtr.h b/src/basics/memory/MbSmartPtr.h
similarity index 100%
rename from src/basics/basics/memory/MbSmartPtr.h
rename to src/basics/memory/MbSmartPtr.h
diff --git a/src/basics/basics/memory/MbSmartPtrBase.cpp b/src/basics/memory/MbSmartPtrBase.cpp
similarity index 100%
rename from src/basics/basics/memory/MbSmartPtrBase.cpp
rename to src/basics/memory/MbSmartPtrBase.cpp
diff --git a/src/basics/basics/memory/MbSmartPtrBase.h b/src/basics/memory/MbSmartPtrBase.h
similarity index 100%
rename from src/basics/basics/memory/MbSmartPtrBase.h
rename to src/basics/memory/MbSmartPtrBase.h
diff --git a/src/basics/basics/objects/ObObject.h b/src/basics/objects/ObObject.h
similarity index 100%
rename from src/basics/basics/objects/ObObject.h
rename to src/basics/objects/ObObject.h
diff --git a/src/basics/basics/parallel/PbMpi.h b/src/basics/parallel/PbMpi.h
similarity index 100%
rename from src/basics/basics/parallel/PbMpi.h
rename to src/basics/parallel/PbMpi.h
diff --git a/src/basics/basics/transmitter/TbTransmitter.h b/src/basics/transmitter/TbTransmitter.h
similarity index 100%
rename from src/basics/basics/transmitter/TbTransmitter.h
rename to src/basics/transmitter/TbTransmitter.h
diff --git a/src/basics/basics/transmitter/TbTransmitterLocal.h b/src/basics/transmitter/TbTransmitterLocal.h
similarity index 100%
rename from src/basics/basics/transmitter/TbTransmitterLocal.h
rename to src/basics/transmitter/TbTransmitterLocal.h
diff --git a/src/basics/basics/transmitter/TbTransmitterMpiPool.h b/src/basics/transmitter/TbTransmitterMpiPool.h
similarity index 100%
rename from src/basics/basics/transmitter/TbTransmitterMpiPool.h
rename to src/basics/transmitter/TbTransmitterMpiPool.h
diff --git a/src/basics/basics/utilities/UbComparators.h b/src/basics/utilities/UbComparators.h
similarity index 100%
rename from src/basics/basics/utilities/UbComparators.h
rename to src/basics/utilities/UbComparators.h
diff --git a/src/basics/basics/utilities/UbEqual.h b/src/basics/utilities/UbEqual.h
similarity index 100%
rename from src/basics/basics/utilities/UbEqual.h
rename to src/basics/utilities/UbEqual.h
diff --git a/src/basics/basics/utilities/UbException.h b/src/basics/utilities/UbException.h
similarity index 100%
rename from src/basics/basics/utilities/UbException.h
rename to src/basics/utilities/UbException.h
diff --git a/src/basics/basics/utilities/UbFileInput.h b/src/basics/utilities/UbFileInput.h
similarity index 100%
rename from src/basics/basics/utilities/UbFileInput.h
rename to src/basics/utilities/UbFileInput.h
diff --git a/src/basics/basics/utilities/UbFileInputASCII.cpp b/src/basics/utilities/UbFileInputASCII.cpp
similarity index 100%
rename from src/basics/basics/utilities/UbFileInputASCII.cpp
rename to src/basics/utilities/UbFileInputASCII.cpp
diff --git a/src/basics/basics/utilities/UbFileInputASCII.h b/src/basics/utilities/UbFileInputASCII.h
similarity index 100%
rename from src/basics/basics/utilities/UbFileInputASCII.h
rename to src/basics/utilities/UbFileInputASCII.h
diff --git a/src/basics/basics/utilities/UbFileInputASCIITest.cfg b/src/basics/utilities/UbFileInputASCIITest.cfg
similarity index 100%
rename from src/basics/basics/utilities/UbFileInputASCIITest.cfg
rename to src/basics/utilities/UbFileInputASCIITest.cfg
diff --git a/src/basics/basics/utilities/UbFileInputASCIITest.cpp b/src/basics/utilities/UbFileInputASCIITest.cpp
similarity index 100%
rename from src/basics/basics/utilities/UbFileInputASCIITest.cpp
rename to src/basics/utilities/UbFileInputASCIITest.cpp
diff --git a/src/basics/basics/utilities/UbFileInputBinary.cpp b/src/basics/utilities/UbFileInputBinary.cpp
similarity index 100%
rename from src/basics/basics/utilities/UbFileInputBinary.cpp
rename to src/basics/utilities/UbFileInputBinary.cpp
diff --git a/src/basics/basics/utilities/UbFileInputBinary.h b/src/basics/utilities/UbFileInputBinary.h
similarity index 100%
rename from src/basics/basics/utilities/UbFileInputBinary.h
rename to src/basics/utilities/UbFileInputBinary.h
diff --git a/src/basics/basics/utilities/UbFileOutput.h b/src/basics/utilities/UbFileOutput.h
similarity index 100%
rename from src/basics/basics/utilities/UbFileOutput.h
rename to src/basics/utilities/UbFileOutput.h
diff --git a/src/basics/basics/utilities/UbFileOutputASCII.cpp b/src/basics/utilities/UbFileOutputASCII.cpp
similarity index 100%
rename from src/basics/basics/utilities/UbFileOutputASCII.cpp
rename to src/basics/utilities/UbFileOutputASCII.cpp
diff --git a/src/basics/basics/utilities/UbFileOutputASCII.h b/src/basics/utilities/UbFileOutputASCII.h
similarity index 100%
rename from src/basics/basics/utilities/UbFileOutputASCII.h
rename to src/basics/utilities/UbFileOutputASCII.h
diff --git a/src/basics/basics/utilities/UbFileOutputBinary.cpp b/src/basics/utilities/UbFileOutputBinary.cpp
similarity index 99%
rename from src/basics/basics/utilities/UbFileOutputBinary.cpp
rename to src/basics/utilities/UbFileOutputBinary.cpp
index ce9fca58f7eddd8d0ec3cc4a7d0ecf48fb2f4691..9b3ef2d26d920961fb20f825c5bd80a80a3d2185 100644
--- a/src/basics/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/basics/utilities/UbFileOutputBinary.h b/src/basics/utilities/UbFileOutputBinary.h
similarity index 100%
rename from src/basics/basics/utilities/UbFileOutputBinary.h
rename to src/basics/utilities/UbFileOutputBinary.h
diff --git a/src/basics/basics/utilities/UbInfinity.h b/src/basics/utilities/UbInfinity.h
similarity index 100%
rename from src/basics/basics/utilities/UbInfinity.h
rename to src/basics/utilities/UbInfinity.h
diff --git a/src/basics/basics/utilities/UbKeys.h b/src/basics/utilities/UbKeys.h
similarity index 100%
rename from src/basics/basics/utilities/UbKeys.h
rename to src/basics/utilities/UbKeys.h
diff --git a/src/basics/basics/utilities/UbLimits.h b/src/basics/utilities/UbLimits.h
similarity index 100%
rename from src/basics/basics/utilities/UbLimits.h
rename to src/basics/utilities/UbLimits.h
diff --git a/src/basics/basics/utilities/UbLogger.cpp b/src/basics/utilities/UbLogger.cpp
similarity index 100%
rename from src/basics/basics/utilities/UbLogger.cpp
rename to src/basics/utilities/UbLogger.cpp
diff --git a/src/basics/basics/utilities/UbLogger.h b/src/basics/utilities/UbLogger.h
similarity index 100%
rename from src/basics/basics/utilities/UbLogger.h
rename to src/basics/utilities/UbLogger.h
diff --git a/src/basics/basics/utilities/UbMath.cpp b/src/basics/utilities/UbMath.cpp
similarity index 100%
rename from src/basics/basics/utilities/UbMath.cpp
rename to src/basics/utilities/UbMath.cpp
diff --git a/src/basics/basics/utilities/UbMath.h b/src/basics/utilities/UbMath.h
similarity index 100%
rename from src/basics/basics/utilities/UbMath.h
rename to src/basics/utilities/UbMath.h
diff --git a/src/basics/basics/utilities/UbNupsTimer.h b/src/basics/utilities/UbNupsTimer.h
similarity index 100%
rename from src/basics/basics/utilities/UbNupsTimer.h
rename to src/basics/utilities/UbNupsTimer.h
diff --git a/src/basics/basics/utilities/UbObservable.h b/src/basics/utilities/UbObservable.h
similarity index 100%
rename from src/basics/basics/utilities/UbObservable.h
rename to src/basics/utilities/UbObservable.h
diff --git a/src/basics/basics/utilities/UbObserver.h b/src/basics/utilities/UbObserver.h
similarity index 100%
rename from src/basics/basics/utilities/UbObserver.h
rename to src/basics/utilities/UbObserver.h
diff --git a/src/basics/basics/utilities/UbRandom.h b/src/basics/utilities/UbRandom.h
similarity index 100%
rename from src/basics/basics/utilities/UbRandom.h
rename to src/basics/utilities/UbRandom.h
diff --git a/src/basics/basics/utilities/UbScheduler.h b/src/basics/utilities/UbScheduler.h
similarity index 100%
rename from src/basics/basics/utilities/UbScheduler.h
rename to src/basics/utilities/UbScheduler.h
diff --git a/src/basics/basics/utilities/UbStringInputASCII.cpp b/src/basics/utilities/UbStringInputASCII.cpp
similarity index 100%
rename from src/basics/basics/utilities/UbStringInputASCII.cpp
rename to src/basics/utilities/UbStringInputASCII.cpp
diff --git a/src/basics/basics/utilities/UbStringInputASCII.h b/src/basics/utilities/UbStringInputASCII.h
similarity index 100%
rename from src/basics/basics/utilities/UbStringInputASCII.h
rename to src/basics/utilities/UbStringInputASCII.h
diff --git a/src/basics/basics/utilities/UbSystem.h b/src/basics/utilities/UbSystem.h
similarity index 95%
rename from src/basics/basics/utilities/UbSystem.h
rename to src/basics/utilities/UbSystem.h
index 0436a360c2b595115824e1b7906214621bd76314..ea25c4166dbc82adf1627a07cf1caecbd3448bf5 100644
--- a/src/basics/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/basics/basics/utilities/UbTiming.h b/src/basics/utilities/UbTiming.h
similarity index 100%
rename from src/basics/basics/utilities/UbTiming.h
rename to src/basics/utilities/UbTiming.h
diff --git a/src/basics/basics/utilities/UbTuple.h b/src/basics/utilities/UbTuple.h
similarity index 100%
rename from src/basics/basics/utilities/UbTuple.h
rename to src/basics/utilities/UbTuple.h
diff --git a/src/basics/basics/utilities/Vector3D.cpp b/src/basics/utilities/Vector3D.cpp
similarity index 100%
rename from src/basics/basics/utilities/Vector3D.cpp
rename to src/basics/utilities/Vector3D.cpp
diff --git a/src/basics/basics/utilities/Vector3D.h b/src/basics/utilities/Vector3D.h
similarity index 100%
rename from src/basics/basics/utilities/Vector3D.h
rename to src/basics/utilities/Vector3D.h
diff --git a/src/basics/basics/utilities/Vector3DTest.cpp b/src/basics/utilities/Vector3DTest.cpp
similarity index 100%
rename from src/basics/basics/utilities/Vector3DTest.cpp
rename to src/basics/utilities/Vector3DTest.cpp
diff --git a/src/basics/basics/writer/WbWriter.h b/src/basics/writer/WbWriter.h
similarity index 100%
rename from src/basics/basics/writer/WbWriter.h
rename to src/basics/writer/WbWriter.h
diff --git a/src/basics/basics/writer/WbWriterAvsASCII.cpp b/src/basics/writer/WbWriterAvsASCII.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterAvsASCII.cpp
rename to src/basics/writer/WbWriterAvsASCII.cpp
diff --git a/src/basics/basics/writer/WbWriterAvsASCII.h b/src/basics/writer/WbWriterAvsASCII.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterAvsASCII.h
rename to src/basics/writer/WbWriterAvsASCII.h
diff --git a/src/basics/basics/writer/WbWriterAvsBinary.cpp b/src/basics/writer/WbWriterAvsBinary.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterAvsBinary.cpp
rename to src/basics/writer/WbWriterAvsBinary.cpp
diff --git a/src/basics/basics/writer/WbWriterAvsBinary.h b/src/basics/writer/WbWriterAvsBinary.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterAvsBinary.h
rename to src/basics/writer/WbWriterAvsBinary.h
diff --git a/src/basics/basics/writer/WbWriterBOBJ.cpp b/src/basics/writer/WbWriterBOBJ.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterBOBJ.cpp
rename to src/basics/writer/WbWriterBOBJ.cpp
diff --git a/src/basics/basics/writer/WbWriterBOBJ.h b/src/basics/writer/WbWriterBOBJ.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterBOBJ.h
rename to src/basics/writer/WbWriterBOBJ.h
diff --git a/src/basics/basics/writer/WbWriterSunflow.cpp b/src/basics/writer/WbWriterSunflow.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterSunflow.cpp
rename to src/basics/writer/WbWriterSunflow.cpp
diff --git a/src/basics/basics/writer/WbWriterSunflow.h b/src/basics/writer/WbWriterSunflow.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterSunflow.h
rename to src/basics/writer/WbWriterSunflow.h
diff --git a/src/basics/basics/writer/WbWriterTecPlotASCII.cpp b/src/basics/writer/WbWriterTecPlotASCII.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterTecPlotASCII.cpp
rename to src/basics/writer/WbWriterTecPlotASCII.cpp
diff --git a/src/basics/basics/writer/WbWriterTecPlotASCII.h b/src/basics/writer/WbWriterTecPlotASCII.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterTecPlotASCII.h
rename to src/basics/writer/WbWriterTecPlotASCII.h
diff --git a/src/basics/basics/writer/WbWriterVtkASCII.cpp b/src/basics/writer/WbWriterVtkASCII.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkASCII.cpp
rename to src/basics/writer/WbWriterVtkASCII.cpp
diff --git a/src/basics/basics/writer/WbWriterVtkASCII.h b/src/basics/writer/WbWriterVtkASCII.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkASCII.h
rename to src/basics/writer/WbWriterVtkASCII.h
diff --git a/src/basics/basics/writer/WbWriterVtkBinary.cpp b/src/basics/writer/WbWriterVtkBinary.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkBinary.cpp
rename to src/basics/writer/WbWriterVtkBinary.cpp
diff --git a/src/basics/basics/writer/WbWriterVtkBinary.h b/src/basics/writer/WbWriterVtkBinary.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkBinary.h
rename to src/basics/writer/WbWriterVtkBinary.h
diff --git a/src/basics/basics/writer/WbWriterVtkXmlASCII.cpp b/src/basics/writer/WbWriterVtkXmlASCII.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkXmlASCII.cpp
rename to src/basics/writer/WbWriterVtkXmlASCII.cpp
diff --git a/src/basics/basics/writer/WbWriterVtkXmlASCII.h b/src/basics/writer/WbWriterVtkXmlASCII.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkXmlASCII.h
rename to src/basics/writer/WbWriterVtkXmlASCII.h
diff --git a/src/basics/basics/writer/WbWriterVtkXmlBinary.cpp b/src/basics/writer/WbWriterVtkXmlBinary.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkXmlBinary.cpp
rename to src/basics/writer/WbWriterVtkXmlBinary.cpp
diff --git a/src/basics/basics/writer/WbWriterVtkXmlBinary.h b/src/basics/writer/WbWriterVtkXmlBinary.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkXmlBinary.h
rename to src/basics/writer/WbWriterVtkXmlBinary.h
diff --git a/src/basics/basics/writer/WbWriterVtkXmlImageBinary.cpp b/src/basics/writer/WbWriterVtkXmlImageBinary.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkXmlImageBinary.cpp
rename to src/basics/writer/WbWriterVtkXmlImageBinary.cpp
diff --git a/src/basics/basics/writer/WbWriterVtkXmlImageBinary.h b/src/basics/writer/WbWriterVtkXmlImageBinary.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterVtkXmlImageBinary.h
rename to src/basics/writer/WbWriterVtkXmlImageBinary.h
diff --git a/src/basics/basics/writer/WbWriterX3D.cpp b/src/basics/writer/WbWriterX3D.cpp
similarity index 100%
rename from src/basics/basics/writer/WbWriterX3D.cpp
rename to src/basics/writer/WbWriterX3D.cpp
diff --git a/src/basics/basics/writer/WbWriterX3D.h b/src/basics/writer/WbWriterX3D.h
similarity index 100%
rename from src/basics/basics/writer/WbWriterX3D.h
rename to src/basics/writer/WbWriterX3D.h
diff --git a/src/cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp b/src/cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp
deleted file mode 100644
index 6f32a053afb4f6f45ae74e32b7f8665ab4fd58db..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/CreateDemObjectsCoProcessor.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-#include "CreateDemObjectsCoProcessor.h"
-#include <mpi/Communicator.h>
-#include "DemCoProcessor.h"
-#include "EquilibriumReconstructor.h"
-#include "ExtrapolationReconstructor.h"
-#include "GbSphere3D.h"
-#include "Grid3D.h"
-#include "LBMReconstructor.h"
-#include "MovableObjectInteractor.h"
-#include "NoSlipBCAlgorithm.h"
-#include "PePhysicsEngineMaterialAdapter.h"
-#include "PhysicsEngineMaterialAdapter.h"
-#include "SetBcBlocksBlockVisitor.h"
-#include "UbScheduler.h"
-#include "VelocityBCAdapter.h"
-#include "VelocityBCAlgorithm.h"
-#include "VelocityBcReconstructor.h"
-#include "VelocityWithDensityBCAlgorithm.h"
-#include "muParser.h"
-
-CreateDemObjectsCoProcessor::CreateDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
- std::shared_ptr<vf::mpi::Communicator> comm,
- SPtr<DemCoProcessor> demCoProcessor,
- SPtr<PhysicsEngineMaterialAdapter> demObjectMaterial,
- double tolerance)
- : CoProcessor(grid, s), comm(comm), demCoProcessor(demCoProcessor), demObjectMaterial(demObjectMaterial),
- tolerance(tolerance)
-{
- mu::Parser fct;
- fct.SetExpr("U");
- fct.DefineConst("U", 0.0);
- velocityBcParticleAdapter =
- SPtr<BCAdapter>(new VelocityBCAdapter(true, false, false, fct, 0, BCFunction::INFCONST));
- velocityBcParticleAdapter->setBcAlgorithm(SPtr<BCAlgorithm>(new VelocityWithDensityBCAlgorithm()));
-
- // const std::shared_ptr<Reconstructor> velocityReconstructor(new VelocityBcReconstructor());
- std::shared_ptr<Reconstructor> equilibriumReconstructor(new EquilibriumReconstructor());
- // const std::shared_ptr<Reconstructor> lbmReconstructor(new LBMReconstructor(false));
- extrapolationReconstructor = SPtr<Reconstructor>(new ExtrapolationReconstructor(equilibriumReconstructor));
- demCounter = 0;
-}
-//////////////////////////////////////////////////////////////////////////
-void CreateDemObjectsCoProcessor::process(double step)
-{
- if (scheduler->isDue(step)) {
- int istep = static_cast<int>(step);
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, "CreateDemObjectsCoProcessor::process start step: " << istep);
- timer.resetAndStart();
-#endif
-
- createGeoObjects();
-
-#ifdef TIMING
- // if (comm->isRoot()) UBLOG(logINFO, "createGeoObjects() time = "<<timer.stop()<<" s");
- // if (comm->isRoot()) UBLOG(logINFO, "number of objects = "<<(int)(geoObjectPrototypeVector.size()));
- // if (comm->isRoot()) UBLOG(logINFO, "total number of objects = "<<demCounter);
- if (comm->isRoot())
- UBLOG(logINFO, "CreateDemObjectsCoProcessor::process stop step: " << istep);
-#endif
-
- // demCoProcessor->distributeIDs();
-
- //#ifdef TIMING
- // if (comm->isRoot()) UBLOG(logINFO, "demCoProcessor->distributeIDs() time = "<<timer.stop()<<" s");
- //#endif
- }
-}
-//////////////////////////////////////////////////////////////////////////
-void CreateDemObjectsCoProcessor::addGeoObject(SPtr<GbObject3D> geoObjectPrototype, Vector3D initalVelocity)
-{
- geoObjectPrototypeVector.push_back(geoObjectPrototype);
- this->initalVelocity.push_back(initalVelocity);
-}
-
-void CreateDemObjectsCoProcessor::clearGeoObjects()
-{
- geoObjectPrototypeVector.clear();
- initalVelocity.clear();
-}
-
-void CreateDemObjectsCoProcessor::createGeoObjects()
-{
- int size = (int)(geoObjectPrototypeVector.size());
-
- std::vector<std::shared_ptr<Block3D>> blockVector;
-
- for (int i = 0; i < size; i++) {
- SPtr<GbSphere3D> sphere = std::dynamic_pointer_cast<GbSphere3D>(geoObjectPrototypeVector[i]);
- if (demCoProcessor->isSpheresIntersection(sphere->getX1Centroid(), sphere->getX2Centroid(),
- sphere->getX3Centroid(),
- sphere->getRadius() * 2.0 * (1.0 - tolerance))) {
- continue;
- }
-
- SPtr<GbObject3D> geoObject((GbObject3D *)(geoObjectPrototypeVector[i]->clone()));
- SPtr<MovableObjectInteractor> geoObjectInt = SPtr<MovableObjectInteractor>(new MovableObjectInteractor(
- geoObject, grid, velocityBcParticleAdapter, Interactor3D::SOLID, extrapolationReconstructor, State::UNPIN));
- demCoProcessor->addInteractor(geoObjectInt, demObjectMaterial, initalVelocity[i]);
- demCounter++;
- }
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, "createGeoObjects() time = " << timer.stop() << " s");
- if (comm->isRoot())
- UBLOG(logINFO, "number of objects = " << (int)(geoObjectPrototypeVector.size()));
- if (comm->isRoot())
- UBLOG(logINFO, "total number of objects = " << demCounter);
- // if (comm->isRoot()) UBLOG(logINFO, "CreateDemObjectsCoProcessor::process stop step: " << istep);
-#endif
-
- demCoProcessor->distributeIDs();
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, "demCoProcessor->distributeIDs() time = " << timer.stop() << " s");
-#endif
-}
diff --git a/src/cpu/DemCoupling/CreateDemObjectsCoProcessor.h b/src/cpu/DemCoupling/CreateDemObjectsCoProcessor.h
deleted file mode 100644
index 7da317e67bd932f7d594c68d63ebc117b50c1e85..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/CreateDemObjectsCoProcessor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef CreateSphereCoProcessor_h__
-#define CreateSphereCoProcessor_h__
-
-#include "CoProcessor.h"
-#include "Vector3D.h"
-#include <array>
-#include <vector>
-
-//#define TIMING
-
-#ifdef TIMING
-#include "UbTiming.h"
-#endif
-
-class Grid3D;
-class UbScheduler;
-namespace vf::mpi {class Communicator;}
-class DemCoProcessor;
-class GbObject3D;
-class BCAdapter;
-class Reconstructor;
-class PhysicsEngineMaterialAdapter;
-
-class CreateDemObjectsCoProcessor : public CoProcessor
-{
-public:
- CreateDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::shared_ptr<vf::mpi::Communicator> comm,
- SPtr<DemCoProcessor> demCoProcessor,
- SPtr<PhysicsEngineMaterialAdapter> geoObjectMaterial, double tolerance = 0);
- void process(double step) override;
- void addGeoObject(SPtr<GbObject3D> geoObjectPrototype, Vector3D initalVelocity);
- void clearGeoObjects();
- void createGeoObjects();
- double getToleranz() const { return tolerance; }
- void setToleranz(double val) { tolerance = val; }
-
-protected:
-private:
- std::shared_ptr<vf::mpi::Communicator> comm;
- SPtr<DemCoProcessor> demCoProcessor;
- std::vector<SPtr<GbObject3D>> geoObjectPrototypeVector;
- SPtr<PhysicsEngineMaterialAdapter> demObjectMaterial;
- std::vector<Vector3D> initalVelocity;
- SPtr<BCAdapter> velocityBcParticleAdapter;
- SPtr<Reconstructor> extrapolationReconstructor;
- int demCounter;
- double tolerance;
-#ifdef TIMING
- UbTimer timer;
-#endif
-};
-#endif // CreateSphereCoProcessor_h__
diff --git a/src/cpu/DemCoupling/DemCoProcessor.cpp b/src/cpu/DemCoupling/DemCoProcessor.cpp
deleted file mode 100644
index 642a942d7d96b73af898690a5737f53d2d88b1a5..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/DemCoProcessor.cpp
+++ /dev/null
@@ -1,515 +0,0 @@
-#include "DemCoProcessor.h"
-
-#include "BCProcessor.h"
-#include <mpi/Communicator.h>
-#include "DataSet3D.h"
-#include "DistributionArray3D.h"
-#include "ForceCalculator.h"
-#include "GbSphere3D.h"
-#include "Grid3D.h"
-#include "ILBMKernel.h"
-#include "MovableObjectInteractor.h"
-#include "SetBcBlocksBlockVisitor.h"
-#include "UbScheduler.h"
-
-#include "PePhysicsEngineGeometryAdapter.h"
-#include "PePhysicsEngineSolverAdapter.h"
-#include "PhysicsEngineGeometryAdapter.h"
-#include "PhysicsEngineMaterialAdapter.h"
-#include "PhysicsEngineSolverAdapter.h"
-
-#include "BCArray3D.h"
-#include "Block3D.h"
-#include "BoundaryConditions.h"
-#include "BoundaryConditionsBlockVisitor.h"
-#include "MPICommunicator.h"
-
-#include "UbLogger.h"
-
-#include <array>
-#include <functional>
-
-DemCoProcessor::DemCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::shared_ptr<vf::mpi::Communicator> comm,
- std::shared_ptr<ForceCalculator> forceCalculator,
- std::shared_ptr<PhysicsEngineSolverAdapter> physicsEngineSolver,
- double intermediatePeSteps)
- : CoProcessor(grid, s), comm(comm), forceCalculator(forceCalculator),
- physicsEngineSolver(std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(physicsEngineSolver)),
- intermediateDemSteps(intermediatePeSteps)
-{
-#ifdef TIMING
- timer.resetAndStart();
-#endif
-
- std::shared_ptr<walberla::blockforest::BlockForest> forest =
- std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(physicsEngineSolver)->getBlockForest();
- std::shared_ptr<walberla::domain_decomposition::BlockDataID> storageId =
- std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(physicsEngineSolver)->getStorageId();
-
- for (auto blockIt = forest->begin(); blockIt != forest->end(); ++blockIt) {
- walberla::pe::Storage *storage = blockIt->getData<walberla::pe::Storage>(*storageId.get());
- walberla::pe::BodyStorage *bodyStorage = &(*storage)[0];
- walberla::pe::BodyStorage *bodyStorageShadowCopies = &(*storage)[1];
-
- bodyStorage->registerAddCallback("DemCoProcessor", std::bind1st(std::mem_fun(&DemCoProcessor::addPeGeo), this));
- bodyStorage->registerRemoveCallback("DemCoProcessor",
- std::bind1st(std::mem_fun(&DemCoProcessor::removePeGeo), this));
-
- bodyStorageShadowCopies->registerAddCallback("DemCoProcessor",
- std::bind1st(std::mem_fun(&DemCoProcessor::addPeShadowGeo), this));
- bodyStorageShadowCopies->registerRemoveCallback(
- "DemCoProcessor", std::bind1st(std::mem_fun(&DemCoProcessor::removePeShadowGeo), this));
- }
-}
-
-DemCoProcessor::~DemCoProcessor()
-{
- std::shared_ptr<walberla::blockforest::BlockForest> forest =
- std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(physicsEngineSolver)->getBlockForest();
- std::shared_ptr<walberla::domain_decomposition::BlockDataID> storageId =
- std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(physicsEngineSolver)->getStorageId();
-
- for (auto ¤tBlock : *forest) {
- walberla::pe::Storage *storage = currentBlock.getData<walberla::pe::Storage>(*storageId.get());
- walberla::pe::BodyStorage &localStorage = (*storage)[0];
- walberla::pe::BodyStorage &shadowStorage = (*storage)[1];
-
- localStorage.clearAddCallbacks();
- localStorage.clearRemoveCallbacks();
-
- shadowStorage.clearAddCallbacks();
- shadowStorage.clearRemoveCallbacks();
- }
-}
-
-void DemCoProcessor::addInteractor(std::shared_ptr<MovableObjectInteractor> interactor,
- std::shared_ptr<PhysicsEngineMaterialAdapter> physicsEngineMaterial,
- Vector3D initalVelocity)
-{
- interactors.push_back(interactor);
- const int id = static_cast<int>(interactors.size() - 1);
- interactor->setID(id);
- const auto peGeometryAdapter = this->createPhysicsEngineGeometryAdapter(interactor, physicsEngineMaterial);
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(peGeometryAdapter)->isActive()) {
- peGeometryAdapter->setLinearVelolocity(initalVelocity);
- geoIdMap.insert(
- std::make_pair(std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(peGeometryAdapter)->getSystemID(),
- std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(peGeometryAdapter)));
- }
- SetBcBlocksBlockVisitor setBcVisitor(interactor);
- grid->accept(setBcVisitor);
-
- // std::vector< std::shared_ptr<Block3D> > blockVector;
- // UbTupleInt3 blockNX=grid->getBlockNX();
- // SPtr<GbObject3D> geoObject(interactor->getGbObject3D());
- // double ext = 0.0;
- // std::array<double, 6> AABB ={
- // geoObject->getX1Minimum(),geoObject->getX2Minimum(),geoObject->getX3Minimum(),geoObject->getX1Maximum(),geoObject->getX2Maximum(),geoObject->getX3Maximum()
- // }; grid->getBlocksByCuboid(AABB[0]-(double)val<1>(blockNX)*ext, AABB[1]-(double)val<2>(blockNX)*ext,
- // AABB[2]-(double)val<3>(blockNX)*ext, AABB[3]+(double)val<1>(blockNX)*ext, AABB[4]+(double)val<2>(blockNX)*ext,
- // AABB[5]+(double)val<3>(blockNX)*ext, blockVector); for (std::shared_ptr<Block3D> block : blockVector)
- //{
- // if (block->getKernel())
- // {
- // interactor->setBCBlock(block);
- // //UBLOG(logINFO, "DemCoProcessor::addInteractor() rank = "<<comm->getProcessID());
- // }
- //}
-
- interactor->initInteractor();
-
- physicsEngineGeometrieAdapters.push_back(peGeometryAdapter);
-}
-
-std::shared_ptr<PhysicsEngineGeometryAdapter> DemCoProcessor::createPhysicsEngineGeometryAdapter(
- std::shared_ptr<MovableObjectInteractor> interactor,
- std::shared_ptr<PhysicsEngineMaterialAdapter> physicsEngineMaterial) const
-{
- const int id = static_cast<int>(interactors.size() - 1);
- SPtr<GbSphere3D> vfSphere = std::static_pointer_cast<GbSphere3D>(interactor->getGbObject3D());
- const Vector3D position(vfSphere->getX1Centroid(), vfSphere->getX2Centroid(), vfSphere->getX3Centroid());
- auto peGeometryAdapter = this->physicsEngineSolver->createPhysicsEngineGeometryAdapter(
- id, position, vfSphere->getRadius(), physicsEngineMaterial);
- interactor->setPhysicsEngineGeometry(peGeometryAdapter);
- return peGeometryAdapter;
-}
-
-void DemCoProcessor::process(double actualTimeStep)
-{
-#ifdef TIMING
- timer.resetAndStart();
-#endif
-
- this->applyForcesOnGeometries();
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, "DemCoProcessor::process start step: " << actualTimeStep);
- if (comm->isRoot())
- UBLOG(logINFO, "DemCoProcessor::applyForcesOnGeometries() time = " << timer.stop() << " s");
-#endif
-
- if (scheduler->isDue(actualTimeStep)) {
- // UBLOG(logINFO, "DemCoProcessor::update - START - timestep = " << actualTimeStep);
- const double demTimeStepsPerIteration = scheduler->getMinStep();
-
- if (demTimeStepsPerIteration != 1)
- this->scaleForcesAndTorques(1.0 / demTimeStepsPerIteration);
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, "DemCoProcessor::scaleForcesAndTorques() time = " << timer.stop() << " s");
- if (comm->isRoot())
- UBLOG(logINFO, "DemCoProcessor::calculateDemTimeStep():");
-#endif
-
- if (this->intermediateDemSteps == 1)
- this->calculateDemTimeStep(demTimeStepsPerIteration);
-
- //#ifdef TIMING
- // if (comm->isRoot()) UBLOG(logINFO, "DemCoProcessor::calculateDemTimeStep() time = "<<timer.stop()<<"
- // s");
- //#endif
- // if ((int)actualTimeStep % 100 == 0)
- //{
- // if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometries[0])->isActive())
- // {
- // //UBLOG(logINFO, "v: (x,y,z) " << physicsEngineGeometries[0]->getLinearVelocity() << " actualTimeStep
- // = " << UbSystem::toString(actualTimeStep));
- // }
- //}
-
- // during the intermediate time steps of the collision response, the currently acting forces
- // (interaction forces, gravitational force, ...) have to remain constant.
- // Since they are reset after the call to collision response, they have to be stored explicitly before.
- // Then they are set again after each intermediate step.
-
- this->moveVfGeoObjects();
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, "DemCoProcessor::moveVfGeoObject() time = " << timer.stop() << " s");
-#endif
-
- grid->accept(*boundaryConditionsBlockVisitor.get());
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, "grid->accept(*boundaryConditionsBlockVisitor.get()) time = " << timer.stop() << " s");
-#endif
-
- // UBLOG(logINFO, "DemCoProcessor::update - END - timestep = " << actualTimeStep);
- }
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, "DemCoProcessor::process stop step: " << actualTimeStep);
-#endif
-}
-//////////////////////////////////////////////////////////////////////////
-std::shared_ptr<PhysicsEngineSolverAdapter> DemCoProcessor::getPhysicsEngineSolver() { return physicsEngineSolver; }
-
-void DemCoProcessor::applyForcesOnGeometries()
-{
- for (int i = 0; i < physicsEngineGeometrieAdapters.size(); i++) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) {
- this->setForcesToObject(grid, interactors[i], physicsEngineGeometrieAdapters[i]);
-
- // physicsEngineGeometries[i]->setLinearVelolocity(Vector3D(-0.001, 0.0, 0.0));
- // physicsEngineGeometries[i]->setAngularVelocity(Vector3D(0.01, 0.01, 0.01));
- // UBLOG(logINFO, "v: (x,y,z) " << physicsEngineGeometries[i]->getLinearVelocity());
- }
- }
-}
-
-void DemCoProcessor::setForcesToObject(SPtr<Grid3D> grid, SPtr<MovableObjectInteractor> interactor,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry)
-{
- for (BcNodeIndicesMap::value_type t : interactor->getBcNodeIndicesMap()) {
- SPtr<Block3D> block = t.first;
- SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
- SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
- distributions->swap();
-
- std::set<std::vector<int>> &transNodeIndicesSet = t.second;
- for (std::vector<int> node : transNodeIndicesSet) {
- int x1 = node[0];
- int x2 = node[1];
- int x3 = node[2];
-
- if (kernel->isInsideOfDomain(x1, x2, x3) && bcArray->isFluid(x1, x2, x3)) {
- // TODO: calculate assumed boundary position
-
- const Vector3D worldCoordinates = grid->getNodeCoordinates(block, x1, x2, x3);
- const auto boundaryVelocity = physicsEngineGeometry->getVelocityAtPosition(worldCoordinates);
-
- SPtr<BoundaryConditions> bc = bcArray->getBC(x1, x2, x3);
- const Vector3D force = forceCalculator->getForces(x1, x2, x3, distributions, bc, boundaryVelocity);
- physicsEngineGeometry->addForceAtPosition(force, worldCoordinates);
- }
- }
- distributions->swap();
- }
-}
-
-void DemCoProcessor::scaleForcesAndTorques(double scalingFactor)
-{
- for (int i = 0; i < physicsEngineGeometrieAdapters.size(); i++) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) {
- const Vector3D force = physicsEngineGeometrieAdapters[i]->getForce() * scalingFactor;
- const Vector3D torque = physicsEngineGeometrieAdapters[i]->getTorque() * scalingFactor;
-
- physicsEngineGeometrieAdapters[i]->resetForceAndTorque();
-
- physicsEngineGeometrieAdapters[i]->setForce(force);
- physicsEngineGeometrieAdapters[i]->setTorque(torque);
-
- // UBLOG(logINFO, "F: (x,y,z) " << force);
- // UBLOG(logINFO, "T: (x,y,z) " << torque);
- }
- }
-}
-
-void DemCoProcessor::calculateDemTimeStep(double step)
-{
- physicsEngineSolver->runTimestep(step);
-
-#ifdef TIMING
- if (comm->isRoot())
- UBLOG(logINFO, " physicsEngineSolver->runTimestep() time = " << timer.stop() << " s");
-#endif
-}
-
-void DemCoProcessor::moveVfGeoObjects()
-{
- for (int i = 0; i < interactors.size(); i++) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])
- ->getSemiactive()) {
- walberla::pe::RigidBody *peGeoObject = getPeGeoObject(
- std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])
- ->getSystemID());
- if (peGeoObject != nullptr) {
- std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])
- ->setGeometry(peGeoObject);
- interactors[i]->moveGbObjectTo(physicsEngineGeometrieAdapters[i]->getPosition());
- std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])
- ->setSemiactive(false);
- } else {
- std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])
- ->setInactive();
- }
- } else {
- interactors[i]->moveGbObjectTo(physicsEngineGeometrieAdapters[i]->getPosition());
- }
- }
- }
-}
-
-bool DemCoProcessor::isDemObjectInAABB(std::array<double, 6> AABB)
-{
- bool result = false;
- for (int i = 0; i < interactors.size(); i++) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) {
- SPtr<GbObject3D> geoObject = interactors[i]->getGbObject3D();
- std::array<double, 2> minMax1;
- std::array<double, 2> minMax2;
- std::array<double, 2> minMax3;
- minMax1[0] = geoObject->getX1Minimum();
- minMax2[0] = geoObject->getX2Minimum();
- minMax3[0] = geoObject->getX3Minimum();
- minMax1[1] = geoObject->getX1Maximum();
- minMax2[1] = geoObject->getX2Maximum();
- minMax3[1] = geoObject->getX3Maximum();
-
- for (int x3 = 0; x3 < 2; x3++)
- for (int x2 = 0; x2 < 2; x2++)
- for (int x1 = 0; x1 < 2; x1++) {
- result =
- result || (minMax1[x1] >= AABB[0] && minMax2[x2] >= AABB[1] && minMax3[x3] >= AABB[2] &&
- minMax1[x1] <= AABB[3] && minMax2[x2] <= AABB[4] && minMax3[x3] <= AABB[5]);
- }
- }
- }
-
- std::vector<int> values;
- values.push_back((int)result);
- std::vector<int> rvalues = comm->gather(values);
-
- if (comm->isRoot()) {
- for (int i = 0; i < (int)rvalues.size(); i++) {
- result = result || (bool)rvalues[i];
- }
- }
- int iresult = (int)result;
- comm->broadcast(iresult);
- result = (bool)iresult;
-
- return result;
-}
-
-int DemCoProcessor::addSurfaceTriangleSet(std::vector<UbTupleFloat3> &nodes, std::vector<UbTupleInt3> &triangles)
-{
- for (int i = 0; i < interactors.size(); i++) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) {
- interactors[i]->getGbObject3D()->addSurfaceTriangleSet(nodes, triangles);
- }
- }
- return (int)interactors.size();
-}
-
-void DemCoProcessor::getObjectsPropertiesVector(std::vector<double> &p)
-{
- for (int i = 0; i < interactors.size(); i++) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) {
- p.push_back(i);
- p.push_back(interactors[i]->getGbObject3D()->getX1Centroid());
- p.push_back(interactors[i]->getGbObject3D()->getX2Centroid());
- p.push_back(interactors[i]->getGbObject3D()->getX3Centroid());
- Vector3D v = physicsEngineGeometrieAdapters[i]->getLinearVelocity();
- p.push_back(v[0]);
- p.push_back(v[1]);
- p.push_back(v[2]);
- }
- }
-}
-
-void DemCoProcessor::addPeGeo(walberla::pe::RigidBody *peGeo)
-{
- auto geometry = getPeGeoAdapter(peGeo->getSystemID());
- if (geometry != nullptr) {
- geometry->setActive();
- geometry->setGeometry(peGeo);
- return;
- } else
- return;
-}
-
-void DemCoProcessor::removePeGeo(walberla::pe::RigidBody *peGeo)
-{
- auto geometry = getPeGeoAdapter(peGeo->getSystemID());
- if (geometry != nullptr) {
- geometry->setSemiactive(true);
- } else
- throw UbException(UB_EXARGS, "PeGeo SystemId=" + UbSystem::toString(peGeo->getSystemID()) +
- " is not matching geometry ID");
-}
-
-void DemCoProcessor::addPeShadowGeo(walberla::pe::RigidBody *peGeo)
-{
- auto geometry = getPeGeoAdapter(peGeo->getSystemID());
- if (geometry != nullptr) {
- geometry->setActive();
- geometry->setGeometry(peGeo);
- return;
- } else
- throw UbException(UB_EXARGS,
- "PeGeo ID=" + UbSystem::toString(peGeo->getSystemID()) + " is not matching geometry ID");
-}
-
-void DemCoProcessor::removePeShadowGeo(walberla::pe::RigidBody *peGeo)
-{
- auto geometry = getPeGeoAdapter(peGeo->getSystemID());
-
- if (geometry != nullptr) {
- geometry->setSemiactive(true);
- } else
- throw UbException(UB_EXARGS,
- "PeGeo ID=" + UbSystem::toString(peGeo->getSystemID()) + " is not matching geometry ID");
-}
-
-bool DemCoProcessor::isSpheresIntersection(double centerX1, double centerX2, double centerX3, double d)
-{
- bool result = false;
- for (int i = 0; i < interactors.size(); i++) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) {
- SPtr<GbObject3D> sphere = interactors[i]->getGbObject3D();
- result = result ||
- (sqrt(pow(sphere->getX1Centroid() - centerX1, 2.0) + pow(sphere->getX2Centroid() - centerX2, 2.0) +
- pow(sphere->getX3Centroid() - centerX3, 2.0)) <= d);
- }
- }
- std::vector<int> values;
- values.push_back((int)result);
- std::vector<int> rvalues = comm->gather(values);
-
- if (comm->isRoot()) {
- for (int i = 0; i < (int)rvalues.size(); i++) {
- result = result || (bool)rvalues[i];
- }
- }
- int iresult = (int)result;
- comm->broadcast(iresult);
- result = (bool)iresult;
-
- return result;
-}
-
-void DemCoProcessor::distributeIDs()
-{
- std::vector<unsigned long long> peIDsSend;
- std::vector<int> vfIDsSend;
-
- for (int i = 0; i < interactors.size(); i++) {
- if (std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])->isActive()) {
- peIDsSend.push_back(
- std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])
- ->getSystemID());
- vfIDsSend.push_back(interactors[i]->getID());
- }
- }
-
- std::vector<unsigned long long> peIDsRecv;
- std::vector<int> vfIDsRecv;
-
- comm->allGather(peIDsSend, peIDsRecv);
- comm->allGather(vfIDsSend, vfIDsRecv);
-
- std::map<int, unsigned long long> idMap;
-
- for (int i = 0; i < peIDsRecv.size(); i++) {
- idMap.insert(std::make_pair(vfIDsRecv[i], peIDsRecv[i]));
- }
-
- for (int i = 0; i < interactors.size(); i++) {
- std::map<int, unsigned long long>::const_iterator it;
- if ((it = idMap.find(interactors[i]->getID())) == idMap.end()) {
- throw UbException(UB_EXARGS, "Interactor ID = " + UbSystem::toString(interactors[i]->getID()) +
- " is invalid! The DEM object may be not in PE domain!");
- }
-
- std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])
- ->setSystemID(it->second);
-
- geoIdMap.insert(std::make_pair(
- it->second, std::dynamic_pointer_cast<PePhysicsEngineGeometryAdapter>(physicsEngineGeometrieAdapters[i])));
- }
-}
-//////////////////////////////////////////////////////////////////////////
-void DemCoProcessor::setBlockVisitor(std::shared_ptr<BoundaryConditionsBlockVisitor> boundaryConditionsBlockVisitor)
-{
- this->boundaryConditionsBlockVisitor = boundaryConditionsBlockVisitor;
-}
-//////////////////////////////////////////////////////////////////////////
-walberla::pe::RigidBody *DemCoProcessor::getPeGeoObject(walberla::id_t id)
-{
- std::shared_ptr<walberla::blockforest::BlockForest> forest =
- std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(physicsEngineSolver)->getBlockForest();
- std::shared_ptr<walberla::domain_decomposition::BlockDataID> storageId =
- std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(physicsEngineSolver)->getStorageId();
- std::shared_ptr<walberla::pe::BodyStorage> globalBodyStorage =
- std::dynamic_pointer_cast<PePhysicsEngineSolverAdapter>(physicsEngineSolver)->getGlobalBodyStorage();
-
- return walberla::pe::getBody(*globalBodyStorage, *forest, *storageId, id,
- walberla::pe::StorageSelect::LOCAL | walberla::pe::StorageSelect::SHADOW);
-}
-////////////////////////////////////////////////////////////////////////////
-std::shared_ptr<PePhysicsEngineGeometryAdapter> DemCoProcessor::getPeGeoAdapter(unsigned long long systemId)
-{
- std::map<unsigned long long, std::shared_ptr<PePhysicsEngineGeometryAdapter>>::const_iterator it;
- if ((it = geoIdMap.find(systemId)) == geoIdMap.end()) {
- return nullptr;
- } else
- return it->second;
-}
diff --git a/src/cpu/DemCoupling/DemCoProcessor.h b/src/cpu/DemCoupling/DemCoProcessor.h
deleted file mode 100644
index d2946f1e93fcaedc69d44a83a68dc2079910e48f..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/DemCoProcessor.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef DEM_CO_PROCESSOR_H
-#define DEM_CO_PROCESSOR_H
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "Vector3D.h"
-
-#include "CoProcessor.h"
-#include "UbTuple.h"
-
-#include <pe/basic.h>
-
-//#define TIMING
-
-#ifdef TIMING
-#include "UbTiming.h"
-#endif
-
-class PhysicsEngineGeometryAdapter;
-class PhysicsEngineSolverAdapter;
-class PePhysicsEngineSolverAdapter;
-class PhysicsEngineMaterialAdapter;
-class PePhysicsEngineGeometryAdapter;
-
-class UbScheduler;
-class Grid3D;
-class ForceCalculator;
-namespace vf::mpi {class Communicator;}
-class MovableObjectInteractor;
-class BoundaryConditionsBlockVisitor;
-
-class DemCoProcessor : public CoProcessor
-{
-public:
- DemCoProcessor(std::shared_ptr<Grid3D> grid, std::shared_ptr<UbScheduler> s, std::shared_ptr<vf::mpi::Communicator> comm,
- std::shared_ptr<ForceCalculator> forceCalculator,
- std::shared_ptr<PhysicsEngineSolverAdapter> physicsEngineSolver, double intermediatePeSteps = 1.0);
- virtual ~DemCoProcessor();
-
- void addInteractor(std::shared_ptr<MovableObjectInteractor> interactor,
- std::shared_ptr<PhysicsEngineMaterialAdapter> physicsEngineMaterial,
- Vector3D initalVelocity = Vector3D(0.0, 0.0, 0.0));
- void process(double step) override;
- std::shared_ptr<PhysicsEngineSolverAdapter> getPhysicsEngineSolver();
- void distributeIDs();
- void setBlockVisitor(std::shared_ptr<BoundaryConditionsBlockVisitor> blockVisitor);
- bool isDemObjectInAABB(std::array<double, 6> AABB);
- int addSurfaceTriangleSet(std::vector<UbTupleFloat3> &nodes, std::vector<UbTupleInt3> &triangles);
- void getObjectsPropertiesVector(std::vector<double> &p);
- void addPeGeo(walberla::pe::RigidBody *peGeo);
- void removePeGeo(walberla::pe::RigidBody *peGeo);
- void addPeShadowGeo(walberla::pe::RigidBody *peGeo);
- void removePeShadowGeo(walberla::pe::RigidBody *peGeo);
- bool isSpheresIntersection(double centerX1, double centerX2, double centerX3, double d);
-
-private:
- std::shared_ptr<PhysicsEngineGeometryAdapter>
- createPhysicsEngineGeometryAdapter(std::shared_ptr<MovableObjectInteractor> interactor,
- std::shared_ptr<PhysicsEngineMaterialAdapter> physicsEngineMaterial) const;
- void applyForcesOnGeometries();
- void setForcesToObject(SPtr<Grid3D> grid, std::shared_ptr<MovableObjectInteractor> interactor,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry);
- void scaleForcesAndTorques(double scalingFactor);
- void calculateDemTimeStep(double step);
- void moveVfGeoObjects();
- walberla::pe::RigidBody *getPeGeoObject(walberla::id_t id);
- std::shared_ptr<PePhysicsEngineGeometryAdapter> getPeGeoAdapter(unsigned long long systemId);
-
-private:
- std::shared_ptr<vf::mpi::Communicator> comm;
- std::vector<std::shared_ptr<MovableObjectInteractor>> interactors;
- std::shared_ptr<ForceCalculator> forceCalculator;
- std::shared_ptr<PePhysicsEngineSolverAdapter> physicsEngineSolver;
- std::vector<std::shared_ptr<PhysicsEngineGeometryAdapter>> physicsEngineGeometrieAdapters;
- double intermediateDemSteps;
- SPtr<BoundaryConditionsBlockVisitor> boundaryConditionsBlockVisitor;
- // walberla::pe::BodyStorage* bodyStorage; //!< Reference to the central body storage.
- // walberla::pe::BodyStorage* bodyStorageShadowCopies; //!< Reference to the body storage containing body shadow
- // copies.
-
- std::map<unsigned long long, std::shared_ptr<PePhysicsEngineGeometryAdapter>> geoIdMap;
-
-#ifdef TIMING
- UbTimer timer;
-#endif
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/DemCoupling.cmake b/src/cpu/DemCoupling/DemCoupling.cmake
deleted file mode 100644
index 927c08b6dadae76d2ed023253503f8e7bd804601..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/DemCoupling.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-INCLUDE(${SOURCE_ROOT}/DemCoupling/CMakePackage.txt)
-INCLUDE(${SOURCE_ROOT}/DemCoupling/physicsEngineAdapter/CMakePackage.txt)
-INCLUDE(${SOURCE_ROOT}/DemCoupling/physicsEngineAdapter/dummy/CMakePackage.txt)
-INCLUDE(${SOURCE_ROOT}/DemCoupling/physicsEngineAdapter/pe/CMakePackage.txt)
-INCLUDE(${SOURCE_ROOT}/DemCoupling/reconstructor/CMakePackage.txt)
-
-INCLUDE(${SOURCE_ROOT}/DemCoupling/IncludsList.cmake)
-
-SET(LINK_LIBRARY optimized ${PE_RELEASE_LIBRARY} debug ${PE_DEBUG_LIBRARY})
-SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-
-SET(LINK_LIBRARY optimized ${BLOCKFOREST_RELEASE_LIBRARY} debug ${BLOCKFOREST_DEBUG_LIBRARY})
-SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-
-SET(LINK_LIBRARY optimized ${DOMAIN_DECOMPOSITION_RELEASE_LIBRARY} debug ${DOMAIN_DECOMPOSITION_DEBUG_LIBRARY})
-SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-
-SET(LINK_LIBRARY optimized ${GEOMETRY_RELEASE_LIBRARY} debug ${GEOMETRY_DEBUG_LIBRARY})
-SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-
-SET(LINK_LIBRARY optimized ${CORE_RELEASE_LIBRARY} debug ${CORE_DEBUG_LIBRARY})
-SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-
-IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} "stdc++fs")
-ENDIF()
-
-IF(${USE_METIS})
- SET(LINK_LIBRARY optimized ${METIS_RELEASE_LIBRARY} debug ${METIS_DEBUG_LIBRARY})
- SET(CAB_ADDITIONAL_LINK_LIBRARIES ${CAB_ADDITIONAL_LINK_LIBRARIES} ${LINK_LIBRARY})
-ENDIF()
\ No newline at end of file
diff --git a/src/cpu/DemCoupling/IncludsList.cmake b/src/cpu/DemCoupling/IncludsList.cmake
deleted file mode 100644
index 7ebf198e6082131956d5c1e146031394f39e37d5..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/IncludsList.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-INCLUDE_DIRECTORIES(${SOURCE_ROOT}/DemCoupling)
-INCLUDE_DIRECTORIES(${SOURCE_ROOT}/DemCoupling/physicsEngineAdapter)
-INCLUDE_DIRECTORIES(${SOURCE_ROOT}/DemCoupling/physicsEngineAdapter/dummy)
-INCLUDE_DIRECTORIES(${SOURCE_ROOT}/DemCoupling/physicsEngineAdapter/pe)
-INCLUDE_DIRECTORIES(${SOURCE_ROOT}/DemCoupling/reconstructor)
-
-INCLUDE_DIRECTORIES(${PE_ROOT}/src)
-INCLUDE_DIRECTORIES(${PE_BINARY_DIR}/src)
\ No newline at end of file
diff --git a/src/cpu/DemCoupling/MovableObjectInteractor.cpp b/src/cpu/DemCoupling/MovableObjectInteractor.cpp
deleted file mode 100644
index 17185c8bb1cdfedfca1d76fa799cc0810a3fb43d..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/MovableObjectInteractor.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-#include "MovableObjectInteractor.h"
-
-#include "GbObject3D.h"
-#include "UbLogger.h"
-#include "Vector3D.h"
-
-#include "BCAdapter.h"
-#include "BCArray3D.h"
-#include "BCProcessor.h"
-#include "Block3D.h"
-#include "CoordinateTransformation3D.h"
-#include "Grid3D.h"
-#include "ILBMKernel.h"
-
-#include "BoundaryConditionsBlockVisitor.h"
-#include "SetBcBlocksBlockVisitor.h"
-
-#include "PhysicsEngineGeometryAdapter.h"
-#include "Reconstructor.h"
-
-#include <array>
-
-//#define TIMING
-
-#ifdef TIMING
-#include "UbTiming.h"
-#endif
-
-MovableObjectInteractor::MovableObjectInteractor(std::shared_ptr<GbObject3D> geoObject3D, std::shared_ptr<Grid3D> grid,
- std::shared_ptr<BCAdapter> bcAdapter, int type,
- std::shared_ptr<Reconstructor> reconstructor, State state)
- : D3Q27Interactor(geoObject3D, grid, bcAdapter, type), reconstructor(reconstructor), state(state)
-{
- // grid->getBlocks(0, grid->getRank(), true, blockVector);
-}
-
-MovableObjectInteractor::~MovableObjectInteractor() {}
-
-void MovableObjectInteractor::setPhysicsEngineGeometry(
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry)
-{
- this->physicsEngineGeometry = physicsEngineGeometry;
- physicsEngineGeometry->changeState(this->state);
-}
-
-void MovableObjectInteractor::moveGbObjectTo(const Vector3D &position)
-{
- // UBLOG(logINFO, "new position: (x,y,z) " << val<1>(position) << ", " << val<2>(position) << ", " <<
- // val<3>(position));
-
- this->getGbObject3D()->setCenterCoordinates(UbTupleDouble3(position[0], position[1], position[2]));
- this->rearrangeGrid();
-}
-
-void MovableObjectInteractor::rearrangeGrid()
-{
-#ifdef TIMING
- UbTimer timer;
- timer.resetAndStart();
-#endif
-
-#ifdef TIMING
- UBLOG(logINFO, "MovableObjectInteractor::rearrangeGrid():start");
-#endif
-
- this->reconstructDistributionOnSolidNodes();
-
-#ifdef TIMING
- UBLOG(logINFO, "reconstructDistributionOnSolidNodes() time = " << timer.stop() << " s");
-#endif
-
- this->setSolidNodesToFluid();
-
-#ifdef TIMING
- UBLOG(logINFO, "setSolidNodesToFluid() time = " << timer.stop() << " s");
-#endif
-
- this->setBcNodesToFluid();
-
-#ifdef TIMING
- UBLOG(logINFO, "setBcNodesToFluid() time = " << timer.stop() << " s");
-#endif
-
- this->removeSolidBlocks();
-
-#ifdef TIMING
- UBLOG(logINFO, "removeSolidBlocks() time = " << timer.stop() << " s");
-#endif
-
- this->removeBcBlocks();
-
-#ifdef TIMING
- UBLOG(logINFO, "removeBcBlocks() time = " << timer.stop() << " s");
-#endif
-
- this->setBcBlocks();
-
-#ifdef TIMING
- UBLOG(logINFO, "setBcBlocks() time = " << timer.stop() << " s");
-#endif
-
- this->initInteractor();
-
-#ifdef TIMING
- UBLOG(logINFO, "initInteractor() time = " << timer.stop() << " s");
-#endif
-
- this->updateVelocityBc();
-
-#ifdef TIMING
- UBLOG(logINFO, "updateVelocityBc() time = " << timer.stop() << " s");
-#endif
-}
-
-void MovableObjectInteractor::updateNodeLists()
-{
- // for (BcNodeIndicesMap::value_type t : bcNodeIndicesMap)
- //{
- // SPtr<Block3D> block = t.first;
- // std::set< UbTupleInt3 >& bcNodeIndices = t.second;
-
- // SPtr<ILBMKernel> kernel = block->getKernel();
-
- // for (UbTupleInt3 node : bcNodeIndices)
- // {
-
- // }
- //}
-}
-
-void MovableObjectInteractor::reconstructDistributionOnSolidNodes()
-{
- for (SolidNodeIndicesMap::value_type t : solidNodeIndicesMap) {
- SPtr<Block3D> block = t.first;
- std::set<UbTupleInt3> &solidNodeIndices = t.second;
-
- SPtr<ILBMKernel> kernel = block->getKernel();
-
- for (UbTupleInt3 node : solidNodeIndices) {
- const int x1 = val<1>(node);
- const int x2 = val<2>(node);
- const int x3 = val<3>(node);
-
- const Vector3D worldCoordinates = this->grid.lock()->getNodeCoordinates(block, x1, x2, x3);
-
- if (kernel->isInsideOfDomain(x1, x2, x3))
- reconstructor->reconstructNode(x1, x2, x3, worldCoordinates, physicsEngineGeometry, kernel);
- }
- }
-}
-
-void MovableObjectInteractor::setSolidNodesToFluid()
-{
- for (SolidNodeIndicesMap::value_type t : solidNodeIndicesMap) {
- SPtr<Block3D> block = t.first;
- std::set<UbTupleInt3> &solidNodeIndices = t.second;
-
- SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
-
- for (UbTupleInt3 node : solidNodeIndices)
- bcArray->setFluid(val<1>(node), val<2>(node), val<3>(node));
- }
-}
-
-void MovableObjectInteractor::setBcNodesToFluid()
-{
- for (BcNodeIndicesMap::value_type t : bcNodeIndicesMap) {
- SPtr<Block3D> block = t.first;
- std::set<std::vector<int>> &bcNodeIndices = t.second;
-
- SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
-
- for (std::vector<int> node : bcNodeIndices)
- bcArray->setFluid(node[0], node[1], node[2]);
- }
-}
-
-void MovableObjectInteractor::setBcBlocks()
-{
- SetBcBlocksBlockVisitor v(shared_from_this());
- this->grid.lock()->accept(v);
-
- //////////////////////////////////////////////////////////////////////////
- // SPtr<GbObject3D> geoObject = this->getGbObject3D();
- // std::array<double, 6> AABB ={
- // geoObject->getX1Minimum(),geoObject->getX2Minimum(),geoObject->getX3Minimum(),geoObject->getX1Maximum(),geoObject->getX2Maximum(),geoObject->getX3Maximum()
- // }; blockVector.clear(); UbTupleInt3 blockNX=grid.lock()->getBlockNX(); double ext = 0.0;
- // grid.lock()->getBlocksByCuboid(AABB[0]-(double)val<1>(blockNX)*ext, AABB[1]-(double)val<2>(blockNX)*ext,
- // AABB[2]-(double)val<3>(blockNX)*ext, AABB[3]+(double)val<1>(blockNX)*ext, AABB[4]+(double)val<2>(blockNX)*ext,
- // AABB[5]+(double)val<3>(blockNX)*ext, blockVector);
-
- // for(std::shared_ptr<Block3D> block : this->blockVector)
- //{
- // if (block->getKernel())
- // {
- // setBCBlock(block);
- // }
- //}
- //////////////////////////////////////////////////////////////////////////
- // SPtr<GbObject3D> geoObject = this->getGbObject3D();
- // std::array <double, 2> minMax1;
- // std::array <double, 2> minMax2;
- // std::array <double, 2> minMax3;
- // minMax1[0] = geoObject->getX1Minimum();
- // minMax2[0] = geoObject->getX2Minimum();
- // minMax3[0] = geoObject->getX3Minimum();
- // minMax1[1] = geoObject->getX1Maximum();
- // minMax2[1] = geoObject->getX2Maximum();
- // minMax3[1] = geoObject->getX3Maximum();
-
- // SPtr<CoordinateTransformation3D> trafo = grid.lock()->getCoordinateTransformator();
-
- // for (int x3 = 0; x3 < 2; x3++)
- // for (int x2 = 0; x2 < 2; x2++)
- // for (int x1 = 0; x1 < 2; x1++)
- // {
- // int ix1 = (int)trafo->transformForwardToX1Coordinate(minMax1[x1], minMax2[x2], minMax3[x3]);
- // int ix2 = (int)trafo->transformForwardToX2Coordinate(minMax1[x1], minMax2[x2], minMax3[x3]);
- // int ix3 = (int)trafo->transformForwardToX3Coordinate(minMax1[x1], minMax2[x2], minMax3[x3]);
- // blockVector.push_back(grid.lock()->getBlock(ix1, ix2, ix3, 0));
- // }
- // for(std::shared_ptr<Block3D> block : this->blockVector)
- //{
- // if (block->getKernel())
- // {
- // setBCBlock(block);
- // }
- //}
-}
-
-void MovableObjectInteractor::updateVelocityBc()
-{
- for (BcNodeIndicesMap::value_type t : this->getBcNodeIndicesMap()) {
- SPtr<Block3D> block = t.first;
- std::set<std::vector<int>> &bcNodeIndices = t.second;
-
- SPtr<BCArray3D> bcArray = block->getKernel()->getBCProcessor()->getBCArray();
-
- for (std::vector<int> node : bcNodeIndices)
- setGeometryVelocityToBoundaryCondition(node, block, bcArray);
- }
-}
-
-void MovableObjectInteractor::setGeometryVelocityToBoundaryCondition(std::vector<int> node, SPtr<Block3D> block,
- SPtr<BCArray3D> bcArray) const
-{
- const SPtr<BoundaryConditions> bc = bcArray->getBC(node[0], node[1], node[2]);
- const Vector3D worldCoordinates = this->grid.lock()->getNodeCoordinates(block, node[0], node[1], node[2]);
- const Vector3D velocity = this->physicsEngineGeometry->getVelocityAtPosition(worldCoordinates);
-
- bc->setBoundaryVelocity(velocity);
-}
diff --git a/src/cpu/DemCoupling/MovableObjectInteractor.h b/src/cpu/DemCoupling/MovableObjectInteractor.h
deleted file mode 100644
index e0e4343a066d5fd69ddb3cf68d2106337a51d031..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/MovableObjectInteractor.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef D3Q27_MOVABLE_OBJECT_INTERACTOR_H
-#define D3Q27_MOVABLE_OBJECT_INTERACTOR_H
-
-#include <memory>
-#include <vector>
-
-#include "D3Q27Interactor.h"
-
-#include "PhysicsEngineGeometryAdapter.h"
-#include "Vector3D.h"
-
-class Grid3D;
-class Block3D;
-class BCArray3D;
-class BCAdapter;
-class GbObject3D;
-
-class PhysicsEngineGeometryAdapter;
-class Reconstructor;
-
-class MovableObjectInteractor : public D3Q27Interactor
-{
-public:
- typedef std::map<SPtr<Block3D>, std::set<std::array<int, 3>>> InBcNodeIndicesMap;
- typedef std::map<SPtr<Block3D>, std::set<std::array<int, 3>>> OutBcNodeIndicesMap;
-
-public:
- MovableObjectInteractor(std::shared_ptr<GbObject3D> geoObject3D, std::shared_ptr<Grid3D> grid,
- std::shared_ptr<BCAdapter> bcAdapter, int type,
- std::shared_ptr<Reconstructor> reconstructor, State isPinned);
- virtual ~MovableObjectInteractor();
-
- void setPhysicsEngineGeometry(std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry);
-
- void moveGbObjectTo(const Vector3D &position);
-
-private:
- void rearrangeGrid();
- void updateNodeLists();
- void setSolidNodesToFluid();
- void setBcNodesToFluid();
- void reconstructDistributionOnSolidNodes();
- void setBcBlocks();
-
- void updateVelocityBc();
- void setGeometryVelocityToBoundaryCondition(std::vector<int> node, std::shared_ptr<Block3D> block,
- std::shared_ptr<BCArray3D> bcArray) const;
-
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry;
-
- std::shared_ptr<Reconstructor> reconstructor;
- State state;
- std::vector<std::shared_ptr<Block3D>> blockVector;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/PePartitioningGridVisitor.cpp b/src/cpu/DemCoupling/PePartitioningGridVisitor.cpp
deleted file mode 100644
index 429eaeb8be0d3a601b64199e5e86279f7d05ce8f..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/PePartitioningGridVisitor.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-#if defined VF_METIS && defined VF_MPI
-
-#include "PePartitioningGridVisitor.h"
-#include "Block3D.h"
-#include <mpi/Communicator.h>
-#include "CoordinateTransformation3D.h"
-#include "Grid3D.h"
-#include "UbLogger.h"
-#include <math.h>
-#include <shared_mutex>
-
-#include "DemCoProcessor.h"
-
-using namespace std;
-
-PePartitioningGridVisitor::PePartitioningGridVisitor(std::shared_ptr<vf::mpi::Communicator> comm, std::shared_ptr<DemCoProcessor> dem)
- : Grid3DVisitor(), comm(comm), dem(dem)
-{
- forest = dynamicPointerCast<PePhysicsEngineSolverAdapter>(dem->getPhysicsEngineSolver())->getForest();
-}
-//////////////////////////////////////////////////////////////////////////
-PePartitioningGridVisitor::~PePartitioningGridVisitor() {}
-//////////////////////////////////////////////////////////////////////////
-void PePartitioningGridVisitor::visit(SPtr<Grid3D> grid)
-{
- UBLOG(logDEBUG1, "PePartitioningGridVisitor::visit() - start");
-
- collectData(grid);
- distributePartitionData(grid);
-
- UBLOG(logDEBUG1, "PePartitioningGridVisitor::visit() - end");
-}
-//////////////////////////////////////////////////////////////////////////
-void PePartitioningGridVisitor::collectData(SPtr<Grid3D> grid)
-{
- // int minInitLevel = grid->getCoarsestInitializedLevel();
- // int maxInitLevel = grid->getFinestInitializedLevel();
-
- walberla::uint_t peRank;
-
- for (auto blockIt = forest->begin(); blockIt != forest->end(); ++blockIt) {
- forest->getProcessRank(peRank, blockIt->getId());
- vector<SPtr<Block3D>> blocks;
- walberla::AABB aabb = blockIt->getAABB();
-
- // getBlocksByCuboid((double)aabb.xMin(), (double)aabb.yMin(), (double)aabb.zMin(), (double)aabb.xMax(),
- // (double)aabb.yMax(), (double)aabb.zMax(), blocks, grid); for (SPtr<Block3D> block : blocks)
- //{
- // ids.push_back(block->getGlobalID());
- // ranks.push_back((int)peRank);
- //}
- SPtr<Block3D> block = getBlockByMinUniform((double)aabb.xMin(), (double)aabb.yMin(), (double)aabb.zMin(), grid);
- if (block) {
- ids.push_back(block->getGlobalID());
- ranks.push_back((int)peRank);
- }
- }
-}
-//////////////////////////////////////////////////////////////////////////
-// void PePartitioningGridVisitor::getBlocksByCuboid(double minX1, double minX2, double minX3, double maxX1, double
-// maxX2, double maxX3, std::vector<SPtr<Block3D>>& blocks, SPtr<Grid3D> grid)
-//{
-// int coarsestLevel = grid->getCoarsestInitializedLevel();
-// int finestLevel = grid->getFinestInitializedLevel();
-//
-// SPtr<CoordinateTransformation3D> trafo = grid->getCoordinateTransformator();
-//
-// //////////////////////////////////////////////////////////////////////////
-// //MINIMALE BLOCK-INDIZES BESTIMMEN
-// //
-// //min:
-// double dMinX1 = trafo->transformForwardToX1Coordinate(minX1, minX2, minX3)*(1<<finestLevel);
-// double dMinX2 = trafo->transformForwardToX2Coordinate(minX1, minX2, minX3)*(1<<finestLevel);
-// double dMinX3 = trafo->transformForwardToX3Coordinate(minX1, minX2, minX3)*(1<<finestLevel);
-//
-// //Achtung, wenn minX1 genau auf grenze zwischen zwei bloecken -> der "kleinere" muss genommen werden,
-// //da beim Transformieren der "groessere" Index rauskommt
-// int iMinX1 = (int)dMinX1; //if (UbMath::zero(dMinX1-iMinX1)) iMinX1-=1;
-// int iMinX2 = (int)dMinX2; //if (UbMath::zero(dMinX2-iMinX2)) iMinX2-=1;
-// int iMinX3 = (int)dMinX3; //if (UbMath::zero(dMinX3-iMinX3)) iMinX3-=1;
-//
-// //max (hier kann die Zusatzabfrage vernachlaessigt werden):
-// int iMaxX1 = (int)(trafo->transformForwardToX1Coordinate(maxX1, maxX2, maxX3)*(1<<finestLevel));
-// int iMaxX2 = (int)(trafo->transformForwardToX2Coordinate(maxX1, maxX2, maxX3)*(1<<finestLevel));
-// int iMaxX3 = (int)(trafo->transformForwardToX3Coordinate(maxX1, maxX2, maxX3)*(1<<finestLevel));
-//
-// SPtr<Block3D> block;
-//
-// //set, um doppelte bloecke zu vermeiden, die u.U. bei periodic auftreten koennen
-// std::set<SPtr<Block3D>> blockset;
-// for (int level=coarsestLevel; level<=finestLevel; level++)
-// {
-// //damit bei negativen werten auch der "kleinere" genommen wird -> floor!
-// int minx1 = (int)std::floor((double)iMinX1/(1<<(finestLevel-level)));
-// int minx2 = (int)std::floor((double)iMinX2/(1<<(finestLevel-level)));
-// int minx3 = (int)std::floor((double)iMinX3/(1<<(finestLevel-level)));
-//
-// int maxx1 = iMaxX1/(1<<(finestLevel-level));
-// int maxx2 = iMaxX2/(1<<(finestLevel-level));
-// int maxx3 = iMaxX3/(1<<(finestLevel-level));
-//
-// for (int ix1=minx1; ix1<maxx1; ix1++)
-// for (int ix2=minx2; ix2<maxx2; ix2++)
-// for (int ix3=minx3; ix3<maxx3; ix3++)
-// if ((block=grid->getBlock(ix1, ix2, ix3, level)))
-// {
-// blockset.insert(block);
-// }
-// }
-//
-// blocks.resize(blockset.size());
-// std::copy(blockset.begin(), blockset.end(), blocks.begin());
-//}
-
-SPtr<Block3D> PePartitioningGridVisitor::getBlockByMinUniform(double minX1, double minX2, double minX3,
- SPtr<Grid3D> grid)
-{
- SPtr<CoordinateTransformation3D> trafo = grid->getCoordinateTransformator();
-
- int ix1 = (int)trafo->transformForwardToX1Coordinate(minX1, minX2, minX3);
- int ix2 = (int)trafo->transformForwardToX2Coordinate(minX1, minX2, minX3);
- int ix3 = (int)trafo->transformForwardToX3Coordinate(minX1, minX2, minX3);
-
- return grid->getBlock(ix1, ix2, ix3, 0);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void PePartitioningGridVisitor::distributePartitionData(SPtr<Grid3D> grid)
-{
- std::vector<int> totalIDs;
- std::vector<int> totalRanks;
-
- assert(ids.size() != 0);
- assert(ranks.size() != 0);
-
- comm->allGather(ids, totalIDs);
- comm->allGather(ranks, totalRanks);
-
- assert(totalIDs.size() == totalRanks.size());
- for (int i = 0; i < totalIDs.size(); i++) {
- SPtr<Block3D> block = grid->getBlock(totalIDs[i]);
- if (block)
- block->setRank(totalRanks[i]);
- }
-}
-//////////////////////////////////////////////////////////////////////////
-
-#endif // VF_METIS
diff --git a/src/cpu/DemCoupling/PePartitioningGridVisitor.h b/src/cpu/DemCoupling/PePartitioningGridVisitor.h
deleted file mode 100644
index cad80c0f4d986c45560c6111e8943226df136d24..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/PePartitioningGridVisitor.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef PePartitioningGridVisitor_h
-#define PePartitioningGridVisitor_h
-
-#if defined VF_MPI
-
-#include <PointerDefinitions.h>
-#include <vector>
-
-#include "Grid3DVisitor.h"
-
-#include "PePhysicsEngineSolverAdapter.h"
-
-#include <array>
-
-////////////////////////////////////////////////////////////////////////
-//! \brief The class implements domain decomposition with PE library
-//! \author Konstantin Kutscher
-//////////////////////////////////////////////////////////////////////////
-namespace vf::mpi {class Communicator;}
-class Grid3D;
-class Block3D;
-class DemCoProcessor;
-// class walberla::blockforest::BlockForest;
-
-class PePartitioningGridVisitor : public Grid3DVisitor
-{
-public:
- //! This describe different types of decomposition
- enum GraphType { LevelIntersected, LevelBased };
-
-public:
- //! Constructor
- //! \param comm - communicator
-
- PePartitioningGridVisitor(std::shared_ptr<vf::mpi::Communicator> comm, std::shared_ptr<DemCoProcessor> dem);
- virtual ~PePartitioningGridVisitor();
- void visit(SPtr<Grid3D> grid) override;
-
-protected:
- void collectData(SPtr<Grid3D> grid);
- void distributePartitionData(SPtr<Grid3D> grid);
- // void getBlocksByCuboid(double minX1, double minX2, double minX3, double maxX1, double maxX2, double maxX3,
- // std::vector<SPtr<Block3D>>& blocks, SPtr<Grid3D> grid);
- SPtr<Block3D> getBlockByMinUniform(double minX1, double minX2, double minX3, SPtr<Grid3D> grid);
-
-private:
- std::shared_ptr<vf::mpi::Communicator> comm;
- std::shared_ptr<DemCoProcessor> dem;
-
- std::vector<int> ids;
- std::vector<int> ranks;
-
- std::shared_ptr<walberla::blockforest::BlockForest> forest;
-};
-
-#endif // VF_MPI
-#endif
diff --git a/src/cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp b/src/cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp
deleted file mode 100644
index ff6cbe7e5a3e394bac18016507a57308d0f1ecbf..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/RestartDemObjectsCoProcessor.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "RestartDemObjectsCoProcessor.h"
-
-#include <mpi/Communicator.h>
-#include "CreateDemObjectsCoProcessor.h"
-#include "DemCoProcessor.h"
-#include "GbSphere3D.h"
-#include "Grid3D.h"
-#include "UbFileInputBinary.h"
-#include "UbFileOutputBinary.h"
-#include "UbScheduler.h"
-#include "UbSystem.h"
-#include "Vector3D.h"
-
-RestartDemObjectsCoProcessor::RestartDemObjectsCoProcessor() {}
-
-RestartDemObjectsCoProcessor::RestartDemObjectsCoProcessor(
- SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, SPtr<DemCoProcessor> demCoProcessor,
- SPtr<CreateDemObjectsCoProcessor> createDemObjectsCoProcessor, double radius, std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), demCoProcessor(demCoProcessor),
- createDemObjectsCoProcessor(createDemObjectsCoProcessor), radius(radius), comm(comm)
-{
-}
-
-void RestartDemObjectsCoProcessor::process(double step)
-{
- if (scheduler->isDue(step)) {
- int istep = static_cast<int>(step);
-
- if (comm->isRoot())
- UBLOG(logINFO, "RestartDemObjectsCoProcessor::write step: " << istep);
-
- write(istep);
- }
-}
-
-void RestartDemObjectsCoProcessor::restart(double step)
-{
- if (comm->isRoot())
- UBLOG(logINFO, "RestartDemObjectsCoProcessor::read step: " << (int)step);
-
- read((int)step);
-}
-
-void RestartDemObjectsCoProcessor::write(int step)
-{
- if (comm->isRoot())
- UBLOG(logINFO, "RestartDemObjectsCoProcessor::write start ");
- std::vector<double> p;
-
- demCoProcessor->getObjectsPropertiesVector(p);
-
- // TODO implement getherv
- std::vector<double> rvalues;
- comm->allGather(p, rvalues);
-
- if (comm->isRoot()) {
- std::map<int, std::vector<double>> infMap;
- int size = (int)rvalues.size();
- for (int i = 0; i < size; i += 7) {
- std::vector<double> infVector(6);
- for (int j = 0; j < 6; j++) {
- infVector[j] = rvalues[i + 1 + j];
- }
- infMap.insert(std::make_pair((int)rvalues[i], infVector));
- }
- std::vector<double> wvalues;
- typedef std::map<int, std::vector<double>>::iterator it_type;
- for (it_type iterator = infMap.begin(); iterator != infMap.end(); iterator++) {
- // iterator->first = key
- // iterator->second = value
- std::vector<double>::iterator it = wvalues.end();
- it = wvalues.insert(it, iterator->second.begin(), iterator->second.end());
- }
- std::string subfolder = "dem_cp_" + UbSystem::toString(step);
- std::string filePath = path + "/dem_cp/" + subfolder + "/dem_cp.bin";
- UbFileOutputBinary fo(filePath);
- fo.writeInteger((int)wvalues.size());
- fo.writeVector<double>(wvalues);
- UBLOG(logINFO, "RestartDemObjectsCoProcessor::write number of objects = " << wvalues.size() / 6);
- }
- if (comm->isRoot())
- UBLOG(logINFO, "RestartDemObjectsCoProcessor::write stop ");
-}
-
-void RestartDemObjectsCoProcessor::read(int step)
-{
- if (comm->isRoot())
- UBLOG(logINFO, "RestartDemObjectsCoProcessor::read start ");
- std::vector<double> p;
-
- if (comm->isRoot()) {
- std::string subfolder = "dem_cp_" + UbSystem::toString(step);
- std::string filePath = path + "/dem_cp/" + subfolder + "/dem_cp.bin";
- UbFileInputBinary fi(filePath);
- int size = fi.readInteger();
- p.resize(size);
- fi.readVector<double>(p);
- }
- comm->broadcast(p);
-
- if (comm->isRoot())
- UBLOG(logINFO, "RestartDemObjectsCoProcessor::read number of objects = " << p.size() / 6);
-
- createDemObjectsCoProcessor->clearGeoObjects();
-
- int size = (int)p.size();
-
- for (int i = 0; i < size; i += 6) {
- SPtr<GbObject3D> sphere(new GbSphere3D(p[i], p[i + 1], p[i + 2], radius));
- createDemObjectsCoProcessor->addGeoObject(sphere, Vector3D(p[i + 3], p[i + 4], p[i + 5]));
- }
-
- createDemObjectsCoProcessor->createGeoObjects();
-
- createDemObjectsCoProcessor->clearGeoObjects();
-
- if (comm->isRoot())
- UBLOG(logINFO, "RestartDemObjectsCoProcessor::read stop ");
-}
diff --git a/src/cpu/DemCoupling/RestartDemObjectsCoProcessor.h b/src/cpu/DemCoupling/RestartDemObjectsCoProcessor.h
deleted file mode 100644
index 5123a2d6e51ece8e96d6623d573141a8c272026f..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/RestartDemObjectsCoProcessor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Author: K. Kutscher
- * mail: kutscher@irmb.tu-bs.de
- */
-#ifndef RestartDemObjectsCoProcessor_H
-#define RestartDemObjectsCoProcessor_H
-
-#include <PointerDefinitions.h>
-#include <string>
-#include <vector>
-
-#include "CoProcessor.h"
-
-namespace vf::mpi {class Communicator;}
-class Grid3D;
-class UbScheduler;
-class DemCoProcessor;
-class CreateDemObjectsCoProcessor;
-
-class RestartDemObjectsCoProcessor : public CoProcessor
-{
-public:
- RestartDemObjectsCoProcessor();
- RestartDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
- SPtr<DemCoProcessor> demCoProcessor,
- SPtr<CreateDemObjectsCoProcessor> createDemObjectsCoProcessor, double radius,
- std::shared_ptr<vf::mpi::Communicator> comm);
- ~RestartDemObjectsCoProcessor() {}
- void process(double step) override;
- void restart(double step);
- void write(int step);
- void read(int step);
-
-private:
- std::string path;
- double radius;
- std::shared_ptr<vf::mpi::Communicator> comm;
- SPtr<DemCoProcessor> demCoProcessor;
- SPtr<CreateDemObjectsCoProcessor> createDemObjectsCoProcessor;
-};
-#endif
diff --git a/src/cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp b/src/cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp
deleted file mode 100644
index 3e22c90cf266fa8593b0036d160d79080a3ad31c..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/WriteDemObjectsCoProcessor.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#include "WriteDemObjectsCoProcessor.h"
-
-#include "basics/writer/WbWriterVtkXmlASCII.h"
-#include "basics/writer/WbWriterVtkXmlBinary.h"
-
-#include <mpi/Communicator.h>
-#include "DemCoProcessor.h"
-#include "Grid3D.h"
-#include "UbScheduler.h"
-#include "UbSystem.h"
-
-WriteDemObjectsCoProcessor::WriteDemObjectsCoProcessor() {}
-//////////////////////////////////////////////////////////////////////////
-WriteDemObjectsCoProcessor::WriteDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
- WbWriter *const writer, SPtr<DemCoProcessor> demCoProcessor,
- std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), writer(writer), demCoProcessor(demCoProcessor), comm(comm)
-{
-}
-//////////////////////////////////////////////////////////////////////////
-void WriteDemObjectsCoProcessor::process(double step)
-{
- if (scheduler->isDue(step)) {
- std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt3> triangles;
-
- int numObjcts = demCoProcessor->addSurfaceTriangleSet(nodes, triangles);
-
- int istep = static_cast<int>(step);
-
- std::string pfilePath, partPath, subfolder, cfilePath;
-
- subfolder = "dem" + UbSystem::toString(istep);
- pfilePath = path + "/dem/" + subfolder;
- cfilePath = path + "/dem/dem_collection";
- partPath = pfilePath + "/dem" + UbSystem::toString(comm->getProcessID()) + "_" + UbSystem::toString(istep);
-
- std::string partName = writer->writeTriangles(partPath, nodes, triangles);
- size_t found = partName.find_last_of("/");
- std::string piece = partName.substr(found + 1);
- piece = subfolder + "/" + piece;
-
- std::vector<std::string> datanames;
- std::vector<std::string> cellDataNames;
- std::vector<std::string> pieces = comm->gather(piece);
- if (comm->isRoot()) {
- std::string pname =
- WbWriterVtkXmlASCII::getInstance()->writeParallelFile(pfilePath, pieces, datanames, cellDataNames);
- found = pname.find_last_of("/");
- piece = pname.substr(found + 1);
-
- std::vector<std::string> filenames;
- filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin()) {
- WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
- } else {
- WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
- }
- UBLOG(logINFO, "WriteDemObjectsCoProcessor number of objects: " << numObjcts);
- UBLOG(logINFO, "WriteDemObjectsCoProcessor step: " << istep);
- }
- }
-}
diff --git a/src/cpu/DemCoupling/WriteDemObjectsCoProcessor.h b/src/cpu/DemCoupling/WriteDemObjectsCoProcessor.h
deleted file mode 100644
index 7fb3b045ccd439d772ef565c2013af32c75a7a2d..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/WriteDemObjectsCoProcessor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Author: K. Kutscher
- * mail: kutscher@irmb.tu-bs.de
- */
-#ifndef WriteDemObjectsCoProcessor_H
-#define WriteDemObjectsCoProcessor_H
-
-#include <PointerDefinitions.h>
-#include <string>
-#include <vector>
-
-#include "CoProcessor.h"
-
-namespace vf::mpi {class Communicator;}
-class Grid3D;
-class UbScheduler;
-class DemCoProcessor;
-class WbWriter;
-
-class WriteDemObjectsCoProcessor : public CoProcessor
-{
-public:
- WriteDemObjectsCoProcessor();
- WriteDemObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, WbWriter *const writer,
- SPtr<DemCoProcessor> demCoProcessor, std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteDemObjectsCoProcessor() {}
- void process(double step) override;
-
-private:
- std::string path;
- WbWriter *writer;
- std::shared_ptr<vf::mpi::Communicator> comm;
- SPtr<DemCoProcessor> demCoProcessor;
-};
-#endif
diff --git a/src/cpu/DemCoupling/WritePeBlocksCoProcessor.cpp b/src/cpu/DemCoupling/WritePeBlocksCoProcessor.cpp
deleted file mode 100644
index 401ea91bc7225eea7f871cbc2e92be44d1a5c9d7..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/WritePeBlocksCoProcessor.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-#include "WritePeBlocksCoProcessor.h"
-
-#include "basics/writer/WbWriterVtkXmlASCII.h"
-
-#include "Block3D.h"
-#include <mpi/Communicator.h>
-#include "D3Q27System.h"
-#include "Grid3D.h"
-#include "UbScheduler.h"
-
-WritePeBlocksCoProcessor::WritePeBlocksCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
- WbWriter *const writer, std::shared_ptr<vf::mpi::Communicator> comm,
- SPtr<walberla::blockforest::BlockForest> forest)
- : CoProcessor(grid, s), path(path), writer(writer), comm(comm), forest(forest)
-{
-}
-
-WritePeBlocksCoProcessor::~WritePeBlocksCoProcessor() {}
-
-void WritePeBlocksCoProcessor::process(double step)
-{
- if (scheduler->isDue(step))
- collectData(step);
-}
-
-void WritePeBlocksCoProcessor::collectData(double step)
-{
- if (comm->getProcessID() == comm->getRoot()) {
- int istep = int(step);
- std::vector<std::string> filenames;
- std::vector<UbTupleFloat3> nodes;
- std::vector<UbTupleInt8> cells;
- std::vector<std::string> celldatanames;
-
- celldatanames.push_back("ID");
- celldatanames.push_back("rank");
-
- walberla::uint_t rank = 0;
-
- std::vector<std::vector<double>> celldata(celldatanames.size());
-
- int nr = 0;
-
- for (auto blockIt = forest->begin(); blockIt != forest->end(); ++blockIt) {
- walberla::AABB aabb = blockIt->getAABB();
-
- nodes.push_back(makeUbTuple((float)aabb.xMin(), (float)aabb.yMin(), (float)aabb.zMin()));
- nodes.push_back(makeUbTuple((float)aabb.xMax(), (float)aabb.yMin(), (float)aabb.zMin()));
- nodes.push_back(makeUbTuple((float)aabb.xMax(), (float)aabb.yMax(), (float)aabb.zMin()));
- nodes.push_back(makeUbTuple((float)aabb.xMin(), (float)aabb.yMax(), (float)aabb.zMin()));
- nodes.push_back(makeUbTuple((float)aabb.xMin(), (float)aabb.yMin(), (float)aabb.zMax()));
- nodes.push_back(makeUbTuple((float)aabb.xMax(), (float)aabb.yMin(), (float)aabb.zMax()));
- nodes.push_back(makeUbTuple((float)aabb.xMax(), (float)aabb.yMax(), (float)aabb.zMax()));
- nodes.push_back(makeUbTuple((float)aabb.xMin(), (float)aabb.yMax(), (float)aabb.zMax()));
- cells.push_back(makeUbTuple(nr, nr + 1, nr + 2, nr + 3, nr + 4, nr + 5, nr + 6, nr + 7));
- nr += 8;
-
- // data
- celldata[0].push_back((double)blockIt->getId().getID());
- forest->getProcessRank(rank, blockIt->getId());
- celldata[1].push_back((double)rank);
- }
-
- filenames.push_back(writer->writeOctsWithCellData(
- path + "/peBlocks/peBlocks_" + UbSystem::toString(grid->getRank()) + "_" + UbSystem::toString(istep), nodes,
- cells, celldatanames, celldata));
-
- if (istep == CoProcessor::scheduler->getMinBegin()) {
- WbWriterVtkXmlASCII::getInstance()->writeCollection(path + "/peBlocks/peBlocks_collection", filenames,
- istep, false);
- } else {
- WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(path + "/peBlocks/peBlocks_collection", filenames,
- istep, false);
- }
-
- UBLOG(logINFO, "WritePeBlocksCoProcessor step: " << istep);
- }
-}
\ No newline at end of file
diff --git a/src/cpu/DemCoupling/WritePeBlocksCoProcessor.h b/src/cpu/DemCoupling/WritePeBlocksCoProcessor.h
deleted file mode 100644
index ae27d50b3f0bba867db7ad8cce79f2e5d8fd5681..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/WritePeBlocksCoProcessor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * WritePeBlocksCoProcessor.h
- *
- * Created on: 07.09.2018
- * Author: K. Kutscher
- */
-
-#ifndef WritePeBlocksCoProcessor_H_
-#define WritePeBlocksCoProcessor_H_
-
-#include <PointerDefinitions.h>
-#include <string>
-
-#include "CoProcessor.h"
-
-#include <pe/basic.h>
-
-namespace vf::mpi {class Communicator;}
-class Grid3D;
-class UbScheduler;
-class WbWriter;
-
-class WritePeBlocksCoProcessor : public CoProcessor
-{
-public:
- WritePeBlocksCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, WbWriter *const writer,
- std::shared_ptr<vf::mpi::Communicator> comm, SPtr<walberla::blockforest::BlockForest> forest);
- virtual ~WritePeBlocksCoProcessor();
-
- void process(double step) override;
-
-protected:
- void collectData(double step);
-
- std::string path;
- WbWriter *writer;
- std::shared_ptr<vf::mpi::Communicator> comm;
- SPtr<walberla::blockforest::BlockForest> forest;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineGeometryAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineGeometryAdapter.h
deleted file mode 100644
index 490c1f979eaba285f1c39f834396acf9646584d9..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineGeometryAdapter.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef PHYSICS_ENGINE_GEOMETRY_ADAPTER_H
-#define PHYSICS_ENGINE_GEOMETRY_ADAPTER_H
-
-#include "Vector3D.h"
-
-enum class State { PIN, UNPIN };
-
-class PhysicsEngineGeometryAdapter
-{
-public:
- virtual ~PhysicsEngineGeometryAdapter() {}
-
- virtual void addForce(const Vector3D &force) = 0;
- virtual void addTorque(const Vector3D &torque) = 0;
-
- virtual void setForce(const Vector3D &force) = 0;
- virtual void setTorque(const Vector3D &torque) = 0;
-
- virtual void addForceAtPosition(const Vector3D &force, const Vector3D &position) = 0;
- virtual void setLinearVelolocity(const Vector3D &velocity) = 0;
- virtual void setAngularVelocity(const Vector3D &velocity) = 0;
-
- virtual void resetForceAndTorque() = 0;
-
- virtual Vector3D getPosition() const = 0;
- virtual Vector3D getVelocityAtPosition(const Vector3D &position) const = 0;
- virtual Vector3D getLinearVelocity() const = 0;
- virtual Vector3D getAngularVelocity() const = 0;
-
- virtual Vector3D getForce() const = 0;
- virtual Vector3D getTorque() const = 0;
-
- virtual void changeState(State state) = 0;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineMaterialAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineMaterialAdapter.h
deleted file mode 100644
index 30504bee98580f25f23e37030d5ec8180fce3ebc..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineMaterialAdapter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef PHYSICS_ENGINE_MATERIAL_ADAPTER_H
-#define PHYSICS_ENGINE_MATERIAL_ADAPTER_H
-
-#include <string>
-
-class PhysicsEngineMaterialAdapter
-{
-public:
- PhysicsEngineMaterialAdapter(std::string name, double density, double restitution, double staticFriction,
- double dynamicFriction, double poissonRatio, double youngModul,
- double stiffnessInNormalDirection, double dampingoefficientNormalDirection,
- double dampingTangentialDirection)
- : name(name), density(density), restitution(restitution), staticFriction(staticFriction),
- dynamicFriction(dynamicFriction), poissonRatio(poissonRatio), youngModul(youngModul),
- stiffnessInNormalDirection(stiffnessInNormalDirection),
- dampingoefficientNormalDirection(dampingoefficientNormalDirection),
- dampingTangentialDirection(dampingTangentialDirection)
- {
- }
- virtual ~PhysicsEngineMaterialAdapter() {}
-
-protected:
- std::string name;
- double density;
- double restitution;
- double staticFriction; // Note: pe doubles the input coefficient of friction for material-material contacts.
- double dynamicFriction; // Similar to static friction for low speed friction.
- double poissonRatio;
- double youngModul;
- double stiffnessInNormalDirection;
- double dampingoefficientNormalDirection;
- double dampingTangentialDirection;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineSolverAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineSolverAdapter.h
deleted file mode 100644
index 8e03bf1d6e651f993012acc1e8297e309e993cc8..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/PhysicsEngineSolverAdapter.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef PHYSICS_ENGINE_SOLVER_ADAPTER_H
-#define PHYSICS_ENGINE_SOLVER_ADAPTER_H
-
-#include "Vector3D.h"
-
-class PhysicsEngineGeometryAdapter;
-class PhysicsEngineMaterialAdapter;
-
-class PhysicsEngineSolverAdapter
-{
-public:
- virtual ~PhysicsEngineSolverAdapter() {}
-
- virtual std::shared_ptr<PhysicsEngineGeometryAdapter>
- createPhysicsEngineGeometryAdapter(int id, const Vector3D &position, double radius,
- std::shared_ptr<PhysicsEngineMaterialAdapter> material) const = 0;
- virtual void runTimestep(double step) = 0;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.cpp
deleted file mode 100644
index b18a57532880491a2419ff9d78bc0c64aac108f8..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "DummyPhysicsEngineGeometryAdapter.h"
-
-void DummyPhysicsEngineGeometryAdapter::addForce(const Vector3D &force) {}
-
-void DummyPhysicsEngineGeometryAdapter::addTorque(const Vector3D &torque) {}
-
-void DummyPhysicsEngineGeometryAdapter::setForce(const Vector3D &force) {}
-
-void DummyPhysicsEngineGeometryAdapter::setTorque(const Vector3D &torque) {}
-
-void DummyPhysicsEngineGeometryAdapter::addForceAtPosition(const Vector3D &force, const Vector3D &position) {}
-
-void DummyPhysicsEngineGeometryAdapter::setLinearVelolocity(const Vector3D &velocity) { this->velocity = velocity; }
-
-void DummyPhysicsEngineGeometryAdapter::setAngularVelocity(const Vector3D &velocity) {}
-
-void DummyPhysicsEngineGeometryAdapter::resetForceAndTorque() {}
-
-Vector3D DummyPhysicsEngineGeometryAdapter::getVelocityAtPosition(const Vector3D &position) const { return velocity; }
-
-Vector3D DummyPhysicsEngineGeometryAdapter::getLinearVelocity() const { return Vector3D(); }
-
-Vector3D DummyPhysicsEngineGeometryAdapter::getAngularVelocity() const { return Vector3D(); }
-
-Vector3D DummyPhysicsEngineGeometryAdapter::getPosition() const { return Vector3D(); }
-
-Vector3D DummyPhysicsEngineGeometryAdapter::getForce() const { return Vector3D(); }
-
-Vector3D DummyPhysicsEngineGeometryAdapter::getTorque() const { return Vector3D(); }
-
-void DummyPhysicsEngineGeometryAdapter::changeState(State state) {}
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.h
deleted file mode 100644
index 70620d3c0681a2d2dc702c4a74f5c8d5a94141ea..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineGeometryAdapter.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef DUMMY_PHYSICS_ENGINE_GEOMETRY_ADAPTER_H
-#define DUMMY_PHYSICS_ENGINE_GEOMETRY_ADAPTER_H
-
-#include "UbTuple.h"
-
-#include "PhysicsEngineGeometryAdapter.h"
-
-class DummyPhysicsEngineGeometryAdapter : public PhysicsEngineGeometryAdapter
-{
-public:
- DummyPhysicsEngineGeometryAdapter() {}
- virtual ~DummyPhysicsEngineGeometryAdapter() {}
-
- void addForce(const Vector3D &force) override;
- void addTorque(const Vector3D &torque) override;
-
- void setForce(const Vector3D &force) override;
- void setTorque(const Vector3D &torque) override;
-
- void addForceAtPosition(const Vector3D &force, const Vector3D &position) override;
- void setLinearVelolocity(const Vector3D &velocity) override;
- void setAngularVelocity(const Vector3D &velocity) override;
-
- void resetForceAndTorque() override;
-
- Vector3D getVelocityAtPosition(const Vector3D &position) const override;
- Vector3D getLinearVelocity() const override;
- Vector3D getAngularVelocity() const override;
- Vector3D getPosition() const override;
- Vector3D getForce() const override;
- Vector3D getTorque() const override;
-
- void changeState(State state) override;
-
-private:
- Vector3D velocity;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.cpp
deleted file mode 100644
index 7890f966872d5433efa5b40b6358ca0b5a25a40d..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "DummyPhysicsEngineMaterialAdapter.h"
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.h
deleted file mode 100644
index e84e0f1089a017ed9135383995c96e55cdf0cee6..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineMaterialAdapter.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef DUMMY_PHYSICS_ENGINE_MATERIAL_ADAPTER
-#define DUMMY_PHYSICS_ENGINE_MATERIAL_ADAPTER
-
-#include "PhysicsEngineMaterialAdapter.h"
-
-class DummyPhysicsEngineMaterialAdapter : public PhysicsEngineMaterialAdapter
-{
-public:
- DummyPhysicsEngineMaterialAdapter(std::string name, double density, double restitution, double staticFriction,
- double dynamicFriction, double poissonRatio, double youngModul,
- double stiffnessInNormalDirection, double dampingoefficientNormalDirection,
- double dampingTangentialDirection)
- : PhysicsEngineMaterialAdapter(name, density, restitution, staticFriction, dynamicFriction, poissonRatio,
- youngModul, stiffnessInNormalDirection, dampingoefficientNormalDirection,
- dampingTangentialDirection)
- {
- }
- virtual ~DummyPhysicsEngineMaterialAdapter() {}
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.cpp
deleted file mode 100644
index 321b523ead35a6a8d16d7b48b1fbb7cb66b0fdc8..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "DummyPhysicsEngineSolverAdapter.h"
-
-#include "DummyPhysicsEngineGeometryAdapter.h"
-
-std::shared_ptr<PhysicsEngineGeometryAdapter> DummyPhysicsEngineSolverAdapter::createPhysicsEngineGeometryAdapter(
- int id, const Vector3D &position, double radius, std::shared_ptr<PhysicsEngineMaterialAdapter> material) const
-{
- return std::static_pointer_cast<PhysicsEngineGeometryAdapter>(
- std::make_shared<DummyPhysicsEngineGeometryAdapter>());
-}
-
-void DummyPhysicsEngineSolverAdapter::runTimestep(double step) {}
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.h
deleted file mode 100644
index 38e9e7f055b415266cfd35c055951707ba4cda44..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/dummy/DummyPhysicsEngineSolverAdapter.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef DUMMY_PHYSICS_ENGINE_SOLVER_ADAPTER_H
-#define DUMMY_PHYSICS_ENGINE_SOLVER_ADAPTER_H
-
-#include <memory>
-
-#include "UbTuple.h"
-
-#include "PhysicsEngineSolverAdapter.h"
-
-class DummyPhysicsEngineSolverAdapter : public PhysicsEngineSolverAdapter
-{
-public:
- DummyPhysicsEngineSolverAdapter(){};
- virtual ~DummyPhysicsEngineSolverAdapter() {}
-
- std::shared_ptr<PhysicsEngineGeometryAdapter>
- createPhysicsEngineGeometryAdapter(int id, const Vector3D &position, double radius,
- std::shared_ptr<PhysicsEngineMaterialAdapter> material) const override;
- void runTimestep(double step) override;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapter.h
deleted file mode 100644
index 0373281d60b6618555de3d48190816d79b9ade5b..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapter.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef PE_ADAPTER_H
-#define PE_ADAPTER_H
-
-#include "Vector3D.h"
-#include <pe/basic.h>
-
-class PeConverter
-{
-public:
- static Vector3D convert(walberla::pe::Vec3 vec3) { return Vector3D(vec3[0], vec3[1], vec3[2]); }
-
- static walberla::pe::Vec3 convert(const Vector3D &vec3) { return walberla::pe::Vec3(vec3[0], vec3[1], vec3[2]); }
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapterTest.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapterTest.cpp
deleted file mode 100644
index a92127c3fd0e2b10ad2d73ee88e7fbd00b8ace85..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeAdapterTest.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//#include "gmock/gmock.h"
-//
-//#include "PeAdapter.h"
-//#include <pe/basic.h>
-//
-//#include "UbTuple.h"
-//
-//
-// TEST(PeAdapterTest, convert_WalberlaVec3_to_Vector3D)
-//{
-// walberla::pe::Vec3 walberlaVec(1.0, -2.0, 3.4);
-// Vector3D ubTuple = PeConverter::convert(walberlaVec);
-//
-// EXPECT_THAT(ubTuple[0], testing::DoubleEq(walberlaVec[0]));
-// EXPECT_THAT(ubTuple[1], testing::DoubleEq(walberlaVec[1]));
-// EXPECT_THAT(ubTuple[2], testing::DoubleEq(walberlaVec[2]));
-//}
-//
-// TEST(PeAdapterTest, convert_Vector3D_to_WalberlaVec3)
-//{
-// Vector3D ubTuple(1.0, -2.0, 3.4);
-// walberla::pe::Vec3 walberlaVec = PeConverter::convert(ubTuple);
-//
-// EXPECT_THAT(ubTuple[0], testing::DoubleEq(walberlaVec[0]));
-// EXPECT_THAT(ubTuple[1], testing::DoubleEq(walberlaVec[1]));
-// EXPECT_THAT(ubTuple[2], testing::DoubleEq(walberlaVec[2]));
-//}
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.cpp
deleted file mode 100644
index 6c597698d608a287cc3a8bd5db84fbf061539234..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "PeLoadBalancerAdapter.h"
-#include "Block3D.h"
-#include "CoordinateTransformation3D.h"
-#include "Grid3D.h"
-#include "UbLogger.h"
-
-#include "core/debug/CheckFunctions.h"
-
-PeLoadBalancerAdapter::PeLoadBalancerAdapter(SPtr<Grid3D> grid, unsigned numberOfProcesses, int rank)
- : grid(grid), numberOfProcesses(numberOfProcesses), rank(rank)
-{
-}
-
-walberla::uint_t PeLoadBalancerAdapter::operator()(walberla::SetupBlockForest &forest,
- const walberla::uint_t numberOfProcesses,
- const walberla::memory_t perProcessMemoryLimit)
-{
- std::vector<walberla::SetupBlock *> peBlocks;
- forest.getBlocks(peBlocks);
-
- for (auto peBlock = peBlocks.begin(); peBlock != peBlocks.end(); ++peBlock) {
- walberla::AABB aabb = (*peBlock)->getAABB();
- SPtr<Block3D> block = getBlockByMinUniform(aabb.xMin() + 0.5 * (aabb.xMax() - aabb.xMin()),
- aabb.yMin() + 0.5 * (aabb.yMax() - aabb.yMin()),
- aabb.zMin() + 0.5 * (aabb.zMax() - aabb.zMin()), grid);
- if (block) {
- (*peBlock)->assignTargetProcess((walberla::uint_t)block->getRank());
- } else {
- // TODO: the rank of pe blocks is not consistent with VF blocks
- (*peBlock)->assignTargetProcess(0);
- // UBLOG(logINFO, "PeLoadBalancerAdapter::operator() peBlockId="<<(*peBlock)->getId());
- }
- }
-
- return numberOfProcesses;
-}
-
-SPtr<Block3D> PeLoadBalancerAdapter::getBlockByMinUniform(double minX1, double minX2, double minX3, SPtr<Grid3D> grid)
-{
- SPtr<CoordinateTransformation3D> trafo = grid->getCoordinateTransformator();
-
- int ix1 = (int)trafo->transformForwardToX1Coordinate(minX1, minX2, minX3);
- int ix2 = (int)trafo->transformForwardToX2Coordinate(minX1, minX2, minX3);
- int ix3 = (int)trafo->transformForwardToX3Coordinate(minX1, minX2, minX3);
-
- return grid->getBlock(ix1, ix2, ix3, 0);
-}
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.h
deleted file mode 100644
index 9e1c64dd330cd9b1aa06857d4d441b736c8a39a1..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PeLoadBalancerAdapter.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef PeLoadBalancerAdapter_h__
-#define PeLoadBalancerAdapter_h__
-
-#include "PointerDefinitions.h"
-#include "blockforest/SetupBlockForest.h"
-
-class Grid3D;
-class Block3D;
-
-class PeLoadBalancerAdapter
-{
-public:
- PeLoadBalancerAdapter(SPtr<Grid3D> grid, unsigned numberOfProcesses, int rank);
- walberla::uint_t operator()(walberla::SetupBlockForest &forest, const walberla::uint_t numberOfProcesses,
- const walberla::memory_t perProcessMemoryLimit);
- unsigned getNumberOfProcesses() const { return numberOfProcesses; }
- int getRank() const { return rank; }
-
-protected:
- SPtr<Block3D> getBlockByMinUniform(double minX1, double minX2, double minX3, SPtr<Grid3D> grid);
-
-private:
- SPtr<Grid3D> grid;
- unsigned numberOfProcesses;
- int rank;
-};
-
-#endif // PeLoadBalancerAdapter_h__
\ No newline at end of file
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.cpp
deleted file mode 100644
index 9800d75b18a78b7eaf0b46c4193b93a55f3ff91b..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "PePhysicsEngineGeometryAdapter.h"
-
-#include <pe/basic.h>
-
-#include "PeAdapter.h"
-
-// PePhysicsEngineGeometryAdapter::PePhysicsEngineGeometryAdapter(walberla::pe::RigidBody* peGeoObject) :
-// peGeoObject(peGeoObject)
-//{
-// this->id = peGeoObject->getID();
-// this->active = true;
-//}
-
-PePhysicsEngineGeometryAdapter::PePhysicsEngineGeometryAdapter()
-{
- this->id = -999;
- this->systemID = -999;
- this->active = false;
- this->semiactive = false;
- shadowCounter = 0;
- counter = 0;
-}
-
-void PePhysicsEngineGeometryAdapter::addForce(const Vector3D &force)
-{
- peGeoObject->addForce(PeConverter::convert(force));
-}
-
-void PePhysicsEngineGeometryAdapter::addTorque(const Vector3D &torque)
-{
- peGeoObject->addTorque(PeConverter::convert(torque));
-}
-
-void PePhysicsEngineGeometryAdapter::setForce(const Vector3D &force)
-{
- peGeoObject->setForce(PeConverter::convert(force));
-}
-
-void PePhysicsEngineGeometryAdapter::setTorque(const Vector3D &torque)
-{
- peGeoObject->setTorque(PeConverter::convert(torque));
-}
-
-void PePhysicsEngineGeometryAdapter::addForceAtPosition(const Vector3D &force, const Vector3D &position)
-{
- peGeoObject->addForceAtPos(PeConverter::convert(force), PeConverter::convert(position));
-}
-
-void PePhysicsEngineGeometryAdapter::setLinearVelolocity(const Vector3D &velocity)
-{
- peGeoObject->setLinearVel(PeConverter::convert(velocity));
-}
-
-void PePhysicsEngineGeometryAdapter::setAngularVelocity(const Vector3D &velocity)
-{
- peGeoObject->setAngularVel(PeConverter::convert(velocity));
-}
-
-void PePhysicsEngineGeometryAdapter::resetForceAndTorque() { peGeoObject->resetForceAndTorque(); }
-
-Vector3D PePhysicsEngineGeometryAdapter::getVelocityAtPosition(const Vector3D &position) const
-{
- return PeConverter::convert(peGeoObject->velFromWF(PeConverter::convert(position)));
-}
-
-Vector3D PePhysicsEngineGeometryAdapter::getLinearVelocity() const
-{
- return PeConverter::convert(peGeoObject->getLinearVel());
-}
-
-Vector3D PePhysicsEngineGeometryAdapter::getAngularVelocity() const
-{
- return PeConverter::convert(peGeoObject->getAngularVel());
-}
-
-Vector3D PePhysicsEngineGeometryAdapter::getPosition() const
-{
- return PeConverter::convert(peGeoObject->getPosition());
-}
-
-Vector3D PePhysicsEngineGeometryAdapter::getForce() const { return PeConverter::convert(peGeoObject->getForce()); }
-
-Vector3D PePhysicsEngineGeometryAdapter::getTorque() const { return PeConverter::convert(peGeoObject->getTorque()); }
-
-void PePhysicsEngineGeometryAdapter::changeState(State state)
-{
- if (state == State::PIN)
- peGeoObject->setMassAndInertiaToInfinity();
-}
-
-int PePhysicsEngineGeometryAdapter::getId() const { return id; }
-
-void PePhysicsEngineGeometryAdapter::setId(int id) { this->id = id; }
-
-void PePhysicsEngineGeometryAdapter::setGeometry(walberla::pe::RigidBody *peGeoObject)
-{
- this->peGeoObject = peGeoObject;
-}
-
-//////////////////////////////////////////////////////////////////////////
-void PePhysicsEngineGeometryAdapter::setActive() { active = true; }
-//////////////////////////////////////////////////////////////////////////
-void PePhysicsEngineGeometryAdapter::setInactive() { active = false; }
-//////////////////////////////////////////////////////////////////////////
-bool PePhysicsEngineGeometryAdapter::isActive() { return active; }
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.h
deleted file mode 100644
index a8eaa7d33ede840f4d76ae90ffb44bef30139f99..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineGeometryAdapter.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef PE_PHYSICS_ENGINE_GEOMETRY_ADAPTER_H
-#define PE_PHYSICS_ENGINE_GEOMETRY_ADAPTER_H
-
-#include "PhysicsEngineGeometryAdapter.h"
-#include <core/DataTypes.h>
-
-namespace walberla
-{
-namespace pe
-{
-class RigidBody;
-}
-} // namespace walberla
-
-class PePhysicsEngineGeometryAdapter : public PhysicsEngineGeometryAdapter
-{
-public:
- PePhysicsEngineGeometryAdapter();
- // PePhysicsEngineGeometryAdapter(walberla::pe::RigidBody* peGeoObject);
- virtual ~PePhysicsEngineGeometryAdapter() {}
-
- void addForce(const Vector3D &force) override;
- void addTorque(const Vector3D &torque) override;
-
- void setForce(const Vector3D &force) override;
- void setTorque(const Vector3D &torque) override;
-
- void addForceAtPosition(const Vector3D &force, const Vector3D &position) override;
- void setLinearVelolocity(const Vector3D &velocity) override;
- void setAngularVelocity(const Vector3D &velocity) override;
-
- void resetForceAndTorque() override;
-
- Vector3D getVelocityAtPosition(const Vector3D &position) const override;
- Vector3D getLinearVelocity() const override;
- Vector3D getAngularVelocity() const override;
- Vector3D getPosition() const override;
- Vector3D getForce() const override;
- Vector3D getTorque() const override;
-
- void changeState(State state) override;
-
- int getId() const;
- void setId(int id);
- void setGeometry(walberla::pe::RigidBody *peGeoObject);
-
- void setActive();
- void setInactive();
- bool isActive();
- // void increaseShadowCounter();
- // void decreaseShad
- int shadowCounter;
- int counter;
-
- unsigned long long getSystemID() const { return systemID; }
- void setSystemID(unsigned long long val) { systemID = val; }
- bool getSemiactive() const { return semiactive; }
- void setSemiactive(bool val) { semiactive = val; }
-
-private:
- walberla::pe::RigidBody *peGeoObject;
- // unsigned long long id;
- int id;
- // walberla::id_t systemId;
- unsigned long long systemID;
- bool active;
- bool semiactive;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.cpp
deleted file mode 100644
index 6a36fa1a3b6415e255e0083ec621f1bcea03e3de..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "PePhysicsEngineMaterialAdapter.h"
-
-walberla::pe::MaterialID PePhysicsEngineMaterialAdapter::getPeMaterial() const
-{
- if (walberla::pe::Material::find(name) != -1)
- return walberla::pe::Material::find(name);
-
- return walberla::pe::createMaterial(name, density, restitution, staticFriction, dynamicFriction, poissonRatio,
- youngModul, stiffnessInNormalDirection, dampingoefficientNormalDirection,
- dampingTangentialDirection);
-}
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.h
deleted file mode 100644
index 6ebfa8d1d9ca67760bffb9e06cafec256b19cf4f..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineMaterialAdapter.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef PE_PHYSICS_ENGINE_MATERIAL_ADAPTER
-#define PE_PHYSICS_ENGINE_MATERIAL_ADAPTER
-
-#include "../PhysicsEngineMaterialAdapter.h"
-#include <pe/basic.h>
-
-class PePhysicsEngineMaterialAdapter : public PhysicsEngineMaterialAdapter
-{
-public:
- PePhysicsEngineMaterialAdapter(std::string name, double density, double restitution, double staticFriction,
- double dynamicFriction, double poissonRatio, double youngModul,
- double stiffnessInNormalDirection, double dampingoefficientNormalDirection,
- double dampingTangentialDirection)
- : PhysicsEngineMaterialAdapter(name, density, restitution, staticFriction, dynamicFriction, poissonRatio,
- youngModul, stiffnessInNormalDirection, dampingoefficientNormalDirection,
- dampingTangentialDirection)
- {
- }
- virtual ~PePhysicsEngineMaterialAdapter() {}
-
- virtual walberla::pe::MaterialID getPeMaterial() const;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.cpp b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.cpp
deleted file mode 100644
index 14cef406392fbfbd9862a71b0c054df85a8608ec..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-#include "PePhysicsEngineSolverAdapter.h"
-
-#include <exception>
-
-#include "pe/rigidbody/BoxFactory.h"
-#include "pe/rigidbody/PlaneFactory.h"
-#include "pe/rigidbody/SphereFactory.h"
-#include <pe/basic.h>
-#include <pe/rigidbody/UnionFactory.h>
-//#include "geometry/GeometricalFunctions.h"
-#include <mpi/Communicator.h>
-#include "PeAdapter.h"
-#include "PeLoadBalancerAdapter.h"
-#include "PePhysicsEngineGeometryAdapter.h"
-#include "PePhysicsEngineMaterialAdapter.h"
-#include "UbException.h"
-#include "UbLogger.h"
-#include "UbSystem.h"
-#include <boost/tuple/tuple.hpp>
-#include <memory>
-
-using namespace walberla;
-using namespace walberla::pe;
-
-typedef boost::tuple<walberla::pe::Box, walberla::pe::Sphere, walberla::pe::Plane> BodyTypeTuple;
-
-PePhysicsEngineSolverAdapter::PePhysicsEngineSolverAdapter(std::shared_ptr<PeParameter> peParameter,
- std::shared_ptr<PeLoadBalancerAdapter> loadBalancer)
- : peParameter(peParameter), loadBalancer(loadBalancer)
-{
- this->initalizePeEnvironment();
-}
-
-void PePhysicsEngineSolverAdapter::initalizePeEnvironment()
-{
- this->initialPeBodyStorage();
- this->initialPeBlockForest();
- this->initalBlockData();
- this->initalPeIntegrator();
- this->executePeBodyTypeTuple();
- this->initialPeChannel();
-}
-
-std::shared_ptr<PhysicsEngineGeometryAdapter> PePhysicsEngineSolverAdapter::createPhysicsEngineGeometryAdapter(
- int id, const Vector3D &position, double radius, std::shared_ptr<PhysicsEngineMaterialAdapter> material) const
-{
- const std::shared_ptr<PePhysicsEngineMaterialAdapter> peMaterial =
- std::dynamic_pointer_cast<PePhysicsEngineMaterialAdapter>(material);
- std::shared_ptr<PePhysicsEngineGeometryAdapter> peGeometryAdapter(new PePhysicsEngineGeometryAdapter());
-
- // UBLOG(logINFO, "PePhysicsEngineSolverAdapter::createSphere():start");
- walberla::pe::GeomID peGeometry = createSphere(*globalBodyStorage, *forest, *storageId, id,
- PeConverter::convert(position), radius, peMaterial->getPeMaterial());
- // UBLOG(logINFO, "PePhysicsEngineSolverAdapter::createSphere():end");
-
- if (peGeometry) {
- peGeometryAdapter->setId(id);
- peGeometryAdapter->setSystemID(peGeometry->getSystemID());
- peGeometryAdapter->setActive();
- peGeometryAdapter->setGeometry(peGeometry);
- return peGeometryAdapter;
- } else {
- peGeometryAdapter->setId(id);
- peGeometryAdapter->setInactive();
- return peGeometryAdapter;
- }
-
- walberla::pe::syncNextNeighbors<BodyTypeTuple>(*forest, *storageId);
-}
-
-void PePhysicsEngineSolverAdapter::runTimestep(double step)
-{
- cr->timestep(walberla::real_c(step));
- walberla::pe::syncNextNeighbors<BodyTypeTuple>(*forest, *storageId);
-}
-
-void PePhysicsEngineSolverAdapter::initialPeBodyStorage()
-{
- globalBodyStorage = std::make_shared<walberla::pe::BodyStorage>();
-}
-
-void PePhysicsEngineSolverAdapter::initialPeBlockForest()
-{
-
- // walberla::SetupBlockForest sforest =
- // walberla::blockforest::createUniformBlockGrid(walberla::AABB(peParameter->simulationDomain[0],
- // peParameter->simulationDomain[1], peParameter->simulationDomain[2],
- // peParameter->simulationDomain[3], peParameter->simulationDomain[4], peParameter->simulationDomain[5]), //
- // simulationDomain walberla::uint_t(val<1>(peParameter->numberOfBlocks)),
- // walberla::uint_t(val<2>(peParameter->numberOfBlocks)),
- // walberla::uint_t(val<3>(peParameter->numberOfBlocks)),walberla::uint_t(10),walberla::uint_t(10),walberla::uint_t(10),
- // 5.0,false);
- walberla::SetupBlockForest sforest;
- // sforest.addWorkloadMemorySUIDAssignmentFunction( uniformWorkloadAndMemoryAssignment );
- sforest.init(walberla::AABB(peParameter->simulationDomain[0], peParameter->simulationDomain[1],
- peParameter->simulationDomain[2], peParameter->simulationDomain[3],
- peParameter->simulationDomain[4], peParameter->simulationDomain[5]), // simulationDomain
- walberla::uint_t(val<1>(peParameter->numberOfBlocks)),
- walberla::uint_t(val<2>(peParameter->numberOfBlocks)),
- walberla::uint_t(val<3>(peParameter->numberOfBlocks)), // blocks in each direction
- val<1>(peParameter->isPeriodic), val<2>(peParameter->isPeriodic), val<3>(peParameter->isPeriodic));
- sforest.balanceLoad(*loadBalancer.get(), loadBalancer->getNumberOfProcesses());
- forest = std::shared_ptr<walberla::blockforest::BlockForest>(
- new walberla::blockforest::BlockForest(walberla::uint_c(loadBalancer->getRank()), sforest));
-
- auto mpiManager = walberla::MPIManager::instance();
- mpiManager->useWorldComm();
- if (!forest)
- throw std::runtime_error("No PE BlockForest created ... ");
-}
-
-void PePhysicsEngineSolverAdapter::initalBlockData()
-{
- storageId = std::make_shared<walberla::domain_decomposition::BlockDataID>(
- forest->addBlockData(walberla::pe::createStorageDataHandling<BodyTypeTuple>(), "Storage"));
-}
-
-void PePhysicsEngineSolverAdapter::initalPeIntegrator()
-{
- auto ccdID =
- forest->addBlockData(walberla::pe::ccd::createHashGridsDataHandling(globalBodyStorage, *storageId), "CCD");
- auto fcdID = forest->addBlockData(
- walberla::pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, walberla::pe::fcd::AnalyticCollideFunctor>(),
- "FCD");
-
- cr = std::make_shared<walberla::pe::cr::HardContactSemiImplicitTimesteppingSolvers>(globalBodyStorage, forest,
- *storageId, ccdID, fcdID);
- cr->setMaxIterations(peParameter->maxPeIterations);
- cr->setRelaxationModel(
- walberla::pe::cr::HardContactSemiImplicitTimesteppingSolvers::ApproximateInelasticCoulombContactByDecoupling);
- cr->setRelaxationParameter(walberla::real_t(peParameter->relaxationParameter));
- cr->setGlobalLinearAcceleration(PeConverter::convert(peParameter->globalLinearAcceleration));
-}
-
-void PePhysicsEngineSolverAdapter::executePeBodyTypeTuple() { walberla::pe::SetBodyTypeIDs<BodyTypeTuple>::execute(); }
-
-void PePhysicsEngineSolverAdapter::initialPeChannel() const
-{
- const walberla::pe::MaterialID material = peParameter->planes->getPeMaterial();
-
- auto simulationDomain = forest->getDomain();
-
- // createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(1, 0, 0), simulationDomain.minCorner(), material);
- // createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(-1, 0, 0), simulationDomain.maxCorner(), material);
- // createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(0, 1, 0), simulationDomain.minCorner(), material);
- // createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(0, -1, 0), simulationDomain.maxCorner(), material);
- // createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(0, 0, 1), simulationDomain.minCorner(), material);
- // createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(0, 0, -1), simulationDomain.maxCorner(), material);
-
- Vector3D minOffset = peParameter->minOffset;
- Vector3D maxOffset = peParameter->maxOffset;
-
- walberla::pe::Vec3 minX1_Offset(minOffset.X1(), 0, 0);
- walberla::pe::Vec3 maxX1_Offset(maxOffset.X1(), 0, 0);
- walberla::pe::Vec3 minX2_Offset(0, minOffset.X2(), 0);
- walberla::pe::Vec3 maxX2_Offset(0, maxOffset.X2(), 0);
- walberla::pe::Vec3 minX3_Offset(0, 0, minOffset.X3());
- walberla::pe::Vec3 maxX3_Offset(0, 0, maxOffset.X3());
-
- walberla::pe::Vec3 minCorner = simulationDomain.minCorner();
- walberla::pe::Vec3 maxCorner = simulationDomain.maxCorner();
-
- createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(1, 0, 0), minCorner + minX1_Offset, material);
- createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(-1, 0, 0), maxCorner + maxX1_Offset, material);
- createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(0, 1, 0), minCorner + minX2_Offset, material);
- createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(0, -1, 0), maxCorner + maxX2_Offset, material);
- createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(0, 0, 1), minCorner + minX3_Offset, material);
- createPlane(*globalBodyStorage, 0, walberla::pe::Vec3(0, 0, -1), maxCorner + maxX3_Offset, material);
-}
-
-std::shared_ptr<walberla::blockforest::BlockForest> PePhysicsEngineSolverAdapter::getForest() { return forest; }
-
-void PePhysicsEngineSolverAdapter::saveToFile(const std::string &path)
-{
- forest->saveToFile(path + "SerializeDeserialize.sbf");
- forest->saveBlockData("SerializeDeserialize.dump", *storageId.get());
-}
-
-void PePhysicsEngineSolverAdapter::loadFromFile(const std::string &path)
-{
- // forest = std::make_shared< walberla::blockforest::BlockForest >( walberla::uint_c(
- // walberla::MPIManager::instance()->rank() ), path+"SerializeDeserialize.sbf", true, false );
- std::string file = path + "SerializeDeserialize.sbf";
- forest = std::shared_ptr<walberla::blockforest::BlockForest>(new walberla::blockforest::BlockForest(
- walberla::uint_c(walberla::MPIManager::instance()->rank()), file.c_str(), true, false));
- storageId = std::make_shared<walberla::domain_decomposition::BlockDataID>(forest->loadBlockData(
- path + "SerializeDeserialize.dump", walberla::pe::createStorageDataHandling<BodyTypeTuple>(), "Storage"));
-
- this->initalPeIntegrator();
-
- auto ccdID =
- forest->addBlockData(walberla::pe::ccd::createHashGridsDataHandling(globalBodyStorage, *storageId), "CCD");
- auto fcdID = forest->addBlockData(
- walberla::pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, walberla::pe::fcd::AnalyticCollideFunctor>(),
- "FCD");
-
- cr = std::make_shared<walberla::pe::cr::HardContactSemiImplicitTimesteppingSolvers>(globalBodyStorage, forest,
- *storageId, ccdID, fcdID);
- cr->setMaxIterations(peParameter->maxPeIterations);
- cr->setRelaxationModel(
- walberla::pe::cr::HardContactSemiImplicitTimesteppingSolvers::ApproximateInelasticCoulombContactByDecoupling);
- cr->setRelaxationParameter(walberla::real_t(peParameter->relaxationParameter));
- cr->setGlobalLinearAcceleration(PeConverter::convert(peParameter->globalLinearAcceleration));
-
- this->executePeBodyTypeTuple();
- this->initialPeChannel();
-
- for (auto blockIt = forest->begin(); blockIt != forest->end(); ++blockIt) {
- walberla::pe::ccd::ICCD *ccd = blockIt->getData<walberla::pe::ccd::ICCD>(ccdID);
- ccd->reloadBodies();
- }
-}
-
-std::shared_ptr<walberla::blockforest::BlockForest> PePhysicsEngineSolverAdapter::getBlockForest() { return forest; }
-
-std::shared_ptr<walberla::domain_decomposition::BlockDataID> PePhysicsEngineSolverAdapter::getStorageId()
-{
- return storageId;
-}
-
-std::shared_ptr<walberla::pe::BodyStorage> PePhysicsEngineSolverAdapter::getGlobalBodyStorage()
-{
- return globalBodyStorage;
-}
-
-void PePhysicsEngineSolverAdapter::createObstacle(const Vector3D ¢er, const Vector3D &lengths)
-{
- const walberla::pe::MaterialID material = peParameter->planes->getPeMaterial();
- bool global = true;
- bool communicating = false;
- bool infiniteMass = true;
-
- walberla::pe::createBox(*globalBodyStorage, *forest, *storageId, 0, PeConverter::convert(center),
- PeConverter::convert(lengths), material, global, communicating, infiniteMass);
-}
diff --git a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.h b/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.h
deleted file mode 100644
index 5b2ef94b8a59b5073aebc7eb999db6e9eb860e3d..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/physicsEngineAdapter/pe/PePhysicsEngineSolverAdapter.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef PE_PHYSICS_ENGINE_SOLVER_ADAPTER_H
-#define PE_PHYSICS_ENGINE_SOLVER_ADAPTER_H
-
-#include <memory>
-#include <shared_mutex>
-
-#include "UbTuple.h"
-#include <pe/basic.h>
-
-#include "PePhysicsEngineSolverAdapter.h"
-#include "PhysicsEngineSolverAdapter.h"
-
-class PePhysicsEngineMaterialAdapter;
-class PhysicsEngineGeometryAdapter;
-class PePhysicsEngineGeometryAdapter;
-class PeLoadBalancerAdapter;
-
-namespace walberla
-{
-namespace domain_decomposition
-{
-class BlockDataID;
-}
-namespace blockforest
-{
-class BlockForest;
-}
-namespace pe
-{
-class BodyStorage;
-class RigidBody;
-namespace cr
-{
-class HardContactSemiImplicitTimesteppingSolvers;
-}
-} // namespace pe
-} // namespace walberla
-
-struct PeParameter {
- PeParameter(double relaxationParameter, int maxPeIterations, Vector3D globalLinearAcceleration,
- std::shared_ptr<PePhysicsEngineMaterialAdapter> planes, std::array<double, 6> simulationDomain,
- UbTupleInt3 numberOfBlocks, UbTupleBool3 isPeriodic, Vector3D minOffset, Vector3D maxOffset)
- : relaxationParameter(relaxationParameter), maxPeIterations(maxPeIterations),
- globalLinearAcceleration(globalLinearAcceleration), simulationDomain(simulationDomain),
- numberOfBlocks(numberOfBlocks), isPeriodic(isPeriodic), planes(planes), minOffset(minOffset),
- maxOffset(maxOffset)
- {
- }
-
- double relaxationParameter;
- int maxPeIterations;
- Vector3D globalLinearAcceleration;
-
- std::array<double, 6> simulationDomain;
- UbTupleInt3 numberOfBlocks;
- UbTupleBool3 isPeriodic;
-
- std::shared_ptr<PePhysicsEngineMaterialAdapter> planes;
-
- Vector3D minOffset;
- Vector3D maxOffset;
-};
-
-class PePhysicsEngineSolverAdapter : public PhysicsEngineSolverAdapter
-{
-public:
- PePhysicsEngineSolverAdapter(std::shared_ptr<PeParameter> peParameter,
- std::shared_ptr<PeLoadBalancerAdapter> loadBalancer);
- virtual ~PePhysicsEngineSolverAdapter() {}
-
- std::shared_ptr<PhysicsEngineGeometryAdapter>
- createPhysicsEngineGeometryAdapter(int id, const Vector3D &position, double radius,
- std::shared_ptr<PhysicsEngineMaterialAdapter> material) const override;
- void runTimestep(double step) override;
- std::shared_ptr<walberla::blockforest::BlockForest> getForest();
- void saveToFile(const std::string &path);
- void loadFromFile(const std::string &path);
- std::shared_ptr<walberla::blockforest::BlockForest> getBlockForest();
- std::shared_ptr<walberla::domain_decomposition::BlockDataID> getStorageId();
- std::shared_ptr<walberla::pe::BodyStorage> getGlobalBodyStorage();
- void createObstacle(const Vector3D ¢er, const Vector3D &lengths);
-
-private:
- void initalizePeEnvironment();
- void initialPeBodyStorage();
- void initialPeBlockForest();
- void initalBlockData();
-
- void initalPeIntegrator();
- static void executePeBodyTypeTuple();
- void initialPeChannel() const;
-
-private:
- std::shared_ptr<PeParameter> peParameter;
- std::shared_ptr<PeLoadBalancerAdapter> loadBalancer;
-
- std::shared_ptr<walberla::pe::BodyStorage> globalBodyStorage;
- std::shared_ptr<walberla::blockforest::BlockForest> forest;
- std::shared_ptr<walberla::domain_decomposition::BlockDataID> storageId;
- std::shared_ptr<walberla::pe::cr::HardContactSemiImplicitTimesteppingSolvers> cr;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.cpp b/src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.cpp
deleted file mode 100644
index c5486db0e23d6df29a04e724471bac74c01ceec8..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "EquilibriumReconstructor.h"
-
-#include "BCArray3D.h"
-#include "BCProcessor.h"
-#include "D3Q27System.h"
-#include "DataSet3D.h"
-#include "ILBMKernel.h"
-
-#include "PhysicsEngineGeometryAdapter.h"
-
-void EquilibriumReconstructor::reconstructNode(const int &x1, const int &x2, const int &x3,
- const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const
-{
- const double averageDensity = this->getLocalAverageDensity(x1, x2, x3, kernel);
- LBMReal feq[27];
- const Vector3D boundaryVelocity = physicsEngineGeometry->getVelocityAtPosition(worldCoordinates);
-
- if (kernel->getCompressible())
- D3Q27System::calcCompFeq(feq, averageDensity, boundaryVelocity[0], boundaryVelocity[1], boundaryVelocity[2]);
- else
- D3Q27System::calcIncompFeq(feq, averageDensity, boundaryVelocity[0], boundaryVelocity[1], boundaryVelocity[2]);
-
- SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
- // distributions->setDistribution(feq, x1, x2, x3);
- distributions->setDistributionInv(feq, x1, x2, x3);
-}
-
-double EquilibriumReconstructor::getLocalAverageDensity(const int &x1, const int &x2, const int &x3,
- std::shared_ptr<ILBMKernel> kernel) const
-{
- int nAverage = 0;
- double averageDensity = 0.0;
-
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
-
- LBMReal f[D3Q27System::ENDF + 1];
- SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
-
- int neighborX1, neighborX2, neighborX3;
- for (int fDir = D3Q27System::FSTARTDIR; fDir <= D3Q27System::FENDDIR; fDir++) {
- neighborX1 = x1 + D3Q27System::DX1[fDir];
- neighborX2 = x2 + D3Q27System::DX2[fDir];
- neighborX3 = x3 + D3Q27System::DX3[fDir];
-
- if (bcArray->isFluid(neighborX1, neighborX2, neighborX3)) {
- distributions->getDistribution(f, neighborX1, neighborX2, neighborX3);
- averageDensity += D3Q27System::getDensity(f);
- ++nAverage;
- }
- }
- return (nAverage > 0) ? averageDensity / nAverage : 0.0;
-}
diff --git a/src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.h b/src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.h
deleted file mode 100644
index 4a5c0071922645f66baeb6dcf8577f7003ca9078..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/EquilibriumReconstructor.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef EQUILIBRIUM_RECONSTRUCTOR_H
-#define EQUILIBRIUM_RECONSTRUCTOR_H
-
-#include "UbTuple.h"
-
-#include "Reconstructor.h"
-
-class ILBMKernel;
-class PhysicsEngineGeometryAdapter;
-
-class EquilibriumReconstructor : public Reconstructor
-{
-public:
- virtual ~EquilibriumReconstructor() {}
-
- void reconstructNode(const int &x1, const int &x2, const int &x3, const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const override;
-
-private:
- double getLocalAverageDensity(const int &x1, const int &x2, const int &x3,
- std::shared_ptr<ILBMKernel> kernel) const;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.cpp b/src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.cpp
deleted file mode 100644
index 8bd915b6c130fd8a1b70cf9e54cbfdfc60b6efcc..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "ExtrapolationReconstructor.h"
-
-#include "BCArray3D.h"
-#include "BCProcessor.h"
-#include "D3Q27System.h"
-#include "DataSet3D.h"
-#include "ILBMKernel.h"
-
-#include "DistributionArray3D.h"
-#include "PhysicsEngineGeometryAdapter.h"
-
-void ExtrapolationReconstructor::setAlternativeReconstructor(std::shared_ptr<Reconstructor> alternativeReconstructor)
-{
- this->alternativeReconstructor = alternativeReconstructor;
-}
-
-ExtrapolationReconstructor::ExtrapolationReconstructor(std::shared_ptr<Reconstructor> alternativeReconstructor)
- : alternativeReconstructor(alternativeReconstructor)
-{
-}
-
-void ExtrapolationReconstructor::reconstructNode(const int &x1, const int &x2, const int &x3,
- const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const
-{
- const UbTupleInt3 extrapolationDirection = getSphereDirection(worldCoordinates, physicsEngineGeometry);
- const int numberOfCellsForExtrapolation = getNumberOfExtrapolationCells(x1, x2, x3, extrapolationDirection, kernel);
-
- // if (numberOfCellsForExtrapolation < 2)
- alternativeReconstructor->reconstructNode(x1, x2, x3, worldCoordinates, physicsEngineGeometry, kernel);
- // else
- //{
- // //UBLOG(logINFO, "point (x,y,z) " << val<1>(worldCoordinates) << ", " << val<2>(worldCoordinates) << ", " <<
- // val<3>(worldCoordinates));
- // //UBLOG(logINFO, "extradir (x,y,z) " << val<1>(extrapolationDirection) << ", " <<
- // val<2>(extrapolationDirection) << ", " << val<3>(extrapolationDirection));
- // //UBLOG(logINFO, "numberOfCellsForExtrapolation: " << numberOfCellsForExtrapolation );
-
- // this->extrapolatePdFs(x1, x2, x3, extrapolationDirection, numberOfCellsForExtrapolation, kernel);
- //}
-}
-
-UbTupleInt3 ExtrapolationReconstructor::getSphereDirection(
- const Vector3D &worldCoordinates, std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry) const
-{
- const Vector3D spherePosition = physicsEngineGeometry->getPosition();
- const Vector3D bodyNormal = worldCoordinates - spherePosition;
- return this->getCorrespondingLatticeDirection(bodyNormal);
-}
-
-UbTupleInt3 ExtrapolationReconstructor::getCorrespondingLatticeDirection(const Vector3D &direction) const
-{
- int correspondingDirection = 0;
- double innerProduct = 0.0;
- for (int fDir = D3Q27System::FSTARTDIR; fDir <= D3Q27System::FENDDIR; fDir++) {
- // compute inner product <dir,c_i>
- const double temporaryInnerProduct = direction[0] * D3Q27System::cNorm[0][fDir] +
- direction[1] * D3Q27System::cNorm[1][fDir] +
- direction[2] * D3Q27System::cNorm[2][fDir];
- if (temporaryInnerProduct > innerProduct) {
- innerProduct = temporaryInnerProduct;
- correspondingDirection = fDir;
- }
- }
-
- return UbTupleInt3(D3Q27System::DX1[correspondingDirection], D3Q27System::DX2[correspondingDirection],
- D3Q27System::DX3[correspondingDirection]);
-}
-
-int ExtrapolationReconstructor::getNumberOfExtrapolationCells(const int x1, const int x2, const int x3,
- const UbTupleInt3 &extrapolationDirection,
- std::shared_ptr<ILBMKernel> kernel) const
-{
- if (extrapolationDirection == UbTupleInt3(0, 0, 0))
- return 0;
-
- const int desiredCellsInExtrapolationDirection = 3;
-
- for (int numCells = 1; numCells <= desiredCellsInExtrapolationDirection; ++numCells) {
- UbTupleInt3 neighbor(x1 + numCells * val<1>(extrapolationDirection),
- x2 + numCells * val<2>(extrapolationDirection),
- x3 + numCells * val<3>(extrapolationDirection));
-
- if (!kernel->isInsideOfDomain(val<1>(neighbor), val<2>(neighbor), val<3>(neighbor)))
- return numCells - 1;
-
- if (!kernel->getBCProcessor()->getBCArray()->isFluid(val<1>(neighbor), val<2>(neighbor), val<3>(neighbor)))
- return numCells - 1;
- }
- return desiredCellsInExtrapolationDirection;
-}
-
-void ExtrapolationReconstructor::extrapolatePdFs(const int x1, const int x2, const int x3,
- const UbTupleInt3 &extrapolationDirection,
- int numberOfCellsForExtrapolation,
- std::shared_ptr<ILBMKernel> kernel) const
-{
- SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
-
- const int nx1 = val<1>(extrapolationDirection);
- const int nx2 = val<2>(extrapolationDirection);
- const int nx3 = val<3>(extrapolationDirection);
-
- LBMReal pdf[D3Q27System::ENDF + 1];
- LBMReal pdfNeighbor1[D3Q27System::ENDF + 1];
- LBMReal pdfNeighbor2[D3Q27System::ENDF + 1];
-
- distributions->getDistribution(pdf, x1, x2, x3);
- distributions->getDistribution(pdfNeighbor1, x1 + nx1, x2 + nx2, x3 + nx3);
- distributions->getDistribution(pdfNeighbor2, x1 + 2 * nx1, x2 + 2 * nx2, x3 + 2 * nx3);
-
- if (numberOfCellsForExtrapolation == 3) // quadratic normal extrapolation
- {
- LBMReal pdfNeighbor3[D3Q27System::ENDF + 1];
- distributions->getDistribution(pdfNeighbor3, x1 + 3 * nx1, x2 + 3 * nx2, x3 + 3 * nx3);
-
- for (int fDir = D3Q27System::FSTARTDIR; fDir <= D3Q27System::FENDDIR; fDir++)
- pdf[fDir] = 3 * pdfNeighbor1[fDir] - 3 * pdfNeighbor2[fDir] + pdfNeighbor3[fDir];
- } else // numberOfCellsForExtrapolation == 2 // linear normal extrapolation
- {
- for (int fDir = D3Q27System::FSTARTDIR; fDir <= D3Q27System::FENDDIR; fDir++)
- pdf[fDir] = 2 * pdfNeighbor1[fDir] - pdfNeighbor2[fDir];
- }
-
- distributions->setDistribution(pdf, x1, x2, x3);
-}
diff --git a/src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.h b/src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.h
deleted file mode 100644
index 2844fdf2490a43e6db31ea9bf32dbcdea67d6f34..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/ExtrapolationReconstructor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef EXTRAPOLATION_RECONSTRUCTOR_H
-#define EXTRAPOLATION_RECONSTRUCTOR_H
-
-#include <memory>
-
-#include "UbTuple.h"
-
-#include "Reconstructor.h"
-
-class ILBMKernel;
-class PhysicsEngineGeometryAdapter;
-
-class ExtrapolationReconstructor : public Reconstructor
-{
-public:
- ExtrapolationReconstructor(std::shared_ptr<Reconstructor> alternativeReconstructor);
- virtual ~ExtrapolationReconstructor() {}
-
- void reconstructNode(const int &x1, const int &x2, const int &x3, const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const override;
-
- void setAlternativeReconstructor(std::shared_ptr<Reconstructor> alternativeReconstructor);
-
-private:
- int getNumberOfExtrapolationCells(const int x1, const int x2, const int x3, const UbTupleInt3 &ubTuple,
- std::shared_ptr<ILBMKernel> kernel) const;
- UbTupleInt3 getSphereDirection(const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry) const;
- UbTupleInt3 getCorrespondingLatticeDirection(const Vector3D &direction) const;
- void extrapolatePdFs(const int x1, const int x2, const int x3, const UbTupleInt3 &ubTuple,
- int numberOfCellsForExtrapolation, std::shared_ptr<ILBMKernel> kernel) const;
-
- std::shared_ptr<Reconstructor> alternativeReconstructor;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/reconstructor/LBMReconstructor.cpp b/src/cpu/DemCoupling/reconstructor/LBMReconstructor.cpp
deleted file mode 100644
index c6dfdc6dfbe064918fc50faf3222ed14d2b3a8d3..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/LBMReconstructor.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-#include "LBMReconstructor.h"
-
-#include "BCArray3D.h"
-#include "BCProcessor.h"
-#include "D3Q27System.h"
-#include "DataSet3D.h"
-#include "ILBMKernel.h"
-
-#include "PhysicsEngineGeometryAdapter.h"
-
-using namespace D3Q27System;
-
-LBMReconstructor::LBMReconstructor(bool compressible)
-{
- if (compressible) {
- calcMacrosFct = &D3Q27System::calcCompMacroscopicValues;
- } else {
- calcMacrosFct = &D3Q27System::calcIncompMacroscopicValues;
- }
-}
-
-void LBMReconstructor::reconstructNode(const int &x1, const int &x2, const int &x3, const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const
-{
- LBMReal pdf[D3Q27System::ENDF + 1];
-
- LBMReal rho, vx1, vx2, vx3;
- calcMacrosFct(pdf, rho, vx1, vx2, vx3);
-
- LBMReal rho_dif = 1;
-
- while (rho_dif > 1e-5) {
- for (int fDir = D3Q27System::FSTARTDIR; fDir <= D3Q27System::FENDDIR; fDir++) {
-
- UbTupleInt3 neighbor(x1 + D3Q27System::DX1[fDir], x2 + D3Q27System::DX2[fDir], x3 + D3Q27System::DX3[fDir]);
-
- if (!kernel->getBCProcessor()->getBCArray()->isFluid(val<1>(neighbor), val<2>(neighbor),
- val<3>(neighbor))) {
- LBMReal pdfNeighbor[D3Q27System::ENDF + 1];
- SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
- const int invDir = D3Q27System::INVDIR[fDir];
- distributions->getDistributionForDirection(pdfNeighbor[invDir], val<1>(neighbor), val<2>(neighbor),
- val<3>(neighbor));
- distributions->setDistributionInvForDirection(pdf[invDir], x1, x2, x3, invDir);
- }
- }
- }
-
- LBMReal collFactor = kernel->getCollisionFactor();
- collide(pdf, collFactor);
-}
-
-void LBMReconstructor::collide(LBMReal *f, LBMReal collFactor)
-{
-
- LBMReal drho, vx1, vx2, vx3;
- LBMReal feq[D3Q27System::ENDF + 1];
-
- drho = ((f[TNE] + f[BSW]) + (f[TSE] + f[BNW])) + ((f[BSE] + f[TNW]) + (f[TSW] + f[BNE])) +
- (((f[NE] + f[SW]) + (f[SE] + f[NW])) + ((f[TE] + f[BW]) + (f[BE] + f[TW])) +
- ((f[BN] + f[TS]) + (f[TN] + f[BS]))) +
- ((f[E] + f[W]) + (f[N] + f[S]) + (f[T] + f[B])) + f[ZERO];
-
- vx1 = ((((f[TNE] - f[BSW]) + (f[TSE] - f[BNW])) + ((f[BSE] - f[TNW]) + (f[BNE] - f[TSW]))) +
- (((f[BE] - f[TW]) + (f[TE] - f[BW])) + ((f[SE] - f[NW]) + (f[NE] - f[SW]))) + (f[E] - f[W]));
-
- vx2 = ((((f[TNE] - f[BSW]) + (f[BNW] - f[TSE])) + ((f[TNW] - f[BSE]) + (f[BNE] - f[TSW]))) +
- (((f[BN] - f[TS]) + (f[TN] - f[BS])) + ((f[NW] - f[SE]) + (f[NE] - f[SW]))) + (f[N] - f[S]));
-
- vx3 = ((((f[TNE] - f[BSW]) + (f[TSE] - f[BNW])) + ((f[TNW] - f[BSE]) + (f[TSW] - f[BNE]))) +
- (((f[TS] - f[BN]) + (f[TN] - f[BS])) + ((f[TW] - f[BE]) + (f[TE] - f[BW]))) + (f[T] - f[B]));
-
- LBMReal cu_sq = 1.5 * (vx1 * vx1 + vx2 * vx2 + vx3 * vx3);
-
- feq[ZERO] = c8o27 * (drho - cu_sq);
- feq[E] = c2o27 * (drho + 3.0 * (vx1) + c9o2 * (vx1) * (vx1)-cu_sq);
- feq[W] = c2o27 * (drho + 3.0 * (-vx1) + c9o2 * (-vx1) * (-vx1) - cu_sq);
- feq[N] = c2o27 * (drho + 3.0 * (vx2) + c9o2 * (vx2) * (vx2)-cu_sq);
- feq[S] = c2o27 * (drho + 3.0 * (-vx2) + c9o2 * (-vx2) * (-vx2) - cu_sq);
- feq[T] = c2o27 * (drho + 3.0 * (vx3) + c9o2 * (vx3) * (vx3)-cu_sq);
- feq[B] = c2o27 * (drho + 3.0 * (-vx3) + c9o2 * (-vx3) * (-vx3) - cu_sq);
- feq[NE] = c1o54 * (drho + 3.0 * (vx1 + vx2) + c9o2 * (vx1 + vx2) * (vx1 + vx2) - cu_sq);
- feq[SW] = c1o54 * (drho + 3.0 * (-vx1 - vx2) + c9o2 * (-vx1 - vx2) * (-vx1 - vx2) - cu_sq);
- feq[SE] = c1o54 * (drho + 3.0 * (vx1 - vx2) + c9o2 * (vx1 - vx2) * (vx1 - vx2) - cu_sq);
- feq[NW] = c1o54 * (drho + 3.0 * (-vx1 + vx2) + c9o2 * (-vx1 + vx2) * (-vx1 + vx2) - cu_sq);
- feq[TE] = c1o54 * (drho + 3.0 * (vx1 + vx3) + c9o2 * (vx1 + vx3) * (vx1 + vx3) - cu_sq);
- feq[BW] = c1o54 * (drho + 3.0 * (-vx1 - vx3) + c9o2 * (-vx1 - vx3) * (-vx1 - vx3) - cu_sq);
- feq[BE] = c1o54 * (drho + 3.0 * (vx1 - vx3) + c9o2 * (vx1 - vx3) * (vx1 - vx3) - cu_sq);
- feq[TW] = c1o54 * (drho + 3.0 * (-vx1 + vx3) + c9o2 * (-vx1 + vx3) * (-vx1 + vx3) - cu_sq);
- feq[TN] = c1o54 * (drho + 3.0 * (vx2 + vx3) + c9o2 * (vx2 + vx3) * (vx2 + vx3) - cu_sq);
- feq[BS] = c1o54 * (drho + 3.0 * (-vx2 - vx3) + c9o2 * (-vx2 - vx3) * (-vx2 - vx3) - cu_sq);
- feq[BN] = c1o54 * (drho + 3.0 * (vx2 - vx3) + c9o2 * (vx2 - vx3) * (vx2 - vx3) - cu_sq);
- feq[TS] = c1o54 * (drho + 3.0 * (-vx2 + vx3) + c9o2 * (-vx2 + vx3) * (-vx2 + vx3) - cu_sq);
- feq[TNE] = c1o216 * (drho + 3.0 * (vx1 + vx2 + vx3) + c9o2 * (vx1 + vx2 + vx3) * (vx1 + vx2 + vx3) - cu_sq);
- feq[BSW] = c1o216 * (drho + 3.0 * (-vx1 - vx2 - vx3) + c9o2 * (-vx1 - vx2 - vx3) * (-vx1 - vx2 - vx3) - cu_sq);
- feq[BNE] = c1o216 * (drho + 3.0 * (vx1 + vx2 - vx3) + c9o2 * (vx1 + vx2 - vx3) * (vx1 + vx2 - vx3) - cu_sq);
- feq[TSW] = c1o216 * (drho + 3.0 * (-vx1 - vx2 + vx3) + c9o2 * (-vx1 - vx2 + vx3) * (-vx1 - vx2 + vx3) - cu_sq);
- feq[TSE] = c1o216 * (drho + 3.0 * (vx1 - vx2 + vx3) + c9o2 * (vx1 - vx2 + vx3) * (vx1 - vx2 + vx3) - cu_sq);
- feq[BNW] = c1o216 * (drho + 3.0 * (-vx1 + vx2 - vx3) + c9o2 * (-vx1 + vx2 - vx3) * (-vx1 + vx2 - vx3) - cu_sq);
- feq[BSE] = c1o216 * (drho + 3.0 * (vx1 - vx2 - vx3) + c9o2 * (vx1 - vx2 - vx3) * (vx1 - vx2 - vx3) - cu_sq);
- feq[TNW] = c1o216 * (drho + 3.0 * (-vx1 + vx2 + vx3) + c9o2 * (-vx1 + vx2 + vx3) * (-vx1 + vx2 + vx3) - cu_sq);
-
- // Relaxation
- f[ZERO] += (feq[ZERO] - f[ZERO]) * collFactor;
- f[E] += (feq[E] - f[E]) * collFactor;
- f[W] += (feq[W] - f[W]) * collFactor;
- f[N] += (feq[N] - f[N]) * collFactor;
- f[S] += (feq[S] - f[S]) * collFactor;
- f[T] += (feq[T] - f[T]) * collFactor;
- f[B] += (feq[B] - f[B]) * collFactor;
- f[NE] += (feq[NE] - f[NE]) * collFactor;
- f[SW] += (feq[SW] - f[SW]) * collFactor;
- f[SE] += (feq[SE] - f[SE]) * collFactor;
- f[NW] += (feq[NW] - f[NW]) * collFactor;
- f[TE] += (feq[TE] - f[TE]) * collFactor;
- f[BW] += (feq[BW] - f[BW]) * collFactor;
- f[BE] += (feq[BE] - f[BE]) * collFactor;
- f[TW] += (feq[TW] - f[TW]) * collFactor;
- f[TN] += (feq[TN] - f[TN]) * collFactor;
- f[BS] += (feq[BS] - f[BS]) * collFactor;
- f[BN] += (feq[BN] - f[BN]) * collFactor;
- f[TS] += (feq[TS] - f[TS]) * collFactor;
-
- f[TNE] += (feq[TNE] - f[TNE]) * collFactor;
- f[BSW] += (feq[BSW] - f[BSW]) * collFactor;
- f[BNE] += (feq[BNE] - f[BNE]) * collFactor;
- f[TSW] += (feq[TSW] - f[TSW]) * collFactor;
- f[TSE] += (feq[TSE] - f[TSE]) * collFactor;
- f[BNW] += (feq[BNW] - f[BNW]) * collFactor;
- f[BSE] += (feq[BSE] - f[BSE]) * collFactor;
- f[TNW] += (feq[TNW] - f[TNW]) * collFactor;
-}
\ No newline at end of file
diff --git a/src/cpu/DemCoupling/reconstructor/LBMReconstructor.h b/src/cpu/DemCoupling/reconstructor/LBMReconstructor.h
deleted file mode 100644
index 173f008a30bc9f1edf4b79eecce87fc0941d9f62..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/LBMReconstructor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef LBM_RECONSTRUCTOR_H
-#define LBM_RECONSTRUCTOR_H
-
-#include "UbTuple.h"
-
-#include "Reconstructor.h"
-
-#include "LBMSystem.h"
-
-class ILBMKernel;
-class PhysicsEngineGeometryAdapter;
-
-class LBMReconstructor : public Reconstructor
-{
-public:
- LBMReconstructor(bool compressible);
- virtual ~LBMReconstructor() {}
-
- void reconstructNode(const int &x1, const int &x2, const int &x3, const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const override;
-
-private:
- static void collide(LBMReal *f, LBMReal collFactor);
-
- typedef void (*CalcMacrosFct)(const LBMReal *const & /*f[27]*/, LBMReal & /*rho*/, LBMReal & /*vx1*/,
- LBMReal & /*vx2*/, LBMReal & /*vx3*/);
- CalcMacrosFct calcMacrosFct;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/reconstructor/Reconstructor.h b/src/cpu/DemCoupling/reconstructor/Reconstructor.h
deleted file mode 100644
index 15355d515dc332521583955f225c3e8758bb5fb7..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/Reconstructor.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef RECONSTRCUTOR_H
-#define RECONSTRCUTOR_H
-
-#include <PointerDefinitions.h>
-
-#include "Vector3D.h"
-
-class ILBMKernel;
-class PhysicsEngineGeometryAdapter;
-
-class Reconstructor
-{
-public:
- virtual ~Reconstructor() {}
-
- virtual void reconstructNode(const int &x1, const int &x2, const int &x3, const Vector3D &worldCoordinates,
- SPtr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const = 0;
-};
-
-#endif
diff --git a/src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.cpp b/src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.cpp
deleted file mode 100644
index c48586ca4ed170d7129990590a7e7ec32154c5f7..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-#include "VelocityBcReconstructor.h"
-
-#include <exception>
-
-#include "BCArray3D.h"
-#include "BCProcessor.h"
-#include "D3Q27System.h"
-#include "DataSet3D.h"
-#include "EsoTwist3D.h"
-#include "ILBMKernel.h"
-
-#include "PhysicsEngineGeometryAdapter.h"
-
-void VelocityBcReconstructor::reconstructNode(const int &x1, const int &x2, const int &x3,
- const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const
-{
- if (kernel->getCompressible())
- throw std::runtime_error("not implemented yet!");
-
- const Vector3D boundaryVelocity = physicsEngineGeometry->getVelocityAtPosition(worldCoordinates);
- // TODO: move to D3Q27 system
- LBMReal wijk[D3Q27System::ENDF + 1];
- D3Q27System::calcIncompFeq(wijk, 1, 0, 0, 0);
-
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
-
- SPtr<BoundaryConditions> bc = SPtr<BoundaryConditions>(new BoundaryConditions());
- bc->setBoundaryVelocityX1((float)boundaryVelocity[0]);
- bc->setBoundaryVelocityX2((float)boundaryVelocity[1]);
- bc->setBoundaryVelocityX3((float)boundaryVelocity[2]);
-
- LBMReal feqNullRho[D3Q27System::ENDF + 1];
- D3Q27System::calcIncompFeq(feqNullRho, 0, boundaryVelocity[0], boundaryVelocity[1], boundaryVelocity[2]);
-
- LBMReal fpre[D3Q27System::ENDF + 1];
- LBMReal fpost[D3Q27System::ENDF + 1];
- SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
-
- distributions->swap();
- distributions->getDistributionInv(fpost, x1, x2, x3);
- distributions->swap();
- distributions->getDistribution(fpre, x1, x2, x3);
-
- int neighborX1, neighborX2, neighborX3;
- int neighborX1Inv, neighborX2Inv, neighborX3Inv;
-
- double sumRho = 0, sumWijk = 0;
- double collFactor = kernel->getCollisionFactor();
-
- for (int fDir = D3Q27System::FSTARTDIR; fDir <= D3Q27System::FENDDIR; fDir++) {
- neighborX1 = x1 + D3Q27System::DX1[fDir];
- neighborX2 = x2 + D3Q27System::DX2[fDir];
- neighborX3 = x3 + D3Q27System::DX3[fDir];
-
- if (bcArray->isFluid(neighborX1, neighborX2, neighborX3)) {
- int invDir = D3Q27System::INVDIR[fDir];
-
- neighborX1Inv = x1 + D3Q27System::DX1[invDir];
- neighborX2Inv = x2 + D3Q27System::DX2[invDir];
- neighborX3Inv = x3 + D3Q27System::DX3[invDir];
- if (!bcArray->isFluid(neighborX1Inv, neighborX2Inv, neighborX3Inv)) {
-
- double velocity = bc->getBoundaryVelocity(invDir);
-
- fpre[fDir] = fpre[invDir] - velocity;
- double Omega = fpost[fDir] - fpre[fDir];
-
- sumRho += Omega / collFactor + fpre[fDir] - feqNullRho[fDir];
- sumWijk += wijk[fDir];
- }
- }
- }
-
- double rho = 0.0;
- if (sumWijk > 0.0)
- rho = sumRho / sumWijk;
-
- for (int fDir = D3Q27System::FSTARTDIR; fDir <= D3Q27System::FENDDIR; fDir++) {
- neighborX1 = x1 + D3Q27System::DX1[fDir];
- neighborX2 = x2 + D3Q27System::DX2[fDir];
- neighborX3 = x3 + D3Q27System::DX3[fDir];
-
- if (!bcArray->isFluid(neighborX1, neighborX2, neighborX3)) {
- int invDir = D3Q27System::INVDIR[fDir];
- neighborX1Inv = x1 + D3Q27System::DX1[invDir];
- neighborX2Inv = x2 + D3Q27System::DX2[invDir];
- neighborX3Inv = x3 + D3Q27System::DX3[invDir];
- if (!bcArray->isFluid(neighborX1Inv, neighborX2Inv, neighborX3Inv)) {
- fpre[fDir] = D3Q27System::getIncompFeqForDirection(
- fDir, rho, bc->getBoundaryVelocityX1(), bc->getBoundaryVelocityX2(), bc->getBoundaryVelocityX3());
- }
- }
- }
-}
diff --git a/src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.h b/src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.h
deleted file mode 100644
index 9f5b3f0b67be91edbcfcdadbc8f5c637a87827dc..0000000000000000000000000000000000000000
--- a/src/cpu/DemCoupling/reconstructor/VelocityBcReconstructor.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Author: S. Peters
- * mail: peters@irmb.tu-bs.de
- */
-#ifndef VELOCITY_BC_RECONSTRUCTOR_H
-#define VELOCITY_BC_RECONSTRUCTOR_H
-
-#include "UbTuple.h"
-
-#include "Reconstructor.h"
-
-class ILBMKernel;
-class PhysicsEngineGeometryAdapter;
-
-class VelocityBcReconstructor : public Reconstructor
-{
-public:
- virtual ~VelocityBcReconstructor() {}
-
- void reconstructNode(const int &x1, const int &x2, const int &x3, const Vector3D &worldCoordinates,
- std::shared_ptr<PhysicsEngineGeometryAdapter> physicsEngineGeometry,
- std::shared_ptr<ILBMKernel> kernel) const override;
-};
-
-#endif
diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCouplingWrapper.cpp b/src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.cpp
similarity index 100%
rename from src/cpu/LiggghtsCoupling/LiggghtsCouplingWrapper.cpp
rename to src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.cpp
diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCouplingWrapper.h b/src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h
similarity index 100%
rename from src/cpu/LiggghtsCoupling/LiggghtsCouplingWrapper.h
rename to src/cpu/LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h
diff --git a/src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.cpp b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp
similarity index 99%
rename from src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.cpp
rename to src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp
index 873bbd88aa43c59429eaff42a0a42d11c80e32bc..ea39fc17d606498a4b977d77a5151f4fff6e216c 100644
--- a/src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.cpp
+++ b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.cpp
@@ -84,7 +84,7 @@ SPtr<LBMKernel> IBcumulantK17LBMKernel::clone()
kernel->setNX(nx);
std::dynamic_pointer_cast<IBcumulantK17LBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -138,7 +138,7 @@ void IBcumulantK17LBMKernel::calculate(int step)
nonLocalDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
restDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
diff --git a/src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.h b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h
similarity index 99%
rename from src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.h
rename to src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h
index 58191d27e4de872aeef87d888fff4a35b90d962b..985ba75df5f0d726868e4ff854c384ad62eeb630 100644
--- a/src/cpu/LiggghtsCoupling/IBcumulantK17LBMKernel.h
+++ b/src/cpu/LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h
@@ -35,7 +35,7 @@
#define IBcumulantK17LBMKernel_h__
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "UbTiming.h"
#include "CbArray4D.h"
diff --git a/src/cpu/LiggghtsCoupling/IBdynamicsParticleData.h b/src/cpu/LiggghtsCoupling/LBM/IBdynamicsParticleData.h
similarity index 100%
rename from src/cpu/LiggghtsCoupling/IBdynamicsParticleData.h
rename to src/cpu/LiggghtsCoupling/LBM/IBdynamicsParticleData.h
diff --git a/src/basics/Core/NonCreatable.h b/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h
similarity index 86%
rename from src/basics/Core/NonCreatable.h
rename to src/cpu/LiggghtsCoupling/LiggghtsCoupling.h
index c581a19ec92b666f45109f1e3c66b9e57fb54614..88e5be001b5f71f97b4369ab3795ee5e3e972210 100644
--- a/src/basics/Core/NonCreatable.h
+++ b/src/cpu/LiggghtsCoupling/LiggghtsCoupling.h
@@ -26,19 +26,13 @@
// 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 NonCreatable.h
-//! \ingroup Core
-//! \author Soeren Peters
+//! \file MultiphasePressureBCStrategy.h
+//! \ingroup BoundarConditions
+//! \author Hesameddin Safari
//=======================================================================================
-#ifndef NON_CREATABLE_H
-#define NON_CREATABLE_H
-class NonCreatable
-{
-private:
- NonCreatable() = delete;
- NonCreatable(const NonCreatable &) = delete;
- NonCreatable &operator=(const NonCreatable &) = delete;
-};
+#pragma once
-#endif
+#include "LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h"
+#include "LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h"
+#include "LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h"
\ No newline at end of file
diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.cpp b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
similarity index 89%
rename from src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.cpp
rename to src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
index bf923b2a216df1c6b82c9538daf4f33a65b24fd6..7b7fafd8a653f9a33559d9f569c6add4fba929f9 100644
--- a/src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.cpp
+++ b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.cpp
@@ -1,34 +1,34 @@
-#include "LiggghtsCouplingCoProcessor.h"
+#include "LiggghtsCouplingSimulationObserver.h"
#include "GbSphere3D.h"
#include "mpi/MPICommunicator.h"
-#include "CoProcessor.h"
-#include "LiggghtsCouplingWrapper.h"
+#include "SimulationObserver.h"
+#include "LiggghtsCoupling/3rdParty/LiggghtsCouplingWrapper.h"
#include "Grid3D.h"
#include "Block3D.h"
#include "LBMKernel.h"
#include "DistributionArray3D.h"
#include "DataSet3D.h"
-#include "IBcumulantK17LBMKernel.h"
+#include "LiggghtsCoupling/LBM/IBcumulantK17LBMKernel.h"
#include "LBMUnitConverter.h"
#include "fix_lb_coupling_onetoone.h"
-LiggghtsCouplingCoProcessor::LiggghtsCouplingCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+LiggghtsCouplingSimulationObserver::LiggghtsCouplingSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
SPtr<vf::mpi::Communicator> comm,
LiggghtsCouplingWrapper &wrapper, int demSteps,
SPtr<LBMUnitConverter> units)
- : CoProcessor(grid, s), comm(comm), wrapper(wrapper), demSteps(demSteps), units(units)
+ : SimulationObserver(grid, s), comm(comm), wrapper(wrapper), demSteps(demSteps), units(units)
{
}
-LiggghtsCouplingCoProcessor::~LiggghtsCouplingCoProcessor()
+LiggghtsCouplingSimulationObserver::~LiggghtsCouplingSimulationObserver()
{
}
-void LiggghtsCouplingCoProcessor::process(double actualTimeStep)
+void LiggghtsCouplingSimulationObserver::update(double actualTimeStep)
{
if (comm->getProcessID() == 0)
- std::cout << "LiggghtsCouplingCoProcessor step: " << actualTimeStep << "\n";
+ std::cout << "LiggghtsCouplingSimulationObserver step: " << actualTimeStep << "\n";
//comm->barrier();
@@ -45,7 +45,7 @@ void LiggghtsCouplingCoProcessor::process(double actualTimeStep)
//comm->barrier();
}
-void LiggghtsCouplingCoProcessor::setSpheresOnLattice()
+void LiggghtsCouplingSimulationObserver::setSpheresOnLattice()
{
std::vector<int> excludeType;
@@ -88,7 +88,7 @@ void LiggghtsCouplingCoProcessor::setSpheresOnLattice()
}
}
-void LiggghtsCouplingCoProcessor::setSingleSphere3D(double *x, double *v, double *omega, /* double *com,*/ double r,
+void LiggghtsCouplingSimulationObserver::setSingleSphere3D(double *x, double *v, double *omega, /* double *com,*/ double r,
int id /*, bool initVelFlag*/)
{
int level = 0;
@@ -172,7 +172,7 @@ void LiggghtsCouplingCoProcessor::setSingleSphere3D(double *x, double *v, double
}
-double LiggghtsCouplingCoProcessor::calcSolidFraction(double const dx_, double const dy_, double const dz_,
+double LiggghtsCouplingSimulationObserver::calcSolidFraction(double const dx_, double const dy_, double const dz_,
double const r_)
{
static int const slicesPerDim = 5;
@@ -219,7 +219,7 @@ double LiggghtsCouplingCoProcessor::calcSolidFraction(double const dx_, double c
return fraction * ((double)n);
}
- void LiggghtsCouplingCoProcessor::setValues(IBdynamicsParticleData &p, int const id, double const sf, double const *v, double const dx, double const dy, double const dz, double const *omega)
+ void LiggghtsCouplingSimulationObserver::setValues(IBdynamicsParticleData &p, int const id, double const sf, double const *v, double const dx, double const dy, double const dz, double const *omega)
{
p.uPart[0] = v[0];
p.uPart[1] = v[1];
@@ -235,7 +235,7 @@ double LiggghtsCouplingCoProcessor::calcSolidFraction(double const dx_, double c
}
-void LiggghtsCouplingCoProcessor::setToZero(IBdynamicsParticleData &p)
+void LiggghtsCouplingSimulationObserver::setToZero(IBdynamicsParticleData &p)
{
p.uPart[0] = 0;
p.uPart[1] = 0;
@@ -244,7 +244,7 @@ void LiggghtsCouplingCoProcessor::setToZero(IBdynamicsParticleData &p)
p.partId = 0;
}
-void LiggghtsCouplingCoProcessor::getForcesFromLattice()
+void LiggghtsCouplingSimulationObserver::getForcesFromLattice()
{
static std::vector<double> force, torque;
static typename ParticleData::ParticleDataArrayVector x_lb;
@@ -319,7 +319,7 @@ void LiggghtsCouplingCoProcessor::getForcesFromLattice()
couplingFix->comm_force_torque();
}
-void LiggghtsCouplingCoProcessor::SumForceTorque3D(ParticleData::ParticleDataArrayVector &x, double *force, double *torque)
+void LiggghtsCouplingSimulationObserver::SumForceTorque3D(ParticleData::ParticleDataArrayVector &x, double *force, double *torque)
{
int nx = grid->getNX1(), ny = grid->getNX2(), nz = grid->getNX3();
@@ -402,12 +402,12 @@ void LiggghtsCouplingCoProcessor::SumForceTorque3D(ParticleData::ParticleDataArr
}
}
-void LiggghtsCouplingCoProcessor::addForce(int const partId, int const coord, double const value, double *force)
+void LiggghtsCouplingSimulationObserver::addForce(int const partId, int const coord, double const value, double *force)
{
force[3 * partId + coord] += value;
}
-void LiggghtsCouplingCoProcessor::addTorque(int const partId, int const coord, double const value, double *torque)
+void LiggghtsCouplingSimulationObserver::addTorque(int const partId, int const coord, double const value, double *torque)
{
torque[3 * partId + coord] += value;
}
\ No newline at end of file
diff --git a/src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.h b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h
similarity index 88%
rename from src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.h
rename to src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h
index 3e87c89d2b92e2d34465cc41ddeab98eee85c5ed..0ae1786dd72346456621f3f4cf584679fca64f42 100644
--- a/src/cpu/LiggghtsCoupling/LiggghtsCouplingCoProcessor.h
+++ b/src/cpu/LiggghtsCoupling/SimulationObserver/LiggghtsCouplingSimulationObserver.h
@@ -26,15 +26,15 @@
// 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 LiggghtsCouplingCoProcessor.h
+//! \file LiggghtsCouplingSimulationObserver.h
//! \ingroup LiggghtsCoupling
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef LiggghtsCouplingCoProcessor_h
-#define LiggghtsCouplingCoProcessor_h
+#ifndef LiggghtsCouplingSimulationObserver_h
+#define LiggghtsCouplingSimulationObserver_h
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "lammps.h"
#include "input.h"
@@ -45,7 +45,7 @@
#include <vector>
-class CoProcessor;
+class SimulationObserver;
namespace vf::mpi {class Communicator;}
class LiggghtsCouplingWrapper;
class Grid3D;
@@ -58,14 +58,14 @@ struct ParticleData {
typedef typename std::vector<double> ParticleDataScalarVector;
};
-class LiggghtsCouplingCoProcessor : public CoProcessor
+class LiggghtsCouplingSimulationObserver : public SimulationObserver
{
public:
- LiggghtsCouplingCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<vf::mpi::Communicator> comm,
+ LiggghtsCouplingSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<vf::mpi::Communicator> comm,
LiggghtsCouplingWrapper &wrapper, int demSteps, SPtr<LBMUnitConverter> units);
- virtual ~LiggghtsCouplingCoProcessor();
+ virtual ~LiggghtsCouplingSimulationObserver();
- void process(double actualTimeStep) override;
+ void update(double actualTimeStep) override;
protected:
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.cpp
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.cpp
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.cpp
index 73e399fb6ab3df0ea06620da4b5c0f6fedc8428e..d438f80f53fcefd553813b0c9517e0fe545af96f 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.cpp
@@ -26,43 +26,43 @@
// 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 MultiphaseNoSlipBCAlgorithm.cpp
+//! \file MultiphaseNoSlipBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#include "MultiphaseNoSlipBCAlgorithm.h"
+#include "MultiphaseNoSlipBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-MultiphaseNoSlipBCAlgorithm::MultiphaseNoSlipBCAlgorithm()
+MultiphaseNoSlipBCStrategy::MultiphaseNoSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::MultiphaseNoSlipBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::MultiphaseNoSlipBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-MultiphaseNoSlipBCAlgorithm::~MultiphaseNoSlipBCAlgorithm()
+MultiphaseNoSlipBCStrategy::~MultiphaseNoSlipBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> MultiphaseNoSlipBCAlgorithm::clone()
+SPtr<BCStrategy> MultiphaseNoSlipBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new MultiphaseNoSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new MultiphaseNoSlipBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseNoSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void MultiphaseNoSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseNoSlipBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
+void MultiphaseNoSlipBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
{
this->distributionsH = distributionsH;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseNoSlipBCAlgorithm::applyBC()
+void MultiphaseNoSlipBCStrategy::applyBC()
{
real f[D3Q27System::ENDF+1];
real h[D3Q27System::ENDF+1];
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.h
similarity index 86%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.h
index dc6e5bc6a558b18e2b70bfea8ab1ed4bf1853a82..390c2952e43398e7437ea61d1bc11890d454b9bc 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.h
@@ -26,25 +26,25 @@
// 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 MultiphaseNoSlipBCAlgorithm.h
+//! \file MultiphaseNoSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#ifndef MultiphaseNoSlipBCAlgorithm_h__
-#define MultiphaseNoSlipBCAlgorithm_h__
+#ifndef MultiphaseNoSlipBCStrategy_h__
+#define MultiphaseNoSlipBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
//! A class implements no-slip boundary condition for multiphase simulations
-class MultiphaseNoSlipBCAlgorithm : public BCAlgorithm
+class MultiphaseNoSlipBCStrategy : public BCStrategy
{
public:
- MultiphaseNoSlipBCAlgorithm();
- virtual ~MultiphaseNoSlipBCAlgorithm();
- SPtr<BCAlgorithm> clone() override;
+ MultiphaseNoSlipBCStrategy();
+ virtual ~MultiphaseNoSlipBCStrategy();
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void addDistributionsH(SPtr<DistributionArray3D> distributionsH) override;
void applyBC() override;
};
-#endif // MultiphaseNoSlipBCAlgorithm_h__
+#endif // MultiphaseNoSlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNonReflectingOutflowBCAlgorithm.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.cpp
similarity index 80%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNonReflectingOutflowBCAlgorithm.cpp
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.cpp
index 918f564b64667223d12169aba21dd659bc3308b6..aae7dec82bde0bd3477558fd937f4058a26eddd0 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNonReflectingOutflowBCAlgorithm.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.cpp
@@ -26,48 +26,48 @@
// 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 MultiphaseNonReflectingOutflowBCAlgorithm.cpp
+//! \file MultiphaseNonReflectingOutflowBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#include "MultiphaseNonReflectingOutflowBCAlgorithm.h"
+#include "MultiphaseNonReflectingOutflowBCStrategy.h"
#include "BoundaryConditions.h"
#include "D3Q27System.h"
#include "DistributionArray3D.h"
-MultiphaseNonReflectingOutflowBCAlgorithm::MultiphaseNonReflectingOutflowBCAlgorithm()
+MultiphaseNonReflectingOutflowBCStrategy::MultiphaseNonReflectingOutflowBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::NonReflectingOutflowBCAlgorithm;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::NonReflectingOutflowBCStrategy;
+ BCStrategy::preCollision = true;
}
//////////////////////////////////////////////////////////////////////////
-MultiphaseNonReflectingOutflowBCAlgorithm::~MultiphaseNonReflectingOutflowBCAlgorithm()
+MultiphaseNonReflectingOutflowBCStrategy::~MultiphaseNonReflectingOutflowBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> MultiphaseNonReflectingOutflowBCAlgorithm::clone()
+SPtr<BCStrategy> MultiphaseNonReflectingOutflowBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new MultiphaseNonReflectingOutflowBCAlgorithm());
+ SPtr<BCStrategy> bc(new MultiphaseNonReflectingOutflowBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseNonReflectingOutflowBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void MultiphaseNonReflectingOutflowBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseNonReflectingOutflowBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
+void MultiphaseNonReflectingOutflowBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
{
this->distributionsH = distributionsH;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseNonReflectingOutflowBCAlgorithm::addDistributionsH2(SPtr<DistributionArray3D> distributionsH2)
+void MultiphaseNonReflectingOutflowBCStrategy::addDistributionsH2(SPtr<DistributionArray3D> distributionsH2)
{
this->distributionsH2 = distributionsH2;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
+void MultiphaseNonReflectingOutflowBCStrategy::applyBC()
{
using namespace D3Q27System;
// using namespace UbMath;
@@ -123,15 +123,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
switch (direction) {
case DIR_P00:
- f[DIR_P00] = ftemp[DIR_P00] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_P00];
- f[DIR_PP0] = ftemp[DIR_PP0] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_PP0];
- f[DIR_PM0] = ftemp[DIR_PM0] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_PM0];
- f[DIR_P0P] = ftemp[DIR_P0P] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_P0P];
- f[DIR_P0M] = ftemp[DIR_P0M] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_P0M];
- f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_PPP];
- f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_PMP];
- f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_PPM];
- f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * f[DIR_PMM];
+ f[DIR_P00] = ftemp[DIR_P00] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P00];
+ f[DIR_PP0] = ftemp[DIR_PP0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PP0];
+ f[DIR_PM0] = ftemp[DIR_PM0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PM0];
+ f[DIR_P0P] = ftemp[DIR_P0P] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P0P];
+ f[DIR_P0M] = ftemp[DIR_P0M] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P0M];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PPP];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PMP];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PPM];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PMM];
distributions->setDistributionInvForDirection(f[DIR_P00], x1 + DX1[DIR_M00], x2 + DX2[DIR_M00], x3 + DX3[DIR_M00], DIR_M00);
distributions->setDistributionInvForDirection(f[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -143,15 +143,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_PPM], x1 + DX1[DIR_MMP], x2 + DX2[DIR_MMP], x3 + DX3[DIR_MMP], DIR_MMP);
distributions->setDistributionInvForDirection(f[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
- h[DIR_P00] = htemp[DIR_P00] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_P00];
- h[DIR_PP0] = htemp[DIR_PP0] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_PP0];
- h[DIR_PM0] = htemp[DIR_PM0] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_PM0];
- h[DIR_P0P] = htemp[DIR_P0P] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_P0P];
- h[DIR_P0M] = htemp[DIR_P0M] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_P0M];
- h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_PPP];
- h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_PMP];
- h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_PPM];
- h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h[DIR_PMM];
+ h[DIR_P00] = htemp[DIR_P00] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_P00];
+ h[DIR_PP0] = htemp[DIR_PP0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PP0];
+ h[DIR_PM0] = htemp[DIR_PM0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PM0];
+ h[DIR_P0P] = htemp[DIR_P0P] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_P0P];
+ h[DIR_P0M] = htemp[DIR_P0M] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_P0M];
+ h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PPP];
+ h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PMP];
+ h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PPM];
+ h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PMM];
distributionsH->setDistributionInvForDirection(h[DIR_P00], x1 + DX1[DIR_M00], x2 + DX2[DIR_M00], x3 + DX3[DIR_M00], DIR_M00);
distributionsH->setDistributionInvForDirection(h[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -163,15 +163,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_PPM], x1 + DX1[DIR_MMP], x2 + DX2[DIR_MMP], x3 + DX3[DIR_MMP], DIR_MMP);
distributionsH->setDistributionInvForDirection(h[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
- h2[DIR_P00] = c1o2 * (h2temp[DIR_P00] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_P00]);
- h2[DIR_PP0] = c1o2 * (h2temp[DIR_PP0] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_PP0]);
- h2[DIR_PM0] = c1o2 * (h2temp[DIR_PM0] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_PM0]);
- h2[DIR_P0P] = c1o2 * (h2temp[DIR_P0P] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_P0P]);
- h2[DIR_P0M] = c1o2 * (h2temp[DIR_P0M] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_P0M]);
- h2[DIR_PPP] = c1o2 * (h2temp[DIR_PPP] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_PPP]);
- h2[DIR_PMP] = c1o2 * (h2temp[DIR_PMP] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_PMP]);
- h2[DIR_PPM] = c1o2 * (h2temp[DIR_PPM] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_PPM]);
- h2[DIR_PMM] = c1o2 * (h2temp[DIR_PMM] * (one_over_sqrt3 + vx1) + (1.0 - one_over_sqrt3 - vx1) * h2[DIR_PMM]);
+ h2[DIR_P00] = c1o2 * (h2temp[DIR_P00] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_P00]);
+ h2[DIR_PP0] = c1o2 * (h2temp[DIR_PP0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_PP0]);
+ h2[DIR_PM0] = c1o2 * (h2temp[DIR_PM0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_PM0]);
+ h2[DIR_P0P] = c1o2 * (h2temp[DIR_P0P] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_P0P]);
+ h2[DIR_P0M] = c1o2 * (h2temp[DIR_P0M] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_P0M]);
+ h2[DIR_PPP] = c1o2 * (h2temp[DIR_PPP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_PPP]);
+ h2[DIR_PMP] = c1o2 * (h2temp[DIR_PMP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_PMP]);
+ h2[DIR_PPM] = c1o2 * (h2temp[DIR_PPM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_PPM]);
+ h2[DIR_PMM] = c1o2 * (h2temp[DIR_PMM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h2[DIR_PMM]);
distributionsH2->setDistributionInvForDirection(h2[DIR_P00], x1 + DX1[DIR_M00], x2 + DX2[DIR_M00], x3 + DX3[DIR_M00], DIR_M00);
distributionsH2->setDistributionInvForDirection(h2[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -185,15 +185,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
break;
case DIR_M00:
- f[DIR_M00] = ftemp[DIR_M00] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_M00];
- f[DIR_MP0] = ftemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_MP0];
- f[DIR_MM0] = ftemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_MM0];
- f[DIR_M0P] = ftemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_M0P];
- f[DIR_M0M] = ftemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_M0M];
- f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_MPP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_MMP];
- f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_MPM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * f[DIR_MMM];
+ f[DIR_M00] = ftemp[DIR_M00] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M00];
+ f[DIR_MP0] = ftemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MP0];
+ f[DIR_MM0] = ftemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MM0];
+ f[DIR_M0P] = ftemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M0P];
+ f[DIR_M0M] = ftemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M0M];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MPP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MMP];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MPM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_M00], x1 + DX1[DIR_P00], x2 + DX2[DIR_P00], x3 + DX3[DIR_P00], DIR_P00);
distributions->setDistributionInvForDirection(f[DIR_MP0], x1 + DX1[DIR_PM0], x2 + DX2[DIR_PM0], x3 + DX3[DIR_PM0], DIR_PM0);
@@ -205,15 +205,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MPM], x1 + DX1[DIR_PMP], x2 + DX2[DIR_PMP], x3 + DX3[DIR_PMP], DIR_PMP);
distributions->setDistributionInvForDirection(f[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
- h[DIR_M00] = htemp[DIR_M00] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_M00];
- h[DIR_MP0] = htemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_MP0];
- h[DIR_MM0] = htemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_MM0];
- h[DIR_M0P] = htemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_M0P];
- h[DIR_M0M] = htemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_M0M];
- h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_MPP];
- h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_MMP];
- h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_MPM];
- h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h[DIR_MMM];
+ h[DIR_M00] = htemp[DIR_M00] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_M00];
+ h[DIR_MP0] = htemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MP0];
+ h[DIR_MM0] = htemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MM0];
+ h[DIR_M0P] = htemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_M0P];
+ h[DIR_M0M] = htemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_M0M];
+ h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MPP];
+ h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MMP];
+ h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MPM];
+ h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MMM];
distributionsH->setDistributionInvForDirection(h[DIR_M00], x1 + DX1[DIR_P00], x2 + DX2[DIR_P00], x3 + DX3[DIR_P00], DIR_P00);
distributionsH->setDistributionInvForDirection(h[DIR_MP0], x1 + DX1[DIR_PM0], x2 + DX2[DIR_PM0], x3 + DX3[DIR_PM0], DIR_PM0);
@@ -225,15 +225,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_MPM], x1 + DX1[DIR_PMP], x2 + DX2[DIR_PMP], x3 + DX3[DIR_PMP], DIR_PMP);
distributionsH->setDistributionInvForDirection(h[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
- h2[DIR_M00] = c1o2 * (htemp[DIR_M00] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_M00]);
- h2[DIR_MP0] = c1o2 * (htemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_MP0]);
- h2[DIR_MM0] = c1o2 * (htemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_MM0]);
- h2[DIR_M0P] = c1o2 * (htemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_M0P]);
- h2[DIR_M0M] = c1o2 * (htemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_M0M]);
- h2[DIR_MPP] = c1o2 * (htemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_MPP]);
- h2[DIR_MMP] = c1o2 * (htemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_MMP]);
- h2[DIR_MPM] = c1o2 * (htemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_MPM]);
- h2[DIR_MMM] = c1o2 * (htemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (1.0 - one_over_sqrt3 + vx1) * h2[DIR_MMM]);
+ h2[DIR_M00] = c1o2 * (htemp[DIR_M00] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_M00]);
+ h2[DIR_MP0] = c1o2 * (htemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_MP0]);
+ h2[DIR_MM0] = c1o2 * (htemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_MM0]);
+ h2[DIR_M0P] = c1o2 * (htemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_M0P]);
+ h2[DIR_M0M] = c1o2 * (htemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_M0M]);
+ h2[DIR_MPP] = c1o2 * (htemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_MPP]);
+ h2[DIR_MMP] = c1o2 * (htemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_MMP]);
+ h2[DIR_MPM] = c1o2 * (htemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_MPM]);
+ h2[DIR_MMM] = c1o2 * (htemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h2[DIR_MMM]);
distributionsH2->setDistributionInvForDirection(h2[DIR_M00], x1 + DX1[DIR_P00], x2 + DX2[DIR_P00], x3 + DX3[DIR_P00], DIR_P00);
distributionsH2->setDistributionInvForDirection(h2[DIR_MP0], x1 + DX1[DIR_PM0], x2 + DX2[DIR_PM0], x3 + DX3[DIR_PM0], DIR_PM0);
@@ -246,15 +246,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH2->setDistributionInvForDirection(h2[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
break;
case DIR_0P0:
- f[DIR_0P0] = ftemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_0P0];
- f[DIR_PP0] = ftemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_PP0];
- f[DIR_MP0] = ftemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_MP0];
- f[DIR_0PP] = ftemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_0PP];
- f[DIR_0PM] = ftemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_0PM];
- f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_PPP];
- f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_MPP];
- f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_PPM];
- f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * f[DIR_MPM];
+ f[DIR_0P0] = ftemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0P0];
+ f[DIR_PP0] = ftemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PP0];
+ f[DIR_MP0] = ftemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MP0];
+ f[DIR_0PP] = ftemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0PP];
+ f[DIR_0PM] = ftemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0PM];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PPP];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MPP];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PPM];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MPM];
distributions->setDistributionInvForDirection(f[DIR_0P0], x1 + DX1[DIR_0M0], x2 + DX2[DIR_0M0], x3 + DX3[DIR_0M0], DIR_0M0);
distributions->setDistributionInvForDirection(f[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -266,15 +266,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_PPM], x1 + DX1[DIR_MMP], x2 + DX2[DIR_MMP], x3 + DX3[DIR_MMP], DIR_MMP);
distributions->setDistributionInvForDirection(f[DIR_MPM], x1 + DX1[DIR_PMP], x2 + DX2[DIR_PMP], x3 + DX3[DIR_PMP], DIR_PMP);
- h[DIR_0P0] = htemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_0P0];
- h[DIR_PP0] = htemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_PP0];
- h[DIR_MP0] = htemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_MP0];
- h[DIR_0PP] = htemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_0PP];
- h[DIR_0PM] = htemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_0PM];
- h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_PPP];
- h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_MPP];
- h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_PPM];
- h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h[DIR_MPM];
+ h[DIR_0P0] = htemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_0P0];
+ h[DIR_PP0] = htemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_PP0];
+ h[DIR_MP0] = htemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_MP0];
+ h[DIR_0PP] = htemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_0PP];
+ h[DIR_0PM] = htemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_0PM];
+ h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_PPP];
+ h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_MPP];
+ h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_PPM];
+ h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_MPM];
distributionsH->setDistributionInvForDirection(h[DIR_0P0], x1 + DX1[DIR_0M0], x2 + DX2[DIR_0M0], x3 + DX3[DIR_0M0], DIR_0M0);
distributionsH->setDistributionInvForDirection(h[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -286,15 +286,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_PPM], x1 + DX1[DIR_MMP], x2 + DX2[DIR_MMP], x3 + DX3[DIR_MMP], DIR_MMP);
distributionsH->setDistributionInvForDirection(h[DIR_MPM], x1 + DX1[DIR_PMP], x2 + DX2[DIR_PMP], x3 + DX3[DIR_PMP], DIR_PMP);
- h2[DIR_0P0] = c1o2 * (htemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_0P0]);
- h2[DIR_PP0] = c1o2 * (htemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_PP0]);
- h2[DIR_MP0] = c1o2 * (htemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_MP0]);
- h2[DIR_0PP] = c1o2 * (htemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_0PP]);
- h2[DIR_0PM] = c1o2 * (htemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_0PM]);
- h2[DIR_PPP] = c1o2 * (htemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_PPP]);
- h2[DIR_MPP] = c1o2 * (htemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_MPP]);
- h2[DIR_PPM] = c1o2 * (htemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_PPM]);
- h2[DIR_MPM] = c1o2 * (htemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (1.0 - one_over_sqrt3 - vx2) * h2[DIR_MPM]);
+ h2[DIR_0P0] = c1o2 * (htemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_0P0]);
+ h2[DIR_PP0] = c1o2 * (htemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_PP0]);
+ h2[DIR_MP0] = c1o2 * (htemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_MP0]);
+ h2[DIR_0PP] = c1o2 * (htemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_0PP]);
+ h2[DIR_0PM] = c1o2 * (htemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_0PM]);
+ h2[DIR_PPP] = c1o2 * (htemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_PPP]);
+ h2[DIR_MPP] = c1o2 * (htemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_MPP]);
+ h2[DIR_PPM] = c1o2 * (htemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_PPM]);
+ h2[DIR_MPM] = c1o2 * (htemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h2[DIR_MPM]);
distributionsH2->setDistributionInvForDirection(h2[DIR_0P0], x1 + DX1[DIR_0M0], x2 + DX2[DIR_0M0], x3 + DX3[DIR_0M0], DIR_0M0);
distributionsH2->setDistributionInvForDirection(h2[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -308,15 +308,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
break;
case DIR_0M0:
- f[DIR_0M0] = ftemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_0M0];
- f[DIR_PM0] = ftemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_PM0];
- f[DIR_MM0] = ftemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_MM0];
- f[DIR_0MP] = ftemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_0MP];
- f[DIR_0MM] = ftemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_0MM];
- f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_PMP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_MMP];
- f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_PMM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * f[DIR_MMM];
+ f[DIR_0M0] = ftemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0M0];
+ f[DIR_PM0] = ftemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PM0];
+ f[DIR_MM0] = ftemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MM0];
+ f[DIR_0MP] = ftemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0MP];
+ f[DIR_0MM] = ftemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0MM];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PMP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MMP];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PMM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_0M0], x1 + DX1[DIR_0P0], x2 + DX2[DIR_0P0], x3 + DX3[DIR_0P0], DIR_0P0);
distributions->setDistributionInvForDirection(f[DIR_PM0], x1 + DX1[DIR_MP0], x2 + DX2[DIR_MP0], x3 + DX3[DIR_MP0], DIR_MP0);
@@ -328,15 +328,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
distributions->setDistributionInvForDirection(f[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
- h[DIR_0M0] = htemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_0M0];
- h[DIR_PM0] = htemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_PM0];
- h[DIR_MM0] = htemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_MM0];
- h[DIR_0MP] = htemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_0MP];
- h[DIR_0MM] = htemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_0MM];
- h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_PMP];
- h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_MMP];
- h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_PMM];
- h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h[DIR_MMM];
+ h[DIR_0M0] = htemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_0M0];
+ h[DIR_PM0] = htemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_PM0];
+ h[DIR_MM0] = htemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_MM0];
+ h[DIR_0MP] = htemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_0MP];
+ h[DIR_0MM] = htemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_0MM];
+ h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_PMP];
+ h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_MMP];
+ h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_PMM];
+ h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_MMM];
distributionsH->setDistributionInvForDirection(h[DIR_0M0], x1 + DX1[DIR_0P0], x2 + DX2[DIR_0P0], x3 + DX3[DIR_0P0], DIR_0P0);
distributionsH->setDistributionInvForDirection(h[DIR_PM0], x1 + DX1[DIR_MP0], x2 + DX2[DIR_MP0], x3 + DX3[DIR_MP0], DIR_MP0);
@@ -348,15 +348,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
distributionsH->setDistributionInvForDirection(h[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
- h2[DIR_0M0] = c1o2 * (htemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_0M0]);
- h2[DIR_PM0] = c1o2 * (htemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_PM0]);
- h2[DIR_MM0] = c1o2 * (htemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_MM0]);
- h2[DIR_0MP] = c1o2 * (htemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_0MP]);
- h2[DIR_0MM] = c1o2 * (htemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_0MM]);
- h2[DIR_PMP] = c1o2 * (htemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_PMP]);
- h2[DIR_MMP] = c1o2 * (htemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_MMP]);
- h2[DIR_PMM] = c1o2 * (htemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_PMM]);
- h2[DIR_MMM] = c1o2 * (htemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (1.0 - one_over_sqrt3 + vx2) * h2[DIR_MMM]);
+ h2[DIR_0M0] = c1o2 * (htemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_0M0]);
+ h2[DIR_PM0] = c1o2 * (htemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_PM0]);
+ h2[DIR_MM0] = c1o2 * (htemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_MM0]);
+ h2[DIR_0MP] = c1o2 * (htemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_0MP]);
+ h2[DIR_0MM] = c1o2 * (htemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_0MM]);
+ h2[DIR_PMP] = c1o2 * (htemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_PMP]);
+ h2[DIR_MMP] = c1o2 * (htemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_MMP]);
+ h2[DIR_PMM] = c1o2 * (htemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_PMM]);
+ h2[DIR_MMM] = c1o2 * (htemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h2[DIR_MMM]);
distributionsH2->setDistributionInvForDirection(h2[DIR_0M0], x1 + DX1[DIR_0P0], x2 + DX2[DIR_0P0], x3 + DX3[DIR_0P0], DIR_0P0);
distributionsH2->setDistributionInvForDirection(h2[DIR_PM0], x1 + DX1[DIR_MP0], x2 + DX2[DIR_MP0], x3 + DX3[DIR_MP0], DIR_MP0);
@@ -370,15 +370,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
break;
case DIR_00P:
- f[DIR_00P] = ftemp[DIR_00P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_00P];
- f[DIR_P0P] = ftemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_P0P];
- f[DIR_M0P] = ftemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_M0P];
- f[DIR_0PP] = ftemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_0PP];
- f[DIR_0MP] = ftemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_0MP];
- f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_PPP];
- f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_MPP];
- f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_PMP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * f[DIR_MMP];
+ f[DIR_00P] = ftemp[DIR_00P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_00P];
+ f[DIR_P0P] = ftemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_P0P];
+ f[DIR_M0P] = ftemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_M0P];
+ f[DIR_0PP] = ftemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_0PP];
+ f[DIR_0MP] = ftemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_0MP];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_PPP];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_MPP];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_PMP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_MMP];
distributions->setDistributionInvForDirection(f[DIR_00P], x1 + DX1[DIR_00M], x2 + DX2[DIR_00M], x3 + DX3[DIR_00M], DIR_00M);
distributions->setDistributionInvForDirection(f[DIR_P0P], x1 + DX1[DIR_M0M], x2 + DX2[DIR_M0M], x3 + DX3[DIR_M0M], DIR_M0M);
@@ -390,15 +390,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_PMP], x1 + DX1[DIR_MPM], x2 + DX2[DIR_MPM], x3 + DX3[DIR_MPM], DIR_MPM);
distributions->setDistributionInvForDirection(f[DIR_MMP], x1 + DX1[DIR_PPM], x2 + DX2[DIR_PPM], x3 + DX3[DIR_PPM], DIR_PPM);
- h[DIR_00P] = htemp[DIR_00P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_00P];
- h[DIR_P0P] = htemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_P0P];
- h[DIR_M0P] = htemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_M0P];
- h[DIR_0PP] = htemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_0PP];
- h[DIR_0MP] = htemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_0MP];
- h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_PPP];
- h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_MPP];
- h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_PMP];
- h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h[DIR_MMP];
+ h[DIR_00P] = htemp[DIR_00P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_00P];
+ h[DIR_P0P] = htemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_P0P];
+ h[DIR_M0P] = htemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_M0P];
+ h[DIR_0PP] = htemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_0PP];
+ h[DIR_0MP] = htemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_0MP];
+ h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_PPP];
+ h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_MPP];
+ h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_PMP];
+ h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_MMP];
distributionsH->setDistributionInvForDirection(h[DIR_00P], x1 + DX1[DIR_00M], x2 + DX2[DIR_00M], x3 + DX3[DIR_00M], DIR_00M);
distributionsH->setDistributionInvForDirection(h[DIR_P0P], x1 + DX1[DIR_M0M], x2 + DX2[DIR_M0M], x3 + DX3[DIR_M0M], DIR_M0M);
@@ -410,15 +410,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_PMP], x1 + DX1[DIR_MPM], x2 + DX2[DIR_MPM], x3 + DX3[DIR_MPM], DIR_MPM);
distributionsH->setDistributionInvForDirection(h[DIR_MMP], x1 + DX1[DIR_PPM], x2 + DX2[DIR_PPM], x3 + DX3[DIR_PPM], DIR_PPM);
- h2[DIR_00P] = c1o2 * (htemp[DIR_00P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_00P]);
- h2[DIR_P0P] = c1o2 * (htemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_P0P]);
- h2[DIR_M0P] = c1o2 * (htemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_M0P]);
- h2[DIR_0PP] = c1o2 * (htemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_0PP]);
- h2[DIR_0MP] = c1o2 * (htemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_0MP]);
- h2[DIR_PPP] = c1o2 * (htemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_PPP]);
- h2[DIR_MPP] = c1o2 * (htemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_MPP]);
- h2[DIR_PMP] = c1o2 * (htemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_PMP]);
- h2[DIR_MMP] = c1o2 * (htemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (1.0 - one_over_sqrt3 - vx3) * h2[DIR_MMP]);
+ h2[DIR_00P] = c1o2 * (htemp[DIR_00P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_00P]);
+ h2[DIR_P0P] = c1o2 * (htemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_P0P]);
+ h2[DIR_M0P] = c1o2 * (htemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_M0P]);
+ h2[DIR_0PP] = c1o2 * (htemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_0PP]);
+ h2[DIR_0MP] = c1o2 * (htemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_0MP]);
+ h2[DIR_PPP] = c1o2 * (htemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_PPP]);
+ h2[DIR_MPP] = c1o2 * (htemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_MPP]);
+ h2[DIR_PMP] = c1o2 * (htemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_PMP]);
+ h2[DIR_MMP] = c1o2 * (htemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h2[DIR_MMP]);
distributionsH2->setDistributionInvForDirection(h2[DIR_00P], x1 + DX1[DIR_00M], x2 + DX2[DIR_00M], x3 + DX3[DIR_00M], DIR_00M);
distributionsH2->setDistributionInvForDirection(h2[DIR_P0P], x1 + DX1[DIR_M0M], x2 + DX2[DIR_M0M], x3 + DX3[DIR_M0M], DIR_M0M);
@@ -432,15 +432,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
break;
case DIR_00M:
- f[DIR_00M] = ftemp[DIR_00M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_00M];
- f[DIR_P0M] = ftemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_P0M];
- f[DIR_M0M] = ftemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_M0M];
- f[DIR_0PM] = ftemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_0PM];
- f[DIR_0MM] = ftemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_0MM];
- f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_PPM];
- f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_MPM];
- f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_PMM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * f[DIR_MMM];
+ f[DIR_00M] = ftemp[DIR_00M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_00M];
+ f[DIR_P0M] = ftemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_P0M];
+ f[DIR_M0M] = ftemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_M0M];
+ f[DIR_0PM] = ftemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_0PM];
+ f[DIR_0MM] = ftemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_0MM];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_PPM];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_MPM];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_PMM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_00M], x1 + DX1[DIR_00P], x2 + DX2[DIR_00P], x3 + DX3[DIR_00P], DIR_00P);
distributions->setDistributionInvForDirection(f[DIR_P0M], x1 + DX1[DIR_M0P], x2 + DX2[DIR_M0P], x3 + DX3[DIR_M0P], DIR_M0P);
@@ -452,15 +452,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
distributions->setDistributionInvForDirection(f[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
- h[DIR_00M] = htemp[DIR_00M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_00M];
- h[DIR_P0M] = htemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_P0M];
- h[DIR_M0M] = htemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_M0M];
- h[DIR_0PM] = htemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_0PM];
- h[DIR_0MM] = htemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_0MM];
- h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_PPM];
- h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_MPM];
- h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_PMM];
- h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h[DIR_MMM];
+ h[DIR_00M] = htemp[DIR_00M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_00M];
+ h[DIR_P0M] = htemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_P0M];
+ h[DIR_M0M] = htemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_M0M];
+ h[DIR_0PM] = htemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_0PM];
+ h[DIR_0MM] = htemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_0MM];
+ h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_PPM];
+ h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_MPM];
+ h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_PMM];
+ h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_MMM];
distributionsH->setDistributionInvForDirection(h[DIR_00M], x1 + DX1[DIR_00P], x2 + DX2[DIR_00P], x3 + DX3[DIR_00P], DIR_00P);
distributionsH->setDistributionInvForDirection(h[DIR_P0M], x1 + DX1[DIR_M0P], x2 + DX2[DIR_M0P], x3 + DX3[DIR_M0P], DIR_M0P);
@@ -472,15 +472,15 @@ void MultiphaseNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
distributionsH->setDistributionInvForDirection(h[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
- h2[DIR_00M] = c1o2 * (htemp[DIR_00M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_00M]);
- h2[DIR_P0M] = c1o2 * (htemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_P0M]);
- h2[DIR_M0M] = c1o2 * (htemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_M0M]);
- h2[DIR_0PM] = c1o2 * (htemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_0PM]);
- h2[DIR_0MM] = c1o2 * (htemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_0MM]);
- h2[DIR_PPM] = c1o2 * (htemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_PPM]);
- h2[DIR_MPM] = c1o2 * (htemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_MPM]);
- h2[DIR_PMM] = c1o2 * (htemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_PMM]);
- h2[DIR_MMM] = c1o2 * (htemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (1.0 - one_over_sqrt3 + vx3) * h2[DIR_MMM]);
+ h2[DIR_00M] = c1o2 * (htemp[DIR_00M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_00M]);
+ h2[DIR_P0M] = c1o2 * (htemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_P0M]);
+ h2[DIR_M0M] = c1o2 * (htemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_M0M]);
+ h2[DIR_0PM] = c1o2 * (htemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_0PM]);
+ h2[DIR_0MM] = c1o2 * (htemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_0MM]);
+ h2[DIR_PPM] = c1o2 * (htemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_PPM]);
+ h2[DIR_MPM] = c1o2 * (htemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_MPM]);
+ h2[DIR_PMM] = c1o2 * (htemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_PMM]);
+ h2[DIR_MMM] = c1o2 * (htemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h2[DIR_MMM]);
distributionsH2->setDistributionInvForDirection(h2[DIR_00M], x1 + DX1[DIR_00P], x2 + DX2[DIR_00P], x3 + DX3[DIR_00P], DIR_00P);
distributionsH2->setDistributionInvForDirection(h2[DIR_P0M], x1 + DX1[DIR_M0P], x2 + DX2[DIR_M0P], x3 + DX3[DIR_M0P], DIR_M0P);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNonReflectingOutflowBCAlgorithm.h b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.h
similarity index 84%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNonReflectingOutflowBCAlgorithm.h
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.h
index 3fa67b2763eb5a3d6d456f72b2fdada5a6040782..3aae2ce0384e67cd0024106fb7de3d9b1b1dd7a8 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseNonReflectingOutflowBCAlgorithm.h
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.h
@@ -26,25 +26,25 @@
// 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 MultiphaseNonReflectingOutflowBCAlgorithm.h
+//! \file MultiphaseNonReflectingOutflowBCStrategy.h
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#ifndef MultiphaseNonReflectingOutflowBCAlgorithm_h__
-#define MultiphaseNonReflectingOutflowBCAlgorithm_h__
+#ifndef MultiphaseNonReflectingOutflowBCStrategy_h__
+#define MultiphaseNonReflectingOutflowBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
//! A class implements non reflecting outflow boundary condition for multiphase simulations
-class MultiphaseNonReflectingOutflowBCAlgorithm : public BCAlgorithm
+class MultiphaseNonReflectingOutflowBCStrategy : public BCStrategy
{
public:
- MultiphaseNonReflectingOutflowBCAlgorithm();
- ~MultiphaseNonReflectingOutflowBCAlgorithm();
- SPtr<BCAlgorithm> clone();
+ MultiphaseNonReflectingOutflowBCStrategy();
+ ~MultiphaseNonReflectingOutflowBCStrategy();
+ SPtr<BCStrategy> clone();
void addDistributions(SPtr<DistributionArray3D> distributions);
void addDistributionsH(SPtr<DistributionArray3D> distributionsH);
void addDistributionsH2(SPtr<DistributionArray3D> distributionsH2);
void applyBC();
};
-#endif // MultiphaseNonReflectingOutflowBCAlgorithm_h__
+#endif // MultiphaseNonReflectingOutflowBCStrategy_h__
diff --git a/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..f85d3c6503fbe645ecef115351c6e8fd11c287d1
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.cpp
@@ -0,0 +1,107 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 MultiphasePressureBCStrategy.cpp
+//! \ingroup BoundarConditions
+//! \author Hesameddin Safari
+//=======================================================================================
+
+#include "MultiphasePressureBCStrategy.h"
+#include "DistributionArray3D.h"
+#include "BoundaryConditions.h"
+
+MultiphasePressureBCStrategy::MultiphasePressureBCStrategy()
+{
+ BCStrategy::type = BCStrategy::MultiphasePressureBCStrategy;
+ BCStrategy::preCollision = false;
+}
+//////////////////////////////////////////////////////////////////////////
+MultiphasePressureBCStrategy::~MultiphasePressureBCStrategy()
+{
+}
+//////////////////////////////////////////////////////////////////////////
+SPtr<BCStrategy> MultiphasePressureBCStrategy::clone()
+{
+ SPtr<BCStrategy> bc(new MultiphasePressureBCStrategy());
+ return bc;
+}
+//////////////////////////////////////////////////////////////////////////
+void MultiphasePressureBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
+{
+ this->distributions = distributions;
+}
+//////////////////////////////////////////////////////////////////////////
+void MultiphasePressureBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
+{
+ this->distributionsH = distributionsH;
+}
+//////////////////////////////////////////////////////////////////////////
+void MultiphasePressureBCStrategy::addDistributionsH2(SPtr<DistributionArray3D> distributionsH)
+{
+ this->distributionsH2 = distributionsH;
+}
+//////////////////////////////////////////////////////////////////////////
+void MultiphasePressureBCStrategy::applyBC()
+{
+ using namespace vf::lbm::dir;
+
+ LBMReal f[D3Q27System::ENDF+1];
+ LBMReal h[D3Q27System::ENDF+1];
+ LBMReal h2[D3Q27System::ENDF + 1];
+ LBMReal feq[D3Q27System::ENDF+1];
+ //LBMReal heq[D3Q27System::ENDF+1];
+ LBMReal htemp[D3Q27System::ENDF+1];
+
+ distributions->getDistributionInv(f, x1, x2, x3);
+ distributionsH->getDistributionInv(h, x1, x2, x3);
+ if (distributionsH2)
+ distributionsH2->getDistributionInv(h2, x1, x2, x3);
+ LBMReal phi, vx1, vx2, vx3, p1, phiBC;
+
+ D3Q27System::calcDensity(h, phi);
+
+ calcMacrosFct(f, p1, vx1, vx2, vx3);
+ p1 = 0.0;
+
+ phiBC = bcPtr->getBoundaryPhaseField();
+ LBMReal rhoBC = bcPtr->getBoundaryDensity();
+ D3Q27System::calcIncompFeq(feq, rhoBC, vx1, vx2, vx3);
+
+ D3Q27System::calcMultiphaseHeq(htemp, phiBC, vx1, vx2, vx3);
+
+ for (int fdir = D3Q27System::STARTF; fdir <= D3Q27System::ENDF; fdir++) {
+ if (bcPtr->hasDensityBoundaryFlag(fdir)) {
+ LBMReal ftemp = -f[D3Q27System::INVDIR[fdir]] + feq[fdir] + feq[D3Q27System::INVDIR[fdir]];
+ distributions->setDistributionForDirection(ftemp, x1, x2, x3, D3Q27System::INVDIR[fdir]);
+
+ LBMReal hReturn = -h[D3Q27System::INVDIR[fdir]] + htemp[fdir] + htemp[D3Q27System::INVDIR[fdir]];
+ distributionsH->setDistributionForDirection(hReturn, x1, x2, x3, D3Q27System::INVDIR[fdir]);
+ }
+ }
+}
+
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.h b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.h
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.h
index 0cfd9a3baa2a13780f39f3dbce024f982907f916..cb6c6cf5e8570b40800a7d2bf1c076307d441738 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.h
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.h
@@ -26,27 +26,27 @@
// 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 MultiphaseVelocityBCAlgorithm.h
+//! \file MultiphasePressureBCStrategy.h
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#ifndef MultiphaseVelocityBCAlgorithm_h__
-#define MultiphaseVelocityBCAlgorithm_h__
+#ifndef MultiphasePressureBCStrategy_h__
+#define MultiphasePressureBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
//! A class implements velocity boundary condition for multiphase simulations
-class MultiphaseVelocityBCAlgorithm : public BCAlgorithm
+class MultiphasePressureBCStrategy : public BCStrategy
{
public:
- MultiphaseVelocityBCAlgorithm();
- ~MultiphaseVelocityBCAlgorithm();
- SPtr<BCAlgorithm> clone() override;
+ MultiphasePressureBCStrategy();
+ ~MultiphasePressureBCStrategy();
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void addDistributionsH(SPtr<DistributionArray3D> distributionsH) override;
void addDistributionsH2(SPtr<DistributionArray3D> distributionsH2) override;
void applyBC() override;
};
-#endif // MultiphaseVelocityBCAlgorithm_h__
+#endif // MultiphasePressureBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseSlipBCAlgorithm.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.cpp
similarity index 88%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseSlipBCAlgorithm.cpp
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.cpp
index c15204f7b9e8c02714d55adf2d40aea0acba8d35..b394d2d5d249004225b533c63fdbd596224e4b33 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseSlipBCAlgorithm.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.cpp
@@ -26,43 +26,43 @@
// 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 MultiphaseSlipBCAlgorithm.cpp
+//! \file MultiphaseSlipBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#include "MultiphaseSlipBCAlgorithm.h"
+#include "MultiphaseSlipBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-MultiphaseSlipBCAlgorithm::MultiphaseSlipBCAlgorithm()
+MultiphaseSlipBCStrategy::MultiphaseSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::SlipBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::SlipBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-MultiphaseSlipBCAlgorithm::~MultiphaseSlipBCAlgorithm()
+MultiphaseSlipBCStrategy::~MultiphaseSlipBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> MultiphaseSlipBCAlgorithm::clone()
+SPtr<BCStrategy> MultiphaseSlipBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new MultiphaseSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new MultiphaseSlipBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void MultiphaseSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseSlipBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
+void MultiphaseSlipBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
{
this->distributionsH = distributionsH;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseSlipBCAlgorithm::applyBC()
+void MultiphaseSlipBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
@@ -101,7 +101,7 @@ void MultiphaseSlipBCAlgorithm::applyBC()
const int invDir = D3Q27System::INVDIR[fdir];
real q = bcPtr->getQ(invDir);// m+m q=0 stabiler
//vx3=0;
- real velocity = 0.0;
+ real velocity = vf::basics::constant::c0o1;
switch (invDir)
{
case DIR_P00: velocity = (vf::basics::constant::c4o9*(+vx1)); break; //(2/cs^2)(=6)*rho_0(=1 bei imkompr)*wi*u*ei mit cs=1/sqrt(3)
@@ -132,7 +132,7 @@ void MultiphaseSlipBCAlgorithm::applyBC()
case DIR_MPP: velocity = (vf::basics::constant::c1o36*(-vx1+vx2+vx3)); break;
default: throw UbException(UB_EXARGS, "unknown error");
}
- real fReturn = ((1.0-q)/(1.0+q))*((f[invDir]-feq[invDir])/(1.0-collFactor)+feq[invDir])+((q*(f[invDir]+f[fdir])-velocity*rho)/(1.0+q));
+ real fReturn = ((vf::basics::constant::c1o1-q)/(vf::basics::constant::c1o1+q))*((f[invDir]-feq[invDir])/(vf::basics::constant::c1o1-collFactor)+feq[invDir])+((q*(f[invDir]+f[fdir])-velocity*rho)/(vf::basics::constant::c1o1+q));
distributions->setDistributionForDirection(fReturn, x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);
//real hReturn = ((1.0-q)/(1.0+q))*((h[invDir]-heq[invDir])/(1.0-collFactorPh)+heq[invDir])+((q/(1.0+q))*(h[invDir]+h[fdir]));
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseSlipBCAlgorithm.h b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseSlipBCAlgorithm.h
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.h
index 53d41d33ca333b7a7bf5515883eef697a20fb04a..1eb25a958505eb2fca2509763acf2f14bdf93414 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseSlipBCAlgorithm.h
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.h
@@ -26,26 +26,26 @@
// 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 MultiphaseSlipBCAlgorithm.h
+//! \file MultiphaseSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#ifndef MultiphaseSlipBCAlgorithm_h__
-#define MultiphaseSlipBCAlgorithm_h__
+#ifndef MultiphaseSlipBCStrategy_h__
+#define MultiphaseSlipBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
//! A class implements slip boundary condition for multiphase simulation
-class MultiphaseSlipBCAlgorithm : public BCAlgorithm
+class MultiphaseSlipBCStrategy : public BCStrategy
{
public:
- MultiphaseSlipBCAlgorithm();
- virtual ~MultiphaseSlipBCAlgorithm();
- SPtr<BCAlgorithm> clone() override;
+ MultiphaseSlipBCStrategy();
+ virtual ~MultiphaseSlipBCStrategy();
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void addDistributionsH(SPtr<DistributionArray3D> distributionsH) override;
void applyBC() override;
};
-#endif // SlipBCAlgorithm_h__
+#endif // SlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAdapter.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
similarity index 82%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAdapter.cpp
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
index ee8761f98fe151282cedd24b07b4a608f8ad3873..26bb0eed80516751da97810b07c6b9caf249f743 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAdapter.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.cpp
@@ -26,12 +26,12 @@
// 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 MultiphaseVelocityBCAdapter.cpp
+//! \file MultiphaseVelocityBC.cpp
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#include "MultiphaseVelocityBCAdapter.h"
+#include "MultiphaseVelocityBC.h"
#include "basics/utilities/UbLogger.h"
#include "basics/utilities/UbMath.h"
#include "basics/utilities/UbTuple.h"
@@ -39,7 +39,7 @@
using namespace std;
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const BCFunction& velVxBC)
+MultiphaseVelocityBC::MultiphaseVelocityBC(const bool& vx1, const bool& vx2, const bool& vx3, const BCFunction& velVxBC)
{
if(vx1) this->vx1BCs.push_back(velVxBC);
if(vx2) this->vx2BCs.push_back(velVxBC);
@@ -47,7 +47,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const bool& vx1, const
this->init();
}
/*==========================================================*/
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function, const real& phiBC, const real& startTime, const real& endTime )
+MultiphaseVelocityBC::MultiphaseVelocityBC(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function, const real& phiBC, const real& startTime, const real& endTime )
{
if(vx1) this->vx1BCs.push_back(BCFunction(function,startTime,endTime));
if(vx2) this->vx2BCs.push_back(BCFunction(function,startTime,endTime));
@@ -58,7 +58,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const bool& vx1, const
}
/*==========================================================*/
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function1, const mu::Parser& function2, const mu::Parser& function3, const real& phiBC, const real& startTime, const real& endTime )
+MultiphaseVelocityBC::MultiphaseVelocityBC(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function1, const mu::Parser& function2, const mu::Parser& function3, const real& phiBC, const real& startTime, const real& endTime )
{
if(vx1) this->vx1BCs.push_back(BCFunction(function1,startTime,endTime));
if(vx2) this->vx2BCs.push_back(BCFunction(function2,startTime,endTime));
@@ -67,7 +67,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const bool& vx1, const
this->init();
}
/*==========================================================*/
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const string& functionstring, const real& startTime, const real& endTime )
+MultiphaseVelocityBC::MultiphaseVelocityBC(const bool& vx1, const bool& vx2, const bool& vx3, const string& functionstring, const real& startTime, const real& endTime )
{
if(vx1) this->vx1BCs.push_back(BCFunction(functionstring,startTime,endTime));
if(vx2) this->vx2BCs.push_back(BCFunction(functionstring,startTime,endTime));
@@ -75,7 +75,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const bool& vx1, const
this->init();
}
/*==========================================================*/
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const BCFunction& velBC, bool x1Dir, bool x2Dir, bool x3Dir)
+MultiphaseVelocityBC::MultiphaseVelocityBC(const BCFunction& velBC, bool x1Dir, bool x2Dir, bool x3Dir)
{
if(x1Dir) this->vx1BCs.push_back(velBC);
if(x2Dir) this->vx2BCs.push_back(velBC);
@@ -83,7 +83,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const BCFunction& velBC
this->init();
}
/*==========================================================*/
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const BCFunction& velVx1BC, const BCFunction& velVx2BC, const BCFunction& velVx3BC)
+MultiphaseVelocityBC::MultiphaseVelocityBC(const BCFunction& velVx1BC, const BCFunction& velVx2BC, const BCFunction& velVx3BC)
{
if( velVx1BC.getEndTime()!=-Ub::inf ) this->vx1BCs.push_back(velVx1BC);
if( velVx2BC.getEndTime()!=-Ub::inf ) this->vx2BCs.push_back(velVx2BC);
@@ -91,7 +91,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const BCFunction& velVx
this->init();
}
/*==========================================================*/
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const vector< BCFunction >& velVx1BCs, const vector< BCFunction >& velVx2BCs, const vector< BCFunction >& velVx3BCs)
+MultiphaseVelocityBC::MultiphaseVelocityBC(const vector< BCFunction >& velVx1BCs, const vector< BCFunction >& velVx2BCs, const vector< BCFunction >& velVx3BCs)
{
this->vx1BCs = velVx1BCs;
this->vx2BCs = velVx2BCs;
@@ -99,7 +99,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const vector< BCFunctio
this->init();
}
/*==========================================================*/
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const real& vx1, const real& vx1StartTime, const real& vx1EndTime,
+MultiphaseVelocityBC::MultiphaseVelocityBC(const real& vx1, const real& vx1StartTime, const real& vx1EndTime,
const real& vx2, const real& vx2StartTime, const real& vx2EndTime,
const real& vx3, const real& vx3StartTime, const real& vx3EndTime )
{
@@ -109,7 +109,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const real& vx1, const
this->init();
}
/*==========================================================*/
-MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const string& vx1Function, const real& vx1StartTime, const real& vx1EndTime,
+MultiphaseVelocityBC::MultiphaseVelocityBC(const string& vx1Function, const real& vx1StartTime, const real& vx1EndTime,
const string& vx2Function, const real& vx2StartTime, const real& vx2EndTime,
const string& vx3Function, const real& vx3StartTime, const real& vx3EndTime )
{
@@ -119,7 +119,7 @@ MultiphaseVelocityBCAdapter::MultiphaseVelocityBCAdapter(const string& vx1Functi
this->init();
}
/*==========================================================*/
-void MultiphaseVelocityBCAdapter::setNewVelocities(const real& vx1, const real& vx1StartTime, const real& vx1EndTime,
+void MultiphaseVelocityBC::setNewVelocities(const real& vx1, const real& vx1StartTime, const real& vx1EndTime,
const real& vx2, const real& vx2StartTime, const real& vx2EndTime,
const real& vx3, const real& vx3StartTime, const real& vx3EndTime )
{
@@ -130,7 +130,7 @@ void MultiphaseVelocityBCAdapter::setNewVelocities(const real& vx1, const real&
this->init();
}
/*==========================================================*/
-void MultiphaseVelocityBCAdapter::init()
+void MultiphaseVelocityBC::init()
{
this->unsetTimeDependent();
@@ -155,7 +155,7 @@ void MultiphaseVelocityBCAdapter::init()
catch(...) { throw UbException(UB_EXARGS,"unknown exception" ); }
}
/*==========================================================*/
-void MultiphaseVelocityBCAdapter::init(std::vector<BCFunction>& vxBCs)
+void MultiphaseVelocityBC::init(std::vector<BCFunction>& vxBCs)
{
for(size_t pos=0; pos<vxBCs.size(); ++pos)
{
@@ -174,7 +174,7 @@ void MultiphaseVelocityBCAdapter::init(std::vector<BCFunction>& vxBCs)
}
}
/*==========================================================*/
-void MultiphaseVelocityBCAdapter::init(const D3Q27Interactor* const& interactor, const real& time)
+void MultiphaseVelocityBC::init(const D3Q27Interactor* const& interactor, const real& time)
{
this->timeStep = time;
this->tmpVx1Function = this->tmpVx2Function = this->tmpVx3Function = NULL;
@@ -259,31 +259,31 @@ void MultiphaseVelocityBCAdapter::init(const D3Q27Interactor* const& interactor,
}
}
- UBLOG(logDEBUG4,"D3Q27VelocityBCAdapter::init(time="<<time<<") "
+ UBLOG(logDEBUG4,"D3Q27VelocityBC::init(time="<<time<<") "
<<", vx1= \""<<(tmpVx1Function ? tmpVx1Function->GetExpr() : "-")<<"\""
<<", vx2= \""<<(tmpVx2Function ? tmpVx2Function->GetExpr() : "-")<<"\""
<<", vx3= \""<<(tmpVx3Function ? tmpVx3Function->GetExpr() : "-")<<"\""
<<", timedependent="<<boolalpha<<this->isTimeDependent() );
}
/*==========================================================*/
-void MultiphaseVelocityBCAdapter::update( const D3Q27Interactor* const& interactor, const real& time )
+void MultiphaseVelocityBC::update( const D3Q27Interactor* const& interactor, const real& time )
{
this->init(interactor,time);
}
/*==========================================================*/
-void MultiphaseVelocityBCAdapter::adaptBCForDirection( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& q, const int& fdirection, const real& time )
+void MultiphaseVelocityBC::adaptBCForDirection( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& q, const int& fdirection, const real& time )
{
bc->setVelocityBoundaryFlag(D3Q27System::INVDIR[fdirection],secondaryBcOption);
bc->setQ((real)q,fdirection);
}
/*==========================================================*/
-void MultiphaseVelocityBCAdapter::adaptBC( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& time )
+void MultiphaseVelocityBC::adaptBC( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& time )
{
this->setNodeVelocity(interactor,bc,worldX1,worldX2,worldX3,time);
- bc->setBcAlgorithmType(algorithmType);
+ bc->setBCStrategyType(algorithmType);
}
/*==========================================================*/
-void MultiphaseVelocityBCAdapter::setNodeVelocity( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& timestep)
+void MultiphaseVelocityBC::setNodeVelocity( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const real& worldX1, const real& worldX2, const real& worldX3, const real& timestep)
{
//Geschwindigkeiten setzen
try
@@ -304,11 +304,11 @@ void MultiphaseVelocityBCAdapter::setNodeVelocity( const D3Q27Interactor& intera
catch(...) { throw UbException(UB_EXARGS,"unknown exception" ); }
}
/*==========================================================*/
-UbTupleDouble3 MultiphaseVelocityBCAdapter::getVelocity(const real& x1, const real& x2, const real& x3, const real& timeStep) const
+UbTupleDouble3 MultiphaseVelocityBC::getVelocity(const real& x1, const real& x2, const real& x3, const real& timeStep) const
{
- real vx1 = 0.0;
- real vx2 = 0.0;
- real vx3 = 0.0;
+ real vx1 = vf::basics::constant::c0o1;
+ real vx2 = vf::basics::constant::c0o1;
+ real vx3 = vf::basics::constant::c0o1;
this->x1 = x1;
this->x2 = x2;
this->x3 = x3;
@@ -321,10 +321,10 @@ UbTupleDouble3 MultiphaseVelocityBCAdapter::getVelocity(const real& x1, const re
return UbTupleDouble3(vx1,vx2,vx3);
}
/*==========================================================*/
-string MultiphaseVelocityBCAdapter::toString()
+string MultiphaseVelocityBC::toString()
{
stringstream info;
- info<<"D3Q27VelocityBCAdapter:\n";
+ info<<"D3Q27VelocityBC:\n";
info<<" #vx1-functions = "<<(int)vx1BCs.size()<<endl;
info<<" #vx2-functions = "<<(int)vx2BCs.size()<<endl;
info<<" #vx3-functions = "<<(int)vx3BCs.size()<<endl;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAdapter.h b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h
similarity index 79%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAdapter.h
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h
index 60d93cdecd141834b9800c08fc9b6d1e4fab3c92..8618d797245a641b8c6ce7fc30fee46a3bfeed22 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAdapter.h
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h
@@ -26,12 +26,12 @@
// 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 MultiphaseVelocityBCAdapter.h
+//! \file MultiphaseVelocityBC.h
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#ifndef MultiphaseVelocityBCAdapter_H
-#define MultiphaseVelocityBCAdapter_H
+#ifndef MultiphaseVelocityBC_H
+#define MultiphaseVelocityBC_H
#include <iostream>
#include <string>
@@ -45,7 +45,7 @@
class UbFileOutput;
class UbFileInput;
-#include <BCAdapter.h>
+#include <BC.h>
#include <BCFunction.h>
//! \brief A class provides an interface for velocity boundary condition for multiphase simulation in grid generator.
@@ -61,8 +61,8 @@ class UbFileInput;
//! vx2BCs.push_back(BCFunction(0.002, 200, 300) ); //t=[200..300[ -> vx2 = 0.002
//! vx2BCs.push_back(BCFunction(0.043, 300, 600) ); //t=[300..600] -> vx2 = 0.043
//!
-//! VelocityBCAdapter bcAdapter(vx1BCs,vx2BCs,vx3BCs);
-//! bcAdapter.setTimePeriodic(); //-> t=[0 ..100[ -> vx1 = 0.01
+//! VelocityBC BC(vx1BCs,vx2BCs,vx3BCs);
+//! BC.setTimePeriodic(); //-> t=[0 ..100[ -> vx1 = 0.01
//! // t=[100..200[ -> vx1 = 0.004
//! // t=[200..400[ -> vx1 = 0.03
//! // t=[400..500[ -> vx1 = 0.01
@@ -79,36 +79,36 @@ 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 );
-//! VelocityBCAdapter velBC(true, false ,false ,fct, 0, BCFunction::INFCONST);
+//! (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
-class MultiphaseVelocityBCAdapter : public BCAdapter
+class MultiphaseVelocityBC : public BC
{
public:
//constructors
- MultiphaseVelocityBCAdapter() { this->init(); }
+ MultiphaseVelocityBC() { this->init(); }
- MultiphaseVelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const BCFunction& velVxBC );
+ MultiphaseVelocityBC(const bool& vx1, const bool& vx2, const bool& vx3, const BCFunction& velVxBC );
- MultiphaseVelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function, const real& phiBC, const real& startTime, const real& endTime );
+ MultiphaseVelocityBC(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function, const real& phiBC, const real& startTime, const real& endTime );
- MultiphaseVelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function1, const mu::Parser& function2, const mu::Parser& function3, const real& phiBC, const real& startTime, const real& endTime );
+ MultiphaseVelocityBC(const bool& vx1, const bool& vx2, const bool& vx3, const mu::Parser& function1, const mu::Parser& function2, const mu::Parser& function3, const real& phiBC, const real& startTime, const real& endTime );
- MultiphaseVelocityBCAdapter(const bool& vx1, const bool& vx2, const bool& vx3, const std::string& functionstring, const real& startTime, const real& endTime );
+ MultiphaseVelocityBC(const bool& vx1, const bool& vx2, const bool& vx3, const std::string& functionstring, const real& startTime, const real& endTime );
- MultiphaseVelocityBCAdapter(const BCFunction& velBC, bool x1Dir, bool x2Dir, bool x3Dir);
+ MultiphaseVelocityBC(const BCFunction& velBC, bool x1Dir, bool x2Dir, bool x3Dir);
- MultiphaseVelocityBCAdapter(const BCFunction& velVx1BC, const BCFunction& velVx2BC, const BCFunction& velVx3BC);
+ MultiphaseVelocityBC(const BCFunction& velVx1BC, const BCFunction& velVx2BC, const BCFunction& velVx3BC);
- MultiphaseVelocityBCAdapter(const std::vector< BCFunction >& velVx1BCs, const std::vector< BCFunction >& velVx2BCs, const std::vector< BCFunction >& velVx3BCs);
+ MultiphaseVelocityBC(const std::vector< BCFunction >& velVx1BCs, const std::vector< BCFunction >& velVx2BCs, const std::vector< BCFunction >& velVx3BCs);
- MultiphaseVelocityBCAdapter(const real& vx1, const real& vx1StartTime, const real& vx1EndTime,
+ MultiphaseVelocityBC(const real& vx1, const real& vx1StartTime, const real& vx1EndTime,
const real& vx2, const real& vx2StartTime, const real& vx2EndTime,
const real& vx3, const real& vx3StartTime, const real& vx3EndTime);
- MultiphaseVelocityBCAdapter(const std::string& vx1Function, const real& vx1StartTime, const real& vx1EndTime,
+ MultiphaseVelocityBC(const std::string& vx1Function, const real& vx1StartTime, const real& vx1EndTime,
const std::string& vx2Function, const real& vx2StartTime, const real& vx2EndTime,
const std::string& vx3Function, const real& vx3StartTime, const real& vx3EndTime );
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.cpp b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.cpp
similarity index 81%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.cpp
rename to src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.cpp
index b6ddf4b46925e770cfcdcc5390d41ed816b992bc..a0b334d8ee7a88471ca3e5c640e04a914f4171bd 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.cpp
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.cpp
@@ -26,47 +26,47 @@
// 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 MultiphaseVelocityBCAlgorithm.cpp
+//! \file MultiphaseVelocityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Hesameddin Safari
//=======================================================================================
-#include "MultiphaseVelocityBCAlgorithm.h"
+#include "MultiphaseVelocityBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-MultiphaseVelocityBCAlgorithm::MultiphaseVelocityBCAlgorithm()
+MultiphaseVelocityBCStrategy::MultiphaseVelocityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::MultiphaseVelocityBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::MultiphaseVelocityBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-MultiphaseVelocityBCAlgorithm::~MultiphaseVelocityBCAlgorithm()
+MultiphaseVelocityBCStrategy::~MultiphaseVelocityBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> MultiphaseVelocityBCAlgorithm::clone()
+SPtr<BCStrategy> MultiphaseVelocityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new MultiphaseVelocityBCAlgorithm());
+ SPtr<BCStrategy> bc(new MultiphaseVelocityBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseVelocityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void MultiphaseVelocityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseVelocityBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
+void MultiphaseVelocityBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
{
this->distributionsH = distributionsH;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseVelocityBCAlgorithm::addDistributionsH2(SPtr<DistributionArray3D> distributionsH)
+void MultiphaseVelocityBCStrategy::addDistributionsH2(SPtr<DistributionArray3D> distributionsH)
{
this->distributionsH2 = distributionsH;
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseVelocityBCAlgorithm::applyBC()
+void MultiphaseVelocityBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
@@ -89,25 +89,12 @@ void MultiphaseVelocityBCAlgorithm::applyBC()
vx1=bcPtr->getBoundaryVelocityX1();
vx2 = bcPtr->getBoundaryVelocityX2();
vx3 = bcPtr->getBoundaryVelocityX3();
- p1 = 0.0;
+ p1 = vf::basics::constant::c0o1;
D3Q27System::calcMultiphaseFeqVB(feq, p1, vx1, vx2, vx3);
D3Q27System::calcMultiphaseHeq(heq, phi, vx1, vx2, vx3);
///// 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/BoundaryConditions/MultiphaseVelocityBCStrategy.h b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.h
new file mode 100644
index 0000000000000000000000000000000000000000..4e99c876aca206eae0cae3bcf8c643d9ce930b87
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.h
@@ -0,0 +1,52 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 MultiphaseVelocityBCStrategy.h
+//! \ingroup BoundarConditions
+//! \author Hesameddin Safari
+//=======================================================================================
+
+#ifndef MultiphaseVelocityBCStrategy_h__
+#define MultiphaseVelocityBCStrategy_h__
+
+#include "BCStrategy.h"
+//! A class implements velocity boundary condition for multiphase simulations
+class MultiphaseVelocityBCStrategy : public BCStrategy
+{
+public:
+ MultiphaseVelocityBCStrategy();
+ ~MultiphaseVelocityBCStrategy();
+ SPtr<BCStrategy> clone() override;
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
+ void addDistributionsH(SPtr<DistributionArray3D> distributionsH) override;
+ void addDistributionsH2(SPtr<DistributionArray3D> distributionsH2) override;
+ void applyBC() override;
+};
+
+#endif // MultiphaseVelocityBCStrategy_h__
+
diff --git a/src/cpu/MultiphaseFlow/CMakeLists.txt b/src/cpu/MultiphaseFlow/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..35765164bce5ce208f1c43fcc7345cbd77f4e999
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/CMakeLists.txt
@@ -0,0 +1 @@
+vf_add_library(PUBLIC_LINK VirtualFluidsCore)
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseCumulantLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseCumulantLBMKernel.cpp
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.cpp
index 5561a04cc18d91b554d094ce43ee0e11f32af2ad..2655e916025b1d2b085348c06cb95c425813d83d 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseCumulantLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.cpp
@@ -69,7 +69,7 @@ SPtr<LBMKernel> MultiphaseCumulantLBMKernel::clone()
kernel->setPhaseFieldRelaxation(this->tauH);
kernel->setMobility(this->mob);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -100,7 +100,7 @@ void MultiphaseCumulantLBMKernel::calculate(int step)
nonLocalDistributionsH = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getNonLocalDistributions();
zeroDistributionsH = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -1290,7 +1290,7 @@ void MultiphaseCumulantLBMKernel::findNeighbors(CbArray3D<real, IndexerX3X2X1>::
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi[DIR_000] = (*ph)(x1, x2, x3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseCumulantLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseCumulantLBMKernel.h
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.h
index 1402e35f0626399c30875d3f58bbcd256367d965..a42f6d5eaf907cd3706546c7afcd67d93e9985f2 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseCumulantLBMKernel.h
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.h
@@ -35,7 +35,7 @@
#define MultiphaseCumulantLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.cpp
rename to src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.cpp
index 551d9d21188cbb865c55bec156469be6c88d8b95..6dc3b454e1874382bb539d716147867f03514c38 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.cpp
@@ -79,7 +79,7 @@ SPtr<LBMKernel> MultiphasePressureFilterCompressibleAirLBMKernel::clone()
kernel->setMobility(this->mob);
kernel->setInterfaceWidth(this->interfaceWidth);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -168,7 +168,7 @@ void MultiphasePressureFilterCompressibleAirLBMKernel::calculate(int step)
CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr pressure = dataSet->getPressureField();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -1630,7 +1630,7 @@ void MultiphasePressureFilterCompressibleAirLBMKernel::findNeighbors(CbArray3D<r
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi[DIR_000] = (*ph)(x1, x2, x3);
@@ -1651,7 +1651,7 @@ void MultiphasePressureFilterCompressibleAirLBMKernel::findNeighbors2(CbArray3D<
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi2[DIR_000] = (*ph)(x1, x2, x3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h
rename to src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h
index 65be707f90d1327cad559cc7f9361e74508bcd30..56d31b53c8ed42358e898869e8193bcf7779743a 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h
@@ -35,7 +35,7 @@
#define MultiphasePressureFilterCompressibleAirLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterLBMKernel.cpp
rename to src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.cpp
index 547ad83259d205f8da99184c3cf6c5a761e7f7b2..1d0d66a1803968f98cdff629d0578ecb197ddc31 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.cpp
@@ -79,7 +79,7 @@ SPtr<LBMKernel> MultiphasePressureFilterLBMKernel::clone()
kernel->setMobility(this->mob);
kernel->setInterfaceWidth(this->interfaceWidth);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -168,7 +168,7 @@ void MultiphasePressureFilterLBMKernel::calculate(int step)
CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr pressure = dataSet->getPressureField();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -1748,7 +1748,7 @@ void MultiphasePressureFilterLBMKernel::findNeighbors(CbArray3D<real, IndexerX3X
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi[DIR_000] = (*ph)(x1, x2, x3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterLBMKernel.h
rename to src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.h
index d13a5aeffa95cc3ee4980edf5cc93650ecc617a3..fc2783b4f844a0acb00386c64ff034bfa900928b 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphasePressureFilterLBMKernel.h
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.h
@@ -35,7 +35,7 @@
#define MultiphasePressureFilterLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..362c8c68be02430dee683287140dd951bb3eb715
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.cpp
@@ -0,0 +1,4876 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 MultiphaseScaleDistributionLBMKernel.cpp
+//! \ingroup LBMKernel
+//! \author M. Geier, K. Kutscher, Hesameddin Safari
+//=======================================================================================
+
+#include "MultiphaseScaleDistributionLBMKernel.h"
+#include "BCArray3D.h"
+#include "Block3D.h"
+#include "D3Q27EsoTwist3DSplittedVector.h"
+#include "D3Q27System.h"
+#include "DataSet3D.h"
+#include "LBMKernel.h"
+#include <cmath>
+#include <iostream>
+#include <string>
+
+using namespace vf::lbm::dir;
+using namespace vf::basics::constant;
+
+#define PROOF_CORRECTNESS
+
+//////////////////////////////////////////////////////////////////////////
+MultiphaseScaleDistributionLBMKernel::MultiphaseScaleDistributionLBMKernel() { this->compressible = false; }
+//////////////////////////////////////////////////////////////////////////
+void MultiphaseScaleDistributionLBMKernel::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));
+
+ divU = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+}
+//////////////////////////////////////////////////////////////////////////
+SPtr<LBMKernel> MultiphaseScaleDistributionLBMKernel::clone()
+{
+ SPtr<LBMKernel> kernel(new MultiphaseScaleDistributionLBMKernel());
+ kernel->setNX(nx);
+ dynamicPointerCast<MultiphaseScaleDistributionLBMKernel>(kernel)->initDataSet();
+ kernel->setCollisionFactorMultiphase(this->collFactorL, this->collFactorG);
+ kernel->setDensityRatio(this->densityRatio);
+ kernel->setMultiphaseModelParameters(this->beta, this->kappa);
+ 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<MultiphaseScaleDistributionLBMKernel>(kernel)->initForcing();
+
+ return kernel;
+}
+//////////////////////////////////////////////////////////////////////////
+void MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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();
+ zeroDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
+
+ localDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getLocalDistributions();
+ nonLocalDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getNonLocalDistributions();
+ zeroDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getZeroDistributions();
+
+ localDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getLocalDistributions();
+ nonLocalDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getNonLocalDistributions();
+ zeroDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->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->zeroDistributionsH1)(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;
+
+ //real mfabb = (*this->localDistributionsH1)(D3Q27System::ET_E, x1, x2, x3);//* rho * c1o3;
+ // real mfbab = (*this->localDistributionsH1)(D3Q27System::ET_N, x1, x2, x3);//* rho * c1o3;
+ // real mfbba = (*this->localDistributionsH1)(D3Q27System::ET_T, x1, x2, x3);//* rho * c1o3;
+ // real mfaab = (*this->localDistributionsH1)(D3Q27System::ET_NE, x1, x2, x3);//* rho * c1o3;
+ // real mfcab = (*this->localDistributionsH1)(D3Q27System::ET_NW, x1p, x2, x3);//* rho * c1o3;
+ // real mfaba = (*this->localDistributionsH1)(D3Q27System::ET_TE, x1, x2, x3);//* rho * c1o3;
+ // real mfcba = (*this->localDistributionsH1)(D3Q27System::ET_TW, x1p, x2, x3);//* rho * c1o3;
+ // real mfbaa = (*this->localDistributionsH1)(D3Q27System::ET_TN, x1, x2, x3);//* rho * c1o3;
+ // real mfbca = (*this->localDistributionsH1)(D3Q27System::ET_TS, x1, x2p, x3);//* rho * c1o3;
+ // real mfaaa = (*this->localDistributionsH1)(D3Q27System::ET_TNE, x1, x2, x3);//* rho * c1o3;
+ // real mfcaa = (*this->localDistributionsH1)(D3Q27System::ET_TNW, x1p, x2, x3);//* rho * c1o3;
+ // real mfaca = (*this->localDistributionsH1)(D3Q27System::ET_TSE, x1, x2p, x3);//* rho * c1o3;
+ // real mfcca = (*this->localDistributionsH1)(D3Q27System::ET_TSW, x1p, x2p, x3);//* rho * c1o3;
+ // real mfcbb = (*this->nonLocalDistributionsH1)(D3Q27System::ET_W, x1p, x2, x3);//* rho * c1o3;
+ // real mfbcb = (*this->nonLocalDistributionsH1)(D3Q27System::ET_S, x1, x2p, x3);//* rho * c1o3;
+ // real mfbbc = (*this->nonLocalDistributionsH1)(D3Q27System::ET_B, x1, x2, x3p);//* rho * c1o3;
+ // real mfccb = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SW, x1p, x2p, x3);//* rho * c1o3;
+ // real mfacb = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SE, x1, x2p, x3);//* rho * c1o3;
+ // real mfcbc = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BW, x1p, x2, x3p);//* rho * c1o3;
+ // real mfabc = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BE, x1, x2, x3p);//* rho * c1o3;
+ // real mfbcc = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BS, x1, x2p, x3p);//* rho * c1o3;
+ // real mfbac = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BN, x1, x2, x3p);//* rho * c1o3;
+ // real mfccc = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSW, x1p, x2p, x3p);//* rho * c1o3;
+ // real mfacc = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSE, x1, x2p, x3p);//* rho * c1o3;
+ // real mfcac = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNW, x1p, x2, x3p);//* rho * c1o3;
+ // real mfaac = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNE, x1, x2, x3p);//* rho * c1o3;
+ // real mfbbb = (*this->zeroDistributionsH1)(x1, x2, x3);
+
+ 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;
+
+ //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->zeroDistributionsH1)(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;
+ //}
+ ////// read F-distributions for velocity formalism
+ //mfabb = (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);//* rho * c1o3;
+ //mfbab = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);//* rho * c1o3;
+ //mfbba = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);//* rho * c1o3;
+ //mfaab = (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);//* rho * c1o3;
+ //mfcab = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);//* rho * c1o3;
+ //mfaba = (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);//* rho * c1o3;
+ //mfcba = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);//* rho * c1o3;
+ //mfbaa = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);//* rho * c1o3;
+ //mfbca = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);//* rho * c1o3;
+ //mfaaa = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);//* rho * c1o3;
+ //mfcaa = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);//* rho * c1o3;
+ //mfaca = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);//* rho * c1o3;
+ //mfcca = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);//* rho * c1o3;
+ //mfcbb = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);//* rho * c1o3;
+ //mfbcb = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);//* rho * c1o3;
+ //mfbbc = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);//* rho * c1o3;
+ //mfccb = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);//* rho * c1o3;
+ //mfacb = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);//* rho * c1o3;
+ //mfcbc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);//* rho * c1o3;
+ //mfabc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);//* rho * c1o3;
+ //mfbcc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);//* rho * c1o3;
+ //mfbac = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);//* rho * c1o3;
+ //mfccc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);//* rho * c1o3;
+ //mfacc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);//* rho * c1o3;
+ //mfcac = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);//* rho * c1o3;
+ //mfaac = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);//* rho * c1o3;
+ //mfbbb = (*this->zeroDistributionsF)(x1, x2, x3);
+
+ //mfcbb = (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);
+ //mfbcb = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);
+ //mfbbc = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);
+ //mfccb = (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);
+ //mfacb = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);
+ //mfcbc = (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);
+ //mfabc = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);
+ //mfbcc = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);
+ //mfbac = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);
+ //mfccc = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);
+ //mfacc = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);
+ //mfcac = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);
+ //mfaac = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ //mfabb = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);
+ //mfbab = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);
+ //mfbba = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);
+ //mfaab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);
+ //mfcab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);
+ //mfaba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);
+ //mfcba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);
+ //mfbaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);
+ //mfbca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);
+ //mfaaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ //mfcaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ //mfaca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ //mfcca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);
+
+ //mfbbb = (*this->zeroDistributionsF)(x1, x2, x3);
+
+
+ //real drho = (((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
+ // + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
+ // + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb;
+
+ //(*rhoNode)(x1, x2, x3) = drho;
+ //(*vxNode)(x1, x2, x3) = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
+ // (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
+ // (mfcbb - mfabb));
+ //(*vyNode)(x1, x2, x3) = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
+ // (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
+ // (mfbcb - mfbab));
+ //(*vzNode)(x1, x2, x3) = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
+ // (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
+ // (mfbbc - mfbba));
+
+ SPtr<DistributionArray3D> distribution = this->getDataSet()->getFdistributions();
+ real ff[27];
+ distribution->getDistributionInv(ff, x1, x2, x3);
+ real rhoG,vx,vy,vz;
+ //real rhoGG = (((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
+ // + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
+ // + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb;
+
+
+ //vx= ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
+ // (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
+ // (mfcbb - mfabb));
+ //vy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
+ // (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
+ // (mfbcb - mfbab));
+ //vz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
+ // (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
+ // (mfbbc - mfbba));
+ D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+ //if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) { }
+ //else { rhoG = 0.0; vx = 0.0; vy = 0.0; vz = 0.0; }
+ //// very bad save the world procedure!!!!
+ //vx = (vx > 1 || vx < -1) ? 0 : vx;
+ //vy = (vy > 1 || vy < -1) ? 0 : vy;
+ //vz = (vz > 1 || vz < -1) ? 0 : vz;
+ //rhoG = (rhoG > 10 || rhoG < -10) ? 0 : rhoG;
+ (*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;
+ //if (fabsf(vx) > 0 && fabsf(vx) < 0.01) {
+ // int test = 0;
+ //}
+
+
+
+ //if ((*vzNode)(x1, x2, x3) != 0) {
+ // real vvvv = (*vzNode)(x1, x2, x3);
+ // real pppp = vvvv / (*phaseField)(x1, x2, x3);
+ // int ii = 1;
+ //}
+
+ }
+ }
+ }
+ }
+
+ 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 curv = computeCurvature_phi();
+ findNeighbors(phaseFieldOld, x1, x2, x3);
+ real sigma = c3o1*c2o1*1e-1;
+
+//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 fGInv = distribution->getDistributionInvForDirection(x1, x2, x3, D3Q27System::INVDIR[fdir]);
+ //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);
+ //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";
+ //}
+
+ //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 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);
+ //if (vxBC != 0) {
+ // int set = 0;
+ //}
+
+ }
+
+ }
+
+
+ }
+ }
+ 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);
+ //alternative way to bounce back by recovering fG from the opiste direction
+ //real fGInv= distribution->getDistributionInvForDirection(x1, x2, x3, D3Q27System::INVDIR[fdir]);
+ //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);
+ //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]));
+ //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 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 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;
+ //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 number = 666;
+
+
+
+ }
+
+ }
+ 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))) {
+ 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 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));
+ //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]);
+ }
+ }
+ //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))) {
+ // 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;
+
+ // //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);
+ // 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);
+
+
+
+ }
+
+
+
+ }
+
+
+ //if ((*phaseField)(x1, x2, x3) <= c1o2) {
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ //
+ // real feqNew = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], 0, 0, 0.0001, 0);
+ // ff[D3Q27System::INVDIR[fdir]] = feqNew;
+ // distribution->setDistributionForDirection(ff[D3Q27System::INVDIR[fdir]], x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // }
+ //}
+ //16.03.23 B: Bounce Back gas side
+ //distribution->getDistributionInv(ff, x1, x2, x3);
+ //real rhoG;
+ //if (phi[DIR_000] > c1o2) { //initialization necessary
+ // real sumRho = 0;
+ // real sumWeight = 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]);
+ // sumWeight += WEIGTH[fdir];
+ // }
+
+ // }
+ // rhoG = sumRho / sumWeight;// uncheck excpetion: what if there is no adequate neigbor?
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[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 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] * (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX2[fdir] * vzBC);
+
+ // distribution->setDistributionForDirection(fBC, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+
+ // }
+ // }
+ // distribution->setDistributionForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoG, vx, vy, vz), 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 = 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 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] * (D3Q27System::DX1[fdir] * vxBC + D3Q27System::DX2[fdir] * vyBC + D3Q27System::DX2[fdir] * vzBC);
+
+ // //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 - fL - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ // }
+
+ // }
+
+
+ // }
+ // }
+ // else {//refill liquid
+
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[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 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]*(D3Q27System::DX1[fdir]*vxBC+ D3Q27System::DX2[fdir] * vyBC+ D3Q27System::DX2[fdir] * vzBC);
+
+ // 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 - fL - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), 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;
+ // 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;
+ // sum2 += WEIGTH[fdir];
+ // }
+ // }
+ // real rhoL;
+ // D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
+ // rhoL = sumRho / sum2;
+
+
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[D3Q27System::INVDIR[fdir]] <= c1o2) && (phi[fdir] > c1o2)) {
+ // 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]);;
+ // distribution->setDistributionForDirection(fL, x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir], fdir);
+ // }
+ // if ((phi[D3Q27System::INVDIR[fdir]] <= c1o2) && (phi[fdir] <= c1o2)) {
+ // 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);
+ // }
+ // }
+
+ // real feqL = D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, vx, vy, vz);
+ // distribution->setDistributionForDirection(feqL, x1, x2, x3, DIR_000);
+
+
+
+ // }
+
+
+
+ //}
+
+
+
+
+ //16.03.23 A: scaled pressure
+ //distribution->getDistributionInv(ff, x1, x2, x3);
+ //real rhoG;
+ //if (phi[DIR_000] > c1o2) { //initialization necessary
+ // real sumRho = 0;
+ // real sumWeight = 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]);
+ // sumWeight += WEIGTH[fdir];
+ // }
+
+ // }
+ // rhoG = sumRho / sumWeight;// uncheck excpetion: what if there is no adequate neigbor?
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[fdir] > c1o2)) {
+ // real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // 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;
+
+ // distribution->setDistributionForDirection(fBC, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+
+ // }
+ // }
+ // distribution->setDistributionForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoG, vx, vy, vz), 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 fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // 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 - fL - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ // }
+
+ // }
+
+
+ // }
+ // }
+ // else {//refill liquid
+
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[fdir] > c1o2)) {
+ // real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // 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 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 - fL - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), 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;
+ // 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;
+ // sum2 += WEIGTH[fdir];
+ // }
+ // }
+ // real rhoL;
+ // D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
+ // rhoL=sumRho/sum2;
+
+
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[D3Q27System::INVDIR[fdir]] <= c1o2) && (phi[fdir] > c1o2)) {
+ // 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]);;
+ // distribution->setDistributionForDirection(fL, x1 - D3Q27System::DX1[fdir], x2 - D3Q27System::DX2[fdir], x3 - D3Q27System::DX3[fdir], fdir);
+ // }
+ // if ((phi[D3Q27System::INVDIR[fdir]] <= c1o2) && (phi[fdir] <= c1o2)) {
+ // 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);
+ // }
+ // }
+
+ // real feqL = D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, vx, vy, vz);
+ // distribution->setDistributionForDirection(feqL, x1 , x2, x3 , DIR_000);
+
+
+
+ // }
+
+
+
+ //}
+
+
+
+
+
+
+
+
+
+
+
+}//end Loop
+
+
+
+
+
+ //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
+ // real kapkap = 0*1.0e-5;
+ // //real scalRefill = 0.0;
+ // real slowerFactor = 1.0e6;
+ // if (((*phaseField)(x1, x2, x3) <= 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);
+
+
+ // distribution->getDistributionInv(ff, x1, x2, x3);
+ // real rhoG;
+ // if (phi[DIR_000] > c1o2) { //initialization necessary
+ // real sumRho = 0;
+ // real sumWeight = 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]);
+ // sumWeight += WEIGTH[fdir];
+ // }
+
+ // }
+ // rhoG = sumRho / sumWeight;// uncheck excpetion: what if there is no adequate neigbor?
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[fdir] > c1o2)) {
+ // real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // 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;
+
+ // distribution->setDistributionForDirection(fBC, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+
+ // }
+ // }
+ // distribution->setDistributionForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoG, vx, vy, vz), x1, x2, x3, DIR_000);
+
+
+
+ // }
+ // else {//no refill required
+
+ // rhoG = (*rhoNode)(x1, x2, x3);
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if ((phi[fdir] > c1o2)) {
+ // real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // 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;
+
+ // 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-fL+kapkap* WEIGTH[fdir]* computeCurvature_phi() -(feqG-feqL)*(c1o1/densityRatio-c1o1)*(vxBC* D3Q27System::DX1[fdir]+vyBC* D3Q27System::DX2[fdir]+vzBC* D3Q27System::DX3[fdir]), x1 , x2 , x3 , fdir);
+ // }
+
+ // }
+ // else {
+ // if (((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) > c1o2) {
+
+ // real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ // real feqOLD = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy,vz);
+ // real slower = c1o1/(c1o1+slowerFactor * (vx * vx + vy * vy + vz * vz));
+ // real feqNew = D3Q27System::getIncompFeqForDirection(fdir, rhoG / densityRatio, slower * vx, slower * vy, slower * vz);
+ // real fBC = (fG - feqOLD) * (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqNew;
+
+ // distribution->setDistributionForDirection(fBC, x1, x2 , x3 , fdir);
+
+ // ////inverse refill from here
+ // //int xn1 = x1 + D3Q27System::DX1[fdir];
+ // //int xn2 = x2 + D3Q27System::DX2[fdir];
+ // //int xn3 = x3 + D3Q27System::DX3[fdir];
+ // //real sumRho = 0;
+ // //real sumWeight = 0;
+ // //for (int nfdir = D3Q27System::STARTF; nfdir < D3Q27System::ENDF; nfdir++) {
+ // // if ((phi[nfdir] > c1o2)) {
+ // // sumRho += WEIGTH[nfdir] * (*rhoNode)(xn1 + D3Q27System::DX1[nfdir], xn2 + D3Q27System::DX2[nfdir], xn3 + D3Q27System::DX3[nfdir]);
+ // // sumWeight += WEIGTH[nfdir];
+ // // }
+ // //}
+ // ////real rhoL = sumRho / sumWeight;// uncheck excpetion: what if there is no adequate neigbor?
+ // //real rhoL = c1o2*(sumRho / sumWeight * scalRefill + (c1o1 - scalRefill) * rhoG / densityRatio);//
+
+ // //// what comes next is the inversion of BC for the gas phase which is only used to derive the liquid BC
+ // //real fBC = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // ////real feqOld = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoL, (*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]));
+ // ////Dirty
+ // //real feqOld = D3Q27System::getIncompFeqForDirection(fdir, rhoL, -(*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 fL = (fBC - feqNew) * (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqOld;
+
+
+ // //real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ // //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 - fL + kapkap * WEIGTH[fdir] * computeCurvature_phi() - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ // ////distribution->setDistributionForDirection(( fG) / densityRatio - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ //
+ //
+ // }
+ // }
+ //
+ // }
+
+ // }
+
+
+
+
+
+
+ //
+
+ //
+ //
+ // }
+ // if (((*phaseField)(x1, x2, x3) > c1o2) && ((*phaseFieldOld)(x1, x2, x3) <= c1o2)) {
+ // real vx = (*vxNode)(x1, x2, x3);
+ // real vy = (*vyNode)(x1, x2, x3);
+ // real vz = (*vzNode)(x1, x2, x3);
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // if (((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) > c1o2) {
+ // real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ // 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, vx * (D3Q27System::DX1[fdir]) * (D3Q27System::DX1[fdir]), vy * (D3Q27System::DX2[fdir]) * (D3Q27System::DX2[fdir]), vz * (D3Q27System::DX3[fdir]) * (D3Q27System::DX3[fdir]));
+
+ // if (((*phaseFieldOld)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) <= c1o2) {
+ // real rhoG = (*rhoNode)(x1, x2, x3);
+ // real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ // real feqOLD = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
+ // real slower = c1o1 / (c1o1 + slowerFactor * (vx * vx + vy * vy + vz * vz));
+ // real feqNew = D3Q27System::getIncompFeqForDirection(fdir, rhoG / densityRatio, slower*vx, slower*vy, slower*vz);
+ // real fBC = (fG - feqOLD) * (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqNew;
+
+ // distribution->setDistributionForDirection(fBC, x1, x2, x3, fdir);
+
+ // /////reverse liquid
+ // //int xn1 = x1 + D3Q27System::DX1[fdir];
+ // //int xn2 = x2 + D3Q27System::DX2[fdir];
+ // //int xn3 = x3 + D3Q27System::DX3[fdir];
+ // //real sumRho = 0;
+ // //real sumWeight = 0;
+ // //for (int nfdir = D3Q27System::STARTF; nfdir < D3Q27System::ENDF; nfdir++) {
+ // // if ((phi[nfdir] > c1o2)) {
+ // // sumRho += WEIGTH[nfdir] * (*rhoNode)(xn1 + D3Q27System::DX1[nfdir], xn2 + D3Q27System::DX2[nfdir], xn3 + D3Q27System::DX3[nfdir]);
+ // // sumWeight += WEIGTH[nfdir];
+ // // }
+ // //}
+ // ////real rhoL = sumRho / sumWeight;// uncheck excpetion: what if there is no adequate neigbor?
+ // //real rhoL = (sumRho / sumWeight*scalRefill+(c1o1-scalRefill)*(*rhoNode)(x1, x2, x3) / densityRatio);//
+ // //// what comes next is the inversion of BC for the gas phase which is only used to derive the liquid BC
+ // //real fBC = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // ////real feqOld = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], rhoL, (*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]));
+ // ////Dirty
+ // //real feqOld = D3Q27System::getIncompFeqForDirection(fdir, rhoL, -(*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], (*rhoNode)(x1, x2, x3), (*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 fL = (fBC - feqNew) * (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqOld;
+
+
+ // //real fG = distribution->getDistributionInvForDirection(x1, x2, x3, fdir);
+ // //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 - fL + kapkap * WEIGTH[fdir] * computeCurvature_phi() - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+
+ // /////!reverse liquid
+ // //
+ // ////distribution->setDistributionForDirection((fG) / densityRatio - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ // }
+ // else {
+ // real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+ // 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], (*rhoNode)(x1, x2, x3), (*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;
+ // distribution->setDistributionForDirection((fBC + fG) / densityRatio - fL + kapkap * WEIGTH[fdir] * computeCurvature_phi() - (feqG - feqL) * (c1o1 / densityRatio - c1o1) * (vxBC * D3Q27System::DX1[fdir] + vyBC * D3Q27System::DX2[fdir] + vzBC * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ // }
+ // }
+ //
+ // }
+
+
+
+ // }
+
+
+
+
+
+ //////////////////////////////////////
+
+// //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)
+// // )) {
+//
+// // real vx = (*vxNode)(x1, x2, x3);
+// // real vy = (*vyNode)(x1, x2, x3);
+// // real vz = (*vzNode)(x1, x2, x3);
+//
+//
+// // distribution->getDistributionInv(ff, x1, x2, x3);
+// // real rhoG;
+// // //D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+// // real sumRhoG = 0.0;
+// // int countRhoG = 0;
+// // for (int fdir = D3Q27System::STARTF; fdir <= D3Q27System::ENDF; fdir++) {
+// // if ((phi[fdir] <= c1o2)) {
+// // //BC version
+// // // rhoG = (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// // //real ftemp = D3Q27System::getCompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, vx, vy, vz) + D3Q27System::getCompFeqForDirection(fdir, rhoG, vx, vy, vz);
+// // //
+// // //real fBB;
+// // //fBB = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// // //distribution->setDistributionForDirection((ftemp - ff[fdir]), x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// // //distribution->setDistributionForDirection(fBB - c6o1 * D3Q27System::WEIGTH[fdir] * (-vx * D3Q27System::DX1[fdir] - vy * D3Q27System::DX2[fdir] - vz * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+// // //scaled Version
+//
+// // real fG;
+// // fG = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+//
+// // //Liquid
+// // real ssrho = 1;
+// // real rhoLL = (*rhoNode)(x1, x2, x3);
+//
+// // //real rhoFilter = (*rhoNode)(x1, x2, x3)*c8o27
+// // // + c2o27*(((*rhoNode)(x1 + 1, x2, x3) + (*rhoNode)(x1 - 1, x2, x3)) + ((*rhoNode)(x1, x2 + 1, x3) + (*rhoNode)(x1, x2 - 1, x3)) + ((*rhoNode)(x1, x2, x3 + 1) + (*rhoNode)(x1, x2, x3 - 1)))
+// // // + c1o54*((((*rhoNode)(x1 + 1, x2 + 1, x3) + (*rhoNode)(x1 - 1, x2 - 1, x3)) + ((*rhoNode)(x1 - 1, x2 + 1, x3) + (*rhoNode)(x1 + 1, x2 - 1, x3)))
+// // // + (((*rhoNode)(x1 + 1, x2, x3 + 1) + (*rhoNode)(x1 - 1, x2, x3 - 1)) + ((*rhoNode)(x1 - 1, x2, x3 + 1) + (*rhoNode)(x1 + 1, x2, x3 - 1)))
+// // // + (((*rhoNode)(x1, x2 + 1, x3 + 1) + (*rhoNode)(x1, x2 - 1, x3 - 1)) + ((*rhoNode)(x1, x2 - 1, x3 + 1) + (*rhoNode)(x1, x2 + 1, x3 - 1)))
+// // // )
+// // // + c1o216*(
+// // // (((*rhoNode)(x1 + 1, x2 + 1, x3 + 1) + (*rhoNode)(x1 - 1, x2 - 1, x3 - 1)) + ((*rhoNode)(x1 + 1, x2 - 1, x3 + 1) + (*rhoNode)(x1 - 1, x2 + 1, x3 - 1)))
+// // // + (((*rhoNode)(x1 + 1, x2 + 1, x3 - 1) + (*rhoNode)(x1 - 1, x2 - 1, x3 + 1)) + ((*rhoNode)(x1 + 1, x2 - 1, x3 - 1) + (*rhoNode)(x1 - 1, x2 + 1, x3 + 1)))
+// // // );
+// // real rhoGG = (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// // real feqOLD = (D3Q27System::getIncompFeqForDirection(fdir, rhoLL/densityRatio, vx, vy, vz));
+// // real feqNew = (D3Q27System::getIncompFeqForDirection(fdir, rhoLL*(c1o1-ssrho)+ssrho*rhoGG, vx, vy, vz));
+// // //real feqNew = (D3Q27System::getIncompFeqForDirection(fdir, rhoFilter, vx, vy, vz));
+// // distribution->setDistributionForDirection( (ff[fdir] - feqOLD)*(c1o1/collFactorG-c1o1)/(c1o1/collFactorL-c1o1) + feqNew, x1, x2, x3, fdir);
+//
+// // 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]));
+// // feqNew = D3Q27System::getIncompFeqForDirection(D3Q27System::INVDIR[fdir], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) / densityRatio, (*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]));
+// // distribution->setDistributionForDirection((fG - feqOLD)* (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqNew, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// // sumRhoG += (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// // countRhoG++;
+//
+//
+// // }
+// // }
+// // (*rhoNode)(x1, x2, x3) = sumRhoG / countRhoG;
+//
+// 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)
+// )) {
+// real vx = (*vxNode)(x1, x2, x3);
+// real vy = (*vyNode)(x1, x2, x3);
+// real vz = (*vzNode)(x1, x2, x3);
+//
+//
+// //distribution->getDistributionInv(ff, x1, x2, x3);
+//
+// if ((*phaseField)(x1, x2, x3) > c1o2) {
+//
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {// populations without DIR_000
+// if ((phi[fdir] <= c1o2)) {
+// real fG = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// 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], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) / densityRatio, (*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]));
+// distribution->setDistributionForDirection((fG - feqOLD)* (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqNew, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+//
+// }
+// }
+//
+//
+// }
+// else {
+// //refill necessary
+// real sumRho = 0;
+// real sumWeight = 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]);
+// sumWeight += WEIGTH[fdir];
+// }
+// }
+// sumRho /= sumWeight;
+//
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// if ((phi[fdir] > c1o2)) {
+// real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// 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], sumRho, (*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]] = (fL - feqOLD) * (c1o1 / collFactorG - c1o1) / (c1o1 / collFactorL - c1o1) + feqNew;
+// }
+// else { ff[D3Q27System::INVDIR[fdir]] = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// }
+// }
+//
+// real rhoG;
+// D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+// sumRho = 0;
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// sumRho = ff[fdir] - D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
+// }
+// rhoG = 27.0 / 19.0 * sumRho;
+// distribution->setDistributionForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoG, vx, vy, vz), x1 , x2 , x3 , DIR_000);
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// //if ((phi[fdir] > c1o2)) {
+// distribution->setDistributionForDirection(ff[D3Q27System::INVDIR[fdir]], x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// //}
+// }
+//
+//
+// }
+//
+//
+// }
+// else 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)
+// )) {
+// real vx = (*vxNode)(x1, x2, x3);
+// real vy = (*vyNode)(x1, x2, x3);
+// real vz = (*vzNode)(x1, x2, x3);
+//
+//
+// //distribution->getDistributionInv(ff, x1, x2, x3);
+// if ((*phaseField)(x1, x2, x3) <= c1o2) {
+// ////explicit way:
+// ////real ppph = (*phaseField)(x1, x2, x3);
+// // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// // if ((phi[fdir] > c1o2)) {
+// // //vx = (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// // //vy = (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// // //vz = (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// // //real rhorho = (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// // //int xx1 = x1 + D3Q27System::DX1[fdir];
+// // //int xx2 = x2 + D3Q27System::DX2[fdir];
+// // //int xx3 = x3 + D3Q27System::DX3[fdir];
+//
+// // real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// // 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], (*rhoNode)(x1 , x2 , x3 ), (*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]));
+// // distribution->setDistributionForDirection((fL - feqOLD) * (c1o1 / collFactorG - c1o1) / (c1o1 / collFactorL - c1o1) + feqNew, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// // }
+// // }
+///////iterative way:
+// real rhoG = (*rhoNode)(x1, x2, x3);
+// //real sumWeight=0;
+// //for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// // if ((phi[fdir] > c1o2)) {
+// // rhoG += WEIGTH[fdir] * (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// // sumWeight += WEIGTH[fdir];
+// // }
+// //}
+// //rhoG = rhoG/sumWeight*densityRatio;
+//
+// for (int itter = 0; itter < 5; itter++) {
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// if ((phi[fdir] > c1o2)) {
+// real fL = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// 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]));
+// ff[D3Q27System::INVDIR[fdir]] = ((fL - feqOLD) * (c1o1 / collFactorG - c1o1) / (c1o1 / collFactorL - c1o1) + feqNew);
+// }
+// else { ff[D3Q27System::INVDIR[fdir]] = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]); }
+// }
+// ff[DIR_000]= distribution->getDistributionInvForDirection(x1, x2, x3, DIR_000);
+// D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+// //real sumRho = 0;
+// //for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// // sumRho = ff[fdir] - D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
+// //}
+// //rhoG = 27.0 / 19.0 * sumRho;
+// }
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+//
+// distribution->setDistributionForDirection(ff[D3Q27System::INVDIR[fdir]], x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+//
+// }
+// //distribution->setDistributionForDirection(ff[DIR_000], x1, x2, x3, DIR_000);
+//
+//
+//
+//
+// }
+// else {
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// if ((phi[fdir] <= c1o2)) {
+// real fG = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);
+// 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], (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) / densityRatio, (*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]] = (fG - 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]);
+// }
+// else { ff[D3Q27System::INVDIR[fdir]] = distribution->getDistributionInvForDirection(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], D3Q27System::INVDIR[fdir]);}
+// }
+// real rhoG;
+// D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+// real sumRho = 0;
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// sumRho = ff[fdir] - D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
+// }
+// rhoG = 27.0 / 19.0 * sumRho;
+// distribution->setDistributionForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoG, vx, vy, vz), x1, x2, x3, DIR_000);
+//
+//
+//
+// }
+//
+// }
+//
+//
+ }
+ }
+ }
+ }
+
+
+
+ this->swapDistributions();
+
+ for (int x3 = minX3; x3 < maxX3; x3++) {
+ 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;
+ findNeighbors(phaseFieldOld, x1, x2, x3);
+
+ //if (((*phaseField)(x1, x2, x3) > c1o2) && (((*phaseFieldOld)(x1, x2, x3) <= c1o2)))
+ {//Refill liquid
+ real vx;
+ real vy;
+ real vz;
+
+
+ distribution->getDistribution(ff, x1, x2, x3);
+ real rhoL;
+ D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
+ //if (vz != 0) {
+
+ // std::cout << "precol: rhoL=" << rhoL << " vx=" << vx << " vy=" << vy << " vz=" << vz << "ffRest=" << ff[DIR_000] << " x=" << x1 << " y=" << x2 << " z=" << x3 << "\n";
+ //}
+ }
+
+ }
+ }
+}
+
+
+
+ ////////momentum balance 06.03.2023
+ //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;
+ // if (((*phaseField)(x1, x2, x3) > c1o2) && (((*phaseFieldOld)(x1, x2, x3) <= c1o2)))
+ // {//Refill liquid
+ // real vx;
+ // real vy;
+ // real vz;
+
+
+ // distribution->getDistribution(ff, x1, x2, x3);
+ // real rhoL;
+ // D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
+ // std::cout << "precol: rhoL=" << rhoL << " vx=" << vx << " vy=" << vy << "ffRest=" << ff[DIR_000] << " x=" << x1 << " y=" << x2 << " z=" << x3 << "\n";
+ // }
+ // }
+ // }
+ // }
+ //}
+
+
+ // real sumRho = 0;
+ // for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+ // sumRho = ff[fdir] - D3Q27System::getIncompFeqForDirection(fdir, 0, vx, vy, vz);
+ // }
+ // rhoL = 27.0 / 19.0 * sumRho;
+ // distribution->setDistributionInvForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, vx, vy, vz), x1, x2, x3, DIR_000);
+
+
+ // }
+ // }
+ // }
+ // }
+ //}
+
+
+ //////rescaling new liquid nodes 10.03.2023
+// 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;
+// if (((*phaseField)(x1, x2, x3) > c1o2) && (((*phaseFieldOld)(x1, x2, x3) <= c1o2)))
+// {//Refill liquid
+// real vx;
+// real vy;
+// real vz;
+//
+// findNeighbors(phaseFieldOld, x1, x2, x3);
+//
+// //real rhoG;
+// //D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+//
+// //vx = (*vxNode)(x1, x2, x3);
+// //vy = (*vyNode)(x1, x2, x3);
+// //vz = (*vzNode)(x1, x2, x3);
+//
+//
+// //for (int fdir = D3Q27System::STARTF; fdir <= D3Q27System::ENDF; fdir++) {// loop includes DIR_000 position, different from all the others
+// // real feqOLD = D3Q27System::getIncompFeqForDirection(fdir, rhoG,vx,vy,vz);
+// // real feqNew = D3Q27System::getIncompFeqForDirection(fdir, rhoG/densityRatio,vx,vy,vz);
+// // real fBC = (ff[fdir] - feqOLD) * (c1o1 / collFactorL - c1o1) / (c1o1 / collFactorG - c1o1) + feqNew;
+//
+// // distribution->setDistributionInvForDirection(fBC, x1 , x2 , x3 ,fdir);
+//
+//
+//
+// //}
+////15.03.2023
+// real sumVx=0, sumVy=0, sumVz=0;
+// real tempRho, tempVx, tempVy, tempVz;
+// real sumRho = 0;
+// real sum = 1e-100;
+// real sum2 = 1e-100;
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// if (!(((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) > c1o2) && (((*phaseFieldOld)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) <= c1o2)))&& !bcArray->isSolid(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) && !bcArray->isUndefined(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir])) {
+// //distribution->getDistribution(ff, x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+// //D3Q27System::calcIncompMacroscopicValues(ff, tempRho, tempVx, tempVy, tempVz);
+// sum += WEIGTH[fdir];
+// sumVx += WEIGTH[fdir] * (*vxNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);//*tempVx;
+// sumVy += WEIGTH[fdir] * (*vyNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);//*tempVy;
+// sumVz += WEIGTH[fdir] * (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);//*tempVz;
+// if ((*phaseField)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) > c1o2) {
+// sumRho += WEIGTH[fdir] * (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);// * tempRho;
+// sum2 += WEIGTH[fdir];
+// }
+// if (tempVz != 0) {
+// std::cout << "vz=" << tempVz << " " << "x=" << x1 << " " << "y=" << x2 << " " << "z=" << x3 << " fdir=" << fdir << " " << "xn=" << x1 + D3Q27System::DX1[fdir] << " " << "yn=" << x2 + D3Q27System::DX2[fdir] << " " << "zn=" << x3 + D3Q27System::DX3[fdir]<<"vzold="<< (*vzNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]) << "\n";
+// }
+// }
+// }
+// sumRho/=sum2 ;
+// sumVx /= sum;
+// sumVy /= sum;
+// sumVz /= sum;
+// distribution->setDistributionInvForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, sumRho, sumVx, sumVy, sumVz), x1, x2, x3, DIR_000);
+//
+// std::cout << "x=" << x1 << " " << "y=" << x2 << " " << "z=" << x3 <<" sumVx="<<sumVx<< " sumVy=" << sumVy << " sumVz=" << sumVz << " sumRho=" << sumRho << "\n";
+//
+////14.03.2023
+// distribution->getDistribution(ff, x1, x2, x3);
+// real rhoG= (*rhoNode)(x1, x2, x3);
+//
+// vx = (*vxNode)(x1, x2, x3);
+// vy = (*vyNode)(x1, x2, x3);
+// vz = (*vzNode)(x1, x2, x3);
+// std::cout << " Vx=" << vx << " Vy=" << vy << " Vz=" << vz << " rhoL=" << (*rhoNode)(x1, x2, x3) / densityRatio << "\n";
+//
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// if (phi[D3Q27System::INVDIR[fdir]] <= c1o2 && phi[fdir] > c1o2) {
+// //ff[fdir] = ff[D3Q27System::INVDIR[fdir]] + c6o1 * WEIGTH[fdir] * (vx * D3Q27System::DX1[fdir] + vy * D3Q27System::DX2[fdir] + vz * D3Q27System::DX3[fdir]);
+// ff[fdir] = ff[D3Q27System::INVDIR[fdir]] + c6o1 * WEIGTH[fdir] * (sumVx * D3Q27System::DX1[fdir] + sumVy * D3Q27System::DX2[fdir] + sumVz * D3Q27System::DX3[fdir]);
+// //ff[fdir] = D3Q27System::getIncompFeqForDirection(fdir, sumRho, sumVx, sumVy, sumVz);
+// distribution->setDistributionInvForDirection(ff[fdir], x1, x2, x3, fdir);
+// }
+// if (phi[fdir] <= c1o2 && phi[D3Q27System::INVDIR[fdir]] <= c1o2) {
+// //ff[fdir] = D3Q27System::getIncompFeqForDirection(fdir, rhoG / densityRatio, vx, vy, vz);
+// ff[fdir]= D3Q27System::getIncompFeqForDirection(fdir, sumRho, sumVx, sumVy, sumVz);
+// distribution->setDistributionInvForDirection(ff[fdir], x1, x2, x3, fdir);
+// }
+// }
+// real rhoL;
+// //D3Q27System::calcIncompMacroscopicValues(ff, rhoL, vx, vy, vz);
+//
+//
+// //real sumRho;
+// real sumRho2= 0;
+// for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
+// sumRho2 += ff[fdir];// -D3Q27System::getIncompFeqForDirection(fdir, 0, sumVx, sumVy, sumVz);
+// }
+// rhoL = 27.0 / 19.0 * sumRho;
+// //distribution->setDistributionInvForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, vx, vy, vz), x1, x2, x3, DIR_000);
+// //distribution->setDistributionInvForDirection(D3Q27System::getIncompFeqForDirection(DIR_000, rhoL, sumVx, sumVy, sumVz), x1, x2, x3, DIR_000);
+// ff[DIR_000] = sumRho - sumRho2;
+// distribution->setDistributionInvForDirection(ff[DIR_000], x1, x2, x3, DIR_000);
+// D3Q27System::calcIncompMacroscopicValues(ff, rhoG, vx, vy, vz);
+// std::cout << " calcVx=" << vx << " calcVy=" << vy << " calcVz=" << vz << " rhoG=" << rhoG << "\n";
+//
+//
+//
+// }
+// }
+// }
+// }
+// }
+
+
+ //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->zeroDistributionsH1)(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 (phiOld > 0.49 && phiOld < 0.501) {
+ // // real ppppppppp = (*phaseField)(x1, x2, x3);
+ // // int ist = 1;
+ // //}
+ // //if (phiOld > 0.5 && (*phaseField)(x1, x2, x3) <= 0.5) {
+ // // real ppppppppp = (*phaseField)(x1, x2, x3);
+ // // int ist = 1;
+ // //}
+
+
+ // if ((*phaseField)(x1, x2, x3) > 1 ) {
+ // (*phaseField)(x1, x2, x3) = c1o1;
+ // }
+
+ // if ((*phaseField)(x1, x2, x3) < 0) {
+ // (*phaseField)(x1, x2, x3) = 0;
+ // }
+ // ////// read F-distributions for velocity formalism
+ // if (((phiOld <= 0.5) && ((*phaseField)(x1, x2, x3) <= 0.5)) || ((phiOld > 0.5) && ((*phaseField)(x1, x2, x3) > 0.5))) {}
+ // else {
+ // real scaleDistribution = densityRatio;// gas turn liquid
+ // real scaleStress = (c1o1/collFactorG)/(c1o1/collFactorL);
+ // if ((phiOld > 0.5) && ((*phaseField)(x1, x2, x3) <= 0.5)) {
+ // scaleDistribution = 1.0 / densityRatio;
+ // scaleStress = (c1o1 / collFactorL) / (c1o1 / collFactorG);
+ // //liquid turned gas
+ // }
+
+ // mfcbb = (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);
+ // mfbcb = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);
+ // mfbbc = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);
+ // mfccb = (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);
+ // mfacb = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);
+ // mfcbc = (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);
+ // mfabc = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);
+ // mfbcc = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);
+ // mfbac = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);
+ // mfccc = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);
+ // mfacc = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);
+ // mfcac = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);
+ // mfaac = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ // mfabb = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);
+ // mfbab = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);
+ // mfbba = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);
+ // mfaab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);
+ // mfcab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);
+ // mfaba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);
+ // mfcba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);
+ // mfbaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);
+ // mfbca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);
+ // mfaaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ // mfcaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ // mfaca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ // mfcca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);
+
+ // mfbbb = (*this->zeroDistributionsF)(x1, x2, x3);
+
+ // distribution->getDistribution(ff, x1, x2, x3);
+ // real vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
+ // (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
+ // (mfcbb - mfabb));
+ // real vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
+ // (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
+ // (mfbcb - mfbab)) ;
+ // real vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
+ // (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
+ // (mfbbc - mfbba)) ;
+ // real drho = (((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;
+ // //real mp= c3o1*(((mfaaa + mfccc) + (mfaca + mfcac)) + ((mfaac + mfcca) + (mfcaa + mfacc))) +
+ // // c2o1*(((mfaab + mfacb) + (mfcab + mfccb)) + ((mfaba + mfabc) + (mfcba + mfcbc)) +
+ // // ((mfbaa + mfbac) + (mfbca + mfbcc))) + ((mfabb + mfcbb) +
+ // // (mfbab + mfbcb) + (mfbba + mfbbc));
+ // //mp -= vvx * vvx - vvy * vvy - vvz * vvz;
+ // real drhoScaled = drho / scaleDistribution;
+ // if (((*phaseField)(x1, x2, x3) <= 0.5)) { drhoScaled = (*rhoNode)(x1, x2, x3); }
+
+ // //mp = 2 * drho - mp;
+ // for (int fdir = D3Q27System::STARTF; fdir <= D3Q27System::ENDF; fdir++) {
+ // real feqOLD = (D3Q27System::getIncompFeqForDirection(fdir, drho, vvx, vvy, vvz));
+ // real feqNew = (D3Q27System::getIncompFeqForDirection(fdir, drhoScaled, vvx, vvy, vvz));
+ // distribution->setDistributionInvForDirection((ff[fdir]-feqOLD)* scaleStress +feqNew,x1,x2,x3,fdir);
+ // }
+
+
+
+
+
+ // }
+ // }
+ // }
+ // }
+ //}
+
+ 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;
+
+
+
+// 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->zeroDistributionsF)(x1, x2, x3);
+//
+// real m0, m1, m2;
+//
+// real rho = (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;
+//
+// real vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
+// (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
+// (mfcbb - mfabb));
+// real vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
+// (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
+// (mfbcb - mfbab));
+// real vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
+// (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
+// (mfbbc - mfbba));
+//
+// //forcing
+// ///////////////////////////////////////////////////////////////////////////////////////////
+// if (withForcing)
+// {
+// muX1 = static_cast<double>(x1 - 1 + ix1 * maxX1);
+// muX2 = static_cast<double>(x2 - 1 + ix2 * maxX2);
+// muX3 = static_cast<double>(x3 - 1 + ix3 * maxX3);
+//
+// forcingX1 = muForcingX1.Eval();
+// forcingX2 = muForcingX2.Eval();
+// forcingX3 = muForcingX3.Eval();
+//
+// vvx += forcingX1 * deltaT * 0.5; // X
+// vvy += forcingX2 * deltaT * 0.5; // Y
+// vvz += forcingX3 * deltaT * 0.5; // Z
+// }
+// ///////////////////////////////////////////////////////////////////////////////////////////
+// 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 = 1. - (oMdrho + m0);
+//
+// real vx2;
+// real vy2;
+// real vz2;
+// vx2 = vvx * vvx;
+// vy2 = vvy * vvy;
+// vz2 = vvz * vvz;
+// ////////////////////////////////////////////////////////////////////////////////////
+// real wadjust;
+// real qudricLimit = 0.01;
+// ////////////////////////////////////////////////////////////////////////////////////
+// //Hin
+// ////////////////////////////////////////////////////////////////////////////////////
+// // mit 1/36, 1/9, 1/36, 1/9, 4/9, 1/9, 1/36, 1/9, 1/36 Konditionieren
+// ////////////////////////////////////////////////////////////////////////////////////
+// // Z - Dir
+// m2 = mfaaa + mfaac;
+// m1 = mfaac - mfaaa;
+// m0 = m2 + mfaab;
+// mfaaa = m0;
+// m0 += c1o36 * oMdrho;
+// mfaab = m1 - m0 * vvz;
+// mfaac = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfaba + mfabc;
+// m1 = mfabc - mfaba;
+// m0 = m2 + mfabb;
+// mfaba = m0;
+// m0 += c1o9 * oMdrho;
+// mfabb = m1 - m0 * vvz;
+// mfabc = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfaca + mfacc;
+// m1 = mfacc - mfaca;
+// m0 = m2 + mfacb;
+// mfaca = m0;
+// m0 += c1o36 * oMdrho;
+// mfacb = m1 - m0 * vvz;
+// mfacc = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfbaa + mfbac;
+// m1 = mfbac - mfbaa;
+// m0 = m2 + mfbab;
+// mfbaa = m0;
+// m0 += c1o9 * oMdrho;
+// mfbab = m1 - m0 * vvz;
+// mfbac = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfbba + mfbbc;
+// m1 = mfbbc - mfbba;
+// m0 = m2 + mfbbb;
+// mfbba = m0;
+// m0 += c4o9 * oMdrho;
+// mfbbb = m1 - m0 * vvz;
+// mfbbc = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfbca + mfbcc;
+// m1 = mfbcc - mfbca;
+// m0 = m2 + mfbcb;
+// mfbca = m0;
+// m0 += c1o9 * oMdrho;
+// mfbcb = m1 - m0 * vvz;
+// mfbcc = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfcaa + mfcac;
+// m1 = mfcac - mfcaa;
+// m0 = m2 + mfcab;
+// mfcaa = m0;
+// m0 += c1o36 * oMdrho;
+// mfcab = m1 - m0 * vvz;
+// mfcac = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfcba + mfcbc;
+// m1 = mfcbc - mfcba;
+// m0 = m2 + mfcbb;
+// mfcba = m0;
+// m0 += c1o9 * oMdrho;
+// mfcbb = m1 - m0 * vvz;
+// mfcbc = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfcca + mfccc;
+// m1 = mfccc - mfcca;
+// m0 = m2 + mfccb;
+// mfcca = m0;
+// m0 += c1o36 * oMdrho;
+// mfccb = m1 - m0 * vvz;
+// mfccc = m2 - 2. * m1 * vvz + vz2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// // mit 1/6, 0, 1/18, 2/3, 0, 2/9, 1/6, 0, 1/18 Konditionieren
+// ////////////////////////////////////////////////////////////////////////////////////
+// // Y - Dir
+// m2 = mfaaa + mfaca;
+// m1 = mfaca - mfaaa;
+// m0 = m2 + mfaba;
+// mfaaa = m0;
+// m0 += c1o6 * oMdrho;
+// mfaba = m1 - m0 * vvy;
+// mfaca = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfaab + mfacb;
+// m1 = mfacb - mfaab;
+// m0 = m2 + mfabb;
+// mfaab = m0;
+// mfabb = m1 - m0 * vvy;
+// mfacb = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfaac + mfacc;
+// m1 = mfacc - mfaac;
+// m0 = m2 + mfabc;
+// mfaac = m0;
+// m0 += c1o18 * oMdrho;
+// mfabc = m1 - m0 * vvy;
+// mfacc = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfbaa + mfbca;
+// m1 = mfbca - mfbaa;
+// m0 = m2 + mfbba;
+// mfbaa = m0;
+// m0 += c2o3 * oMdrho;
+// mfbba = m1 - m0 * vvy;
+// mfbca = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfbab + mfbcb;
+// m1 = mfbcb - mfbab;
+// m0 = m2 + mfbbb;
+// mfbab = m0;
+// mfbbb = m1 - m0 * vvy;
+// mfbcb = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfbac + mfbcc;
+// m1 = mfbcc - mfbac;
+// m0 = m2 + mfbbc;
+// mfbac = m0;
+// m0 += c2o9 * oMdrho;
+// mfbbc = m1 - m0 * vvy;
+// mfbcc = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfcaa + mfcca;
+// m1 = mfcca - mfcaa;
+// m0 = m2 + mfcba;
+// mfcaa = m0;
+// m0 += c1o6 * oMdrho;
+// mfcba = m1 - m0 * vvy;
+// mfcca = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfcab + mfccb;
+// m1 = mfccb - mfcab;
+// m0 = m2 + mfcbb;
+// mfcab = m0;
+// mfcbb = m1 - m0 * vvy;
+// mfccb = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfcac + mfccc;
+// m1 = mfccc - mfcac;
+// m0 = m2 + mfcbc;
+// mfcac = m0;
+// m0 += c1o18 * oMdrho;
+// mfcbc = m1 - m0 * vvy;
+// mfccc = m2 - 2. * m1 * vvy + vy2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// // mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
+// ////////////////////////////////////////////////////////////////////////////////////
+// // X - Dir
+// m2 = mfaaa + mfcaa;
+// m1 = mfcaa - mfaaa;
+// m0 = m2 + mfbaa;
+// mfaaa = m0;
+// m0 += 1. * oMdrho;
+// mfbaa = m1 - m0 * vvx;
+// mfcaa = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfaba + mfcba;
+// m1 = mfcba - mfaba;
+// m0 = m2 + mfbba;
+// mfaba = m0;
+// mfbba = m1 - m0 * vvx;
+// mfcba = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfaca + mfcca;
+// m1 = mfcca - mfaca;
+// m0 = m2 + mfbca;
+// mfaca = m0;
+// m0 += c1o3 * oMdrho;
+// mfbca = m1 - m0 * vvx;
+// mfcca = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfaab + mfcab;
+// m1 = mfcab - mfaab;
+// m0 = m2 + mfbab;
+// mfaab = m0;
+// mfbab = m1 - m0 * vvx;
+// mfcab = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfabb + mfcbb;
+// m1 = mfcbb - mfabb;
+// m0 = m2 + mfbbb;
+// mfabb = m0;
+// mfbbb = m1 - m0 * vvx;
+// mfcbb = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfacb + mfccb;
+// m1 = mfccb - mfacb;
+// m0 = m2 + mfbcb;
+// mfacb = m0;
+// mfbcb = m1 - m0 * vvx;
+// mfccb = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfaac + mfcac;
+// m1 = mfcac - mfaac;
+// m0 = m2 + mfbac;
+// mfaac = m0;
+// m0 += c1o3 * oMdrho;
+// mfbac = m1 - m0 * vvx;
+// mfcac = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfabc + mfcbc;
+// m1 = mfcbc - mfabc;
+// m0 = m2 + mfbbc;
+// mfabc = m0;
+// mfbbc = m1 - m0 * vvx;
+// mfcbc = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m2 = mfacc + mfccc;
+// m1 = mfccc - mfacc;
+// m0 = m2 + mfbcc;
+// mfacc = m0;
+// m0 += c1o9 * oMdrho;
+// mfbcc = m1 - m0 * vvx;
+// mfccc = m2 - 2. * m1 * vvx + vx2 * m0;
+// ////////////////////////////////////////////////////////////////////////////////////
+// // Cumulants
+// ////////////////////////////////////////////////////////////////////////////////////
+// real OxxPyyPzz = 1.; //omega2 or bulk viscosity
+// real OxyyPxzz = 1.;//-s9;//2+s9;//
+// //real OxyyMxzz = 1.;//2+s9;//
+// real O4 = 1.;
+// real O5 = 1.;
+// real O6 = 1.;
+// real OxyyMxzz = 1.;
+// //real OxyyPxzz = 1.;
+//
+// //Cum 4.
+// //real CUMcbb = mfcbb - ((mfcaa + c1o3 * oMdrho) * mfabb + 2. * mfbba * mfbab); // till 18.05.2015
+// //real CUMbcb = mfbcb - ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb); // till 18.05.2015
+// //real CUMbbc = mfbbc - ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb); // till 18.05.2015
+//
+// 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 - 1.) * oMdrho);
+// real CUMcac = mfcac - ((mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9 * (oMdrho - 1.) * oMdrho);
+// real CUMacc = mfacc - ((mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9 * (oMdrho - 1.) * 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;
+// real mxxMyy = mfcaa - mfaca;
+// real mxxMzz = mfcaa - mfaac;
+//
+// real dxux = -c1o2 * collFactorM * (mxxMyy + mxxMzz) + c1o2 * OxxPyyPzz * (mfaaa - mxxPyyPzz);
+// real dyuy = dxux + collFactorM * c3o2 * mxxMyy;
+// real dzuz = dxux + collFactorM * c3o2 * mxxMzz;
+//
+// //relax
+// mxxPyyPzz += OxxPyyPzz * (mfaaa - mxxPyyPzz) - 3. * (1. - c1o2 * OxxPyyPzz) * (vx2 * dxux + vy2 * dyuy + vz2 * dzuz);
+// mxxMyy += collFactorM * (-mxxMyy) - 3. * (1. - c1o2 * collFactor) * (vx2 * dxux - vy2 * dyuy);
+// mxxMzz += collFactorM * (-mxxMzz) - 3. * (1. - c1o2 * collFactor) * (vx2 * dxux - vz2 * dzuz);
+//
+// mfabb += collFactorM * (-mfabb);
+// mfbab += collFactorM * (-mfbab);
+// mfbba += collFactorM * (-mfbba);
+//
+// // 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;
+//
+// //relax
+// wadjust = OxyyMxzz + (1. - OxyyMxzz) * 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 * (-CUMacc);
+// CUMcac += O4 * (-CUMcac);
+// CUMcca += O4 * (-CUMcca);
+//
+// CUMbbc += O4 * (-CUMbbc);
+// CUMbcb += O4 * (-CUMbcb);
+// CUMcbb += 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 * oMdrho) * mfabb + 2. * mfbba * mfbab); // till 18.05.2015
+// //mfbcb = CUMbcb + ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb); // till 18.05.2015
+// //mfbbc = CUMbbc + ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb); // till 18.05.2015
+//
+// 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 - 1) * oMdrho;
+// mfcac = CUMcac + (mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9 * (oMdrho - 1) * oMdrho;
+// mfacc = CUMacc + (mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9 * (oMdrho - 1) * 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;
+// //////////////////////////////////////////////////////////////////////////////////////
+//
+// ////////////////////////////////////////////////////////////////////////////////////
+// //back
+// ////////////////////////////////////////////////////////////////////////////////////
+// //mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
+// ////////////////////////////////////////////////////////////////////////////////////
+// // Z - Dir
+// m0 = mfaac * c1o2 + mfaab * (vvz - c1o2) + (mfaaa + 1. * oMdrho) * (vz2 - vvz) * c1o2;
+// m1 = -mfaac - 2. * mfaab * vvz + mfaaa * (1. - vz2) - 1. * oMdrho * vz2;
+// m2 = mfaac * c1o2 + mfaab * (vvz + c1o2) + (mfaaa + 1. * oMdrho) * (vz2 + vvz) * c1o2;
+// mfaaa = m0;
+// mfaab = m1;
+// mfaac = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfabc * c1o2 + mfabb * (vvz - c1o2) + mfaba * (vz2 - vvz) * c1o2;
+// m1 = -mfabc - 2. * mfabb * vvz + mfaba * (1. - vz2);
+// m2 = mfabc * c1o2 + mfabb * (vvz + c1o2) + mfaba * (vz2 + vvz) * c1o2;
+// mfaba = m0;
+// mfabb = m1;
+// mfabc = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfacc * c1o2 + mfacb * (vvz - c1o2) + (mfaca + c1o3 * oMdrho) * (vz2 - vvz) * c1o2;
+// m1 = -mfacc - 2. * mfacb * vvz + mfaca * (1. - vz2) - c1o3 * oMdrho * vz2;
+// m2 = mfacc * c1o2 + mfacb * (vvz + c1o2) + (mfaca + c1o3 * oMdrho) * (vz2 + vvz) * c1o2;
+// mfaca = m0;
+// mfacb = m1;
+// mfacc = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfbac * c1o2 + mfbab * (vvz - c1o2) + mfbaa * (vz2 - vvz) * c1o2;
+// m1 = -mfbac - 2. * mfbab * vvz + mfbaa * (1. - vz2);
+// m2 = mfbac * c1o2 + mfbab * (vvz + c1o2) + mfbaa * (vz2 + vvz) * c1o2;
+// mfbaa = m0;
+// mfbab = m1;
+// mfbac = m2;
+// /////////b//////////////////////////////////////////////////////////////////////////
+// m0 = mfbbc * c1o2 + mfbbb * (vvz - c1o2) + mfbba * (vz2 - vvz) * c1o2;
+// m1 = -mfbbc - 2. * mfbbb * vvz + mfbba * (1. - vz2);
+// m2 = mfbbc * c1o2 + mfbbb * (vvz + c1o2) + mfbba * (vz2 + vvz) * c1o2;
+// mfbba = m0;
+// mfbbb = m1;
+// mfbbc = m2;
+// /////////b//////////////////////////////////////////////////////////////////////////
+// m0 = mfbcc * c1o2 + mfbcb * (vvz - c1o2) + mfbca * (vz2 - vvz) * c1o2;
+// m1 = -mfbcc - 2. * mfbcb * vvz + mfbca * (1. - vz2);
+// m2 = mfbcc * c1o2 + mfbcb * (vvz + c1o2) + mfbca * (vz2 + vvz) * c1o2;
+// mfbca = m0;
+// mfbcb = m1;
+// mfbcc = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfcac * c1o2 + mfcab * (vvz - c1o2) + (mfcaa + c1o3 * oMdrho) * (vz2 - vvz) * c1o2;
+// m1 = -mfcac - 2. * mfcab * vvz + mfcaa * (1. - vz2) - c1o3 * oMdrho * vz2;
+// m2 = mfcac * c1o2 + mfcab * (vvz + c1o2) + (mfcaa + c1o3 * oMdrho) * (vz2 + vvz) * c1o2;
+// mfcaa = m0;
+// mfcab = m1;
+// mfcac = m2;
+// /////////c//////////////////////////////////////////////////////////////////////////
+// m0 = mfcbc * c1o2 + mfcbb * (vvz - c1o2) + mfcba * (vz2 - vvz) * c1o2;
+// m1 = -mfcbc - 2. * mfcbb * vvz + mfcba * (1. - vz2);
+// m2 = mfcbc * c1o2 + mfcbb * (vvz + c1o2) + mfcba * (vz2 + vvz) * c1o2;
+// mfcba = m0;
+// mfcbb = m1;
+// mfcbc = m2;
+// /////////c//////////////////////////////////////////////////////////////////////////
+// m0 = mfccc * c1o2 + mfccb * (vvz - c1o2) + (mfcca + c1o9 * oMdrho) * (vz2 - vvz) * c1o2;
+// m1 = -mfccc - 2. * mfccb * vvz + mfcca * (1. - vz2) - c1o9 * oMdrho * vz2;
+// m2 = mfccc * c1o2 + mfccb * (vvz + c1o2) + (mfcca + c1o9 * oMdrho) * (vz2 + vvz) * 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 * (vvy - c1o2) + (mfaaa + c1o6 * oMdrho) * (vy2 - vvy) * c1o2;
+// m1 = -mfaca - 2. * mfaba * vvy + mfaaa * (1. - vy2) - c1o6 * oMdrho * vy2;
+// m2 = mfaca * c1o2 + mfaba * (vvy + c1o2) + (mfaaa + c1o6 * oMdrho) * (vy2 + vvy) * c1o2;
+// mfaaa = m0;
+// mfaba = m1;
+// mfaca = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfacb * c1o2 + mfabb * (vvy - c1o2) + (mfaab + c2o3 * oMdrho) * (vy2 - vvy) * c1o2;
+// m1 = -mfacb - 2. * mfabb * vvy + mfaab * (1. - vy2) - c2o3 * oMdrho * vy2;
+// m2 = mfacb * c1o2 + mfabb * (vvy + c1o2) + (mfaab + c2o3 * oMdrho) * (vy2 + vvy) * c1o2;
+// mfaab = m0;
+// mfabb = m1;
+// mfacb = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfacc * c1o2 + mfabc * (vvy - c1o2) + (mfaac + c1o6 * oMdrho) * (vy2 - vvy) * c1o2;
+// m1 = -mfacc - 2. * mfabc * vvy + mfaac * (1. - vy2) - c1o6 * oMdrho * vy2;
+// m2 = mfacc * c1o2 + mfabc * (vvy + c1o2) + (mfaac + c1o6 * oMdrho) * (vy2 + vvy) * c1o2;
+// mfaac = m0;
+// mfabc = m1;
+// mfacc = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfbca * c1o2 + mfbba * (vvy - c1o2) + mfbaa * (vy2 - vvy) * c1o2;
+// m1 = -mfbca - 2. * mfbba * vvy + mfbaa * (1. - vy2);
+// m2 = mfbca * c1o2 + mfbba * (vvy + c1o2) + mfbaa * (vy2 + vvy) * c1o2;
+// mfbaa = m0;
+// mfbba = m1;
+// mfbca = m2;
+// /////////b//////////////////////////////////////////////////////////////////////////
+// m0 = mfbcb * c1o2 + mfbbb * (vvy - c1o2) + mfbab * (vy2 - vvy) * c1o2;
+// m1 = -mfbcb - 2. * mfbbb * vvy + mfbab * (1. - vy2);
+// m2 = mfbcb * c1o2 + mfbbb * (vvy + c1o2) + mfbab * (vy2 + vvy) * c1o2;
+// mfbab = m0;
+// mfbbb = m1;
+// mfbcb = m2;
+// /////////b//////////////////////////////////////////////////////////////////////////
+// m0 = mfbcc * c1o2 + mfbbc * (vvy - c1o2) + mfbac * (vy2 - vvy) * c1o2;
+// m1 = -mfbcc - 2. * mfbbc * vvy + mfbac * (1. - vy2);
+// m2 = mfbcc * c1o2 + mfbbc * (vvy + c1o2) + mfbac * (vy2 + vvy) * c1o2;
+// mfbac = m0;
+// mfbbc = m1;
+// mfbcc = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfcca * c1o2 + mfcba * (vvy - c1o2) + (mfcaa + c1o18 * oMdrho) * (vy2 - vvy) * c1o2;
+// m1 = -mfcca - 2. * mfcba * vvy + mfcaa * (1. - vy2) - c1o18 * oMdrho * vy2;
+// m2 = mfcca * c1o2 + mfcba * (vvy + c1o2) + (mfcaa + c1o18 * oMdrho) * (vy2 + vvy) * c1o2;
+// mfcaa = m0;
+// mfcba = m1;
+// mfcca = m2;
+// /////////c//////////////////////////////////////////////////////////////////////////
+// m0 = mfccb * c1o2 + mfcbb * (vvy - c1o2) + (mfcab + c2o9 * oMdrho) * (vy2 - vvy) * c1o2;
+// m1 = -mfccb - 2. * mfcbb * vvy + mfcab * (1. - vy2) - c2o9 * oMdrho * vy2;
+// m2 = mfccb * c1o2 + mfcbb * (vvy + c1o2) + (mfcab + c2o9 * oMdrho) * (vy2 + vvy) * c1o2;
+// mfcab = m0;
+// mfcbb = m1;
+// mfccb = m2;
+// /////////c//////////////////////////////////////////////////////////////////////////
+// m0 = mfccc * c1o2 + mfcbc * (vvy - c1o2) + (mfcac + c1o18 * oMdrho) * (vy2 - vvy) * c1o2;
+// m1 = -mfccc - 2. * mfcbc * vvy + mfcac * (1. - vy2) - c1o18 * oMdrho * vy2;
+// m2 = mfccc * c1o2 + mfcbc * (vvy + c1o2) + (mfcac + c1o18 * oMdrho) * (vy2 + vvy) * 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 * (vvx - c1o2) + (mfaaa + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfcaa - 2. * mfbaa * vvx + mfaaa * (1. - vx2) - c1o36 * oMdrho * vx2;
+// m2 = mfcaa * c1o2 + mfbaa * (vvx + c1o2) + (mfaaa + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfaaa = m0;
+// mfbaa = m1;
+// mfcaa = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfcba * c1o2 + mfbba * (vvx - c1o2) + (mfaba + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfcba - 2. * mfbba * vvx + mfaba * (1. - vx2) - c1o9 * oMdrho * vx2;
+// m2 = mfcba * c1o2 + mfbba * (vvx + c1o2) + (mfaba + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfaba = m0;
+// mfbba = m1;
+// mfcba = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfcca * c1o2 + mfbca * (vvx - c1o2) + (mfaca + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfcca - 2. * mfbca * vvx + mfaca * (1. - vx2) - c1o36 * oMdrho * vx2;
+// m2 = mfcca * c1o2 + mfbca * (vvx + c1o2) + (mfaca + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfaca = m0;
+// mfbca = m1;
+// mfcca = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfcab * c1o2 + mfbab * (vvx - c1o2) + (mfaab + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfcab - 2. * mfbab * vvx + mfaab * (1. - vx2) - c1o9 * oMdrho * vx2;
+// m2 = mfcab * c1o2 + mfbab * (vvx + c1o2) + (mfaab + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfaab = m0;
+// mfbab = m1;
+// mfcab = m2;
+// ///////////b////////////////////////////////////////////////////////////////////////
+// m0 = mfcbb * c1o2 + mfbbb * (vvx - c1o2) + (mfabb + c4o9 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfcbb - 2. * mfbbb * vvx + mfabb * (1. - vx2) - c4o9 * oMdrho * vx2;
+// m2 = mfcbb * c1o2 + mfbbb * (vvx + c1o2) + (mfabb + c4o9 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfabb = m0;
+// mfbbb = m1;
+// mfcbb = m2;
+// ///////////b////////////////////////////////////////////////////////////////////////
+// m0 = mfccb * c1o2 + mfbcb * (vvx - c1o2) + (mfacb + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfccb - 2. * mfbcb * vvx + mfacb * (1. - vx2) - c1o9 * oMdrho * vx2;
+// m2 = mfccb * c1o2 + mfbcb * (vvx + c1o2) + (mfacb + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfacb = m0;
+// mfbcb = m1;
+// mfccb = m2;
+// ////////////////////////////////////////////////////////////////////////////////////
+// ////////////////////////////////////////////////////////////////////////////////////
+// m0 = mfcac * c1o2 + mfbac * (vvx - c1o2) + (mfaac + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfcac - 2. * mfbac * vvx + mfaac * (1. - vx2) - c1o36 * oMdrho * vx2;
+// m2 = mfcac * c1o2 + mfbac * (vvx + c1o2) + (mfaac + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfaac = m0;
+// mfbac = m1;
+// mfcac = m2;
+// ///////////c////////////////////////////////////////////////////////////////////////
+// m0 = mfcbc * c1o2 + mfbbc * (vvx - c1o2) + (mfabc + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfcbc - 2. * mfbbc * vvx + mfabc * (1. - vx2) - c1o9 * oMdrho * vx2;
+// m2 = mfcbc * c1o2 + mfbbc * (vvx + c1o2) + (mfabc + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfabc = m0;
+// mfbbc = m1;
+// mfcbc = m2;
+// ///////////c////////////////////////////////////////////////////////////////////////
+// m0 = mfccc * c1o2 + mfbcc * (vvx - c1o2) + (mfacc + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
+// m1 = -mfccc - 2. * mfbcc * vvx + mfacc * (1. - vx2) - c1o36 * oMdrho * vx2;
+// m2 = mfccc * c1o2 + mfbcc * (vvx + c1o2) + (mfacc + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
+// mfacc = m0;
+// mfbcc = m1;
+// mfccc = m2;
+//
+// //////////////////////////////////////////////////////////////////////////
+// //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;
+// //real dif = fabs(rho - rho_post);
+// real dif = rho - rho_post;
+//#ifdef SINGLEPRECISION
+// if (dif > 10.0E-7 || dif < -10.0E-7)
+//#else
+// if (dif > 10.0E-15 || dif < -10.0E-15)
+//#endif
+// {
+// UB_THROW(UbException(UB_EXARGS, "rho=" + UbSystem::toString(rho) + ", rho_post=" + UbSystem::toString(rho_post)
+// + " dif=" + UbSystem::toString(dif)
+// + " rho is not correct for node " + UbSystem::toString(x1) + "," + UbSystem::toString(x2) + "," + UbSystem::toString(x3)
+// + " in " + block.lock()->toString() + " step = " + UbSystem::toString(step)));
+// }
+//#endif
+// //////////////////////////////////////////////////////////////////////////
+// //write distribution
+// //////////////////////////////////////////////////////////////////////////
+// (*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->zeroDistributionsF)(x1, x2, x3) = mfbbb;
+//
+// findNeighbors(phaseField, x1, x2, x3);
+// 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;
+//
+// real normX1 = dX1_phi / denom;
+// real normX2 = dX2_phi / denom;
+// real normX3 = dX3_phi / denom;
+ //////////////////////////////////////////////////////////////////////////
+
+// ////////////////old kernel
+// //////////////////////////////////////////////////////////////////////////
+// // Read distributions and phase field
+// ////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////
+//
+// // E N T
+// // c c c
+// //////////
+// // W S B
+// // a a a
+//
+// // Rest ist b
+//
+// // mfxyz
+// // a - negative
+// // b - null
+// // c - positive
+//
+// // a b c
+// //-1 0 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->zeroDistributionsF)(x1, x2, x3);
+
+
+ //real mfhcbb ;//= (*this->localDistributionsH2)(D3Q27System::ET_E, x1, x2, x3);
+ //real mfhbcb ;//= (*this->localDistributionsH2)(D3Q27System::ET_N, x1, x2, x3);
+ //real mfhbbc ;//= (*this->localDistributionsH2)(D3Q27System::ET_T, x1, x2, x3);
+ //real mfhccb ;//= (*this->localDistributionsH2)(D3Q27System::ET_NE, x1, x2, x3);
+ //real mfhacb ;//= (*this->localDistributionsH2)(D3Q27System::ET_NW, x1p, x2, x3);
+ //real mfhcbc ;//= (*this->localDistributionsH2)(D3Q27System::ET_TE, x1, x2, x3);
+ //real mfhabc ;//= (*this->localDistributionsH2)(D3Q27System::ET_TW, x1p, x2, x3);
+ //real mfhbcc ;//= (*this->localDistributionsH2)(D3Q27System::ET_TN, x1, x2, x3);
+ //real mfhbac ;//= (*this->localDistributionsH2)(D3Q27System::ET_TS, x1, x2p, x3);
+ //real mfhccc ;//= (*this->localDistributionsH2)(D3Q27System::ET_TNE, x1, x2, x3);
+ //real mfhacc ;//= (*this->localDistributionsH2)(D3Q27System::ET_TNW, x1p, x2, x3);
+ //real mfhcac ;//= (*this->localDistributionsH2)(D3Q27System::ET_TSE, x1, x2p, x3);
+ //real mfhaac ;//= (*this->localDistributionsH2)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ //real mfhabb ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_W, x1p, x2, x3);
+ //real mfhbab ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_S, x1, x2p, x3);
+ //real mfhbba ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_B, x1, x2, x3p);
+ //real mfhaab ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_SW, x1p, x2p, x3);
+ //real mfhcab ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_SE, x1, x2p, x3);
+ //real mfhaba ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BW, x1p, x2, x3p);
+ //real mfhcba ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BE, x1, x2, x3p);
+ //real mfhbaa ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BS, x1, x2p, x3p);
+ //real mfhbca ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BN, x1, x2, x3p);
+ //real mfhaaa ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ //real mfhcaa ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ //real mfhaca ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ //real mfhcca ;//= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNE, x1, x2, x3p);
+ //real mfhbbb ;//= (*this->zeroDistributionsH2)(x1, x2, x3);
+
+
+ //if (phi[DIR_000] < c1o2)
+ //{
+ mfcbb= (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);
+ mfbcb= (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);
+ mfbbc= (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);
+ mfccb= (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);
+ mfacb= (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);
+ mfcbc= (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);
+ mfabc= (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);
+ mfbcc= (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);
+ mfbac= (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);
+ mfccc= (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);
+ mfacc= (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);
+ mfcac= (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);
+ mfaac= (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ mfabb= (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);
+ mfbab= (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);
+ mfbba= (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);
+ mfaab= (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);
+ mfcab= (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);
+ mfaba= (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);
+ mfcba= (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);
+ mfbaa= (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);
+ mfbca= (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);
+ mfaaa= (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ mfcaa= (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ mfaca= (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ mfcca= (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);
+ mfbbb= (*this->zeroDistributionsF)(x1, x2, x3);
+
+
+ // mfhcbb= (*this->localDistributionsH2)(D3Q27System::ET_E, x1, x2, x3);
+ // mfhbcb= (*this->localDistributionsH2)(D3Q27System::ET_N, x1, x2, x3);
+ // mfhbbc= (*this->localDistributionsH2)(D3Q27System::ET_T, x1, x2, x3);
+ // mfhccb= (*this->localDistributionsH2)(D3Q27System::ET_NE, x1, x2, x3);
+ // mfhacb= (*this->localDistributionsH2)(D3Q27System::ET_NW, x1p, x2, x3);
+ // mfhcbc= (*this->localDistributionsH2)(D3Q27System::ET_TE, x1, x2, x3);
+ // mfhabc= (*this->localDistributionsH2)(D3Q27System::ET_TW, x1p, x2, x3);
+ // mfhbcc= (*this->localDistributionsH2)(D3Q27System::ET_TN, x1, x2, x3);
+ // mfhbac= (*this->localDistributionsH2)(D3Q27System::ET_TS, x1, x2p, x3);
+ // mfhccc= (*this->localDistributionsH2)(D3Q27System::ET_TNE, x1, x2, x3);
+ // mfhacc= (*this->localDistributionsH2)(D3Q27System::ET_TNW, x1p, x2, x3);
+ // mfhcac= (*this->localDistributionsH2)(D3Q27System::ET_TSE, x1, x2p, x3);
+ // mfhaac= (*this->localDistributionsH2)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ // mfhabb= (*this->nonLocalDistributionsH2)(D3Q27System::ET_W, x1p, x2, x3);
+ // mfhbab= (*this->nonLocalDistributionsH2)(D3Q27System::ET_S, x1, x2p, x3);
+ // mfhbba= (*this->nonLocalDistributionsH2)(D3Q27System::ET_B, x1, x2, x3p);
+ // mfhaab= (*this->nonLocalDistributionsH2)(D3Q27System::ET_SW, x1p, x2p, x3);
+ // mfhcab= (*this->nonLocalDistributionsH2)(D3Q27System::ET_SE, x1, x2p, x3);
+ // mfhaba= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BW, x1p, x2, x3p);
+ // mfhcba= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BE, x1, x2, x3p);
+ // mfhbaa= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BS, x1, x2p, x3p);
+ // mfhbca= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BN, x1, x2, x3p);
+ // mfhaaa= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ // mfhcaa= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ // mfhaca= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ // mfhcca= (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNE, x1, x2, x3p);
+ // mfhbbb= (*this->zeroDistributionsH2)(x1, x2, x3);
+
+ //}
+ //else
+ //{
+ // mfhcbb = (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);
+ // mfhbcb = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);
+ // mfhbbc = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);
+ // mfhccb = (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);
+ // mfhacb = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);
+ // mfhcbc = (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);
+ // mfhabc = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);
+ // mfhbcc = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);
+ // mfhbac = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);
+ // mfhccc = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);
+ // mfhacc = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);
+ // mfhcac = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);
+ // mfhaac = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ // mfhabb = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);
+ // mfhbab = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);
+ // mfhbba = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);
+ // mfhaab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);
+ // mfhcab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);
+ // mfhaba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);
+ // mfhcba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);
+ // mfhbaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);
+ // mfhbca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);
+ // mfhaaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ // mfhcaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ // mfhaca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ // mfhcca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);
+ // mfhbbb = (*this->zeroDistributionsF)(x1, x2, x3);
+
+
+ // mfcbb = (*this->localDistributionsH2)(D3Q27System::ET_E, x1, x2, x3);
+ // mfbcb = (*this->localDistributionsH2)(D3Q27System::ET_N, x1, x2, x3);
+ // mfbbc = (*this->localDistributionsH2)(D3Q27System::ET_T, x1, x2, x3);
+ // mfccb = (*this->localDistributionsH2)(D3Q27System::ET_NE, x1, x2, x3);
+ // mfacb = (*this->localDistributionsH2)(D3Q27System::ET_NW, x1p, x2, x3);
+ // mfcbc = (*this->localDistributionsH2)(D3Q27System::ET_TE, x1, x2, x3);
+ // mfabc = (*this->localDistributionsH2)(D3Q27System::ET_TW, x1p, x2, x3);
+ // mfbcc = (*this->localDistributionsH2)(D3Q27System::ET_TN, x1, x2, x3);
+ // mfbac = (*this->localDistributionsH2)(D3Q27System::ET_TS, x1, x2p, x3);
+ // mfccc = (*this->localDistributionsH2)(D3Q27System::ET_TNE, x1, x2, x3);
+ // mfacc = (*this->localDistributionsH2)(D3Q27System::ET_TNW, x1p, x2, x3);
+ // mfcac = (*this->localDistributionsH2)(D3Q27System::ET_TSE, x1, x2p, x3);
+ // mfaac = (*this->localDistributionsH2)(D3Q27System::ET_TSW, x1p, x2p, x3);
+ // mfabb = (*this->nonLocalDistributionsH2)(D3Q27System::ET_W, x1p, x2, x3);
+ // mfbab = (*this->nonLocalDistributionsH2)(D3Q27System::ET_S, x1, x2p, x3);
+ // mfbba = (*this->nonLocalDistributionsH2)(D3Q27System::ET_B, x1, x2, x3p);
+ // mfaab = (*this->nonLocalDistributionsH2)(D3Q27System::ET_SW, x1p, x2p, x3);
+ // mfcab = (*this->nonLocalDistributionsH2)(D3Q27System::ET_SE, x1, x2p, x3);
+ // mfaba = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BW, x1p, x2, x3p);
+ // mfcba = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BE, x1, x2, x3p);
+ // mfbaa = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BS, x1, x2p, x3p);
+ // mfbca = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BN, x1, x2, x3p);
+ // mfaaa = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSW, x1p, x2p, x3p);
+ // mfcaa = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSE, x1, x2p, x3p);
+ // mfaca = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNW, x1p, x2, x3p);
+ // mfcca = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNE, x1, x2, x3p);
+ // mfbbb = (*this->zeroDistributionsH2)(x1, x2, x3);
+
+ //}
+
+ //real rhoH = 1.0;
+ //real rhoL = 1.0 / densityRatio;
+
+ 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;
+
+
+ //real pushInterface = 2.0;
+ //collFactorM = collFactorL + (collFactorL - collFactorG) * (phi[DIR_000] - phiH) / (phiH - phiL);
+ //collFactorM = collFactorL + (collFactorL - collFactorG) * (tanh(pushInterface * (c2o1 * phi[DIR_000] - c1o1)) / tanh(pushInterface) * c1o2 + c1o2 - phiH) / (phiH - phiL);
+ collFactorM = phi[DIR_000] > c1o2 ? collFactorL : collFactorG;
+ //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();
+
+ //----------- Calculating Macroscopic Values -------------
+ real rho = phi[DIR_000] > c1o2 ? rhoH : rhoL;//rhoH + rhoToPhi * (phi[DIR_000] - phiH); //Incompressible
+
+ //real rho = rhoH + rhoToPhi * (tanh(pushInterface*(c2o1*phi[DIR_000]-c1o1))/tanh(pushInterface)*c1o2 +c1o2 - phiH); //Incompressible
+ ///scaled phase field
+ //real rho = rhoH + rhoToPhi * ((*phaseField)(x1, x2, x3) * (*phaseField)(x1, x2, x3) / ((*phaseField)(x1, x2, x3) * (*phaseField)(x1, x2, x3) + (c1o1 - (*phaseField)(x1, x2, x3)) * (c1o1 - (*phaseField)(x1, x2, x3))) - phiH);
+ ///!scaled phase field
+
+ //real rho = rhoH + rhoToPhi * (phi[DIR_000] - phiH)+(c1o1-phi[DIR_000])* (*pressure)(x1, x2, x3)*c3o1; //compressible
+ //real rho = rhoL + (rhoH - rhoL) * phi[DIR_000] + (c1o1 - phi[DIR_000]) * (*pressure)(x1, x2, x3) * c3o1; //compressible
+
+ 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;
+ ////Filter&Gradient merged
+ //real pressureHere = (*pressureOld)(x1, x2, x3);
+ //real pressureHere = (*pressure)(x1, x2, x3);
+
+ //real arrayP[3][3][3] = { {{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere}},
+ // {{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere}},
+ // { {pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere}} };
+ //real LaplaceP = 0.0;
+ //LaplaceP += WEIGTH[DIR_PPP] * (((((*pressureOld)(x1+1,x2+1,x3+1) - pressureHere) + ((*pressureOld)(x1 - 1, x2 - 1, x3 - 1) - pressureHere)) + (((*pressureOld)(x1 + 1, x2 + 1, x3 - 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2 - 1, x3 + 1) - pressureHere)))
+ // + ((((*pressureOld)(x1 + 1, x2 - 1, x3 + 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2 + 1, x3 - 1) - pressureHere)) + (((*pressureOld)(x1 + 1, x2 - 1, x3 - 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2 + 1, x3 + 1) - pressureHere))));
+ //LaplaceP += WEIGTH[DIR_0PP] * (
+ // ((((*pressureOld)(x1 + 1, x2 + 1, x3) - pressureHere) + ((*pressureOld)(x1 - 1, x2 - 1, x3) - pressureHere)) + (((*pressureOld)(x1 + 1, x2 - 1, x3) - pressureHere) + ((*pressureOld)(x1 - 1, x2 + 1, x3) - pressureHere)))
+ // + ((((*pressureOld)(x1 + 1, x2, x3 + 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2, x3 -1) - pressureHere)) + (((*pressureOld)(x1 + 1, x2, x3 - 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2, x3 + 1) - pressureHere)))
+ // + ((((*pressureOld)(x1, x2 + 1, x3 + 1) - pressureHere) + ((*pressureOld)(x1, x2 - 1, x3 - 1) - pressureHere)) + (((*pressureOld)(x1, x2 + 1, x3 - 1) - pressureHere) + ((*pressureOld)(x1, x2 - 1, x3 + 1) - pressureHere)))
+ // );
+ //LaplaceP += WEIGTH[DIR_00P] * (
+ // (((*pressureOld)(x1 + 1, x2, x3) - pressureHere) + ((*pressureOld)(x1, x2-1, x3) - pressureHere))
+ // + (((*pressureOld)(x1, x2 + 1, x3) - pressureHere) + ((*pressureOld)(x1, x2 - 1, x3) - pressureHere))
+ // + (((*pressureOld)(x1, x2, x3 + 1) - pressureHere) + ((*pressureOld)(x1, x2, x3 - 1) - pressureHere))
+ // );
+
+ //LaplaceP= 6.0 * LaplaceP;
+
+ //real sum = 0.0;
+
+// for (int dir1 = -1; dir1 <= 1; dir1++) {
+// for (int dir2 = -1; dir2 <= 1; dir2++) {
+// for (int dir3 = -1; dir3 <= 1; dir3++){
+// int xxx = x1 + dir1;
+// int yyy = x2 + dir2;
+// int zzz = x3 + dir3;
+// if (!bcArray->isSolid(xxx, yyy, zzz) && !bcArray->isUndefined(xxx, yyy, zzz)) arrayP[dir1 + 1][dir2 + 1][dir3 + 1] = (*pressureOld)(xxx, yyy, zzz);
+// //if (!bcArray->isSolid(xxx, yyy, zzz) && !bcArray->isUndefined(xxx, yyy, zzz)) arrayP[dir1 + 1][dir2 + 1][dir3 + 1] = (*pressure)(xxx, yyy, zzz);
+// // sum += 64.0 / (216.0 * (c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)) * (c1o1 + c3o1 * abs(dir3))) * arrayP[dir1 + 1][dir2 + 1][dir3 + 1];
+// }
+// }
+// }
+//// (*pressure)(x1, x2, x3) = sum;// *0.1 + (1.0 - 0.1) * (*pressureOld)(x1, x2, x3);
+//
+//
+// (*pressure)(x1, x2, x3) = (((((arrayP[0][0][0] + arrayP[2][2][2]) + (arrayP[0][2][0] + arrayP[2][0][2])) + ((arrayP[2][0][0] + arrayP[0][2][2]) + (arrayP[2][2][0] + arrayP[0][0][2]))) * c1o216
+// + (((arrayP[0][0][1] + arrayP[2][2][1]) + (arrayP[0][1][0] + arrayP[2][1][2])) + ((arrayP[1][0][0] + arrayP[1][2][2]) + (arrayP[0][1][2] + arrayP[2][1][0])) + ((arrayP[1][0][2] + arrayP[1][2][0]) + (arrayP[0][2][1] + arrayP[2][0][1]))) * c1o54)
+// + ((arrayP[0][1][1] + arrayP[2][1][1]) + (arrayP[1][0][1] + arrayP[1][2][1]) + (arrayP[1][1][0] + arrayP[1][1][2])) * c2o27)
+// + arrayP[1][1][1] * c8o27;
+ //real gradPx = 0.0;
+ //real gradPy = 0.0;
+ //real gradPz = 0.0;
+ //for (int dir1 = -1; dir1 <= 1; dir1++) {
+ // for (int dir2 = -1; dir2 <= 1; dir2++) {
+ // gradPx -= arrayP[0][dir1+1][dir2+1] * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // gradPx += arrayP[2][dir1+1][dir2+1] * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+
+
+
+ // gradPy -= arrayP[dir1+1][0][dir2+1] * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // gradPy += arrayP[dir1+1][2][dir2+1] * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ //
+
+ // gradPz -= arrayP[dir1+1][dir2+1][0] * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // gradPz += arrayP[dir1+1][dir2+1][2] * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ //}
+
+ //real gradPx = ((((arrayP[2][0][0] - arrayP[0][2][2]) + (arrayP[2][2][0] - arrayP[0][0][2])) + ((arrayP[2][2][2] - arrayP[0][0][0]) + (arrayP[2][0][2] - arrayP[0][2][0]))) * c1o72
+ // + (((arrayP[2][1][0] - arrayP[0][1][2]) + (arrayP[2][2][1] - arrayP[0][0][1])) + ((arrayP[2][0][1] - arrayP[0][2][1]) + (arrayP[2][1][2] - arrayP[0][1][0]))) * c1o18)
+ // + (arrayP[2][1][1] - arrayP[0][1][1]) * c2o9;
+ //real gradPy = ((((arrayP[0][2][0] - arrayP[2][0][2]) + (arrayP[2][2][0] - arrayP[0][0][2])) + ((arrayP[2][2][2] - arrayP[0][0][0]) + (arrayP[0][2][2] - arrayP[2][0][0]))) * c1o72
+ // + (((arrayP[1][2][0] - arrayP[1][0][2]) + (arrayP[2][2][1] - arrayP[0][0][1])) + ((arrayP[0][2][1] - arrayP[2][0][1]) + (arrayP[1][2][2] - arrayP[1][0][0]))) * c1o18)
+ // + (arrayP[1][2][1] - arrayP[1][0][1]) * c2o9;
+ //real gradPz = ((((arrayP[0][0][2] - arrayP[2][2][0]) + (arrayP[0][2][2] - arrayP[2][0][0])) + ((arrayP[2][2][2] - arrayP[0][0][0]) + (arrayP[2][0][2] - arrayP[0][2][0]))) * c1o72
+ // + (((arrayP[0][1][2] - arrayP[2][1][0]) + (arrayP[1][2][2] - arrayP[1][0][0])) + ((arrayP[1][0][2] - arrayP[1][2][0]) + (arrayP[2][1][2] - arrayP[0][1][0]))) * c1o18)
+ // + (arrayP[1][1][2] - arrayP[1][1][0]) * c2o9;
+
+ //gradPx *=c1o1 - (*pressure)(x1, x2, x3)+pressureHere;
+ //gradPy *=c1o1 - (*pressure)(x1, x2, x3) + pressureHere;
+ //gradPz *=c1o1 - (*pressure)(x1, x2, x3) + pressureHere;
+
+ ////!Filter&Gradient merged
+ //real gradPx = 0.0;
+ //real gradPy = 0.0;
+ //real gradPz = 0.0;
+ //for (int dir1 = -1; dir1 <= 1; dir1++) {
+ // for (int dir2 = -1; dir2 <= 1; dir2++) {
+ // int yyy = x2 + dir1;
+ // int zzz = x3 + dir2;
+ // if (!bcArray->isSolid(x1-1, yyy, zzz) && !bcArray->isUndefined(x1-1, yyy, zzz)) {
+ // gradPx -= (*pressure)(x1 - 1, yyy, zzz) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // else {
+ // gradPx -= (*pressure)(x1, x2, x3) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // if (!bcArray->isSolid(x1 + 1, yyy, zzz) && !bcArray->isUndefined(x1 + 1, yyy, zzz)) {
+ // gradPx += (*pressure)(x1 + 1, yyy, zzz) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // else {
+ // gradPx += (*pressure)(x1, x2, x3) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+
+ // int xxx = x1 + dir1;
+ // if (!bcArray->isSolid(xxx, x2-1, zzz) && !bcArray->isUndefined(xxx, x2-1, zzz)) {
+ // gradPy -= (*pressure)(xxx, x2-1, zzz) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // else {
+ // gradPy -= (*pressure)(x1, x2, x3) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // if (!bcArray->isSolid(xxx, x2+1, zzz) && !bcArray->isUndefined(xxx, x2+1, zzz)) {
+ // gradPy += (*pressure)(xxx, x2+1, zzz) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // else {
+ // gradPy += (*pressure)(x1, x2, x3) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+
+ // yyy = x2 + dir2;
+ // if (!bcArray->isSolid(xxx, yyy, x3-1) && !bcArray->isUndefined(xxx, yyy, x3-1)) {
+ // gradPz -= (*pressure)(xxx, yyy, x3-1) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // else {
+ // gradPz -= (*pressure)(x1, x2, x3) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // if (!bcArray->isSolid(xxx, yyy, x3+1) && !bcArray->isUndefined(xxx, yyy, x3+1)) {
+ // gradPz += (*pressure)(xxx, yyy, x3+1) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+ // else {
+ // gradPz += (*pressure)(x1, x2, x3) * c2o9 / ((c1o1 + c3o1 * abs(dir1)) * (c1o1 + c3o1 * abs(dir2)));
+ // }
+
+ // }
+ //}
+
+ //Viscosity increase by phase field residuum
+ //real errPhi = (((1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale)- denom);
+ //real limVis = 0.01;// 0.0000001 * 10;//0.01;
+ // collFactorM =collFactorM/(c1o1+limVis*(errPhi*errPhi)*collFactorM);
+ // collFactorM = (collFactorM < 1.8) ? 1.8 : collFactorM;
+ //errPhi = errPhi * errPhi* errPhi * errPhi * errPhi * errPhi;
+ //collFactorM = collFactorM + (1.8 - collFactorM) * errPhi / (errPhi + limVis);
+
+ //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]));
+
+
+
+ ////external pressure
+ //forcingX1 =/* muForcingX1.Eval()/rho */- gradPx/rho;
+ //forcingX2 =/* muForcingX2.Eval()/rho */- gradPy/rho;
+ //forcingX3 =/* muForcingX3.Eval()/rho */- gradPz/rho;
+
+ ///////////////////////////////////////////////
+
+ //real pBefore = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
+ // + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
+ // + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb) * c1o3;
+ //pBefore = -c1o3 * (-1.0e-10)/((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) );
+ ////if (vvx * vvx + vvy * vvy + vvz * vvz > 1.0e-100) {
+ // mfabb -= pBefore * c2o9 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_P00] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbab -= pBefore * c2o9 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_0P0] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbba -= pBefore * c2o9 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_00P] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfaab -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_PP0] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfcab -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_MP0] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfaba -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_P0P] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfcba -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_M0P] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbaa -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_0PP] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbca -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_0MP] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfaaa -= pBefore * c1o72 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_PPP] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfcaa -= pBefore * c1o72 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_MPP] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfaca -= pBefore * c1o72 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_PMP] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfcca -= pBefore * c1o72 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_MMP] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfcbb -= pBefore * c2o9 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_M00] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbcb -= pBefore * c2o9 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_0M0] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbbc -= pBefore * c2o9 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_00M] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfccb -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_MM0] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfacb -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_PM0] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfcbc -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_M0M] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfabc -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_P0M] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbcc -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_0MM] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbac -= pBefore * c1o18 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_0PM] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfccc -= pBefore * c1o72 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_MMM] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfacc -= pBefore * c1o72 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_PMM] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfcac -= pBefore * c1o72 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_MPM] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfaac -= pBefore * c1o72 * ((rhoL + phi[DIR_000] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[DIR_PPM] * (rhoH - rhoL) / (phiH - phiL)));
+ // mfbbb -= pBefore * 8.0 / 9.0;
+ //}
+
+ ///////////////////////////////////////////////
+
+ //real pStarStart = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
+ // + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
+ // + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb) * c1o3;
+
+ //rho = rhoH + rhoToPhi * ((phi[DIR_000] - phiH)+fabs(pStarStart)*0); //Incompressible
+
+ muRho = rho;
+
+
+ /////////////////////
+
+ vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
+ (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
+ (mfcbb - mfabb)) / rhoRef;
+ vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
+ (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
+ (mfbcb - mfbab)) / rhoRef;
+ vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
+ (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
+ (mfbbc - mfbba)) / rhoRef;
+
+
+ //real dRhoInvX = -(((((mfhccc - mfhaaa) + (mfhcac - mfhaca)) + ((mfhcaa - mfhacc) + (mfhcca - mfhaac))) +
+ // (((mfhcba - mfhabc) + (mfhcbc - mfhaba)) + ((mfhcab - mfhacb) + (mfhccb - mfhaab))) +
+ // (mfhcbb - mfhabb)));
+ //real dRhoInvY = -(((((mfhccc - mfhaaa) + (mfhaca - mfhcac)) + ((mfhacc - mfhcaa) + (mfhcca - mfhaac))) +
+ // (((mfhbca - mfhbac) + (mfhbcc - mfhbaa)) + ((mfhacb - mfhcab) + (mfhccb - mfhaab))) +
+ // (mfhbcb - mfhbab)));
+ //real dRhoInvZ = -(((((mfhccc - mfhaaa) + (mfhcac - mfhaca)) + ((mfhacc - mfhcaa) + (mfhaac - mfhcca))) +
+ // (((mfhbac - mfhbca) + (mfhbcc - mfhbaa)) + ((mfhabc - mfhcba) + (mfhcbc - mfhaba))) +
+ // (mfhbbc - mfhbba)));
+
+
+ forcingX1 = 0.0;
+ forcingX2 = 0.0;
+ forcingX3 = 0.0;
+ //!Abbas
+ //real dX1_rhoInv = gradX1_rhoInv(rhoL, rhoH - rhoL);
+ //real dX2_rhoInv = gradX2_rhoInv(rhoL, rhoH - rhoL);
+ //real dX3_rhoInv = gradX3_rhoInv(rhoL, rhoH - rhoL);
+ //forcingX1 =/* muForcingX1.Eval() / rho*/ +pStar * dX1_rhoInv * rho;
+ //forcingX2 =/* muForcingX2.Eval() / rho*/ +pStar * dX2_rhoInv * rho;
+ //forcingX3 =/* muForcingX3.Eval() / rho*/ +pStar * dX3_rhoInv * rho;
+
+ //forcingX1 = (-pStar * dX1_phi * rhoToPhi / rho + pStar * dX1_rhoInv * rho) *c1o2;
+ //forcingX2 = (-pStar * dX2_phi * rhoToPhi / rho + pStar * dX2_rhoInv * rho) *c1o2;
+ //forcingX3 = (-pStar * dX3_phi * rhoToPhi / rho + pStar * dX3_rhoInv * rho) *c1o2;
+ //real FdX1_phi = normX1 * (1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale;
+ //real FdX2_phi = normX2 * (1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale;
+ //real FdX3_phi = normX3 * (1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale;
+
+
+ //forcingX1 = (-pStar * dX1_phi * rhoToPhi / rho ) ;
+ //forcingX2 = (-pStar * dX2_phi * rhoToPhi / rho ) ;
+ //forcingX3 = (-pStar * dX3_phi * rhoToPhi / rho ) ;
+
+ //forcingX1 = (pStar * dRhoInvX* rho *c3o1) ;
+ //forcingX2 = (pStar * dRhoInvY* rho *c3o1) ;
+ //forcingX3 = (pStar * dRhoInvZ* rho *c3o1) ;
+ //if (phi[DIR_000] > 0.1 && phi[DIR_000] < 0.9) std::cout << phi[DIR_000] << " " << dX1_phi * rhoToPhi / rho << " " << dRhoInvX * rho *3<< std::endl;
+ //real forcingX1ALTERNAT = ( pStar * dX1_rhoInv * rho) ;
+ //real forcingX2ALTERNAT = ( pStar * dX2_rhoInv * rho) ;
+ //real forcingX3ALTERNAT = ( pStar * dX3_rhoInv * rho) ;
+
+ //forcingX1 = (fabs(vvx + c1o2 * forcingX1) < fabs(vvx + c1o2 * forcingX1ALTERNAT)) ? forcingX1 : forcingX1ALTERNAT;
+ //forcingX2 = (fabs(vvy + c1o2 * forcingX2) < fabs(vvy + c1o2 * forcingX2ALTERNAT)) ? forcingX2 : forcingX2ALTERNAT;
+ //forcingX3 = (fabs(vvz + c1o2 * forcingX3) < fabs(vvz + c1o2 * forcingX3ALTERNAT)) ? forcingX3 : forcingX3ALTERNAT;
+
+ // forcingX1 = -pStar * rhoToPhi / rho * normX1 * (1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale;
+ // forcingX2 = -pStar * rhoToPhi / rho * normX2 * (1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale;
+ // forcingX3 = -pStar * rhoToPhi / rho * normX3 * (1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale;
+
+ //forcingX1 = (-pStar * dX1_phi * rhoToPhi / rho *(c1o1- phi[DIR_000]) + pStar * dX1_rhoInv * rho*(phi[DIR_000]));
+ //forcingX2 = (-pStar * dX2_phi * rhoToPhi / rho *(c1o1- phi[DIR_000]) + pStar * dX2_rhoInv * rho*(phi[DIR_000]));
+ //forcingX3 = (-pStar * dX3_phi * rhoToPhi / rho *(c1o1- phi[DIR_000]) + pStar * dX3_rhoInv * rho*(phi[DIR_000]));
+ //if (phi[DIR_000] > 0.3 && phi[DIR_000] < 0.7)
+ //{
+ // int test = 1;
+ // std::cout << phi[DIR_000] <<" "<< dX1_phi <<" "<< normX1 * (1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale<<" "<< normX1 * (1.0 - phi[DIR_000]) * (phi[DIR_000]) * oneOverInterfaceScale/ dX1_phi<< std::endl;
+ //}
+
+
+
+ //real scaleGrad = c2o1 * phi[DIR_000] * (1.0 - phi[DIR_000]) / ((phi[DIR_000] * phi[DIR_000] + (1.0 - phi[DIR_000]) * (1.0 - phi[DIR_000])) * (phi[DIR_000] * phi[DIR_000] + (1.0 - phi[DIR_000]) * (1.0 - phi[DIR_000])));
+ //dX1_phi *= scaleGrad;
+ //dX2_phi *= scaleGrad;
+ //dX3_phi *= scaleGrad;
+
+ ///Experimental interface sharpening force 20.06.2022
+
+ //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;
+ ///surface tension force
+ //forcingX1 += mu * dX1_phi/rho;
+ //forcingX2 += mu * dX2_phi/rho;
+ //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];
+
+ // //19.08.2022
+ //vvx += vvxh / rho * c1o2;
+ //vvy += vvyh / rho * c1o2;
+ //vvz += vvzh / rho * c1o2;
+ // //
+
+
+ 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
+ //vvz += (forcingX3 + muForcingX3.Eval() / rho) * deltaT * c1o2; // Z
+
+
+
+ // vvx += (forcingX1 + muForcingX1.Eval() / rho) * deltaT * forcingBIAS; // X
+ // vvy += (forcingX2 + muForcingX2.Eval() / rho) * deltaT * forcingBIAS; // Y
+ // vvz += (forcingX3 + muForcingX3.Eval() / rho) * deltaT * forcingBIAS; // Z
+
+
+
+
+ real vx2;
+ real vy2;
+ real vz2;
+ vx2 = vvx * vvx;
+ vy2 = vvy * vvy;
+ vz2 = vvz * vvz;
+ //pStar =ppStar- (vx2 + vy2 + vz2)*pStar;
+ // pStar = (pStar + ppStar)*c1o2;
+ ///////////////////////////////////////////////////////////////////////////////////////////
+ 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.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 = 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;
+ // if (phi[DIR_000] > c1o2 && (*phaseFieldOld)(x1, x2, x3) <= c1o2) collFactorM = 1.8;
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //! - 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.;
+
+ //collFactorM+= (1.7 - collFactorM) * fabs(mfaaa) / (fabs(mfaaa) + 0.001f);
+ //////
+ //M110 -= vvx * vvy - mfbba;
+ //M101 -= vvx * vvz - mfbab;
+ //M011 -= vvy * vvz - mfabb;
+
+
+
+ //M200 -= vx2;
+ //M020 -= vy2;
+ //M002 -= vz2;
+ //real Mp = (M200 + M020 + M002);
+
+
+
+ //M200 -= c1o3 * Mp;
+ //M020 -= c1o3 * Mp;
+ //M002 -= c1o3 * Mp;
+
+ //M200 -= -mfcaa + (mfcaa + mfaca + mfaac) * c1o3;
+ //M020 -= -mfaca + (mfcaa + mfaca + mfaac) * c1o3;
+ //M002 -= -mfaac + (mfcaa + mfaca + mfaac) * c1o3;
+
+ /////
+
+ /////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));
+ //real stress = 1.0;// stress / (stress + 1.0e-10);
+ //stress = 1.0;
+ //OxyyPxzz += stress*(1.0-OxyyPxzz);
+ //OxyyPxzz = c3o1 * (collFactorM - c2o1) / (collFactorM - c3o1);
+ //OxyyMxzz += stress*(1.0-OxyyMxzz);
+ //Oxyz += stress*(1.0-Oxyz);
+ //A *= 1.0-stress;
+ //BB *= 1.0-stress;
+
+ //Cum 4.
+ //real CUMcbb = mfcbb - ((mfcaa + c1o3 * oMdrho) * mfabb + 2. * mfbba * mfbab); // till 18.05.2015
+ //real CUMbcb = mfbcb - ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb); // till 18.05.2015
+ //real CUMbbc = mfbbc - ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb); // till 18.05.2015
+
+ 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;
+ //pStar = (mxxPyyPzz+vx2+vy2+vz2) * c1o3;//does not work
+ //pStar = (mxxPyyPzz) * c1o3;
+ //pStar = pStar + 1.5 * (mxxPyyPzz * c1o3 - pStar);
+ //mfaaa = mxxPyyPzz;
+ // real mfaaaS = (mfaaa * (-4 - 3 * OxxPyyPzz * (-1 + rho)) + 6 * mxxPyyPzz * OxxPyyPzz * (-1 + rho)) / (-4 + 3 * OxxPyyPzz * (-1 + rho));
+ mxxPyyPzz -= mfaaa ;//12.03.21 shifted by mfaaa
+ //mxxPyyPzz-=(mfaaa+mfaaaS)*c1o2;//12.03.21 shifted by mfaaa
+ //dirty (04.04.2023)
+ //if (phi[DIR_000] > c1o2 &&(dX1_phi*vvx+dX2_phi*vvy+dX3_phi*vvz)<0) {
+ // //collFactorM = c1o1 / (c1o1 / collFactorM +1e10* fabsf(mxxPyyPzz)*(c1o1-fabsf(phi[DIR_000])));
+ // collFactorM = c1o1 / (c1o1 / collFactorM - 1e15*(dX1_phi * vvx + dX2_phi * vvy + dX3_phi * vvz)* fabsf(mxxPyyPzz) );
+ // 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));
+
+ //}
+ 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)&& (normX1 * vvx + normX2 * vvy + normX3 * vvz < 0)){//&& ((*phaseFieldOld)(x1, x2, x3) <= c1o2)) {
+ // //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);
+ // //if (nuEddy > c1o1 / collFactorM) std::cout << nuEddy <<" "<< fabsf(dxux + dyuy + dzuz)<< "\n";
+ // nuEddy = (nuEddy < c1o1 / collFactorM) ? c1o1 / collFactorM : nuEddy;
+ // collFactorM = c1o1 / nuEddy;
+ // //collFactorM = 1.8;
+ // //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));
+
+ //}
+ ///////
+ real mxxMyyh = -c2o1 * (dxux - dyuy) / collFactorMInv * c1o3;
+ real mxxMzzh = -c2o1 * (dxux - dzuz) / collFactorMInv * c1o3;
+// mfhbba = -Dxy / collFactorMInv*c1o3;
+// mfhbab = -Dxz / collFactorMInv * c1o3;
+// mfhabb = -Dyz / collFactorMInv * c1o3;
+
+// // attempt to improve implicit stress computation by fixed iteration
+// real dX2_rho = (rhoToPhi)*dX2_phi;
+// real dX1_rho = (rhoToPhi)*dX1_phi;
+// real dX3_rho = (rhoToPhi)*dX3_phi;
+//
+// real dfx= c1o3 * (c1o1 / collFactorM - c1o2) *(2 * dxux * dX1_rho + Dxy * dX2_rho + Dxz * dX3_rho) / (rho);
+// real dfy = c1o3 * (c1o1 / collFactorM - c1o2) *(Dxy * dX1_rho + 2 * dyuy * dX2_rho + Dyz * dX3_rho) / (rho);
+// real dfz = c1o3 * (c1o1 / collFactorM - c1o2) *(Dxz * dX1_rho + Dyz * dX2_rho + 2 * dyuy * dX3_rho) / (rho);
+//
+// for (int iteration = 0; iteration < 5; iteration++) {
+// mxxMyy = (mfcaa - dfx * dfx * c1o2) - (mfaca - dfy * dfy * c1o2);
+// mxxMzz = (mfcaa - dfx * dfx * c1o2) - (mfaac - dfz * dfz * c1o2);
+// }
+/////end fixed iteration
+//
+
+
+ //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);
+
+// mfhaaa = (phi[DIR_000] < c1o2) ? mfaaa * rhoL / rhoH : mfaaa * rhoL / rhoH;
+ mxxMyyh += collFactorMInv * (-mxxMyyh) - 3. * (1. - c1o2 * collFactorMInv) * (vx2 * dxux - vy2 * dyuy);
+ mxxMzzh += collFactorMInv * (-mxxMzzh) - 3. * (1. - c1o2 * collFactorMInv) * (vx2 * dxux - vz2 * dzuz);
+
+ //mfhabb += collFactorMInv * (-mfhabb);
+ //mfhbab += collFactorMInv * (-mfhbab);
+ //mfhbba += collFactorMInv * (-mfhbba);
+
+ //mfhcaa = c1o3 * (mxxMyyh + mxxMzzh + mfhaaa);
+ //mfhaca = c1o3 * (-2. * mxxMyyh + mxxMzzh + mfhaaa);
+ //mfhaac = c1o3 * (mxxMyyh - 2. * mxxMzzh + mfhaaa);
+
+
+ //if (fabsf(mfaaa + (dxux + dyuy + dzuz) > 1e-9)){
+ // std::cout << mfaaa <<" "<< (dxux + dyuy + dzuz)<< std::endl;
+ //}
+
+
+ ////updated pressure
+ //mfaaa += (dX1_phi * vvx + dX2_phi * vvy + dX3_phi * vvz) * correctionScaling;
+ //mfaaa *= (c1o1-omegaDRho);// (mfaaa + (dxux + dyuy + dzuz)) * .5; // Pressure elimination as in standard velocity model
+ // mfaaa += (rho - c1o1) * (dxux + dyuy + 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 * oMdrho) * mfabb + 2. * mfbba * mfbab); // till 18.05.2015
+ //mfbcb = CUMbcb + ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb); // till 18.05.2015
+ //mfbbc = CUMbbc + ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb); // till 18.05.2015
+
+ 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;
+
+
+ ////////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;
+
+
+ ////////////////////////////////////////////////////////////////////////////////////
+ //forcing
+ mfbaa = -mfbaa;// *(c1o1 - forcingBIAS) / forcingBIAS;
+ mfaba = -mfaba;// *(c1o1 - forcingBIAS) / forcingBIAS;
+ mfaab = -mfaab;// *(c1o1 - forcingBIAS) / forcingBIAS;
+
+
+ //mfhbaa = mfbaa;
+ //mfhaba = mfaba;
+ //mfhaab = mfaab;
+
+ //mfhcba = 0.;
+ //mfhabc = 0.;
+ //mfhcab = 0.;
+ //mfhacb = 0.;
+ //mfhbca = 0.;
+ //mfhbac = 0.;
+ //mfhbbb = 0.;
+
+ //real oMdrhoInv = (rhoRef - (mfhaaa )) / rhoRef;
+ //mfhcbb =/* CUMcbb + */((mfhcaa + c1o3) * mfhabb + 2. * mfhbba * mfhbab);
+ //mfhbcb =/* CUMbcb + */((mfhaca + c1o3) * mfhbab + 2. * mfhbba * mfhabb);
+ //mfhbbc =/* CUMbbc + */((mfhaac + c1o3) * mfhbba + 2. * mfhbab * mfhabb);
+
+ //mfhcca = /*CUMcca + */(mfhcaa * mfhaca + 2. * mfhbba * mfhbba) + c1o3 * (mfhcaa + mfhaca) * oMdrhoInv + c1o9 * (oMdrhoInv - c1o1) * oMdrhoInv;
+ //mfhcac = /*CUMcac + */(mfhcaa * mfhaac + 2. * mfhbab * mfhbab) + c1o3 * (mfhcaa + mfhaac) * oMdrhoInv + c1o9 * (oMdrhoInv - c1o1) * oMdrhoInv;
+ //mfhacc = /*CUMacc + */(mfhaac * mfhaca + 2. * mfhabb * mfhabb) + c1o3 * (mfhaac + mfhaca) * oMdrhoInv + c1o9 * (oMdrhoInv - c1o1) * oMdrhoInv;
+
+ ////5.
+ //mfhbcc = /*CUMbcc +*/ (mfhaac * mfhbca + mfhaca * mfhbac + 4. * mfhabb * mfhbbb + 2. * (mfhbab * mfhacb + mfhbba * mfhabc)) + c1o3 * (mfhbca + mfhbac) * oMdrhoInv;
+ //mfhcbc = /*CUMcbc +*/ (mfhaac * mfhcba + mfhcaa * mfhabc + 4. * mfhbab * mfhbbb + 2. * (mfhabb * mfhcab + mfhbba * mfhbac)) + c1o3 * (mfhcba + mfhabc) * oMdrhoInv;
+ //mfhccb = /*CUMccb +*/ (mfhcaa * mfhacb + mfhaca * mfhcab + 4. * mfhbba * mfhbbb + 2. * (mfhbab * mfhbca + mfhabb * mfhcba)) + c1o3 * (mfhacb + mfhcab) * oMdrhoInv;
+
+ ////6.
+ //mfhccc = /*CUMccc */- ((-4. * mfhbbb * mfhbbb
+ // - (mfhcaa * mfhacc + mfhaca * mfhcac + mfhaac * mfhcca)
+ // - 4. * (mfhabb * mfhcbb + mfhbac * mfhbca + mfhbba * mfhbbc)
+ // - 2. * (mfhbca * mfhbac + mfhcba * mfhabc + mfhcab * mfhacb))
+ // + (4. * (mfhbab * mfhbab * mfhaca + mfhabb * mfhabb * mfhcaa + mfhbba * mfhbba * mfhaac)
+ // + 2. * (mfhcaa * mfhaca * mfhaac)
+ // + 16. * mfhbba * mfhbab * mfhabb)
+ // - c1o3 * (mfhacc + mfhcac + mfhcca) * oMdrhoInv - c1o9 * oMdrhoInv * oMdrhoInv
+ // - c1o9 * (mfhcaa + mfhaca + mfhaac) * oMdrhoInv * (1. - 2. * oMdrhoInv) - c1o27 * oMdrhoInv * oMdrhoInv * (-2. * oMdrhoInv)
+ // + (2. * (mfhbab * mfhbab + mfhabb * mfhabb + mfhbba * mfhbba)
+ // + (mfhaac * mfhaca + mfhaac * mfhcaa + mfhaca * mfhcaa)) * c2o3 * oMdrhoInv) - c1o27 * oMdrhoInv;
+
+
+
+
+
+ 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);
+
+
+
+
+
+ //backwardInverseChimeraWithKincompressible(mfhaaa, mfhbaa, mfhcaa, vvx, vx2, c1o1, c1o1, oMdrhoInv);
+ //backwardChimera(mfhaba, mfhbba, mfhcba, vvx, vx2);
+ //backwardInverseChimeraWithKincompressible(mfhaca, mfhbca, mfhcca, vvx, vx2, c3o1, c1o3, oMdrhoInv);
+ //backwardChimera(mfhaab, mfhbab, mfhcab, vvx, vx2);
+ //backwardChimera(mfhabb, mfhbbb, mfhcbb, vvx, vx2);
+ //backwardChimera(mfhacb, mfhbcb, mfhccb, vvx, vx2);
+ //backwardInverseChimeraWithKincompressible(mfhaac, mfhbac, mfhcac, vvx, vx2, c3o1, c1o3, oMdrhoInv);
+ //backwardChimera(mfhabc, mfhbbc, mfhcbc, vvx, vx2);
+ //backwardInverseChimeraWithKincompressible(mfhacc, mfhbcc, mfhccc, vvx, vx2, c9o1, c1o9, oMdrhoInv);
+
+ //////////////////////////////////////////////////////////////////////////////////////
+ //// Y - Dir
+ //backwardInverseChimeraWithKincompressible(mfhaaa, mfhaba, mfhaca, vvy, vy2, c6o1, c1o6, oMdrhoInv);
+ //backwardChimera(mfhaab, mfhabb, mfhacb, vvy, vy2);
+ //backwardInverseChimeraWithKincompressible(mfhaac, mfhabc, mfhacc, vvy, vy2, c18o1, c1o18, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhbaa, mfhbba, mfhbca, vvy, vy2, c3o2, c2o3, oMdrhoInv);
+ //backwardChimera(mfhbab, mfhbbb, mfhbcb, vvy, vy2);
+ //backwardInverseChimeraWithKincompressible(mfhbac, mfhbbc, mfhbcc, vvy, vy2, c9o2, c2o9, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhcaa, mfhcba, mfhcca, vvy, vy2, c6o1, c1o6, oMdrhoInv);
+ //backwardChimera(mfhcab, mfhcbb, mfhccb, vvy, vy2);
+ //backwardInverseChimeraWithKincompressible(mfhcac, mfhcbc, mfhccc, vvy, vy2, c18o1, c1o18, oMdrhoInv);
+
+ //////////////////////////////////////////////////////////////////////////////////////
+ //// Z - Dir
+ //backwardInverseChimeraWithKincompressible(mfhaaa, mfhaab, mfhaac, vvz, vz2, c36o1, c1o36, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhaba, mfhabb, mfhabc, vvz, vz2, c9o1, c1o9, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhaca, mfhacb, mfhacc, vvz, vz2, c36o1, c1o36, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhbaa, mfhbab, mfhbac, vvz, vz2, c9o1, c1o9, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhbba, mfhbbb, mfhbbc, vvz, vz2, c9o4, c4o9, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhbca, mfhbcb, mfhbcc, vvz, vz2, c9o1, c1o9, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhcaa, mfhcab, mfhcac, vvz, vz2, c36o1, c1o36, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhcba, mfhcbb, mfhcbc, vvz, vz2, c9o1, c1o9, oMdrhoInv);
+ //backwardInverseChimeraWithKincompressible(mfhcca, mfhccb, mfhccc, vvz, vz2, c36o1, c1o36, oMdrhoInv);
+
+ /////////////////////
+
+ //////////////////////////////////////////////////////////////////////////
+ //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;
+ // //real dif = fabs(drho - rho_post);
+ // real dif = drho + (dX1_phi * vvx + dX2_phi * vvy + dX3_phi * vvz) * correctionScaling - rho_post;
+ //#ifdef SINGLEPRECISION
+ // if (dif > 10.0E-7 || dif < -10.0E-7)
+ //#else
+ // if (dif > 10.0E-15 || dif < -10.0E-15)
+ //#endif
+ // {
+ // UB_THROW(UbException(UB_EXARGS, "drho=" + UbSystem::toString(drho) + ", rho_post=" + UbSystem::toString(rho_post)
+ // + " dif=" + UbSystem::toString(dif)
+ // + " drho is not correct for node " + UbSystem::toString(x1) + "," + UbSystem::toString(x2) + "," + UbSystem::toString(x3)));
+ // //UBLOG(logERROR,"LBMKernelETD3Q27CCLB::collideAll(): drho is not correct for node "+UbSystem::toString(x1)+","+UbSystem::toString(x2)+","+UbSystem::toString(x3));
+ // //exit(EXIT_FAILURE);
+ // }
+ //#endif
+
+ 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->zeroDistributionsF)(x1, x2, x3) = mfbbb;// *rho* c1o3;
+
+
+ //(*this->localDistributionsH2)(D3Q27System::ET_E, x1, x2, x3) = mfhabb;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_N, x1, x2, x3) = mfhbab;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_T, x1, x2, x3) = mfhbba;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_NE, x1, x2, x3) = mfhaab;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_NW, x1p, x2, x3) = mfhcab;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_TE, x1, x2, x3) = mfhaba;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_TW, x1p, x2, x3) = mfhcba;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_TN, x1, x2, x3) = mfhbaa;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_TS, x1, x2p, x3) = mfhbca;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_TNE, x1, x2, x3) = mfhaaa;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_TNW, x1p, x2, x3) = mfhcaa;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_TSE, x1, x2p, x3) = mfhaca;//* rho * c1o3;
+ //(*this->localDistributionsH2)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfhcca;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_W, x1p, x2, x3) = mfhcbb;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_S, x1, x2p, x3) = mfhbcb;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_B, x1, x2, x3p) = mfhbbc;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_SW, x1p, x2p, x3) = mfhccb;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_SE, x1, x2p, x3) = mfhacb;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_BW, x1p, x2, x3p) = mfhcbc;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_BE, x1, x2, x3p) = mfhabc;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_BS, x1, x2p, x3p) = mfhbcc;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_BN, x1, x2, x3p) = mfhbac;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfhccc;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfhacc;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfhcac;//* rho * c1o3;
+ //(*this->nonLocalDistributionsH2)(D3Q27System::ET_BNE, x1, x2, x3p) = mfhaac;//* rho * c1o3;
+
+ //(*this->zeroDistributionsH2)(x1, x2, x3) = mfhbbb;// *rho* c1o3;
+ // }
+
+
+ // else {
+ // (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3) = mfhabb;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3) = mfhbab;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3) = mfhbba;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3) = mfhaab;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3) = mfhcab;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3) = mfhaba;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3) = mfhcba;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3) = mfhbaa;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3) = mfhbca;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3) = mfhaaa;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3) = mfhcaa;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3) = mfhaca;//* rho * c1o3;
+ // (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfhcca;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3) = mfhcbb;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3) = mfhbcb;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p) = mfhbbc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3) = mfhccb;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3) = mfhacb;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p) = mfhcbc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p) = mfhabc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p) = mfhbcc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p) = mfhbac;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfhccc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfhacc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfhcac;//* rho * c1o3;
+ // (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p) = mfhaac;//* rho * c1o3;
+
+ // (*this->zeroDistributionsF)(x1, x2, x3) = mfhbbb;// *rho* c1o3;
+
+
+ // (*this->localDistributionsH2)(D3Q27System::ET_E, x1, x2, x3) = mfabb;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_N, x1, x2, x3) = mfbab;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_T, x1, x2, x3) = mfbba;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_NE, x1, x2, x3) = mfaab;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_NW, x1p, x2, x3) = mfcab;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_TE, x1, x2, x3) = mfaba;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_TW, x1p, x2, x3) = mfcba;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_TN, x1, x2, x3) = mfbaa;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_TS, x1, x2p, x3) = mfbca;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_TNE, x1, x2, x3) = mfaaa;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_TNW, x1p, x2, x3) = mfcaa;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_TSE, x1, x2p, x3) = mfaca;//* rho * c1o3;
+ // (*this->localDistributionsH2)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfcca;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_W, x1p, x2, x3) = mfcbb;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_S, x1, x2p, x3) = mfbcb;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_B, x1, x2, x3p) = mfbbc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_SW, x1p, x2p, x3) = mfccb;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_SE, x1, x2p, x3) = mfacb;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_BW, x1p, x2, x3p) = mfcbc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_BE, x1, x2, x3p) = mfabc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_BS, x1, x2p, x3p) = mfbcc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_BN, x1, x2, x3p) = mfbac;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfccc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfacc;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfcac;//* rho * c1o3;
+ // (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNE, x1, x2, x3p) = mfaac;//* rho * c1o3;
+
+ // (*this->zeroDistributionsH2)(x1, x2, x3) = mfbbb;// *rho* c1o3;
+ //}
+ // !Old Kernel
+///////////////////// 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->zeroDistributionsH1)(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;
+
+ //25.03.2023 mixed normals
+ real MomX1 = vvx * concentration - cx;
+ real MomX2 = vvy * concentration - cy;
+ real MomX3 = vvz * concentration - cz;
+ real mixNormal = 0.5;
+
+ real MomXDenom = sqrt(MomX1 * MomX1 + MomX2 * MomX2 + MomX3 * MomX3)+1.0e-100;
+ real scaleNorm = (normX1 * MomX1 + normX2 * MomX2 + normX3 * MomX3) / MomXDenom;
+ scaleNorm = scaleNorm * scaleNorm;// *scaleNorm* scaleNorm;
+
+ normX1 = (normX1 * (c1o1 - mixNormal) + mixNormal * MomX1 / MomXDenom )* scaleNorm;
+ normX2 = (normX2 * (c1o1 - mixNormal) + mixNormal * MomX2 / MomXDenom )* scaleNorm;
+ normX3 = (normX3 * (c1o1 - mixNormal) + mixNormal * MomX3 / MomXDenom )* scaleNorm;
+
+ //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;
+
+ //take second moment from fluid
+ //mfbba = concentration*MMxy;
+ //mfbab = concentration*MMxz;
+ //mfabb = concentration*MMyz;
+
+ //mfcaa = (c1o3+MMxx) * concentration;
+ //mfaca = (c1o3+MMyy) * concentration;
+ //mfaac = (c1o3+MMzz) * 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->zeroDistributionsH1)(x1,x2,x3) = mfbbb;
+
+
+
+
+ }
+ }
+ }
+ }
+ }
+ //Set multiphase BCs
+ //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);
+ // 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)
+ // )) {
+ // //real mfabb = (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);//* rho * c1o3;
+ // //real mfbab = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);//* rho * c1o3;
+ // //real mfbba = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);//* rho * c1o3;
+ // //real mfaab = (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);//* rho * c1o3;
+ // //real mfcab = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);//* rho * c1o3;
+ // //real mfaba = (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);//* rho * c1o3;
+ // //real mfcba = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);//* rho * c1o3;
+ // //real mfbaa = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);//* rho * c1o3;
+ // //real mfbca = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);//* rho * c1o3;
+ // //real mfaaa = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);//* rho * c1o3;
+ // //real mfcaa = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);//* rho * c1o3;
+ // //real mfaca = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);//* rho * c1o3;
+ // //real mfcca = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);//* rho * c1o3;
+ // //real mfcbb = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);//* rho * c1o3;
+ // //real mfbcb = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);//* rho * c1o3;
+ // //real mfbbc = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);//* rho * c1o3;
+ // //real mfccb = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);//* rho * c1o3;
+ // //real mfacb = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);//* rho * c1o3;
+ // //real mfcbc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);//* rho * c1o3;
+ // //real mfabc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);//* rho * c1o3;
+ // //real mfbcc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);//* rho * c1o3;
+ // //real mfbac = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);//* rho * c1o3;
+ // //real mfccc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);//* rho * c1o3;
+ // //real mfacc = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);//* rho * c1o3;
+ // //real mfcac = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);//* rho * c1o3;
+ // //real mfaac = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);//* rho * c1o3;
+ // //real mfbbb = (*this->zeroDistributionsF)(x1, x2, x3);
+ //
+ // real vx = (*vxNode)(x1, x2, x3);
+ // real vy = (*vyNode)(x1, x2, x3);
+ // real vz = (*vzNode)(x1, x2, x3);
+ // SPtr<DistributionArray3D> distribution = this->getDataSet()->getFdistributions();
+ // real ff[27];
+ // distribution->getDistributionInv(ff, x1, x2 , x3 );
+
+ // for (int fdir = D3Q27System::STARTF; fdir <= D3Q27System::ENDF; fdir++) {
+ // if ((phi[fdir] <= c1o2)) {
+ // real rhoG = (*rhoNode)(x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir]);
+ // real ftemp= D3Q27System::getCompFeqForDirection(D3Q27System::INVDIR[fdir], rhoG, vx, vy, vz) + D3Q27System::getCompFeqForDirection(fdir, rhoG, vx, vy, vz);
+ // real fBB;
+ // fBB=distribution->getDistributionInvForDirection( x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir],fdir);
+ // distribution->setDistributionInvForDirection(ftemp - ff[fdir], x1 + D3Q27System::DX1[fdir], x2 + D3Q27System::DX2[fdir], x3 + D3Q27System::DX3[fdir], fdir);
+ // distribution->setDistributionForDirection(fBB-c6o1*D3Q27System::WEIGTH[fdir] * (-vx * D3Q27System::DX1[fdir] - vy * D3Q27System::DX2[fdir] - vz * D3Q27System::DX3[fdir]), x1, x2, x3, fdir);
+ // }
+ // }
+
+ // //if ((phi[DIR_P00] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 + 1, x2, x3);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(W, rhoG, vx,vy,vz )+ D3Q27System::getCompFeqForDirection(E, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_E, x1 + 1, x2, x3);
+ // // (*this->localDistributionsF)(D3Q27System::ET_E, x1+1, x2, x3)=ftemp-mfcbb;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3)=fBB-c6o1*c2o27*(-vx);
+ // //}
+ // //if ((phi[DIR_M00] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2, x3);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(E, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(W, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p-1, x2, x3);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p - 1, x2, x3) = ftemp - mfabb;
+ // // (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3) = fBB - c6o1 * c2o27 * ( vx);
+ // //}
+ // //if ((phi[DIR_0P0] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1, x2+1, x3);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(S, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(N, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2+1, x3);
+ // // (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2+1, x3) = ftemp - mfbcb;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3) = fBB - c6o1 * c2o27 * (-vy);
+ // //}
+ // //if ((phi[DIR_0M0] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1, x2 - 1, x3);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(N, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(S, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p-1, x3);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p - 1, x3) = ftemp - mfbab;
+ // // (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3) = fBB - c6o1 * c2o27 * ( vy);
+ // //}
+ // //if ((phi[DIR_00P] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1, x2 , x3+1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(B, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(T, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3+1) = ftemp - mfbbc;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p) = fBB - c6o1 * c2o27 * (-vz);
+ // //}
+ // //if ((phi[DIR_00M] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1, x2, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(T, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(B, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p-1) = ftemp - mfbba;
+ // // (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3) = fBB - c6o1 * c2o27 * ( vz);
+ // //}
+ // //
+ // //if ((phi[DIR_PP0] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 + 1, x2+1, x3);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(SW, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(NE, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_NE, x1+1, x2+1, x3);
+ // // (*this->localDistributionsF)(D3Q27System::ET_NE, x1 + 1, x2 + 1, x3) = ftemp - mfccb;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3) = fBB - c6o1 * c1o54 * (-vx-vy);
+ // //}
+ // //if ((phi[DIR_MM0] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2 - 1, x3);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(NE, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(SW, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p-1, x2p-1, x3);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p - 1, x2p - 1, x3) = ftemp - mfaab;
+ // // (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3) = fBB - c6o1 * c1o54 * ( vx + vy);
+ // //}
+ // //if ((phi[DIR_MP0] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2 + 1, x3);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(SE, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(NW, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p-1, x2+1, x3);
+ // // (*this->localDistributionsF)(D3Q27System::ET_NW, x1p - 1, x2 + 1, x3) = ftemp - mfacb;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3) = fBB - c6o1 * c1o54 * ( vx - vy);
+ // //}
+ // //if ((phi[DIR_PM0] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 + 1, x2 - 1, x3);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(NW, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(SE, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1+1, x2p-1, x3);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1 + 1, x2p - 1, x3) = ftemp - mfcab;
+ // // (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3) = fBB - c6o1 * c1o54 * (-vx + vy);
+ // //}
+ // //if ((phi[DIR_P0P] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 + 1, x2 , x3+1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(BW, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(TE, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_TE, x1+1, x2, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_TE, x1 + 1, x2, x3 + 1) = ftemp - mfcbc;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p) = fBB - c6o1 * c1o54 * (-vx - vz);
+ // //}
+ // //if ((phi[DIR_M0P] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2, x3 + 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(BE, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(TW, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p-1, x2, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_TW, x1p - 1, x2, x3 + 1) = ftemp - mfabc;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p) = fBB - c6o1 * c1o54 * ( vx - vz);
+ // //}
+ // //if ((phi[DIR_P0M] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 + 1, x2, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(TW, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(BE, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1+1, x2, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1 + 1, x2, x3p - 1) = ftemp - mfcba;
+ // // (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3) = fBB - c6o1 * c1o54 * (-vx + vz);
+ // //}
+ // //if ((phi[DIR_M0M] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(TE, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(BW, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p-1, x2, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p - 1, x2, x3p - 1) = ftemp - mfaba;
+ // // (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3) = fBB - c6o1 * c1o54 * ( vx + vz);
+ // //}
+ // //if ((phi[DIR_0PP] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1, x2+1, x3 + 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(BS, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(TN, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2+1, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2 + 1, x3 + 1) = ftemp - mfbcc;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p) = fBB - c6o1 * c1o54 * (-vy - vz);
+ // //}
+ // //if ((phi[DIR_0MP] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1, x2 - 1, x3 + 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(BN, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(TS, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p-1, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p - 1, x3 + 1) = ftemp - mfbac;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p) = fBB - c6o1 * c1o54 * ( vy - vz);
+ // //}
+ // //if ((phi[DIR_0PM] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1, x2 + 1, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(TS, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(BN, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2+1, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2 + 1, x3p - 1) = ftemp - mfbca;
+ // // (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3) = fBB - c6o1 * c1o54 * (-vy + vz);
+ // //}
+ // //if ((phi[DIR_0MM] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1, x2 - 1, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(TN, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(BS, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p-1, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p - 1, x3p - 1) = ftemp - mfbaa;
+ // // (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3) = fBB - c6o1 * c1o54 * (-vy - vz);
+ // //}
+
+ // //if ((phi[DIR_PPP] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1+1, x2 + 1, x3 + 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(BSW, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(TNE, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1+1, x2+1, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_TNE, x1 + 1, x2 + 1, x3 + 1) = ftemp - mfccc;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p) = fBB - c6o1 * c1o216 * (-vx -vy - vz);
+ // //}
+ // //if ((phi[DIR_MPP] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2 + 1, x3 + 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(BSE, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(TNW, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p-1, x2+1, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p - 1, x2 + 1, x3 + 1) = ftemp - mfacc;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p) = fBB - c6o1 * c1o216 * ( vx - vy - vz);
+ // //}
+ // //if ((phi[DIR_MMP] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2 - 1, x3 + 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(BNE, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(TSW, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p-1, x2p-1, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p - 1, x2p - 1, x3 + 1) = ftemp - mfaac;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p) = fBB - c6o1 * c1o216 * (vx + vy - vz);
+ // //}
+ // //if ((phi[DIR_PMP] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 + 1, x2 - 1, x3 + 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(BNW, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(TSE, rhoG, vx, vy, vz);
+ // // real fBB = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1+1, x2p-1, x3+1);
+ // // (*this->localDistributionsF)(D3Q27System::ET_TSE, x1 + 1, x2p - 1, x3 + 1) = ftemp - mfcac;
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p) = fBB - c6o1 * c1o216 * (-vx + vy - vz);
+ // //}
+ // //if ((phi[DIR_PMM] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 + 1, x2 - 1, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(TNW, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(BSE, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1+1, x2p-1, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1+1, x2p-1, x3p-1) = ftemp - mfcaa;
+ // // (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3) = fBB - c6o1 * c1o216 * (-vx + vy + vz);
+ // //}
+ // //if ((phi[DIR_MMM] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2 - 1, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(TNE, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(BSW, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p-1, x2p-1, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p - 1, x2p - 1, x3p - 1) = ftemp - mfaaa;
+ // // (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3) = fBB - c6o1 * c1o216 * ( vx + vy + vz);
+ // //}
+ // //if ((phi[DIR_MPM] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 - 1, x2 + 1, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(TSE, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(BNW, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p-1, x2+1, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p - 1, x2 + 1, x3p - 1) = ftemp - mfaca;
+ // // (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3) = fBB - c6o1 * c1o216 * (vx - vy + vz);
+ // //}
+ // //if ((phi[DIR_PPM] <= c1o2)) {
+ // // real rhoG = (*rhoNode)(x1 + 1, x2 + 1, x3 - 1);
+ // // real ftemp = D3Q27System::getCompFeqForDirection(TSW, rhoG, vx, vy, vz)+ D3Q27System::getCompFeqForDirection(BNE, rhoG, vx, vy, vz);
+ // // real fBB = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1+1, x2+1, x3p-1);
+ // // (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1 + 1, x2 + 1, x3p - 1) = ftemp - mfcca;
+ // // (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3) = fBB - c6o1 * c1o216 * (-vx - vy + vz);
+ // //}
+
+
+
+
+ // }
+ // }
+ // }
+ // }
+ //}
+}
+
+
+
+
+
+
+
+//////////////////////////////////////////////////////////////////////////
+
+real MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 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));
+}
+
+void MultiphaseScaleDistributionLBMKernel::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->zeroDistributionsH1)(x1, x2, x3);
+ }
+ }
+ }
+ }
+}
+
+void MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::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 MultiphaseScaleDistributionLBMKernel::swapDistributions()
+{
+ LBMKernel::swapDistributions();
+ dataSet->getHdistributions()->swap();
+ dataSet->getH2distributions()->swap();
+}
+
+void MultiphaseScaleDistributionLBMKernel::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/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.h
new file mode 100644
index 0000000000000000000000000000000000000000..67a6680bb7d11980e357c0f797c185899618b324
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.h
@@ -0,0 +1,132 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 MultiphaseScaleDistributionLBMKernel.h
+//! \ingroup LBMKernel
+//! \author M. Geier, K. Kutscher, Hesameddin Safari
+//=======================================================================================
+
+#ifndef MultiphaseScaleDistributionLBMKernel_H
+#define MultiphaseScaleDistributionLBMKernel_H
+
+#include "LBMKernel.h"
+#include "BCSet.h"
+#include "D3Q27System.h"
+#include "basics/utilities/UbTiming.h"
+#include "basics/container/CbArray4D.h"
+#include "basics/container/CbArray3D.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 MultiphaseScaleDistributionLBMKernel : public LBMKernel
+{
+public:
+ MultiphaseScaleDistributionLBMKernel();
+ virtual ~MultiphaseScaleDistributionLBMKernel(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 zeroDistributionsF;
+
+ CbArray4D<real,IndexerX4X3X2X1>::CbArray4DPtr localDistributionsH1;
+ CbArray4D<real,IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributionsH1;
+ CbArray3D<real,IndexerX3X2X1>::CbArray3DPtr zeroDistributionsH1;
+
+ CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr localDistributionsH2;
+ CbArray4D<real, IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributionsH2;
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr zeroDistributionsH2;
+
+ 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;
+ real forcingX1;
+ real forcingX2;
+ real forcingX3;
+};
+
+#endif
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseScratchCumulantLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseScratchCumulantLBMKernel.cpp
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.cpp
index eb9606e49591c9ec550c65fe15eca025c31e5ab0..85d6dcadcd3f8ebf661d7f32f18dcbc54c4eb5c4 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseScratchCumulantLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.cpp
@@ -70,7 +70,7 @@ SPtr<LBMKernel> MultiphaseScratchCumulantLBMKernel::clone()
kernel->setPhaseFieldRelaxation(this->tauH);
kernel->setMobility(this->mob);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -155,7 +155,7 @@ void MultiphaseScratchCumulantLBMKernel::calculate(int step)
nonLocalDistributionsH = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getNonLocalDistributions();
zeroDistributionsH = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -3062,7 +3062,7 @@ void MultiphaseScratchCumulantLBMKernel::findNeighbors(CbArray3D<real, IndexerX3
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi[DIR_000] = (*ph)(x1, x2, x3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseScratchCumulantLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseScratchCumulantLBMKernel.h
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.h
index 6f10c9b5db0e2272d734de02a55dab1452f79d1a..db4e547a2054f1a37468bb726f4f3fc20c33bd53 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseScratchCumulantLBMKernel.h
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.h
@@ -35,7 +35,7 @@
#define MultiphaseScratchCumulantLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1d0e30aee4eb9d9fb7f692b855eb36449e08a500
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp
@@ -0,0 +1,1674 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 MultiphaseSharpInterfaceLBMKernel.cpp
+//! \ingroup LBMKernel
+//! \author M. Geier, K. Kutscher, Hesameddin Safari
+//=======================================================================================
+
+#include "MultiphaseSharpInterfaceLBMKernel.h"
+#include "BCArray3D.h"
+#include "Block3D.h"
+#include "D3Q27EsoTwist3DSplittedVector.h"
+#include "D3Q27System.h"
+#include "DataSet3D.h"
+#include "LBMKernel.h"
+#include <cmath>
+#include <iostream>
+#include <string>
+#include "NonNewtonianFluids/LBM/Rheology.h"
+
+#define PROOF_CORRECTNESS
+
+using namespace vf::lbm::dir;
+using namespace vf::basics::constant;
+
+//////////////////////////////////////////////////////////////////////////
+MultiphaseSharpInterfaceLBMKernel::MultiphaseSharpInterfaceLBMKernel() { this->compressible = false; }
+//////////////////////////////////////////////////////////////////////////
+void MultiphaseSharpInterfaceLBMKernel::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));
+
+ //divU = CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<real, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
+}
+//////////////////////////////////////////////////////////////////////////
+SPtr<LBMKernel> MultiphaseSharpInterfaceLBMKernel::clone()
+{
+ SPtr<LBMKernel> kernel(new MultiphaseSharpInterfaceLBMKernel());
+ kernel->setNX(nx);
+ dynamicPointerCast<MultiphaseSharpInterfaceLBMKernel>(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<MultiphaseSharpInterfaceLBMKernel>(kernel)->initForcing();
+
+ return kernel;
+}
+//////////////////////////////////////////////////////////////////////////
+void MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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();
+ zeroDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
+
+ localDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getLocalDistributions();
+ nonLocalDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getNonLocalDistributions();
+ zeroDistributionsH1 = 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->zeroDistributionsH1)(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->zeroDistributionsF)(x1, x2, x3);
+
+
+
+
+ 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;
+ }
+ 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->zeroDistributionsF)(x1, x2, x3) = mfbbb;// *rho* c1o3;
+///////////////////// 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->zeroDistributionsH1)(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->zeroDistributionsH1)(x1,x2,x3) = mfbbb;
+
+
+
+
+ }
+ }
+ }
+ }
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+
+real MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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->zeroDistributionsH1)(x1, x2, x3);
+ }
+ }
+ }
+ }
+}
+
+void MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::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 MultiphaseSharpInterfaceLBMKernel::swapDistributions()
+{
+ LBMKernel::swapDistributions();
+ dataSet->getHdistributions()->swap();
+}
+
+void MultiphaseSharpInterfaceLBMKernel::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/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.h
new file mode 100644
index 0000000000000000000000000000000000000000..fd4b2d88ad4f195683fa2cf17990380a581221dd
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.h
@@ -0,0 +1,129 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 MultiphaseSharpInterfaceLBMKernel.h
+//! \ingroup LBMKernel
+//! \author M. Geier, K. Kutscher, Hesameddin Safari
+//=======================================================================================
+
+#ifndef MultiphaseSharpInterfaceLBMKernel_H
+#define MultiphaseSharpInterfaceLBMKernel_H
+
+#include "LBMKernel.h"
+#include "BCSet.h"
+#include "D3Q27System.h"
+#include "basics/utilities/UbTiming.h"
+#include "basics/container/CbArray4D.h"
+#include "basics/container/CbArray3D.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 MultiphaseSharpInterfaceLBMKernel : public LBMKernel
+{
+public:
+ MultiphaseSharpInterfaceLBMKernel();
+ virtual ~MultiphaseSharpInterfaceLBMKernel(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 zeroDistributionsF;
+
+ CbArray4D<real,IndexerX4X3X2X1>::CbArray4DPtr localDistributionsH1;
+ CbArray4D<real,IndexerX4X3X2X1>::CbArray4DPtr nonLocalDistributionsH1;
+ CbArray3D<real,IndexerX3X2X1>::CbArray3DPtr zeroDistributionsH1;
+
+ 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/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp
index 54b2f412a530be065ad9931a77e38511a68b3aa9..047da3666e9f77cd5624f5a3479b3cb79a43990b 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp
@@ -85,7 +85,7 @@ SPtr<LBMKernel> MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::clone()
kernel->setMobility(this->mob);
kernel->setInterfaceWidth(this->interfaceWidth);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -170,7 +170,7 @@ void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::calculate(int step)
CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr pressure = dataSet->getPressureField();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -2982,7 +2982,7 @@ void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::findNeighbors(CbArra
using namespace vf::lbm::dir;
using namespace vf::basics::constant;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi[DIR_000] = (*ph)(x1, x2, x3);
if (phi[DIR_000] < 0) {
@@ -3007,7 +3007,7 @@ void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::findNeighbors2(CbArr
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi2[DIR_000] = (*ph)(x1, x2, x3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h
index e2dc6d86abf7525231510df4f052cfc0768df457..98ca6108dca8f0835bc5e4e9479f696791cc354c 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h
@@ -35,7 +35,7 @@
#define MultiphaseSimpleVelocityBaseExternalPressureLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.cpp
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.cpp
index 7ca468f57b58610619b4d641290bae360fc92891..8abd71133dd7088199066b1de0975b8efb16ebc8 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.cpp
@@ -71,7 +71,7 @@ SPtr<LBMKernel> MultiphaseTwoPhaseFieldsCumulantLBMKernel::clone()
kernel->setPhaseFieldRelaxation(this->tauH);
kernel->setMobility(this->mob);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -160,7 +160,7 @@ void MultiphaseTwoPhaseFieldsCumulantLBMKernel::calculate(int step)
nonLocalDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getNonLocalDistributions();
zeroDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -3174,7 +3174,7 @@ void MultiphaseTwoPhaseFieldsCumulantLBMKernel::findNeighbors(CbArray3D<real, In
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi[DIR_000] = (*ph)(x1, x2, x3);
@@ -3195,7 +3195,7 @@ void MultiphaseTwoPhaseFieldsCumulantLBMKernel::findNeighbors2(CbArray3D<real, I
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi2[DIR_000] = (*ph)(x1, x2, x3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h
index dbc94d613c4683fb19cb92a7ab7d075da41ab231..34730f454faf81a126eb1431fb623f0447f52fa1 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h
@@ -35,7 +35,7 @@
#define MultiphaseTwoPhaseFieldsCumulantLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.cpp
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.cpp
index 090abea7ab2158faf9bdf807be64e35ff49d25d1..8a6c2bde6d5031a1b379bdd391aaa1051ca6217f 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.cpp
@@ -83,7 +83,7 @@ SPtr<LBMKernel> MultiphaseTwoPhaseFieldsPressureFilterLBMKernel::clone()
kernel->setMobility(this->mob);
kernel->setInterfaceWidth(this->interfaceWidth);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -176,7 +176,7 @@ void MultiphaseTwoPhaseFieldsPressureFilterLBMKernel::calculate(int step)
CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr pressure = dataSet->getPressureField();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -3540,7 +3540,7 @@ void MultiphaseTwoPhaseFieldsPressureFilterLBMKernel::findNeighbors(CbArray3D<re
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi[DIR_000] = (*ph)(x1, x2, x3);
@@ -3561,7 +3561,7 @@ void MultiphaseTwoPhaseFieldsPressureFilterLBMKernel::findNeighbors2(CbArray3D<r
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi2[DIR_000] = (*ph)(x1, x2, x3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h
index 138b24410b10b4631b1411fba3e803bde504531a..c486caf0c0fb64c3a9a7366b55bb3150c139468a 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h
@@ -35,7 +35,7 @@
#define MultiphaseTwoPhaseFieldsPressureFilterLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.cpp b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.cpp
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.cpp
index eb5bd4201e5aa29c66be74440ac619caf3992f86..ef0d033bc0c255d02e51a08fa1a0a85d1b20f0b4 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.cpp
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.cpp
@@ -73,7 +73,7 @@ SPtr<LBMKernel> MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel::clone()
kernel->setPhaseFieldRelaxation(this->tauH);
kernel->setMobility(this->mob);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -162,7 +162,7 @@ void MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel::calculate(int step)
nonLocalDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getNonLocalDistributions();
zeroDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -3471,7 +3471,7 @@ void MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel::findNeighbors(CbArray3D<
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi[DIR_000] = (*ph)(x1, x2, x3);
@@ -3492,7 +3492,7 @@ void MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel::findNeighbors2(CbArray3D
using namespace D3Q27System;
using namespace vf::lbm::dir;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
phi2[DIR_000] = (*ph)(x1, x2, x3);
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h
rename to src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h
index a34858ae47c0cb5b10755b21df14290fa242115a..34c0f5b8db234c27a2f55f7c8dee4a7c33bdc949 100644
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h
+++ b/src/cpu/MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h
@@ -35,7 +35,7 @@
#define MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/MultiphaseFlow/MultiphaseFlow.h b/src/cpu/MultiphaseFlow/MultiphaseFlow.h
new file mode 100644
index 0000000000000000000000000000000000000000..469a819060f7a06ce6e914ace68cb44f6b83dca1
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/MultiphaseFlow.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "MultiphaseFlow/BoundaryConditions/MultiphaseNoSlipBCStrategy.h"
+#include "MultiphaseFlow/BoundaryConditions/MultiphaseNonReflectingOutflowBCStrategy.h"
+#include "MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBC.h"
+#include "MultiphaseFlow/BoundaryConditions/MultiphaseVelocityBCStrategy.h"
+#include "MultiphaseFlow/BoundaryConditions/MultiphaseSlipBCStrategy.h"
+#include "MultiphaseFlow/BoundaryConditions/MultiphasePressureBCStrategy.h"
+
+#include "MultiphaseFlow/LBM/MultiphaseCumulantLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphasePressureFilterLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphaseScaleDistributionLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphaseScratchCumulantLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h"
+#include "MultiphaseFlow/LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h"
+
+#include "MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.h"
+#include "MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.h"
+
+#include "MultiphaseFlow/Visitors/MultiphaseSetKernelBlockVisitor.h"
+#include "MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h"
+#include "MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.h"
+#include "MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h"
+
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMultiphaseQuantitiesCoProcessor.cpp b/src/cpu/MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.cpp
similarity index 93%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteMultiphaseQuantitiesCoProcessor.cpp
rename to src/cpu/MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.cpp
index 74fced98d39116ebbb9ebc9a762398f2cba7c579..adc6a4f81f77cc57a4030643517cc583b61b3c7d 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMultiphaseQuantitiesCoProcessor.cpp
+++ b/src/cpu/MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.cpp
@@ -26,13 +26,13 @@
// 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 WriteMultiphaseQuantitiesCoProcessor.cpp
-//! \ingroup CoProcessors
+//! \file WriteMultiphaseQuantitiesSimulationObserver.cpp
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#include "WriteMultiphaseQuantitiesCoProcessor.h"
-#include "BCProcessor.h"
+#include "WriteMultiphaseQuantitiesSimulationObserver.h"
+#include "BCSet.h"
#include "LBMKernel.h"
#include <string>
#include <vector>
@@ -47,14 +47,14 @@
#include "basics/writer/WbWriterVtkXmlASCII.h"
#include <logger/Logger.h>
-WriteMultiphaseQuantitiesCoProcessor::WriteMultiphaseQuantitiesCoProcessor() = default;
+WriteMultiphaseQuantitiesSimulationObserver::WriteMultiphaseQuantitiesSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-WriteMultiphaseQuantitiesCoProcessor::WriteMultiphaseQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+WriteMultiphaseQuantitiesSimulationObserver::WriteMultiphaseQuantitiesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
const std::string &path,
WbWriter *const writer,
SPtr<LBMUnitConverter> conv,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), writer(writer), conv(conv), comm(comm)
+ : SimulationObserver(grid, s), path(path), writer(writer), conv(conv), comm(comm)
{
gridRank = comm->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -69,21 +69,21 @@ WriteMultiphaseQuantitiesCoProcessor::WriteMultiphaseQuantitiesCoProcessor(SPtr<
}
//////////////////////////////////////////////////////////////////////////
-void WriteMultiphaseQuantitiesCoProcessor::init()
+void WriteMultiphaseQuantitiesSimulationObserver::init()
{}
//////////////////////////////////////////////////////////////////////////
-void WriteMultiphaseQuantitiesCoProcessor::process(real step)
+void WriteMultiphaseQuantitiesSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- //UBLOG(logDEBUG3, "WriteMultiphaseQuantitiesCoProcessor::update:" << step);
- VF_LOG_DEBUG("WriteMultiphaseQuantitiesCoProcessor::update:: {}", step);
+ //UBLOG(logDEBUG3, "WriteMultiphaseQuantitiesSimulationObserver::update:" << step);
+ VF_LOG_DEBUG("WriteMultiphaseQuantitiesSimulationObserver::update:: {}", step);
}
//////////////////////////////////////////////////////////////////////////
-void WriteMultiphaseQuantitiesCoProcessor::collectData(real step)
+void WriteMultiphaseQuantitiesSimulationObserver::collectData(real step)
{
int istep = static_cast<int>(step);
@@ -120,22 +120,22 @@ void WriteMultiphaseQuantitiesCoProcessor::collectData(real step)
std::vector<std::string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin())
+ if (step == SimulationObserver::scheduler->getMinBegin())
{
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
} else
{
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- //UBLOG(logINFO, "WriteMultiphaseQuantitiesCoProcessor step: " << istep);
- VF_LOG_INFO("WriteMultiphaseQuantitiesCoProcessor step: {}", istep);
+ //UBLOG(logINFO, "WriteMultiphaseQuantitiesSimulationObserver step: " << istep);
+ VF_LOG_INFO("WriteMultiphaseQuantitiesSimulationObserver step: {}", istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void WriteMultiphaseQuantitiesCoProcessor::clearData()
+void WriteMultiphaseQuantitiesSimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -144,7 +144,7 @@ void WriteMultiphaseQuantitiesCoProcessor::clearData()
}
//////////////////////////////////////////////////////////////////////////
-void WriteMultiphaseQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
+void WriteMultiphaseQuantitiesSimulationObserver::addDataMQ(SPtr<Block3D> block)
{
using namespace D3Q27System;
// using namespace UbMath;
@@ -167,7 +167,7 @@ void WriteMultiphaseQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
data.resize(datanames.size());
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributionsF = kernel->getDataSet()->getFdistributions();
SPtr<DistributionArray3D> distributionsH = kernel->getDataSet()->getHdistributions();
SPtr<DistributionArray3D> distributionsH2 = kernel->getDataSet()->getH2distributions();
@@ -474,7 +474,7 @@ void WriteMultiphaseQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
}
}
-real WriteMultiphaseQuantitiesCoProcessor::gradX1_phi(const real *const &h)
+real WriteMultiphaseQuantitiesSimulationObserver::gradX1_phi(const real *const &h)
{
using namespace D3Q27System;
real sum = 0.0;
@@ -483,7 +483,7 @@ real WriteMultiphaseQuantitiesCoProcessor::gradX1_phi(const real *const &h)
}
return 3.0 * sum;
}
-real WriteMultiphaseQuantitiesCoProcessor::gradX2_phi(const real *const &h)
+real WriteMultiphaseQuantitiesSimulationObserver::gradX2_phi(const real *const &h)
{
using namespace D3Q27System;
real sum = 0.0;
@@ -493,7 +493,7 @@ real WriteMultiphaseQuantitiesCoProcessor::gradX2_phi(const real *const &h)
return 3.0 * sum;
}
-real WriteMultiphaseQuantitiesCoProcessor::gradX3_phi(const real *const &h)
+real WriteMultiphaseQuantitiesSimulationObserver::gradX3_phi(const real *const &h)
{
using namespace D3Q27System;
real sum = 0.0;
@@ -503,7 +503,7 @@ real WriteMultiphaseQuantitiesCoProcessor::gradX3_phi(const real *const &h)
return 3.0 * sum;
}
-real WriteMultiphaseQuantitiesCoProcessor::nabla2_phi(const real *const &h)
+real WriteMultiphaseQuantitiesSimulationObserver::nabla2_phi(const real *const &h)
{
using namespace vf::lbm::dir;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMultiphaseQuantitiesCoProcessor.h b/src/cpu/MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.h
similarity index 85%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteMultiphaseQuantitiesCoProcessor.h
rename to src/cpu/MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.h
index de09654bb01b8bd851df3afcea1fb3445386fff0..452a06d3bbb23943995f42ce84d712aa3c01b6a4 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMultiphaseQuantitiesCoProcessor.h
+++ b/src/cpu/MultiphaseFlow/SimulationObservers/WriteMultiphaseQuantitiesSimulationObserver.h
@@ -26,19 +26,19 @@
// 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 WriteMultiphaseQuantitiesCoProcessor.h
-//! \ingroup CoProcessors
+//! \file WriteMultiphaseQuantitiesSimulationObserver.h
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef WriteMultiphaseQuantitiesCoProcessor_H
-#define WriteMultiphaseQuantitiesCoProcessor_H
+#ifndef WriteMultiphaseQuantitiesSimulationObserver_H
+#define WriteMultiphaseQuantitiesSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
#include "UbTuple.h"
@@ -50,11 +50,11 @@ class WbWriter;
class Block3D;
//! \brief A class writes macroscopic quantities information to a VTK-file
-class WriteMultiphaseQuantitiesCoProcessor : public CoProcessor
+class WriteMultiphaseQuantitiesSimulationObserver : public SimulationObserver
{
public:
- WriteMultiphaseQuantitiesCoProcessor();
- //! \brief Construct WriteMultiphaseQuantitiesCoProcessor object
+ WriteMultiphaseQuantitiesSimulationObserver();
+ //! \brief Construct WriteMultiphaseQuantitiesSimulationObserver object
//! \pre The Grid3D and UbScheduler objects must exist
//! \param grid is observable Grid3D object
//! \param s is UbScheduler object for scheduling of observer
@@ -62,11 +62,11 @@ public:
//! \param writer is WbWriter object
//! \param conv is LBMUnitConverter object
//! \param comm is Communicator object
- WriteMultiphaseQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ WriteMultiphaseQuantitiesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
WbWriter *const writer, SPtr<LBMUnitConverter> conv, std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteMultiphaseQuantitiesCoProcessor() override = default;
+ ~WriteMultiphaseQuantitiesSimulationObserver() override = default;
- void process(real step) override;
+ void update(real step) override;
protected:
//! Collect data for VTK-file
diff --git a/src/cpu/MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.cpp b/src/cpu/MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..64ef23bcffb2d9b5478b1f57590d7d297ab08f52
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.cpp
@@ -0,0 +1,416 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 WriteSharpInterfaceQuantitiesSimulationObserver.cpp
+//! \ingroup SimulationObservers
+//! \author Konstantin Kutscher
+//=======================================================================================
+
+#include "WriteSharpInterfaceQuantitiesSimulationObserver.h"
+#include "BCSet.h"
+#include "LBMKernel.h"
+#include <string>
+#include <vector>
+
+#include "BCArray3D.h"
+#include "Block3D.h"
+#include <mpi/Communicator.h>
+#include "DataSet3D.h"
+#include "Grid3D.h"
+#include "LBMUnitConverter.h"
+#include "UbScheduler.h"
+#include "basics/writer/WbWriterVtkXmlASCII.h"
+
+WriteSharpInterfaceQuantitiesSimulationObserver::WriteSharpInterfaceQuantitiesSimulationObserver() = default;
+//////////////////////////////////////////////////////////////////////////
+WriteSharpInterfaceQuantitiesSimulationObserver::WriteSharpInterfaceQuantitiesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+ const std::string &path,
+ WbWriter *const writer,
+ SPtr<LBMUnitConverter> conv,
+ std::shared_ptr<vf::mpi::Communicator> comm)
+ : SimulationObserver(grid, s), path(path), writer(writer), conv(conv), comm(comm)
+{
+ gridRank = comm->getProcessID();
+ minInitLevel = this->grid->getCoarsestInitializedLevel();
+ maxInitLevel = this->grid->getFinestInitializedLevel();
+
+ blockVector.resize(maxInitLevel + 1);
+
+ for (int level = minInitLevel; level <= maxInitLevel; level++)
+ {
+ grid->getBlocks(level, gridRank, true, blockVector[level]);
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////
+void WriteSharpInterfaceQuantitiesSimulationObserver::init()
+{}
+
+//////////////////////////////////////////////////////////////////////////
+void WriteSharpInterfaceQuantitiesSimulationObserver::update(double step)
+{
+ if (scheduler->isDue(step))
+ collectData(step);
+
+ UBLOG(logDEBUG3, "WriteSharpInterfaceQuantitiesSimulationObserver::update:" << step);
+}
+
+//////////////////////////////////////////////////////////////////////////
+void WriteSharpInterfaceQuantitiesSimulationObserver::collectData(double step)
+{
+ int istep = static_cast<int>(step);
+
+ for (int level = minInitLevel; level <= maxInitLevel; level++)
+ {
+ for (SPtr<Block3D> block : blockVector[level])
+ {
+ if (block)
+ {
+ addDataMQ(block);
+ }
+ }
+ }
+
+ std::string pfilePath, partPath, subfolder, cfilePath;
+
+ subfolder = "mq" + UbSystem::toString(istep);
+ pfilePath = path + "/mq/" + subfolder;
+ cfilePath = path + "/mq/mq_collection";
+ partPath = pfilePath + "/mq" + UbSystem::toString(gridRank) + "_" + UbSystem::toString(istep);
+
+ std::string partName = writer->writeOctsWithNodeData(partPath, nodes, cells, datanames, data);
+ size_t found = partName.find_last_of("/");
+ std::string piece = partName.substr(found + 1);
+ piece = subfolder + "/" + piece;
+
+ std::vector<std::string> cellDataNames;
+ std::vector<std::string> pieces = comm->gather(piece);
+ if (comm->getProcessID() == comm->getRoot()) {
+ std::string pname =
+ WbWriterVtkXmlASCII::getInstance()->writeParallelFile(pfilePath, pieces, datanames, cellDataNames);
+ found = pname.find_last_of("/");
+ piece = pname.substr(found + 1);
+
+ std::vector<std::string> filenames;
+ filenames.push_back(piece);
+ if (step == SimulationObserver::scheduler->getMinBegin())
+ {
+ WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
+ } else
+ {
+ WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
+ }
+ UBLOG(logINFO, "WriteSharpInterfaceQuantitiesSimulationObserver step: " << istep);
+ }
+
+ clearData();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void WriteSharpInterfaceQuantitiesSimulationObserver::clearData()
+{
+ nodes.clear();
+ cells.clear();
+ datanames.clear();
+ data.clear();
+}
+
+//////////////////////////////////////////////////////////////////////////
+void WriteSharpInterfaceQuantitiesSimulationObserver::addDataMQ(SPtr<Block3D> block)
+{
+ using namespace D3Q27System;
+ //using namespace UbMath;
+ using namespace vf::lbm::dir;
+ using namespace vf::basics::constant;
+ SPtr<LBMKernel> kernel = dynamicPointerCast<LBMKernel>(block->getKernel());
+ //double level = (double)block->getLevel();
+ kernel->swapDistributions();
+ // Diese Daten werden geschrieben:
+ datanames.resize(0);
+ datanames.push_back("Phi");
+ datanames.push_back("Vx");
+ datanames.push_back("Vy");
+ datanames.push_back("Vz");
+ datanames.push_back("Pressure");
+
+ data.resize(datanames.size());
+
+
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
+ SPtr<DistributionArray3D> distributionsF = kernel->getDataSet()->getFdistributions();
+ SPtr<DistributionArray3D> distributionsH = kernel->getDataSet()->getHdistributions();
+ SPtr<DistributionArray3D> distributionsH2 = kernel->getDataSet()->getH2distributions();
+ SPtr<PhaseFieldArray3D> divU = kernel->getDataSet()->getPhaseField();
+
+ real pressure;
+
+ real f[D3Q27System::ENDF + 1];
+ real phi;
+ real vx1, vx2, vx3, rho;
+ real densityRatio = kernel->getDensityRatio();
+ //real phiL = kernel->getPhiL();
+ //real phiH = kernel->getPhiH();
+
+ // knotennummerierung faengt immer bei 0 an!
+ int SWB, SEB, NEB, NWB, SWT, SET, NET, NWT;
+
+ if (block->getKernel()->getCompressible()) {
+ calcMacros = &D3Q27System::calcCompMacroscopicValues;
+ } else {
+ calcMacros = &D3Q27System::calcIncompMacroscopicValues;
+ }
+
+ // int minX1 = 0;
+ // int minX2 = 0;
+ // int minX3 = 0;
+
+ int maxX1 = (int)(distributionsF->getNX1());
+ int maxX2 = (int)(distributionsF->getNX2());
+ int maxX3 = (int)(distributionsF->getNX3());
+
+ int minX1 = 0;
+ int minX2 = 0;
+ int minX3 = 0;
+
+ if (kernel->getGhostLayerWidth() == 2)
+ {
+ minX1 = 1;
+ minX2 = 1;
+ minX3 = 1;
+ }
+
+ // int maxX1 = (int)(distributions->getNX1());
+ // int maxX2 = (int)(distributions->getNX2());
+ // int maxX3 = (int)(distributions->getNX3());
+
+ // nummern vergeben und node vector erstellen + daten sammeln
+ CbArray3D<int> nodeNumbers((int)maxX1, (int)maxX2, (int)maxX3, -1);
+ CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr phaseField(
+ new CbArray3D<real, IndexerX3X2X1>(maxX1, maxX2, maxX3, -999.0));
+
+
+ for (int ix3 = minX3; ix3 < maxX3; ix3++) {
+ for (int ix2 = minX2; ix2 < maxX2; ix2++) {
+ for (int ix1 = minX1; ix1 < maxX1; ix1++) {
+ if (!bcArray->isUndefined(ix1, ix2, ix3) && !bcArray->isSolid(ix1, ix2, ix3)) {
+ distributionsH->getDistributionInv(f, ix1, ix2, ix3);
+ (*phaseField)(ix1, ix2, ix3) =
+ ((f[DIR_PPP] + f[DIR_MMM]) + (f[DIR_PMP] + f[DIR_MPM])) + ((f[DIR_PMM] + f[DIR_MPP]) + (f[DIR_MMP] + f[DIR_PPM])) +
+ (((f[DIR_PP0] + f[DIR_MM0]) + (f[DIR_PM0] + f[DIR_MP0])) + ((f[DIR_P0P] + f[DIR_M0M]) + (f[DIR_P0M] + f[DIR_M0P])) +
+ ((f[DIR_0PM] + f[DIR_0MP]) + (f[DIR_0PP] + f[DIR_0MM]))) +
+ ((f[DIR_P00] + f[DIR_M00]) + (f[DIR_0P0] + f[DIR_0M0]) + (f[DIR_00P] + f[DIR_00M])) + f[DIR_000];
+ }
+ }
+ }
+ }
+
+ if (kernel->getGhostLayerWidth() == 1)
+ {
+ maxX1 -= 2;
+ maxX2 -= 2;
+ maxX3 -= 2;
+ }
+ else if (kernel->getGhostLayerWidth() == 2)
+ {
+ maxX1 -= 3;
+ maxX2 -= 3;
+ maxX3 -= 3;
+ }
+
+ int nr = (int)nodes.size();
+ //real dX1_phi;
+ //real dX2_phi;
+ //real dX3_phi;
+ //real mu;
+
+ for (int ix3 = minX3; ix3 <= maxX3; ix3++) {
+ for (int ix2 = minX2; ix2 <= maxX2; ix2++) {
+ for (int ix1 = minX1; ix1 <= maxX1; ix1++) {
+ if (!bcArray->isUndefined(ix1, ix2, ix3) && !bcArray->isSolid(ix1, ix2, ix3)) {
+ int index = 0;
+ nodeNumbers(ix1, ix2, ix3) = nr++;
+ Vector3D worldCoordinates = grid->getNodeCoordinates(block, ix1, ix2, ix3);
+ nodes.push_back(UbTupleFloat3(float(worldCoordinates[0]), float(worldCoordinates[1]),
+ float(worldCoordinates[2])));
+
+ phi = (*phaseField)(ix1, ix2, ix3);
+
+
+ distributionsF->getDistributionInv(f, ix1, ix2, ix3);
+ //real dU = (*divU)(ix1, ix2, ix3);
+
+ real rhoH = 1.0;
+ real rhoL = 1.0 / densityRatio;
+ // real rhoToPhi = (1.0 - 1.0/densityRatio);
+ //real rhoToPhi = (rhoH - rhoL) / (phiH - phiL);
+
+ // rho = phi[ZERO] + (1.0 - phi[ZERO])*1.0/densityRatio;
+
+
+ rho = (phi>c1o2) ? rhoH : rhoL; // rhoH + rhoToPhi * (phi - phiH);
+
+ vx1 =
+ ((((f[DIR_PPP] - f[DIR_MMM]) + (f[DIR_PMP] - f[DIR_MPM])) + ((f[DIR_PMM] - f[DIR_MPP]) + (f[DIR_PPM] - f[DIR_MMP]))) +
+ (((f[DIR_P0M] - f[DIR_M0P]) + (f[DIR_P0P] - f[DIR_M0M])) + ((f[DIR_PM0] - f[DIR_MP0]) + (f[DIR_PP0] - f[DIR_MM0]))) + (f[DIR_P00] - f[DIR_M00])) ;
+
+ vx2 =
+ ((((f[DIR_PPP] - f[DIR_MMM]) + (f[DIR_MPM] - f[DIR_PMP])) + ((f[DIR_MPP] - f[DIR_PMM]) + (f[DIR_PPM] - f[DIR_MMP]))) +
+ (((f[DIR_0PM] - f[DIR_0MP]) + (f[DIR_0PP] - f[DIR_0MM])) + ((f[DIR_MP0] - f[DIR_PM0]) + (f[DIR_PP0] - f[DIR_MM0]))) + (f[DIR_0P0] - f[DIR_0M0])) ;
+
+ vx3 =
+ ((((f[DIR_PPP] - f[DIR_MMM]) + (f[DIR_PMP] - f[DIR_MPM])) + ((f[DIR_MPP] - f[DIR_PMM]) + (f[DIR_MMP] - f[DIR_PPM]))) +
+ (((f[DIR_0MP] - f[DIR_0PM]) + (f[DIR_0PP] - f[DIR_0MM])) + ((f[DIR_M0P] - f[DIR_P0M]) + (f[DIR_P0P] - f[DIR_M0M]))) + (f[DIR_00P] - f[DIR_00M]));
+
+
+
+ pressure = (((f[DIR_PPP] + f[DIR_MMM]) + (f[DIR_PMP] + f[DIR_MPM])) + ((f[DIR_PMM] + f[DIR_MPP]) + (f[DIR_MMP] + f[DIR_PPM])) +
+ (((f[DIR_PP0] + f[DIR_MM0]) + (f[DIR_PM0] + f[DIR_MP0])) + ((f[DIR_P0P] + f[DIR_M0M]) + (f[DIR_P0M] + f[DIR_M0P])) +
+ ((f[DIR_0PM] + f[DIR_0MP]) + (f[DIR_0PP] + f[DIR_0MM]))) +
+ ((f[DIR_P00] + f[DIR_M00]) + (f[DIR_0P0] + f[DIR_0M0]) + (f[DIR_00P] + f[DIR_00M])) + f[DIR_000])*c1o3*rho;
+
+ if (UbMath::isNaN(vx1) || UbMath::isInfinity(vx1))
+ UB_THROW(UbException(
+ UB_EXARGS, "vx1 is not a number (nan or -1.#IND) or infinity number -1.#INF in block=" +
+ block->toString() + ", node=" + UbSystem::toString(ix1) + "," +
+ UbSystem::toString(ix2) + "," + UbSystem::toString(ix3)));
+ // vx1=999.0;
+ if (UbMath::isNaN(vx2) || UbMath::isInfinity(vx2))
+ UB_THROW(UbException(
+ UB_EXARGS, "vx2 is not a number (nan or -1.#IND) or infinity number -1.#INF in block=" +
+ block->toString() + ", node=" + UbSystem::toString(ix1) + "," +
+ UbSystem::toString(ix2) + "," + UbSystem::toString(ix3)));
+ // vx2=999.0;
+ if (UbMath::isNaN(vx3) || UbMath::isInfinity(vx3))
+ UB_THROW(UbException(
+ UB_EXARGS, "vx3 is not a number (nan or -1.#IND) or infinity number -1.#INF in block=" +
+ block->toString() + ", node=" + UbSystem::toString(ix1) + "," +
+ UbSystem::toString(ix2) + "," + UbSystem::toString(ix3)));
+
+ if (UbMath::isNaN(phi) || UbMath::isInfinity(phi))
+ UB_THROW(UbException(
+ UB_EXARGS, "phi is not a number (nan or -1.#IND) or infinity number -1.#INF in block=" +
+ block->toString() + ", node=" + UbSystem::toString(ix1) + "," +
+ UbSystem::toString(ix2) + "," + UbSystem::toString(ix3)));
+
+ if (UbMath::isNaN(pressure) || UbMath::isInfinity(pressure))
+ UB_THROW( UbException(UB_EXARGS,"pressure is not a number (nan or -1.#IND) or infinity number -1.#INF in block="+block->toString()+
+ ", node="+UbSystem::toString(ix1)+","+UbSystem::toString(ix2)+","+UbSystem::toString(ix3)));
+
+ //if (UbMath::isNaN(p1) || UbMath::isInfinity(p1))
+ // UB_THROW( UbException(UB_EXARGS,"p1 is not a number (nan or -1.#IND) or infinity number -1.#INF in block="+block->toString()+
+ // ", node="+UbSystem::toString(ix1)+","+UbSystem::toString(ix2)+","+UbSystem::toString(ix3)));
+
+ //if (UbMath::isNaN(mp) || UbMath::isInfinity(mp))
+ // UB_THROW(UbException(UB_EXARGS, "mp is not a number (nan or -1.#IND) or infinity number -1.#INF in block=" + block->toString() +
+ // ", node=" + UbSystem::toString(ix1) + "," + UbSystem::toString(ix2) + "," + UbSystem::toString(ix3)));
+
+ //if (UbMath::isNaN(delmp) || UbMath::isInfinity(delmp))
+ // UB_THROW(UbException(UB_EXARGS, "delmp is not a number (nan or -1.#IND) or infinity number -1.#INF in block=" + block->toString() +
+ // ", node=" + UbSystem::toString(ix1) + "," + UbSystem::toString(ix2) + "," + UbSystem::toString(ix3)));
+
+ data[index++].push_back(phi);
+ data[index++].push_back(vx1);
+ data[index++].push_back(vx2);
+ data[index++].push_back(vx3);
+ //data[index++].push_back(p1);
+ //data[index++].push_back(phi2[DIR_000]);
+ //data[index++].push_back(mp);
+ //data[index++].push_back(delmp);
+ data[index++].push_back(pressure);
+ }
+ }
+ }
+ }
+ maxX1 -= 1;
+ maxX2 -= 1;
+ maxX3 -= 1;
+ // cell vector erstellen
+ for (int ix3 = minX3; ix3 <= maxX3; ix3++) {
+ for (int ix2 = minX2; ix2 <= maxX2; ix2++) {
+ for (int ix1 = minX1; ix1 <= maxX1; ix1++) {
+ if ((SWB = nodeNumbers(ix1, ix2, ix3)) >= 0 && (SEB = nodeNumbers(ix1 + 1, ix2, ix3)) >= 0 &&
+ (NEB = nodeNumbers(ix1 + 1, ix2 + 1, ix3)) >= 0 && (NWB = nodeNumbers(ix1, ix2 + 1, ix3)) >= 0 &&
+ (SWT = nodeNumbers(ix1, ix2, ix3 + 1)) >= 0 && (SET = nodeNumbers(ix1 + 1, ix2, ix3 + 1)) >= 0 &&
+ (NET = nodeNumbers(ix1 + 1, ix2 + 1, ix3 + 1)) >= 0 &&
+ (NWT = nodeNumbers(ix1, ix2 + 1, ix3 + 1)) >= 0) {
+ cells.push_back(makeUbTuple((unsigned int)SWB, (unsigned int)SEB, (unsigned int)NEB,
+ (unsigned int)NWB, (unsigned int)SWT, (unsigned int)SET,
+ (unsigned int)NET, (unsigned int)NWT));
+ }
+ }
+ }
+ }
+ kernel->swapDistributions();
+}
+
+real WriteSharpInterfaceQuantitiesSimulationObserver::gradX1_phi(const real *const &h)
+{
+ using namespace D3Q27System;
+ using namespace vf::lbm::dir;
+ using namespace vf::basics::constant;
+ real sum = c0o1;
+ for (int k = FSTARTDIR; k <= FENDDIR; k++) {
+ sum += WEIGTH[k] * DX1[k] * h[k];
+ }
+ return 3.0 * sum;
+}
+real WriteSharpInterfaceQuantitiesSimulationObserver::gradX2_phi(const real *const &h)
+{
+ using namespace D3Q27System;
+ using namespace vf::lbm::dir;
+ using namespace vf::basics::constant;
+ real sum = c0o1;
+ for (int k = FSTARTDIR; k <= FENDDIR; k++) {
+ sum += WEIGTH[k] * DX2[k] * h[k];
+ }
+ return 3.0 * sum;
+}
+
+real WriteSharpInterfaceQuantitiesSimulationObserver::gradX3_phi(const real *const &h)
+{
+ using namespace D3Q27System;
+ using namespace vf::lbm::dir;
+ using namespace vf::basics::constant;
+ real sum = c0o1;
+ for (int k = FSTARTDIR; k <= FENDDIR; k++) {
+ sum += WEIGTH[k] * DX3[k] * h[k];
+ }
+ return 3.0 * sum;
+}
+
+real WriteSharpInterfaceQuantitiesSimulationObserver::nabla2_phi(const real *const &h)
+{
+ using namespace D3Q27System;
+ using namespace vf::lbm::dir;
+ using namespace vf::basics::constant;
+ real sum = c0o1;
+ for (int k = FSTARTDIR; k <= FENDDIR; k++) {
+ sum += WEIGTH[k] * (h[k] - h[DIR_000]);
+ }
+ return 6.0 * sum;
+}
\ No newline at end of file
diff --git a/src/cpu/MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.h b/src/cpu/MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.h
new file mode 100644
index 0000000000000000000000000000000000000000..8c1e6347862a80cf25ab26a99b1304c731e2e2ee
--- /dev/null
+++ b/src/cpu/MultiphaseFlow/SimulationObservers/WriteSharpInterfaceQuantitiesSimulationObserver.h
@@ -0,0 +1,104 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 WriteSharpInterfaceQuantitiesSimulationObserver.h
+//! \ingroup SimulationObservers
+//! \author Konstantin Kutscher
+//=======================================================================================
+
+#ifndef WriteSharpInterfaceQuantitiesSimulationObserver_H
+#define WriteSharpInterfaceQuantitiesSimulationObserver_H
+
+#include <PointerDefinitions.h>
+#include <string>
+#include <vector>
+
+#include "SimulationObserver.h"
+#include "LBMSystem.h"
+#include "UbTuple.h"
+
+namespace vf::mpi {class Communicator;}
+class Grid3D;
+class UbScheduler;
+class LBMUnitConverter;
+class WbWriter;
+class Block3D;
+
+//! \brief A class writes macroscopic quantities information to a VTK-file
+class WriteSharpInterfaceQuantitiesSimulationObserver : public SimulationObserver
+{
+public:
+ WriteSharpInterfaceQuantitiesSimulationObserver();
+ //! \brief Construct WriteSharpInterfaceQuantitiesSimulationObserver object
+ //! \pre The Grid3D and UbScheduler objects must exist
+ //! \param grid is observable Grid3D object
+ //! \param s is UbScheduler object for scheduling of observer
+ //! \param path is path of folder for output
+ //! \param writer is WbWriter object
+ //! \param conv is LBMUnitConverter object
+ //! \param comm is Communicator object
+ WriteSharpInterfaceQuantitiesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ WbWriter *const writer, SPtr<LBMUnitConverter> conv, std::shared_ptr<vf::mpi::Communicator> comm);
+ ~WriteSharpInterfaceQuantitiesSimulationObserver() override = default;
+
+ void update(double step) override;
+
+protected:
+ //! Collect data for VTK-file
+ //! \param step is a time step
+ void collectData(double step);
+ //! Collect data for VTK-file
+ //! \param block is a time step
+ void addDataMQ(SPtr<Block3D> block);
+ void clearData();
+
+private:
+ void init();
+ std::vector<UbTupleFloat3> nodes;
+ std::vector<UbTupleUInt8> cells;
+ std::vector<std::string> datanames;
+ std::vector<std::vector<double>> data;
+ std::string path;
+ WbWriter *writer;
+ SPtr<LBMUnitConverter> conv;
+ std::vector<std::vector<SPtr<Block3D>>> blockVector;
+ int minInitLevel;
+ int maxInitLevel;
+ int gridRank;
+ std::shared_ptr<vf::mpi::Communicator> comm;
+
+ real gradX1_phi(const real *const &);
+ real gradX2_phi(const real *const &);
+ real gradX3_phi(const real *const &);
+ real nabla2_phi(const real *const &);
+
+ using CalcMacrosFct = void (*)(const real *const &, real &, real &, real &, real &);
+ CalcMacrosFct calcMacros;
+};
+
+#endif
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp b/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
similarity index 90%
rename from src/cpu/VirtualFluidsCore/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
rename to src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
index b4eee2dfbd952d27835dbaab24da84c041999a21..1b8dc581c37fea66b6f5725330d5d693917adf7d 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.cpp
@@ -32,15 +32,15 @@
//=======================================================================================
#include "MultiphaseBoundaryConditionsBlockVisitor.h"
-#include "BCAdapter.h"
+#include "BC.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "DataSet3D.h"
#include "Grid3D.h"
#include "D3Q27System.h"
-#include "BCAdapter.h"
+#include "BC.h"
#include "Block3D.h"
#include "BCArray3D.h"
#include "LBMKernel.h"
@@ -67,14 +67,14 @@ void MultiphaseBoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Blo
throw UbException(UB_EXARGS, "LBMKernel in " + block->toString() + "is not exist!");
}
- SPtr<BCProcessor> bcProcessor = kernel->getBCProcessor();
+ SPtr<BCSet> bcSet = kernel->getBCSet();
- if (!bcProcessor)
+ if (!bcSet)
{
throw UbException(UB_EXARGS,"Boundary Conditions Processor is not exist!" );
}
- SPtr<BCArray3D> bcArray = bcProcessor->getBCArray();
+ SPtr<BCArray3D> bcArray = bcSet->getBCArray();
bool compressible = kernel->getCompressible();
real collFactorL = kernel->getCollisionFactorL();
@@ -93,7 +93,7 @@ void MultiphaseBoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Blo
int maxX3 = (int)bcArray->getNX3();
SPtr<BoundaryConditions> bcPtr;
- bcProcessor->clearBC();
+ bcSet->clearBC();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<DistributionArray3D> distributionsH = kernel->getDataSet()->getHdistributions();
@@ -109,8 +109,8 @@ void MultiphaseBoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Blo
{
if ((bcPtr = bcArray->getBC(x1, x2, x3)) != NULL)
{
- char alg = bcPtr->getBcAlgorithmType();
- SPtr<BCAlgorithm> bca = bcMap[alg];
+ char alg = bcPtr->getBCStrategyType();
+ SPtr<BCStrategy> bca = bcMap[alg];
if (bca)
{
@@ -129,7 +129,7 @@ void MultiphaseBoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Blo
bca->setPhiBound(phiL, phiH);
bca->setCompressible(compressible);
bca->setBcArray(bcArray);
- bcProcessor->addBC(bca);
+ bcSet->addBC(bca);
}
}
}
@@ -139,9 +139,9 @@ void MultiphaseBoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Blo
}
}
//////////////////////////////////////////////////////////////////////////
-void MultiphaseBoundaryConditionsBlockVisitor::addBC(SPtr<BCAdapter> bc)
+void MultiphaseBoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
{
- bcMap.insert(std::make_pair(bc->getBcAlgorithmType(), bc->getAlgorithm()));
+ bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
}
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h b/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h
similarity index 95%
rename from src/cpu/VirtualFluidsCore/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h
rename to src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h
index e6cbc69c8bb2431e552d01210c73e450661961c3..cc04246d411dfc91f225598c269c1a10893817f5 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h
+++ b/src/cpu/MultiphaseFlow/Visitors/MultiphaseBoundaryConditionsBlockVisitor.h
@@ -37,8 +37,8 @@
#include "Block3DVisitor.h"
#include <map>
-class BCAdapter;
-class BCAlgorithm;
+class BC;
+class BCStrategy;
class MultiphaseBoundaryConditionsBlockVisitor : public Block3DVisitor
{
@@ -47,9 +47,9 @@ public:
virtual ~MultiphaseBoundaryConditionsBlockVisitor();
void visit(SPtr<Grid3D> grid, SPtr<Block3D> block);
- void addBC(SPtr<BCAdapter> bc);
+ void addBC(SPtr<BC> bc);
protected:
private:
- std::map<char, SPtr<BCAlgorithm>> bcMap;
+ std::map<char, SPtr<BCStrategy>> bcMap;
};
#endif // MultiphaseBoundaryConditionsBlockVisitor_h__
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp b/src/cpu/MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp
rename to src/cpu/MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp
index 4bc8a1862535ad4f7129577b864de6fe6dfc9ae8..ded01d95428ce53dc09f1371961d68ee1b005c00 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp
+++ b/src/cpu/MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.cpp
@@ -33,7 +33,7 @@
#include "MultiphaseInitDistributionsBlockVisitor.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "DataSet3D.h"
#include "EsoTwist3D.h"
@@ -174,7 +174,7 @@ void MultiphaseInitDistributionsBlockVisitor::visit(const SPtr<Grid3D> grid, SPt
if (!kernel)
throw UbException(UB_EXARGS, "The LBM kernel isn't exist in block: "+block->toString());
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<EsoTwist3D> distributionsF = dynamicPointerCast<EsoTwist3D>(kernel->getDataSet()->getFdistributions());
SPtr<EsoTwist3D> distributionsH = dynamicPointerCast<EsoTwist3D>(kernel->getDataSet()->getHdistributions());
SPtr<EsoTwist3D> distributionsH2 = dynamicPointerCast<EsoTwist3D>(kernel->getDataSet()->getH2distributions());
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.h b/src/cpu/MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.h
similarity index 100%
rename from src/cpu/VirtualFluidsCore/Visitors/MultiphaseInitDistributionsBlockVisitor.h
rename to src/cpu/MultiphaseFlow/Visitors/MultiphaseInitDistributionsBlockVisitor.h
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.cpp b/src/cpu/MultiphaseFlow/Visitors/MultiphaseSetKernelBlockVisitor.cpp
similarity index 89%
rename from src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.cpp
rename to src/cpu/MultiphaseFlow/Visitors/MultiphaseSetKernelBlockVisitor.cpp
index 8885b09ea0e19d56bce205334263a7b5c1f16313..04590a0d9e6700720bd3addc824ec4eb04fd94a3 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.cpp
+++ b/src/cpu/MultiphaseFlow/Visitors/MultiphaseSetKernelBlockVisitor.cpp
@@ -58,24 +58,24 @@ void MultiphaseSetKernelBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> blo
newKernel->setDataSet(dataSet);
- SPtr<BCProcessor> bcProc = block->getKernel()->getBCProcessor();
+ SPtr<BCSet> bcProc = block->getKernel()->getBCSet();
if (!bcProc)
{
- UB_THROW(UbException(UB_EXARGS, "It is not possible to change a BCProcessor in kernel! Old BCProcessor is not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "It is not possible to change a BCSet in kernel! Old BCSet is not exist!"));
}
- newKernel->setBCProcessor(bcProc);
+ newKernel->setBCSet(bcProc);
block->setKernel(newKernel);
}
break;
case MultiphaseSetKernelBlockVisitor::ChangeKernelWithData:
{
- SPtr<BCProcessor> bcProc = block->getKernel()->getBCProcessor();
+ SPtr<BCSet> bcProc = block->getKernel()->getBCSet();
if (!bcProc)
{
- UB_THROW(UbException(UB_EXARGS, "It is not possible to change a BCProcessor in kernel! Old BCProcessor is not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "It is not possible to change a BCSet in kernel! Old BCSet is not exist!"));
}
- newKernel->setBCProcessor(bcProc);
+ newKernel->setBCSet(bcProc);
block->setKernel(newKernel);
}
break;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.h b/src/cpu/MultiphaseFlow/Visitors/MultiphaseSetKernelBlockVisitor.h
similarity index 100%
rename from src/cpu/VirtualFluidsCore/Visitors/MultiphaseSetKernelBlockVisitor.h
rename to src/cpu/MultiphaseFlow/Visitors/MultiphaseSetKernelBlockVisitor.h
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.cpp b/src/cpu/MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.cpp
similarity index 83%
rename from src/cpu/VirtualFluidsCore/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.cpp
rename to src/cpu/MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.cpp
index 1338ab8822f254cc00fc795aa07bdb1b9a525ac2..0aca152c1d9d326e73216a86540130dae3dd4ad0 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.cpp
+++ b/src/cpu/MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.cpp
@@ -33,7 +33,7 @@
#include "MultiphaseVelocityFormInitDistributionsBlockVisitor.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "DataSet3D.h"
#include "EsoTwist3D.h"
@@ -48,6 +48,7 @@ MultiphaseVelocityFormInitDistributionsBlockVisitor::MultiphaseVelocityFormInitD
this->setVx2(0.0);
this->setVx3(0.0);
this->setRho(0.0);
+ this->setPhi(0.0);
this->setPressure(0.0);
}
//////////////////////////////////////////////////////////////////////////
@@ -178,7 +179,7 @@ void MultiphaseVelocityFormInitDistributionsBlockVisitor::visit(const SPtr<Grid3
if (!kernel)
throw UbException(UB_EXARGS, "The LBM kernel isn't exist in block: "+block->toString());
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<EsoTwist3D> distributionsF = dynamicPointerCast<EsoTwist3D>(kernel->getDataSet()->getFdistributions());
SPtr<EsoTwist3D> distributionsH = dynamicPointerCast<EsoTwist3D>(kernel->getDataSet()->getHdistributions());
SPtr<EsoTwist3D> distributionsH2 = dynamicPointerCast<EsoTwist3D>(kernel->getDataSet()->getH2distributions());
@@ -207,7 +208,8 @@ void MultiphaseVelocityFormInitDistributionsBlockVisitor::visit(const SPtr<Grid3
vx3 = muVx3.Eval();
phi = muPhi.Eval();
pres = muPressure.Eval();
- (*pressure)(ix1, ix2, ix3) = pres;
+ if (pressure)
+ (*pressure)(ix1, ix2, ix3) = pres;
//rho = phi*1.0 + (1.0-phi)/densityRatio;
@@ -223,7 +225,7 @@ void MultiphaseVelocityFormInitDistributionsBlockVisitor::visit(const SPtr<Grid3
real vx1Sq = vx1*vx1;
real vx2Sq = vx2*vx2;
real vx3Sq = vx3*vx3;
- for (int dir = STARTF; dir < (ENDF+1); dir++)
+ for (int dir = STARTF; dir <= ENDF; dir++)
{
real velProd = DX1[dir]*vx1 + DX2[dir]*vx2 + DX3[dir]*vx3;
real velSq1 = velProd*velProd;
@@ -236,65 +238,65 @@ void MultiphaseVelocityFormInitDistributionsBlockVisitor::visit(const SPtr<Grid3
geq[dir] = p1 * WEIGTH[dir] / (vf::basics::constant::c1o3) + gamma ;
}
-
- f[DIR_P00] = geq[DIR_P00] ;
- f[DIR_00M] = geq[DIR_00M] ;
- f[DIR_0P0] = geq[DIR_0P0] ;
- f[DIR_0M0] = geq[DIR_0M0] ;
- f[DIR_00P] = geq[DIR_00P] ;
- f[DIR_00M] = geq[DIR_00M] ;
- f[DIR_PP0] = geq[DIR_PP0] ;
- f[DIR_MM0] = geq[DIR_MM0] ;
- f[DIR_PM0] = geq[DIR_PM0] ;
- f[DIR_MP0] = geq[DIR_MP0] ;
- f[DIR_P0P] = geq[DIR_P0P] ;
- f[DIR_M0M] = geq[DIR_M0M] ;
- f[DIR_P0M] = geq[DIR_P0M] ;
- f[DIR_M0P] = geq[DIR_M0P] ;
- f[DIR_0PP] = geq[DIR_0PP] ;
- f[DIR_0MM] = geq[DIR_0MM] ;
- f[DIR_0PM] = geq[DIR_0PM] ;
- f[DIR_0MP] = geq[DIR_0MP] ;
- f[DIR_PPP] = geq[DIR_PPP] ;
- f[DIR_MPP] = geq[DIR_MPP] ;
- f[DIR_PMP] = geq[DIR_PMP] ;
- f[DIR_MMP] = geq[DIR_MMP] ;
- f[DIR_PPM] = geq[DIR_PPM] ;
- f[DIR_MPM] = geq[DIR_MPM] ;
- f[DIR_PMM] = geq[DIR_PMM] ;
- f[DIR_MMM] = geq[DIR_MMM] ;
- f[DIR_000] = geq[DIR_000] ;
+ f[DIR_000] = geq[DIR_000];
+ f[DIR_P00] = geq[DIR_P00];
+ f[DIR_M00] = geq[DIR_M00];
+ f[DIR_0P0] = geq[DIR_0P0];
+ f[DIR_0M0] = geq[DIR_0M0];
+ f[DIR_00P] = geq[DIR_00P];
+ f[DIR_00M] = geq[DIR_00M];
+ f[DIR_PP0] = geq[DIR_PP0];
+ f[DIR_MM0] = geq[DIR_MM0];
+ f[DIR_PM0] = geq[DIR_PM0];
+ f[DIR_MP0] = geq[DIR_MP0];
+ f[DIR_P0P] = geq[DIR_P0P];
+ f[DIR_M0M] = geq[DIR_M0M];
+ f[DIR_P0M] = geq[DIR_P0M];
+ f[DIR_M0P] = geq[DIR_M0P];
+ f[DIR_0PP] = geq[DIR_0PP];
+ f[DIR_0MM] = geq[DIR_0MM];
+ f[DIR_0PM] = geq[DIR_0PM];
+ f[DIR_0MP] = geq[DIR_0MP];
+ f[DIR_PPP] = geq[DIR_PPP];
+ f[DIR_MPP] = geq[DIR_MPP];
+ f[DIR_PMP] = geq[DIR_PMP];
+ f[DIR_MMP] = geq[DIR_MMP];
+ f[DIR_PPM] = geq[DIR_PPM];
+ f[DIR_MPM] = geq[DIR_MPM];
+ f[DIR_PMM] = geq[DIR_PMM];
+ f[DIR_MMM] = geq[DIR_MMM];
+
distributionsF->setDistribution(f, ix1, ix2, ix3);
distributionsF->setDistributionInv(f, ix1, ix2, ix3);
- f[DIR_000] = phi * feq[DIR_000]; // / rho;
- f[DIR_P00] = phi * feq[DIR_P00] ;// / rho;
- f[DIR_M00] = phi * feq[DIR_M00] ;// / rho;
- f[DIR_0P0] = phi * feq[DIR_0P0] ;// / rho;
- f[DIR_0M0] = phi * feq[DIR_0M0] ;// / rho;
- f[DIR_00P] = phi * feq[DIR_00P] ;// / rho;
- f[DIR_00M] = phi * feq[DIR_00M] ;// / rho;
- f[DIR_PP0] = phi * feq[DIR_PP0] ;// / rho;
- f[DIR_MM0] = phi * feq[DIR_MM0] ;// / rho;
- f[DIR_PM0] = phi * feq[DIR_PM0] ;// / rho;
- f[DIR_MP0] = phi * feq[DIR_MP0] ;// / rho;
- f[DIR_P0P] = phi * feq[DIR_P0P] ;// / rho;
- f[DIR_M0M] = phi * feq[DIR_M0M] ;// / rho;
- f[DIR_P0M] = phi * feq[DIR_P0M] ;// / rho;
- f[DIR_M0P] = phi * feq[DIR_M0P] ;// / rho;
- f[DIR_0PP] = phi * feq[DIR_0PP] ;// / rho;
- f[DIR_0MM] = phi * feq[DIR_0MM] ;// / rho;
- f[DIR_0PM] = phi * feq[DIR_0PM] ;// / rho;
- f[DIR_0MP] = phi * feq[DIR_0MP] ;// / rho;
- f[DIR_PPP] = phi * feq[DIR_PPP] ;// / rho;
- f[DIR_MPP] = phi * feq[DIR_MPP] ;// / rho;
- f[DIR_PMP] = phi * feq[DIR_PMP] ;// / rho;
- f[DIR_MMP] = phi * feq[DIR_MMP] ;// / rho;
- f[DIR_PPM] = phi * feq[DIR_PPM] ;// / rho;
- f[DIR_MPM] = phi * feq[DIR_MPM] ;// / rho;
- f[DIR_PMM] = phi * feq[DIR_PMM] ;// / rho;
- f[DIR_MMM] = phi * feq[DIR_MMM] ;// / rho;
+ f[DIR_000] = phi * feq[DIR_000];// / rho;
+ f[DIR_P00] = phi * feq[DIR_P00];// / rho;
+ f[DIR_M00] = phi * feq[DIR_M00];// / rho;
+ f[DIR_0P0] = phi * feq[DIR_0P0];// / rho;
+ f[DIR_0M0] = phi * feq[DIR_0M0];// / rho;
+ f[DIR_00P] = phi * feq[DIR_00P];// / rho;
+ f[DIR_00M] = phi * feq[DIR_00M];// / rho;
+ f[DIR_PP0] = phi * feq[DIR_PP0];// / rho;
+ f[DIR_MM0] = phi * feq[DIR_MM0];// / rho;
+ f[DIR_PM0] = phi * feq[DIR_PM0];// / rho;
+ f[DIR_MP0] = phi * feq[DIR_MP0];// / rho;
+ f[DIR_P0P] = phi * feq[DIR_P0P];// / rho;
+ f[DIR_M0M] = phi * feq[DIR_M0M];// / rho;
+ f[DIR_P0M] = phi * feq[DIR_P0M];// / rho;
+ f[DIR_M0P] = phi * feq[DIR_M0P];// / rho;
+ f[DIR_0PP] = phi * feq[DIR_0PP];// / rho;
+ f[DIR_0MM] = phi * feq[DIR_0MM];// / rho;
+ f[DIR_0PM] = phi * feq[DIR_0PM];// / rho;
+ f[DIR_0MP] = phi * feq[DIR_0MP];// / rho;
+ f[DIR_PPP] = phi * feq[DIR_PPP];// / rho;
+ f[DIR_MPP] = phi * feq[DIR_MPP];// / rho;
+ f[DIR_PMP] = phi * feq[DIR_PMP];// / rho;
+ f[DIR_MMP] = phi * feq[DIR_MMP];// / rho;
+ f[DIR_PPM] = phi * feq[DIR_PPM];// / rho;
+ f[DIR_MPM] = phi * feq[DIR_MPM];// / rho;
+ f[DIR_PMM] = phi * feq[DIR_PMM];// / rho;
+ f[DIR_MMM] = phi * feq[DIR_MMM];// / rho;
distributionsH->setDistribution(f, ix1, ix2, ix3);
diff --git a/src/cpu/VirtualFluidsCore/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h b/src/cpu/MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h
similarity index 100%
rename from src/cpu/VirtualFluidsCore/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h
rename to src/cpu/MultiphaseFlow/Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyBinghamModelNoSlipBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelNoSlipBCStrategy.h
similarity index 77%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyBinghamModelNoSlipBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelNoSlipBCStrategy.h
index 45c9c0c21dba308862c8d4a8c1c1827a4a07e7c7..24c96da39c87a156574327fb92ad758d2025e639 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyBinghamModelNoSlipBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelNoSlipBCStrategy.h
@@ -26,29 +26,29 @@
// 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 RheologyBinghamModelNoSlipBCAlgorithm.h
+//! \file RheologyBinghamModelNoSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef RheologyBinghamModelNoSlipBCAlgorithm_h__
-#define RheologyBinghamModelNoSlipBCAlgorithm_h__
+#ifndef RheologyBinghamModelNoSlipBCStrategy_h__
+#define RheologyBinghamModelNoSlipBCStrategy_h__
-#include "RheologyNoSlipBCAlgorithm.h"
-#include "Rheology.h"
+#include "RheologyNoSlipBCStrategy.h"
+#include "cpu/NonNewtonianFluids/LBM/Rheology.h"
-class RheologyBinghamModelNoSlipBCAlgorithm : public RheologyNoSlipBCAlgorithm
+class RheologyBinghamModelNoSlipBCStrategy : public RheologyNoSlipBCStrategy
{
public:
- RheologyBinghamModelNoSlipBCAlgorithm()
+ RheologyBinghamModelNoSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::RheologyBinghamModelNoSlipBCAlgorithm;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::RheologyBinghamModelNoSlipBCStrategy;
+ BCStrategy::preCollision = true;
}
- ~RheologyBinghamModelNoSlipBCAlgorithm() {}
- SPtr<BCAlgorithm> clone() override
+ ~RheologyBinghamModelNoSlipBCStrategy() {}
+ SPtr<BCStrategy> clone() override
{
- SPtr<BCAlgorithm> bc(new RheologyBinghamModelNoSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new RheologyBinghamModelNoSlipBCStrategy());
return bc;
}
protected:
@@ -57,4 +57,4 @@ protected:
return Rheology::getBinghamCollFactor(omegaInf, shearRate, drho);
}
};
-#endif // BinghamModelNoSlipBCAlgorithm_h__
+#endif // BinghamModelNoSlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyBinghamModelVelocityBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelVelocityBCStrategy.h
similarity index 77%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyBinghamModelVelocityBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelVelocityBCStrategy.h
index 2837238c40ec02bffe7a8eccb4fedb5100846d55..bbff469c0ebef26eaf57859d56e4bd27c39b358a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyBinghamModelVelocityBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelVelocityBCStrategy.h
@@ -26,29 +26,29 @@
// 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 RheologyBinghamModelVelocityBCAlgorithm.h
+//! \file RheologyBinghamModelVelocityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef BinghamModelVelocityBCAlgorithm_h__
-#define BinghamModelVelocityBCAlgorithm_h__
+#ifndef BinghamModelVelocityBCStrategy_h__
+#define BinghamModelVelocityBCStrategy_h__
-#include "RheologyVelocityBCAlgorithm.h"
-#include "Rheology.h"
+#include "RheologyVelocityBCStrategy.h"
+#include "cpu/NonNewtonianFluids/LBM/Rheology.h"
-class RheologyBinghamModelVelocityBCAlgorithm : public RheologyVelocityBCAlgorithm
+class RheologyBinghamModelVelocityBCStrategy : public RheologyVelocityBCStrategy
{
public:
- RheologyBinghamModelVelocityBCAlgorithm()
+ RheologyBinghamModelVelocityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::RheologyBinghamModelVelocityBCAlgorithm;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::RheologyBinghamModelVelocityBCStrategy;
+ BCStrategy::preCollision = true;
}
- ~RheologyBinghamModelVelocityBCAlgorithm() {}
- SPtr<BCAlgorithm> clone() override
+ ~RheologyBinghamModelVelocityBCStrategy() {}
+ SPtr<BCStrategy> clone() override
{
- SPtr<BCAlgorithm> bc(new RheologyBinghamModelVelocityBCAlgorithm());
+ SPtr<BCStrategy> bc(new RheologyBinghamModelVelocityBCStrategy());
return bc;
}
protected:
@@ -57,4 +57,4 @@ protected:
return Rheology::getBinghamCollFactor(omegaInf, shearRate, drho);
}
};
-#endif // BinghamModelVelocityBCAlgorithm_h__
+#endif // BinghamModelVelocityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCStrategy.h
similarity index 76%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCStrategy.h
index c9b76b563dd16044ee109acbdc8eff73cde95959..c29c6e9cebc3092358369bc16c5bfe5b65215ea9 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCStrategy.h
@@ -26,28 +26,28 @@
// 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 RheologyHerschelBulkleyModelNoSlipBCAlgorithm.h
+//! \file RheologyHerschelBulkleyModelNoSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef RheologyHerschelBulkleyModelNoSlipBCAlgorithm_h__
-#define RheologyHerschelBulkleyModelNoSlipBCAlgorithm_h__
+#ifndef RheologyHerschelBulkleyModelNoSlipBCStrategy_h__
+#define RheologyHerschelBulkleyModelNoSlipBCStrategy_h__
-#include "RheologyNoSlipBCAlgorithm.h"
-#include "Rheology.h"
+#include "RheologyNoSlipBCStrategy.h"
+#include "cpu/NonNewtonianFluids/LBM/Rheology.h"
-class RheologyHerschelBulkleyModelNoSlipBCAlgorithm : public RheologyNoSlipBCAlgorithm
+class RheologyHerschelBulkleyModelNoSlipBCStrategy : public RheologyNoSlipBCStrategy
{
public:
- RheologyHerschelBulkleyModelNoSlipBCAlgorithm()
+ RheologyHerschelBulkleyModelNoSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::RheologyHerschelBulkleyModelNoSlipBCAlgorithm;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::RheologyHerschelBulkleyModelNoSlipBCStrategy;
+ BCStrategy::preCollision = true;
}
- ~RheologyHerschelBulkleyModelNoSlipBCAlgorithm() {}
- SPtr<BCAlgorithm> clone() override
+ ~RheologyHerschelBulkleyModelNoSlipBCStrategy() {}
+ SPtr<BCStrategy> clone() override
{
- SPtr<BCAlgorithm> bc(new RheologyHerschelBulkleyModelNoSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new RheologyHerschelBulkleyModelNoSlipBCStrategy());
return bc;
}
protected:
@@ -56,4 +56,4 @@ protected:
return Rheology::getHerschelBulkleyCollFactor(omegaInf, shearRate, drho);
}
};
-#endif // RheologyHerschelBulkleyModelNoSlipBCAlgorithm_h__
\ No newline at end of file
+#endif // RheologyHerschelBulkleyModelNoSlipBCStrategy_h__
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyNoSlipBCAlgorithm.cpp b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.cpp
similarity index 91%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyNoSlipBCAlgorithm.cpp
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.cpp
index 73bf54ad7eccbd42deb2454fa5d0a060cf6b5c15..4227b3af8af343de69b15944a5ebb96f5bd5c9d8 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyNoSlipBCAlgorithm.cpp
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.cpp
@@ -26,21 +26,21 @@
// 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 RheologyNoSlipBCAlgorithm.cpp
+//! \file RheologyNoSlipBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "RheologyNoSlipBCAlgorithm.h"
+#include "RheologyNoSlipBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
//////////////////////////////////////////////////////////////////////////
-void RheologyNoSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void RheologyNoSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void RheologyNoSlipBCAlgorithm::applyBC()
+void RheologyNoSlipBCStrategy::applyBC()
{
real f[D3Q27System::ENDF + 1];
real feq[D3Q27System::ENDF + 1];
@@ -59,7 +59,7 @@ void RheologyNoSlipBCAlgorithm::applyBC()
//quadratic bounce back
const int invDir = D3Q27System::INVDIR[fDir];
real q = bcPtr->getQ(invDir);
- real fReturn =(f[invDir] + q * f[fDir] + q * collFactorF * (feq[invDir] - f[invDir] + feq[fDir] - f[fDir])) / (1.0 + q);
+ real fReturn =(f[invDir] + q * f[fDir] + q * collFactorF * (feq[invDir] - f[invDir] + feq[fDir] - f[fDir])) / (vf::basics::constant::c1o1 + q);
distributions->setDistributionInvForDirection(fReturn, x1 + D3Q27System::DX1[invDir], x2 + D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir], invDir);
}
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyNoSlipBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.h
similarity index 85%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyNoSlipBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.h
index c8c38ad7fcf3e35378b1e5dd14938cdad230f185..611d87bcd3b6e275869b6ec430b7a1f349c0aa3e 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyNoSlipBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.h
@@ -26,27 +26,27 @@
// 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 RheologyNoSlipBCAlgorithm.h
+//! \file RheologyNoSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef RheologyNoSlipBCAlgorithm_h__
-#define RheologyNoSlipBCAlgorithm_h__
+#ifndef RheologyNoSlipBCStrategy_h__
+#define RheologyNoSlipBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
-class RheologyNoSlipBCAlgorithm : public BCAlgorithm
+class RheologyNoSlipBCStrategy : public BCStrategy
{
public:
- RheologyNoSlipBCAlgorithm() = default;
- ~RheologyNoSlipBCAlgorithm() = default;
- virtual SPtr<BCAlgorithm> clone() override { UB_THROW(UbException("real clone() - belongs in the derived class")); }
+ RheologyNoSlipBCStrategy() = default;
+ ~RheologyNoSlipBCStrategy() = default;
+ virtual SPtr<BCStrategy> clone() override { UB_THROW(UbException("real clone() - belongs in the derived class")); }
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
protected:
virtual real getRheologyCollFactor(real omegaInf, real shearRate, real drho) const = 0; // { UB_THROW(UbException("real getRheologyCollFactor() - belongs in the derived class")); }
};
-#endif // RheologyNoSlipBCAlgorithm_h__
+#endif // RheologyNoSlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyPowellEyringModelNoSlipBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyPowellEyringModelNoSlipBCStrategy.h
similarity index 76%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyPowellEyringModelNoSlipBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyPowellEyringModelNoSlipBCStrategy.h
index a6a3a5a745f193d66f2d87303ab5df1fd62826eb..f867ab1dc2df84bb8498728295a1f6d7cf734d83 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyPowellEyringModelNoSlipBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyPowellEyringModelNoSlipBCStrategy.h
@@ -26,28 +26,28 @@
// 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 RheologyPowellEyringModelNoSlipBCAlgorithm.h
+//! \file RheologyPowellEyringModelNoSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef RheologyPowellEyringModelNoSlipBCAlgorithm_h__
-#define RheologyPowellEyringModelNoSlipBCAlgorithm_h__
+#ifndef RheologyPowellEyringModelNoSlipBCStrategy_h__
+#define RheologyPowellEyringModelNoSlipBCStrategy_h__
-#include "RheologyNoSlipBCAlgorithm.h"
-#include "Rheology.h"
+#include "RheologyNoSlipBCStrategy.h"
+#include "cpu/NonNewtonianFluids/LBM/Rheology.h"
-class RheologyPowellEyringModelNoSlipBCAlgorithm : public RheologyNoSlipBCAlgorithm
+class RheologyPowellEyringModelNoSlipBCStrategy : public RheologyNoSlipBCStrategy
{
public:
- RheologyPowellEyringModelNoSlipBCAlgorithm()
+ RheologyPowellEyringModelNoSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::RheologyPowellEyringModelNoSlipBCAlgorithm;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::RheologyPowellEyringModelNoSlipBCStrategy;
+ BCStrategy::preCollision = true;
}
- ~RheologyPowellEyringModelNoSlipBCAlgorithm() {}
- SPtr<BCAlgorithm> clone() override
+ ~RheologyPowellEyringModelNoSlipBCStrategy() {}
+ SPtr<BCStrategy> clone() override
{
- SPtr<BCAlgorithm> bc(new RheologyPowellEyringModelNoSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new RheologyPowellEyringModelNoSlipBCStrategy());
return bc;
}
protected:
@@ -56,4 +56,4 @@ protected:
return Rheology::getHerschelBulkleyCollFactor(omegaInf, shearRate, drho);
}
};
-#endif // RheologyPowellEyringModelNoSlipBCAlgorithm_h__
\ No newline at end of file
+#endif // RheologyPowellEyringModelNoSlipBCStrategy_h__
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyVelocityBCAlgorithm.cpp b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyVelocityBCStrategy.cpp
similarity index 63%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyVelocityBCAlgorithm.cpp
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyVelocityBCStrategy.cpp
index 9f7881af1705fca4ef24402f0fed4dbcb701127b..706edc7a2efe6ab23dde750b26d2905f16fe4220 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyVelocityBCAlgorithm.cpp
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyVelocityBCStrategy.cpp
@@ -26,54 +26,58 @@
// 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 RheologyVelocityBCAlgorithm.cpp
+//! \file RheologyVelocityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "RheologyVelocityBCAlgorithm.h"
+#include "RheologyVelocityBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-RheologyVelocityBCAlgorithm::RheologyVelocityBCAlgorithm()
+RheologyVelocityBCStrategy::RheologyVelocityBCStrategy()
{
- //BCAlgorithm::type = BCAlgorithm::RheologyVelocityBCAlgorithm;
- //BCAlgorithm::preCollision = false;
+ //BCStrategy::type = BCStrategy::RheologyVelocityBCStrategy;
+ //BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-RheologyVelocityBCAlgorithm::~RheologyVelocityBCAlgorithm()
+RheologyVelocityBCStrategy::~RheologyVelocityBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-void RheologyVelocityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void RheologyVelocityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void RheologyVelocityBCAlgorithm::applyBC()
+void RheologyVelocityBCStrategy::applyBC()
{
- real f[D3Q27System::ENDF+1];
- real feq[D3Q27System::ENDF+1];
- distributions->getDistributionInv(f, x1, x2, x3);
- real rho, vx1, vx2, vx3, drho;
- calcMacrosFct(f, drho, vx1, vx2, vx3);
- calcFeqFct(feq, drho, vx1, vx2, vx3);
+ using namespace vf::basics::constant;
+
+ real f[D3Q27System::ENDF+1];
+ real feq[D3Q27System::ENDF+1];
+ distributions->getDistribution(f, x1, x2, x3);
+ real rho, vx1, vx2, vx3, drho;
+ calcMacrosFct(f, drho, vx1, vx2, vx3);
+ calcFeqFct(feq, drho, vx1, vx2, vx3);
real shearRate = D3Q27System::getShearRate(f, collFactor);
+ // getShearRate(f, collFactor) takes pre collision state but is given post collision state. Requires rescaling
real collFactorF = getRheologyCollFactor(collFactor, shearRate, drho);
+
rho = 1.0+drho*compressibleFactor;
- for (int fdir = D3Q27System::FSTARTDIR; fdir<=D3Q27System::FENDDIR; fdir++)
- {
- if (bcPtr->hasVelocityBoundaryFlag(fdir))
- {
- const int invDir = D3Q27System::INVDIR[fdir];
- real q = bcPtr->getQ(invDir);// m+m q=0 stabiler
- real velocity = bcPtr->getBoundaryVelocity(invDir);
- real fReturn = ((1.0-q)/(1.0+q))*((f[invDir]-feq[invDir])/(1.0-collFactorF)+feq[invDir])+((q*(f[invDir]+f[fdir])-velocity*rho)/(1.0+q));
- distributions->setDistributionForDirection(fReturn, x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);
- }
- }
+ for (int fdir = D3Q27System::FSTARTDIR; fdir<=D3Q27System::FENDDIR; fdir++)
+ {
+ if (bcPtr->hasVelocityBoundaryFlag(fdir))
+ {
+ const int invDir = D3Q27System::INVDIR[fdir];
+ real q = bcPtr->getQ(invDir);
+ real velocity = bcPtr->getBoundaryVelocity(invDir);
+ real fReturn = ((c1o1 - q) / (c1o1 + q)) * ((f[invDir])) + ((q * (f[invDir] + f[fdir] - collFactorF * (f[invDir] - feq[invDir] + f[fdir] - feq[fdir])) - velocity * rho) / (c1o1 + q));
+ distributions->setDistributionForDirection(fReturn, x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);
+ }
+ }
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyVelocityBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyVelocityBCStrategy.h
similarity index 85%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyVelocityBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyVelocityBCStrategy.h
index 91ac9ec574b9252c4d2842b9134d4190878d9daf..00c08230cf19fd73bfa56b7949239e62be72fbd4 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/RheologyVelocityBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/RheologyVelocityBCStrategy.h
@@ -26,29 +26,29 @@
// 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 RheologyVelocityBCAlgorithm.h
+//! \file RheologyVelocityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef RheologyVelocityBCAlgorithm_h__
-#define RheologyVelocityBCAlgorithm_h__
+#ifndef RheologyVelocityBCStrategy_h__
+#define RheologyVelocityBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
-class RheologyVelocityBCAlgorithm : public BCAlgorithm
+class RheologyVelocityBCStrategy : public BCStrategy
{
public:
- RheologyVelocityBCAlgorithm();
- ~RheologyVelocityBCAlgorithm();
- virtual SPtr<BCAlgorithm> clone() override { UB_THROW(UbException("real clone() - belongs in the derived class")); }
+ RheologyVelocityBCStrategy();
+ ~RheologyVelocityBCStrategy();
+ virtual SPtr<BCStrategy> clone() override { UB_THROW(UbException("real clone() - belongs in the derived class")); }
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
protected:
virtual real getRheologyCollFactor(real omegaInf, real shearRate, real drho) const = 0; // { UB_THROW(UbException("real getRheologyCollFactor() - belongs in the derived class")); }
};
-#endif // RheologyVelocityBCAlgorithm_h__
+#endif // RheologyVelocityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyDensityBCAlgorithm.cpp b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.cpp
similarity index 84%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyDensityBCAlgorithm.cpp
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.cpp
index ebdf07f25ba489a87b637646271171bdc6de6d58..70981c5d0e4178eb0b58ac807305635be5a7fdfd 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyDensityBCAlgorithm.cpp
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.cpp
@@ -26,51 +26,51 @@
// 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 ThixotropyDensityBCAlgorithm.cpp
+//! \file ThixotropyDensityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "ThixotropyDensityBCAlgorithm.h"
+#include "ThixotropyDensityBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-ThixotropyDensityBCAlgorithm::ThixotropyDensityBCAlgorithm()
+ThixotropyDensityBCStrategy::ThixotropyDensityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::ThixotropyDensityBCAlgorithm;
- BCAlgorithm::preCollision = false;
- BCAlgorithm::thixotropy = true;
+ BCStrategy::type = BCStrategy::ThixotropyDensityBCStrategy;
+ BCStrategy::preCollision = false;
+ BCStrategy::thixotropy = true;
lambdaBC = 0.0;
}
//////////////////////////////////////////////////////////////////////////
-ThixotropyDensityBCAlgorithm::~ThixotropyDensityBCAlgorithm()
+ThixotropyDensityBCStrategy::~ThixotropyDensityBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> ThixotropyDensityBCAlgorithm::clone()
+SPtr<BCStrategy> ThixotropyDensityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new ThixotropyDensityBCAlgorithm());
- dynamicPointerCast<ThixotropyDensityBCAlgorithm>(bc)->setLambdaBC(lambdaBC);
+ SPtr<BCStrategy> bc(new ThixotropyDensityBCStrategy());
+ dynamicPointerCast<ThixotropyDensityBCStrategy>(bc)->setLambdaBC(lambdaBC);
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyDensityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void ThixotropyDensityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-//void ThixotropyDensityBCAlgorithm::addDistributionsF(DistributionArray3DPtr distributions)
+//void ThixotropyDensityBCStrategy::addDistributionsF(DistributionArray3DPtr distributions)
//{
// this->distributionsf = distributions;
//}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyDensityBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributions)
+void ThixotropyDensityBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributions)
{
this->distributionsH = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyDensityBCAlgorithm::applyBC()
+void ThixotropyDensityBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
using namespace D3Q27System;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyDensityBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyDensityBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h
index 2b83eed0ef9720b247751011e4d49d70df4b5e71..a40500fe5b9e5ca2136bba71e3723e75db33bd50 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyDensityBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h
@@ -26,23 +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 ThixotropyDensityBCAlgorithm.h
+//! \file ThixotropyDensityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef ThixotropyDensityBCAlgorithm_h__
-#define ThixotropyDensityBCAlgorithm_h__
+#ifndef ThixotropyDensityBCStrategy_h__
+#define ThixotropyDensityBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
-class ThixotropyDensityBCAlgorithm : public BCAlgorithm
+class ThixotropyDensityBCStrategy : public BCStrategy
{
public:
- ThixotropyDensityBCAlgorithm();
- virtual ~ThixotropyDensityBCAlgorithm();
- SPtr<BCAlgorithm> clone();
+ ThixotropyDensityBCStrategy();
+ virtual ~ThixotropyDensityBCStrategy();
+ SPtr<BCStrategy> clone();
void addDistributions(SPtr<DistributionArray3D> distributions);
//void addDistributionsF(SPtr<DistributionArray3D> distributions);
void addDistributionsH(SPtr<DistributionArray3D> distributions);
@@ -54,5 +54,5 @@ protected:
private:
real lambdaBC;
};
-#endif // ThixotropyDensityBCAlgorithm_h__
+#endif // ThixotropyDensityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.cpp b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.cpp
similarity index 76%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.cpp
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.cpp
index e973a0091ea12db88e21052c3addc8fa4db8e995..da1f2deaa8c18fb74f9d5b60212f05dbb94173fe 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.cpp
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.cpp
@@ -26,49 +26,49 @@
// 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 ThixotropyNoSlipBCAlgorithm.cpp
+//! \file ThixotropyNoSlipBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "ThixotropyNoSlipBCAlgorithm.h"
+#include "ThixotropyNoSlipBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-ThixotropyNoSlipBCAlgorithm::ThixotropyNoSlipBCAlgorithm()
+ThixotropyNoSlipBCStrategy::ThixotropyNoSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::ThixotropyNoSlipBCAlgorithm;
- BCAlgorithm::preCollision = false;
- BCAlgorithm::thixotropy = true;
+ BCStrategy::type = BCStrategy::ThixotropyNoSlipBCStrategy;
+ BCStrategy::preCollision = false;
+ BCStrategy::thixotropy = true;
}
//////////////////////////////////////////////////////////////////////////
-ThixotropyNoSlipBCAlgorithm::~ThixotropyNoSlipBCAlgorithm()
+ThixotropyNoSlipBCStrategy::~ThixotropyNoSlipBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> ThixotropyNoSlipBCAlgorithm::clone()
+SPtr<BCStrategy> ThixotropyNoSlipBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new ThixotropyNoSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new ThixotropyNoSlipBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyNoSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void ThixotropyNoSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-//void ThixotropyNoSlipBCAlgorithm::addDistributionsF(SPtr<DistributionArray3D> distributions)
+//void ThixotropyNoSlipBCStrategy::addDistributionsF(SPtr<DistributionArray3D> distributions)
//{
// this->distributionsf = distributions;
//}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyNoSlipBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributions)
+void ThixotropyNoSlipBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributions)
{
this->distributionsH = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyNoSlipBCAlgorithm::applyBC()
+void ThixotropyNoSlipBCStrategy::applyBC()
{
real f[D3Q27System::ENDF + 1];
real feq[D3Q27System::ENDF + 1];
@@ -91,8 +91,8 @@ void ThixotropyNoSlipBCAlgorithm::applyBC()
//quadratic bounce back
const int invDir = D3Q27System::INVDIR[fdir];
real q = bcPtr->getQ(invDir);
- real fReturnf = ((1.0 - q) / (1.0 + q))*((f[invDir] - feq[invDir]) / (1.0 - collFactor) + feq[invDir]) + ((q / (1.0 + q))*(f[invDir] + f[fdir]));
- real fReturnh = ((1.0 - q) / (1.0 + q))*((h[invDir] - heq[invDir]) / (1.0 - collFactor) + heq[invDir]) + ((q / (1.0 + q))*(h[invDir] + h[fdir]));
+ real fReturnf = ((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]));
+ real fReturnh = ((vf::basics::constant::c1o1 - q) / (vf::basics::constant::c1o1 + q))*((h[invDir] - heq[invDir]) / (vf::basics::constant::c1o1 - collFactor) + heq[invDir]) + ((q / (vf::basics::constant::c1o1 + q))*(h[invDir] + h[fdir]));
distributions->setDistributionForDirection(fReturnf, x1 + D3Q27System::DX1[invDir], x2 + D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir], fdir);
distributionsH->setDistributionForDirection(fReturnh, x1 + D3Q27System::DX1[invDir], x2 + D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir], fdir);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.h
index e3e0ebc348909bd7152cdcbb9d1ede2253c80497..edd8952333f9607429e78ea917edf360768743c7 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNoSlipBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.h
@@ -26,21 +26,21 @@
// 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 ThixotropyNoSlipBCAlgorithm.h
+//! \file ThixotropyNoSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef ThixotropyNoSlipBCAlgorithm_h__
-#define ThixotropyNoSlipBCAlgorithm_h__
+#ifndef ThixotropyNoSlipBCStrategy_h__
+#define ThixotropyNoSlipBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
-class ThixotropyNoSlipBCAlgorithm : public BCAlgorithm
+class ThixotropyNoSlipBCStrategy : public BCStrategy
{
public:
- ThixotropyNoSlipBCAlgorithm();
- virtual ~ThixotropyNoSlipBCAlgorithm();
- SPtr<BCAlgorithm> clone();
+ ThixotropyNoSlipBCStrategy();
+ virtual ~ThixotropyNoSlipBCStrategy();
+ SPtr<BCStrategy> clone();
void addDistributions(SPtr<DistributionArray3D> distributions);
//void addDistributionsF(DistributionArray3DPtr distributions);
void addDistributionsH(SPtr<DistributionArray3D> distributions);
@@ -50,5 +50,5 @@ protected:
private:
};
-#endif // ThixotropyNoSlipBCAlgorithm_h__
+#endif // ThixotropyNoSlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNonReflectingOutflowBCAlgorithm.cpp b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.cpp
similarity index 52%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNonReflectingOutflowBCAlgorithm.cpp
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.cpp
index 257b2b6f227a71f2b22312aad20bb49d93dbf4e9..3ee059eec142c2c0ef14d36d52cdf097a68efa18 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNonReflectingOutflowBCAlgorithm.cpp
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.cpp
@@ -26,51 +26,52 @@
// 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 ThixotropyNonReflectingOutflowBCAlgorithm.cpp
+//! \file ThixotropyNonReflectingOutflowBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "ThixotropyNonReflectingOutflowBCAlgorithm.h"
+#include "ThixotropyNonReflectingOutflowBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-ThixotropyNonReflectingOutflowBCAlgorithm::ThixotropyNonReflectingOutflowBCAlgorithm()
+ThixotropyNonReflectingOutflowBCStrategy::ThixotropyNonReflectingOutflowBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::ThixotropyNonReflectingOutflowBCAlgorithm;
- BCAlgorithm::preCollision = true;
- BCAlgorithm::thixotropy = true;
+ BCStrategy::type = BCStrategy::ThixotropyNonReflectingOutflowBCStrategy;
+ BCStrategy::preCollision = true;
+ BCStrategy::thixotropy = true;
}
//////////////////////////////////////////////////////////////////////////
-ThixotropyNonReflectingOutflowBCAlgorithm::~ThixotropyNonReflectingOutflowBCAlgorithm()
+ThixotropyNonReflectingOutflowBCStrategy::~ThixotropyNonReflectingOutflowBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> ThixotropyNonReflectingOutflowBCAlgorithm::clone()
+SPtr<BCStrategy> ThixotropyNonReflectingOutflowBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new ThixotropyNonReflectingOutflowBCAlgorithm());
+ SPtr<BCStrategy> bc(new ThixotropyNonReflectingOutflowBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyNonReflectingOutflowBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void ThixotropyNonReflectingOutflowBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-//void ThixotropyNonReflectingOutflowBCAlgorithm::addDistributionsF(DistributionArray3DPtr distributions)
+//void ThixotropyNonReflectingOutflowBCStrategy::addDistributionsF(DistributionArray3DPtr distributions)
//{
// this->distributionsf = distributions;
//}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyNonReflectingOutflowBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributions)
+void ThixotropyNonReflectingOutflowBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributions)
{
this->distributionsH = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
+void ThixotropyNonReflectingOutflowBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
using namespace D3Q27System;
+ using namespace vf::basics::constant;
real f[ENDF + 1];
real ftemp[ENDF + 1];
@@ -97,16 +98,16 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
switch (direction)
{
- case DIR_P00:
- f[DIR_P00] = ftemp[DIR_P00] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_P00];
- f[DIR_PP0] = ftemp[DIR_PP0] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PP0];
- f[DIR_PM0] = ftemp[DIR_PM0] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PM0];
- f[DIR_P0P] = ftemp[DIR_P0P] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_P0P];
- f[DIR_P0M] = ftemp[DIR_P0M] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_P0M];
- f[DIR_PPP] = ftemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PPP];
- f[DIR_PMP] = ftemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PMP];
- f[DIR_PPM] = ftemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PPM];
- f[DIR_PMM] = ftemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PMM];
+ case DIR_P00:
+ f[DIR_P00] = ftemp[DIR_P00] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P00];
+ f[DIR_PP0] = ftemp[DIR_PP0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PP0];
+ f[DIR_PM0] = ftemp[DIR_PM0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PM0];
+ f[DIR_P0P] = ftemp[DIR_P0P] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P0P];
+ f[DIR_P0M] = ftemp[DIR_P0M] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P0M];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PPP];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PMP];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PPM];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PMM];
distributions->setDistributionInvForDirection(f[DIR_P00], x1 + DX1[DIR_M00], x2 + DX2[DIR_M00], x3 + DX3[DIR_M00], DIR_M00);
distributions->setDistributionInvForDirection(f[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -119,15 +120,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
break;
case DIR_M00:
- f[DIR_M00] = ftemp[DIR_M00] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_M00];
- f[DIR_MP0] = ftemp[DIR_MP0] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MP0];
- f[DIR_MM0] = ftemp[DIR_MM0] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MM0];
- f[DIR_M0P] = ftemp[DIR_M0P] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_M0P];
- f[DIR_M0M] = ftemp[DIR_M0M] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_M0M];
- f[DIR_MPP] = ftemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MPP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MMP];
- f[DIR_MPM] = ftemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MPM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MMM];
+ f[DIR_M00] = ftemp[DIR_M00] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M00];
+ f[DIR_MP0] = ftemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MP0];
+ f[DIR_MM0] = ftemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MM0];
+ f[DIR_M0P] = ftemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M0P];
+ f[DIR_M0M] = ftemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M0M];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MPP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MMP];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MPM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_M00], x1 + DX1[DIR_P00], x2 + DX2[DIR_P00], x3 + DX3[DIR_P00], DIR_P00);
distributions->setDistributionInvForDirection(f[DIR_MP0], x1 + DX1[DIR_PM0], x2 + DX2[DIR_PM0], x3 + DX3[DIR_PM0], DIR_PM0);
@@ -140,15 +141,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
break;
case DIR_0P0:
- f[DIR_0P0] = ftemp[DIR_0P0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_0P0];
- f[DIR_PP0] = ftemp[DIR_PP0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_PP0];
- f[DIR_MP0] = ftemp[DIR_MP0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_MP0];
- f[DIR_0PP] = ftemp[DIR_0PP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_0PP];
- f[DIR_0PM] = ftemp[DIR_0PM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_0PM];
- f[DIR_PPP] = ftemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_PPP];
- f[DIR_MPP] = ftemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_MPP];
- f[DIR_PPM] = ftemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_PPM];
- f[DIR_MPM] = ftemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_MPM];
+ f[DIR_0P0] = ftemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0P0];
+ f[DIR_PP0] = ftemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PP0];
+ f[DIR_MP0] = ftemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MP0];
+ f[DIR_0PP] = ftemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0PP];
+ f[DIR_0PM] = ftemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0PM];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PPP];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MPP];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PPM];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MPM];
distributions->setDistributionInvForDirection(f[DIR_0P0], x1 + DX1[DIR_0M0], x2 + DX2[DIR_0M0], x3 + DX3[DIR_0M0], DIR_0M0);
distributions->setDistributionInvForDirection(f[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -161,15 +162,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MPM], x1 + DX1[DIR_PMP], x2 + DX2[DIR_PMP], x3 + DX3[DIR_PMP], DIR_PMP);
break;
case DIR_0M0:
- f[DIR_0M0] = ftemp[DIR_0M0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_0M0];
- f[DIR_PM0] = ftemp[DIR_PM0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_PM0];
- f[DIR_MM0] = ftemp[DIR_MM0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_MM0];
- f[DIR_0MP] = ftemp[DIR_0MP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_0MP];
- f[DIR_0MM] = ftemp[DIR_0MM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_0MM];
- f[DIR_PMP] = ftemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_PMP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_MMP];
- f[DIR_PMM] = ftemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_PMM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_MMM];
+ f[DIR_0M0] = ftemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0M0];
+ f[DIR_PM0] = ftemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PM0];
+ f[DIR_MM0] = ftemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MM0];
+ f[DIR_0MP] = ftemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0MP];
+ f[DIR_0MM] = ftemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0MM];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PMP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MMP];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PMM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_0M0], x1 + DX1[DIR_0P0], x2 + DX2[DIR_0P0], x3 + DX3[DIR_0P0], DIR_0P0);
distributions->setDistributionInvForDirection(f[DIR_PM0], x1 + DX1[DIR_MP0], x2 + DX2[DIR_MP0], x3 + DX3[DIR_MP0], DIR_MP0);
@@ -182,15 +183,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
break;
case DIR_00P:
- f[DIR_00P] = ftemp[DIR_00P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_00P];
- f[DIR_P0P] = ftemp[DIR_P0P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_P0P];
- f[DIR_M0P] = ftemp[DIR_M0P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_M0P];
- f[DIR_0PP] = ftemp[DIR_0PP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_0PP];
- f[DIR_0MP] = ftemp[DIR_0MP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_0MP];
- f[DIR_PPP] = ftemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_PPP];
- f[DIR_MPP] = ftemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_MPP];
- f[DIR_PMP] = ftemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_PMP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_MMP];
+ f[DIR_00P] = ftemp[DIR_00P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_00P];
+ f[DIR_P0P] = ftemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_P0P];
+ f[DIR_M0P] = ftemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_M0P];
+ f[DIR_0PP] = ftemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_0PP];
+ f[DIR_0MP] = ftemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_0MP];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_PPP];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_MPP];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_PMP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_MMP];
distributions->setDistributionInvForDirection(f[DIR_00P], x1 + DX1[DIR_00M], x2 + DX2[DIR_00M], x3 + DX3[DIR_00M], DIR_00M);
distributions->setDistributionInvForDirection(f[DIR_P0P], x1 + DX1[DIR_M0M], x2 + DX2[DIR_M0M], x3 + DX3[DIR_M0M], DIR_M0M);
@@ -203,15 +204,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MMP], x1 + DX1[DIR_PPM], x2 + DX2[DIR_PPM], x3 + DX3[DIR_PPM], DIR_PPM);
break;
case DIR_00M:
- f[DIR_00M] = ftemp[DIR_00M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_00M];
- f[DIR_P0M] = ftemp[DIR_P0M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_P0M];
- f[DIR_M0M] = ftemp[DIR_M0M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_M0M];
- f[DIR_0PM] = ftemp[DIR_0PM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_0PM];
- f[DIR_0MM] = ftemp[DIR_0MM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_0MM];
- f[DIR_PPM] = ftemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_PPM];
- f[DIR_MPM] = ftemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_MPM];
- f[DIR_PMM] = ftemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_PMM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_MMM];
+ f[DIR_00M] = ftemp[DIR_00M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_00M];
+ f[DIR_P0M] = ftemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_P0M];
+ f[DIR_M0M] = ftemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_M0M];
+ f[DIR_0PM] = ftemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_0PM];
+ f[DIR_0MM] = ftemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_0MM];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_PPM];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_MPM];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_PMM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_00M], x1 + DX1[DIR_00P], x2 + DX2[DIR_00P], x3 + DX3[DIR_00P], DIR_00P);
distributions->setDistributionInvForDirection(f[DIR_P0M], x1 + DX1[DIR_M0P], x2 + DX2[DIR_M0P], x3 + DX3[DIR_M0P], DIR_M0P);
@@ -242,15 +243,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
switch (direction)
{
case DIR_P00:
- h[DIR_P00] = htemp[DIR_P00] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_P00];
- h[DIR_PP0] = htemp[DIR_PP0] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_PP0];
- h[DIR_PM0] = htemp[DIR_PM0] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_PM0];
- h[DIR_P0P] = htemp[DIR_P0P] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_P0P];
- h[DIR_P0M] = htemp[DIR_P0M] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_P0M];
- h[DIR_PPP] = htemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_PPP];
- h[DIR_PMP] = htemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_PMP];
- h[DIR_PPM] = htemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_PPM];
- h[DIR_PMM] = htemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * h[DIR_PMM];
+ h[DIR_P00] = htemp[DIR_P00] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_P00];
+ h[DIR_PP0] = htemp[DIR_PP0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PP0];
+ h[DIR_PM0] = htemp[DIR_PM0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PM0];
+ h[DIR_P0P] = htemp[DIR_P0P] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_P0P];
+ h[DIR_P0M] = htemp[DIR_P0M] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_P0M];
+ h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PPP];
+ h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PMP];
+ h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PPM];
+ h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * h[DIR_PMM];
distributionsH->setDistributionInvForDirection(h[DIR_P00], x1 + DX1[DIR_M00], x2 + DX2[DIR_M00], x3 + DX3[DIR_M00], DIR_M00);
distributionsH->setDistributionInvForDirection(h[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -263,15 +264,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
break;
case DIR_M00:
- h[DIR_M00] = htemp[DIR_M00] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_M00];
- h[DIR_MP0] = htemp[DIR_MP0] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_MP0];
- h[DIR_MM0] = htemp[DIR_MM0] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_MM0];
- h[DIR_M0P] = htemp[DIR_M0P] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_M0P];
- h[DIR_M0M] = htemp[DIR_M0M] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_M0M];
- h[DIR_MPP] = htemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_MPP];
- h[DIR_MMP] = htemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_MMP];
- h[DIR_MPM] = htemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_MPM];
- h[DIR_MMM] = htemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * h[DIR_MMM];
+ h[DIR_M00] = htemp[DIR_M00] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_M00];
+ h[DIR_MP0] = htemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MP0];
+ h[DIR_MM0] = htemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MM0];
+ h[DIR_M0P] = htemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_M0P];
+ h[DIR_M0M] = htemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_M0M];
+ h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MPP];
+ h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MMP];
+ h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MPM];
+ h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * h[DIR_MMM];
distributionsH->setDistributionInvForDirection(h[DIR_M00], x1 + DX1[DIR_P00], x2 + DX2[DIR_P00], x3 + DX3[DIR_P00], DIR_P00);
distributionsH->setDistributionInvForDirection(h[DIR_MP0], x1 + DX1[DIR_PM0], x2 + DX2[DIR_PM0], x3 + DX3[DIR_PM0], DIR_PM0);
@@ -284,15 +285,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
break;
case DIR_0P0:
- h[DIR_0P0] = htemp[DIR_0P0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_0P0];
- h[DIR_PP0] = htemp[DIR_PP0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_PP0];
- h[DIR_MP0] = htemp[DIR_MP0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_MP0];
- h[DIR_0PP] = htemp[DIR_0PP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_0PP];
- h[DIR_0PM] = htemp[DIR_0PM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_0PM];
- h[DIR_PPP] = htemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_PPP];
- h[DIR_MPP] = htemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_MPP];
- h[DIR_PPM] = htemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_PPM];
- h[DIR_MPM] = htemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * h[DIR_MPM];
+ h[DIR_0P0] = htemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_0P0];
+ h[DIR_PP0] = htemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_PP0];
+ h[DIR_MP0] = htemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_MP0];
+ h[DIR_0PP] = htemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_0PP];
+ h[DIR_0PM] = htemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_0PM];
+ h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_PPP];
+ h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_MPP];
+ h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_PPM];
+ h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * h[DIR_MPM];
distributionsH->setDistributionInvForDirection(h[DIR_0P0], x1 + DX1[DIR_0M0], x2 + DX2[DIR_0M0], x3 + DX3[DIR_0M0], DIR_0M0);
distributionsH->setDistributionInvForDirection(h[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -305,15 +306,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_MPM], x1 + DX1[DIR_PMP], x2 + DX2[DIR_PMP], x3 + DX3[DIR_PMP], DIR_PMP);
break;
case DIR_0M0:
- h[DIR_0M0] = htemp[DIR_0M0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_0M0];
- h[DIR_PM0] = htemp[DIR_PM0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_PM0];
- h[DIR_MM0] = htemp[DIR_MM0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_MM0];
- h[DIR_0MP] = htemp[DIR_0MP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_0MP];
- h[DIR_0MM] = htemp[DIR_0MM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_0MM];
- h[DIR_PMP] = htemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_PMP];
- h[DIR_MMP] = htemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_MMP];
- h[DIR_PMM] = htemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_PMM];
- h[DIR_MMM] = htemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * h[DIR_MMM];
+ h[DIR_0M0] = htemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_0M0];
+ h[DIR_PM0] = htemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_PM0];
+ h[DIR_MM0] = htemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_MM0];
+ h[DIR_0MP] = htemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_0MP];
+ h[DIR_0MM] = htemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_0MM];
+ h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_PMP];
+ h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_MMP];
+ h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_PMM];
+ h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * h[DIR_MMM];
distributionsH->setDistributionInvForDirection(h[DIR_0M0], x1 + DX1[DIR_0P0], x2 + DX2[DIR_0P0], x3 + DX3[DIR_0P0], DIR_0P0);
distributionsH->setDistributionInvForDirection(h[DIR_PM0], x1 + DX1[DIR_MP0], x2 + DX2[DIR_MP0], x3 + DX3[DIR_MP0], DIR_MP0);
@@ -326,15 +327,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
break;
case DIR_00P:
- h[DIR_00P] = htemp[DIR_00P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_00P];
- h[DIR_P0P] = htemp[DIR_P0P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_P0P];
- h[DIR_M0P] = htemp[DIR_M0P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_M0P];
- h[DIR_0PP] = htemp[DIR_0PP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_0PP];
- h[DIR_0MP] = htemp[DIR_0MP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_0MP];
- h[DIR_PPP] = htemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_PPP];
- h[DIR_MPP] = htemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_MPP];
- h[DIR_PMP] = htemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_PMP];
- h[DIR_MMP] = htemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * h[DIR_MMP];
+ h[DIR_00P] = htemp[DIR_00P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_00P];
+ h[DIR_P0P] = htemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_P0P];
+ h[DIR_M0P] = htemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_M0P];
+ h[DIR_0PP] = htemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_0PP];
+ h[DIR_0MP] = htemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_0MP];
+ h[DIR_PPP] = htemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_PPP];
+ h[DIR_MPP] = htemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_MPP];
+ h[DIR_PMP] = htemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_PMP];
+ h[DIR_MMP] = htemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * h[DIR_MMP];
distributionsH->setDistributionInvForDirection(h[DIR_00P], x1 + DX1[DIR_00M], x2 + DX2[DIR_00M], x3 + DX3[DIR_00M], DIR_00M);
distributionsH->setDistributionInvForDirection(h[DIR_P0P], x1 + DX1[DIR_M0M], x2 + DX2[DIR_M0M], x3 + DX3[DIR_M0M], DIR_M0M);
@@ -347,15 +348,15 @@ void ThixotropyNonReflectingOutflowBCAlgorithm::applyBC()
distributionsH->setDistributionInvForDirection(h[DIR_MMP], x1 + DX1[DIR_PPM], x2 + DX2[DIR_PPM], x3 + DX3[DIR_PPM], DIR_PPM);
break;
case DIR_00M:
- h[DIR_00M] = htemp[DIR_00M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_00M];
- h[DIR_P0M] = htemp[DIR_P0M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_P0M];
- h[DIR_M0M] = htemp[DIR_M0M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_M0M];
- h[DIR_0PM] = htemp[DIR_0PM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_0PM];
- h[DIR_0MM] = htemp[DIR_0MM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_0MM];
- h[DIR_PPM] = htemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_PPM];
- h[DIR_MPM] = htemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_MPM];
- h[DIR_PMM] = htemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_PMM];
- h[DIR_MMM] = htemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * h[DIR_MMM];
+ h[DIR_00M] = htemp[DIR_00M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_00M];
+ h[DIR_P0M] = htemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_P0M];
+ h[DIR_M0M] = htemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_M0M];
+ h[DIR_0PM] = htemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_0PM];
+ h[DIR_0MM] = htemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_0MM];
+ h[DIR_PPM] = htemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_PPM];
+ h[DIR_MPM] = htemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_MPM];
+ h[DIR_PMM] = htemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_PMM];
+ h[DIR_MMM] = htemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * h[DIR_MMM];
distributionsH->setDistributionInvForDirection(h[DIR_00M], x1 + DX1[DIR_00P], x2 + DX2[DIR_00P], x3 + DX3[DIR_00P], DIR_00P);
distributionsH->setDistributionInvForDirection(h[DIR_P0M], x1 + DX1[DIR_M0P], x2 + DX2[DIR_M0P], x3 + DX3[DIR_M0P], DIR_M0P);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNonReflectingOutflowBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.h
similarity index 85%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNonReflectingOutflowBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.h
index cabc67bd67111b873c9c62db748d1f04eb006c56..7ae90994a13ab1a0842a0abbad596d1762bd4927 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyNonReflectingOutflowBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.h
@@ -26,22 +26,22 @@
// 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 ThixotropyNonReflectingOutflowBCAlgorithm.h
+//! \file ThixotropyNonReflectingOutflowBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef ThixotropyNonReflectingOutflowBCAlgorithm_h__
-#define ThixotropyNonReflectingOutflowBCAlgorithm_h__
+#ifndef ThixotropyNonReflectingOutflowBCStrategy_h__
+#define ThixotropyNonReflectingOutflowBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
-class ThixotropyNonReflectingOutflowBCAlgorithm : public BCAlgorithm
+class ThixotropyNonReflectingOutflowBCStrategy : public BCStrategy
{
public:
- ThixotropyNonReflectingOutflowBCAlgorithm();
- virtual ~ThixotropyNonReflectingOutflowBCAlgorithm();
- SPtr<BCAlgorithm> clone();
+ ThixotropyNonReflectingOutflowBCStrategy();
+ virtual ~ThixotropyNonReflectingOutflowBCStrategy();
+ SPtr<BCStrategy> clone();
void addDistributions(SPtr<DistributionArray3D> distributions);
//void addDistributionsF(SPtr<DistributionArray3D> distributions);
void addDistributionsH(SPtr<DistributionArray3D> distributions);
@@ -53,5 +53,5 @@ protected:
private:
//LBMReal lambdaBC;
};
-#endif // ThixotropyNonReflectingOutflowBCAlgorithm_h__
+#endif // ThixotropyNonReflectingOutflowBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityBCAlgorithm.cpp b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.cpp
similarity index 81%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityBCAlgorithm.cpp
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.cpp
index 189f52fd3088392be0db5b144158ed97623beafe..2b2dd1714eb7a9decceeb92a28a5dbfae6944e9c 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityBCAlgorithm.cpp
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.cpp
@@ -26,50 +26,50 @@
// 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 ThixotropyVelocityBCAlgorithm.cpp
+//! \file ThixotropyVelocityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "ThixotropyVelocityBCAlgorithm.h"
+#include "ThixotropyVelocityBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-ThixotropyVelocityBCAlgorithm::ThixotropyVelocityBCAlgorithm()
+ThixotropyVelocityBCStrategy::ThixotropyVelocityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::ThixotropyVelocityBCAlgorithm;
- BCAlgorithm::preCollision = false;
- BCAlgorithm::thixotropy = true;
- lambdaBC = 0.0;
+ BCStrategy::type = BCStrategy::ThixotropyVelocityBCStrategy;
+ BCStrategy::preCollision = false;
+ BCStrategy::thixotropy = true;
+ lambdaBC = vf::basics::constant::c0o1;
}
//////////////////////////////////////////////////////////////////////////
-ThixotropyVelocityBCAlgorithm::~ThixotropyVelocityBCAlgorithm()
+ThixotropyVelocityBCStrategy::~ThixotropyVelocityBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> ThixotropyVelocityBCAlgorithm::clone()
+SPtr<BCStrategy> ThixotropyVelocityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new ThixotropyVelocityBCAlgorithm());
- dynamicPointerCast<ThixotropyVelocityBCAlgorithm>(bc)->setLambdaBC(lambdaBC);
+ SPtr<BCStrategy> bc(new ThixotropyVelocityBCStrategy());
+ dynamicPointerCast<ThixotropyVelocityBCStrategy>(bc)->setLambdaBC(lambdaBC);
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyVelocityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void ThixotropyVelocityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-//void ThixotropyVelocityBCAlgorithm::addDistributionsF(DistributionArray3DPtr distributions)
+//void ThixotropyVelocityBCStrategy::addDistributionsF(DistributionArray3DPtr distributions)
//{
// this->distributionsf = distributions;
//}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyVelocityBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributions)
+void ThixotropyVelocityBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributions)
{
this->distributionsH = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyVelocityBCAlgorithm::applyBC()
+void ThixotropyVelocityBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
@@ -84,7 +84,7 @@ void ThixotropyVelocityBCAlgorithm::applyBC()
calcMacrosFct(f, drho, vx1, vx2, vx3);
calcFeqFct(feq, drho, vx1, vx2, vx3);
- rho = 1.0 + drho * compressibleFactor;
+ rho = vf::basics::constant::c1o1 + drho * compressibleFactor;
//calcDiffusionMacrosFctPost(h, concentration, fl1, fl2, fl3, m100, collFactor);
real lambda = D3Q27System::getDensity(h);
@@ -127,7 +127,7 @@ void ThixotropyVelocityBCAlgorithm::applyBC()
const int invDir = D3Q27System::INVDIR[fdir];
real q = bcPtr->getQ(invDir);// m+m q=0 stabiler
real velocity = bcPtr->getBoundaryVelocity(invDir);
- real fReturn = ((1.0 - q) / (1.0 + q)) * ((f[invDir] - feq[invDir]) / (1.0 - collFactor) + feq[invDir]) + ((q * (f[invDir] + f[fdir]) - velocity * rho) / (1.0 + q));
+ real fReturn = ((vf::basics::constant::c1o1 - q) / (vf::basics::constant::c1o1 + q)) * ((f[invDir] - feq[invDir]) / (vf::basics::constant::c1o1 - collFactor) + feq[invDir]) + ((q * (f[invDir] + f[fdir]) - velocity * rho) / (vf::basics::constant::c1o1 + q));
distributions->setDistributionForDirection(fReturn, x1 + D3Q27System::DX1[invDir], x2 + D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir], fdir);
real htemp = D3Q27System::getCompFeqForDirection(fdir, lambda, vx1, vx2, vx3);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.h
index bea3b0a374a128f1de88b1ef3d6e75c0ad34190a..93cf6d2206efe942c57024e979ef9a4f970c2807 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.h
@@ -26,22 +26,22 @@
// 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 ThixotropyVelocityBCAlgorithm.h
+//! \file ThixotropyVelocityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef ThixotropyVelocityBCAlgorithm_h__
-#define ThixotropyVelocityBCAlgorithm_h__
+#ifndef ThixotropyVelocityBCStrategy_h__
+#define ThixotropyVelocityBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
-class ThixotropyVelocityBCAlgorithm : public BCAlgorithm
+class ThixotropyVelocityBCStrategy : public BCStrategy
{
public:
- ThixotropyVelocityBCAlgorithm();
- virtual ~ThixotropyVelocityBCAlgorithm();
- SPtr<BCAlgorithm> clone();
+ ThixotropyVelocityBCStrategy();
+ virtual ~ThixotropyVelocityBCStrategy();
+ SPtr<BCStrategy> clone();
void addDistributions(SPtr<DistributionArray3D> distributions);
void addDistributionsH(SPtr<DistributionArray3D> distributions);
void applyBC();
@@ -52,5 +52,5 @@ protected:
private:
real lambdaBC;
};
-#endif // ThixotropyVelocityBCAlgorithm_h__
+#endif // ThixotropyVelocityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityWithDensityBCAlgorithm.cpp b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.cpp
similarity index 83%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityWithDensityBCAlgorithm.cpp
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.cpp
index 6c2622fc7838381de8fa94b12a97d35146b78b43..5d91a1e7a38ea5fc3d20e8aef5f78c9fad6a468d 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityWithDensityBCAlgorithm.cpp
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.cpp
@@ -26,43 +26,43 @@
// 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 ThixotropyVelocityWithDensityBCAlgorithm.cpp
+//! \file ThixotropyVelocityWithDensityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "ThixotropyVelocityWithDensityBCAlgorithm.h"
+#include "ThixotropyVelocityWithDensityBCStrategy.h"
#include "DistributionArray3D.h"
#include "BCArray3D.h"
-ThixotropyVelocityWithDensityBCAlgorithm::ThixotropyVelocityWithDensityBCAlgorithm()
+ThixotropyVelocityWithDensityBCStrategy::ThixotropyVelocityWithDensityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::ThixotropyVelocityWithDensityBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::ThixotropyVelocityWithDensityBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-ThixotropyVelocityWithDensityBCAlgorithm::~ThixotropyVelocityWithDensityBCAlgorithm()
+ThixotropyVelocityWithDensityBCStrategy::~ThixotropyVelocityWithDensityBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> ThixotropyVelocityWithDensityBCAlgorithm::clone()
+SPtr<BCStrategy> ThixotropyVelocityWithDensityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new ThixotropyVelocityWithDensityBCAlgorithm());
- dynamicPointerCast<ThixotropyVelocityWithDensityBCAlgorithm>(bc)->setLambdaBC(lambdaBC);
+ SPtr<BCStrategy> bc(new ThixotropyVelocityWithDensityBCStrategy());
+ dynamicPointerCast<ThixotropyVelocityWithDensityBCStrategy>(bc)->setLambdaBC(lambdaBC);
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyVelocityWithDensityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void ThixotropyVelocityWithDensityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyVelocityWithDensityBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributions)
+void ThixotropyVelocityWithDensityBCStrategy::addDistributionsH(SPtr<DistributionArray3D> distributions)
{
this->distributionsH = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void ThixotropyVelocityWithDensityBCAlgorithm::applyBC()
+void ThixotropyVelocityWithDensityBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
@@ -76,7 +76,7 @@ void ThixotropyVelocityWithDensityBCAlgorithm::applyBC()
real rho, vx1, vx2, vx3, drho;
calcMacrosFct(f, drho, vx1, vx2, vx3);
- rho = 1.0+drho*compressibleFactor;
+ rho = vf::basics::constant::c1o1+drho*compressibleFactor;
///////////////////////////////////////////////////////////////////
// Rheology
@@ -116,7 +116,7 @@ void ThixotropyVelocityWithDensityBCAlgorithm::applyBC()
const int invDir = D3Q27System::INVDIR[fdir];
real velocity = bcPtr->getBoundaryVelocity(fdir);
- real fReturn = (f[fdir] + f[invDir] - velocity*rho) / 2.0 - drho*D3Q27System::WEIGTH[invDir];
+ real fReturn = (f[fdir] + f[invDir] - velocity*rho) / vf::basics::constant::c2o1 - drho*D3Q27System::WEIGTH[invDir];
distributions->setDistributionForDirection(fReturn, nX1, nX2, nX3, invDir);
}
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityWithDensityBCAlgorithm.h b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.h
similarity index 86%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityWithDensityBCAlgorithm.h
rename to src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.h
index d69e79a223e3db56cb6a37014bbf030183adf606..74d33efc0a1dbb693280665d0d27e541081b2fd3 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThixotropyVelocityWithDensityBCAlgorithm.h
+++ b/src/cpu/NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.h
@@ -26,27 +26,27 @@
// 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 ThixotropyVelocityWithDensityBCAlgorithm.h
+//! \file ThixotropyVelocityWithDensityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef ThixotropyVelocityWithDensityBCAlgorithm_h__
-#define ThixotropyVelocityWithDensityBCAlgorithm_h__
+#ifndef ThixotropyVelocityWithDensityBCStrategy_h__
+#define ThixotropyVelocityWithDensityBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
//! \brief Class implements Dirichlet boundary condition for velocity. Set density in system. It is used together with non reflecting outflow.
-class ThixotropyVelocityWithDensityBCAlgorithm : public BCAlgorithm
+class ThixotropyVelocityWithDensityBCStrategy : public BCStrategy
{
public:
- ThixotropyVelocityWithDensityBCAlgorithm();
- ~ThixotropyVelocityWithDensityBCAlgorithm();
- SPtr<BCAlgorithm> clone();
+ ThixotropyVelocityWithDensityBCStrategy();
+ ~ThixotropyVelocityWithDensityBCStrategy();
+ SPtr<BCStrategy> clone();
void addDistributions(SPtr<DistributionArray3D> distributions);
void addDistributionsH(SPtr<DistributionArray3D> distributions);
void applyBC();
@@ -57,4 +57,4 @@ protected:
private:
real lambdaBC;
};
-#endif // ThixotropyVelocityWithDensityBCAlgorithm_h__
+#endif // ThixotropyVelocityWithDensityBCStrategy_h__
diff --git a/src/cpu/NonNewtonianFluids/CMakeLists.txt b/src/cpu/NonNewtonianFluids/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..35765164bce5ce208f1c43fcc7345cbd77f4e999
--- /dev/null
+++ b/src/cpu/NonNewtonianFluids/CMakeLists.txt
@@ -0,0 +1 @@
+vf_add_library(PUBLIC_LINK VirtualFluidsCore)
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/LBM/Rheology.cpp b/src/cpu/NonNewtonianFluids/LBM/Rheology.cpp
similarity index 100%
rename from src/cpu/VirtualFluidsCore/LBM/Rheology.cpp
rename to src/cpu/NonNewtonianFluids/LBM/Rheology.cpp
diff --git a/src/cpu/VirtualFluidsCore/LBM/Rheology.h b/src/cpu/NonNewtonianFluids/LBM/Rheology.h
similarity index 100%
rename from src/cpu/VirtualFluidsCore/LBM/Rheology.h
rename to src/cpu/NonNewtonianFluids/LBM/Rheology.h
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyBinghamModelLBMKernel.h b/src/cpu/NonNewtonianFluids/LBM/RheologyBinghamModelLBMKernel.h
similarity index 98%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyBinghamModelLBMKernel.h
rename to src/cpu/NonNewtonianFluids/LBM/RheologyBinghamModelLBMKernel.h
index da51e6c4e11f67ff48efe7a34c7eeaf900e9e730..61ff8c86d65db9d36b0a6919927704ffc2618716 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyBinghamModelLBMKernel.h
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyBinghamModelLBMKernel.h
@@ -50,7 +50,7 @@ public:
kernel->setNX(nx);
kernel->setCollisionFactor(collFactor);
dynamicPointerCast<RheologyBinghamModelLBMKernel>(kernel)->initDataSet();
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyHerschelBulkleyModelLBMKernel.h b/src/cpu/NonNewtonianFluids/LBM/RheologyHerschelBulkleyModelLBMKernel.h
similarity index 98%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyHerschelBulkleyModelLBMKernel.h
rename to src/cpu/NonNewtonianFluids/LBM/RheologyHerschelBulkleyModelLBMKernel.h
index 2422efefd52cdbfac183a9fdd19b9b2f5a5fee70..55435e1b4c1243aaefd5f7f141ec2da84c594116 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyHerschelBulkleyModelLBMKernel.h
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyHerschelBulkleyModelLBMKernel.h
@@ -49,7 +49,7 @@ public:
kernel->setNX(nx);
kernel->setCollisionFactor(collFactor);
dynamicPointerCast<RheologyHerschelBulkleyModelLBMKernel>(kernel)->initDataSet();
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyInterpolationProcessor.cpp b/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.cpp
similarity index 100%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyInterpolationProcessor.cpp
rename to src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.cpp
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyInterpolationProcessor.h b/src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h
similarity index 100%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyInterpolationProcessor.h
rename to src/cpu/NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.cpp b/src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.cpp
rename to src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.cpp
index 9cb096cd1df43332e41b09c5229b2cdeb0b2936b..a9c7a05da6eefb4f44834d1c91f5e5b43d4f5eb4 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.cpp
@@ -71,7 +71,7 @@ SPtr<LBMKernel> RheologyK17LBMKernel::clone()
kernel->setNX(nx);
dynamicPointerCast<RheologyK17LBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -126,7 +126,7 @@ void RheologyK17LBMKernel::calculate(int step)
nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.h b/src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.h
rename to src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.h
index 80bf7dcb346f500d75a31eca68fefdd092f2e9e8..1244bb031c1dffda3ea369739a5e9436238e1e0a 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyK17LBMKernel.h
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyK17LBMKernel.h
@@ -35,7 +35,7 @@
#define RheologyK17LBMKernel_h__
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel.cpp b/src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel.cpp
rename to src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel.cpp
index 8fe8a78a41609e4acb4bcd6fcd09a7285912b6a7..7f1c8c884d4cf3b4a174f7d2c58e2f070c459b6b 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel.cpp
@@ -83,7 +83,7 @@ void RheologyModelLBMKernel::calculate(int step)
nonLocalDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -903,7 +903,7 @@ void RheologyModelLBMKernel::calculate(int step)
// kernel->setCollisionFactor(collFactor);
// collFactorF = collFactor;
// dynamicPointerCast<RheologyModelLBMKernel>(kernel)->initDataSet();
-// kernel->setBCProcessor(bcProcessor->clone(kernel));
+// kernel->setBCSet(bcSet->clone(kernel));
// kernel->setWithForcing(withForcing);
// kernel->setForcingX1(muForcingX1);
// kernel->setForcingX2(muForcingX2);
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel.h b/src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel.h
rename to src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel.h
index 8b4ce82984d12ef33b1011fe020fe7d3f0c638e4..4ff3bb9f7b679c4f97b2a685b2d1bbe64912d892 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel.h
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel.h
@@ -34,7 +34,7 @@
#define RheologyModelLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel2.cpp b/src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel2.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel2.cpp
rename to src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel2.cpp
index b7d7f2c916c8ec1c76fc4fe6175d05fd9312b8c4..380bb9861343803b3ec2165af96c684ac4722c47 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel2.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel2.cpp
@@ -53,7 +53,7 @@ void RheologyModelLBMKernel2::calculate(int step)
nonLocalDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -902,7 +902,7 @@ void RheologyModelLBMKernel2::calculate(int step)
// kernel->setCollisionFactor(collFactor);
// collFactorF = collFactor;
// dynamicPointerCast<RheologyModelLBMKernel2>(kernel)->initDataSet();
-// kernel->setBCProcessor(bcProcessor->clone(kernel));
+// kernel->setBCSet(bcSet->clone(kernel));
// kernel->setWithForcing(withForcing);
// kernel->setForcingX1(muForcingX1);
// kernel->setForcingX2(muForcingX2);
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel2.h b/src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel2.h
similarity index 98%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel2.h
rename to src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel2.h
index ca058f1e4e67cd8cf51e971999f9a2a359aa197d..ca97551c849d2b3315ff1813ecb0b3936a451a5b 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyModelLBMKernel2.h
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyModelLBMKernel2.h
@@ -2,7 +2,7 @@
#define RheologyModelLBMKernel2_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/RheologyPowellEyringModelLBMKernel.h b/src/cpu/NonNewtonianFluids/LBM/RheologyPowellEyringModelLBMKernel.h
similarity index 98%
rename from src/cpu/VirtualFluidsCore/LBM/RheologyPowellEyringModelLBMKernel.h
rename to src/cpu/NonNewtonianFluids/LBM/RheologyPowellEyringModelLBMKernel.h
index acd02101fed8793175a6aae62394ce14e2847832..5cf0533f96b1c1df10ea8843196e15064044cbb9 100644
--- a/src/cpu/VirtualFluidsCore/LBM/RheologyPowellEyringModelLBMKernel.h
+++ b/src/cpu/NonNewtonianFluids/LBM/RheologyPowellEyringModelLBMKernel.h
@@ -49,7 +49,7 @@ public:
kernel->setNX(nx);
kernel->setCollisionFactor(collFactor);
dynamicPointerCast<RheologyPowellEyringModelLBMKernel>(kernel)->initDataSet();
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.cpp b/src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.cpp
rename to src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.cpp
index 70bfdfdadc0d3ebb50befbc022798dc91717276d..cbfa924405109fa03dfef6532c538fb2917d2d43 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.cpp
@@ -45,7 +45,7 @@ SPtr<LBMKernel> ThixotropyExpLBMKernel::clone()
dynamicPointerCast<ThixotropyExpLBMKernel>(kernel)->setCollisionFactorH(this->collFactorH);
dynamicPointerCast<ThixotropyExpLBMKernel>(kernel)->setAlpha(this->alpha);
dynamicPointerCast<ThixotropyExpLBMKernel>(kernel)->setTheta(this->theta);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -98,7 +98,7 @@ void ThixotropyExpLBMKernel::calculate(int step)
nonLocalDistributionsH = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getNonLocalDistributions();
zeroDistributionsH = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.h b/src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.h
similarity index 98%
rename from src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.h
rename to src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.h
index 1316493c81c56a849cdcc39a9adfb064aa684205..754dd0ae09129455331c5a55b3b4d640350f33db 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyExpLBMKernel.h
+++ b/src/cpu/NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.h
@@ -2,7 +2,7 @@
#define ThixotropyExpLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.cpp b/src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.cpp
similarity index 99%
rename from src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.cpp
rename to src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.cpp
index f866381d42538f01e7194d67415e134d9106ab16..368436088dc72bb10677f046aa9e954f9120be42 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.cpp
+++ b/src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.cpp
@@ -45,7 +45,7 @@ SPtr<LBMKernel> ThixotropyLBMKernel::clone()
dynamicPointerCast<ThixotropyLBMKernel>(kernel)->setCollisionFactorH(this->collFactorH);
dynamicPointerCast<ThixotropyLBMKernel>(kernel)->setAlpha(this->alpha);
dynamicPointerCast<ThixotropyLBMKernel>(kernel)->setTheta(this->theta);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -98,7 +98,7 @@ void ThixotropyLBMKernel::calculate(int step)
nonLocalDistributionsH = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getNonLocalDistributions();
zeroDistributionsH = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
diff --git a/src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.h b/src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.h
similarity index 98%
rename from src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.h
rename to src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.h
index c638105425c20dfa64a221a02004ee1ece8879fd..00b374ed133f58878ed8e1cf541c3fad79ea7c5e 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ThixotropyLBMKernel.h
+++ b/src/cpu/NonNewtonianFluids/LBM/ThixotropyLBMKernel.h
@@ -2,7 +2,7 @@
#define ThixotropyLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h b/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h
new file mode 100644
index 0000000000000000000000000000000000000000..169082259b203b195b7fc636d84cdd4029ce6ccf
--- /dev/null
+++ b/src/cpu/NonNewtonianFluids/NonNewtonianFluids.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/RheologyNoSlipBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelNoSlipBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/RheologyPowellEyringModelNoSlipBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/RheologyBinghamModelVelocityBCStrategy.h"
+
+#include "NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.h"
+#include "NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.h"
+
+#include "NonNewtonianFluids/LBM/ThixotropyLBMKernel.h"
+#include "NonNewtonianFluids/LBM/ThixotropyExpLBMKernel.h"
+#include "NonNewtonianFluids/LBM/RheologyBinghamModelLBMKernel.h"
+#include "NonNewtonianFluids/LBM/RheologyHerschelBulkleyModelLBMKernel.h"
+#include "NonNewtonianFluids/LBM/RheologyInterpolationProcessor.h"
+#include "NonNewtonianFluids/LBM/Rheology.h"
+#include "NonNewtonianFluids/LBM/RheologyK17LBMKernel.h"
+#include "NonNewtonianFluids/LBM/RheologyPowellEyringModelLBMKernel.h"
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp b/src/cpu/NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.cpp
similarity index 53%
rename from src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
rename to src/cpu/NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.cpp
index 93b3854070c0b9f1f589e6d32f1872cc8521ca86..82adf2f0e2e59a36e4585d42d9baadb4e793f55f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.cpp
+++ b/src/cpu/NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.cpp
@@ -1,5 +1,5 @@
-#include "CalculateTorqueCoProcessor.h"
-#include "BCProcessor.h"
+#include "CalculateTorqueSimulationObserver.h"
+#include "BCSet.h"
#include <mpi/Communicator.h>
#include "D3Q27Interactor.h"
@@ -12,8 +12,9 @@
#include "BCArray3D.h"
#include "EsoTwist3D.h"
#include "DistributionArray3D.h"
+#include "NonNewtonianFluids/LBM/Rheology.h"
-CalculateTorqueCoProcessor::CalculateTorqueCoProcessor( SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path_, std::shared_ptr<vf::mpi::Communicator> comm) : CoProcessor(grid, s), path(path_), comm(comm), torqueX1global(0), torqueX2global(0), torqueX3global(0)
+CalculateTorqueSimulationObserver::CalculateTorqueSimulationObserver( SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path_, std::shared_ptr<vf::mpi::Communicator> comm) : SimulationObserver(grid, s), path(path_), comm(comm), torqueX1global(0), torqueX2global(0), torqueX3global(0)
{
if (comm->getProcessID() == comm->getRoot())
{
@@ -36,20 +37,20 @@ CalculateTorqueCoProcessor::CalculateTorqueCoProcessor( SPtr<Grid3D> grid, SPtr<
}
}
//////////////////////////////////////////////////////////////////////////
-CalculateTorqueCoProcessor::~CalculateTorqueCoProcessor()
+CalculateTorqueSimulationObserver::~CalculateTorqueSimulationObserver()
{
}
//////////////////////////////////////////////////////////////////////////
-void CalculateTorqueCoProcessor::process( real step )
+void CalculateTorqueSimulationObserver::update( real step )
{
if(scheduler->isDue(step) )
collectData(step);
- UBLOG(logDEBUG3, "D3Q27ForcesCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "D3Q27ForcesSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void CalculateTorqueCoProcessor::collectData( real step )
+void CalculateTorqueSimulationObserver::collectData( real step )
{
calculateForces();
@@ -70,13 +71,16 @@ void CalculateTorqueCoProcessor::collectData( real step )
ostr << istep << ";";
ostr << torqueX1global << ";";
ostr << torqueX2global << ";";
- ostr << torqueX3global;
+ ostr << torqueX3global << ";";
+ ostr << Fx << ";";
+ ostr << Fy << ";";
+ ostr << Fz;
ostr << std::endl;
ostr.close();
}
}
//////////////////////////////////////////////////////////////////////////
-void CalculateTorqueCoProcessor::calculateForces()
+void CalculateTorqueSimulationObserver::calculateForces()
{
torqueX1global = 0.0;
torqueX2global = 0.0;
@@ -101,9 +105,8 @@ void CalculateTorqueCoProcessor::calculateForces()
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
- distributions->swap();
int ghostLayerWidth = kernel->getGhostLayerWidth();
int minX1 = ghostLayerWidth;
@@ -125,15 +128,24 @@ void CalculateTorqueCoProcessor::calculateForces()
if(bcArray->isFluid(x1,x2,x3)) //es kann sein, dass der node von einem anderen interactor z.B. als solid gemarkt wurde!!!
{
SPtr<BoundaryConditions> bc = bcArray->getBC(x1,x2,x3);
- UbTupleDouble3 forceVec = getForces(x1,x2,x3,distributions,bc);
- real Fx = val<1>(forceVec);
- real Fy = val<2>(forceVec);
- real Fz = val<3>(forceVec);
-
+
Vector3D worldCoordinates = grid->getNodeCoordinates(block, x1, x2, x3);
- real rx = (worldCoordinates[0] - x1Centre) / deltaX;
- real ry = (worldCoordinates[1] - x2Centre) / deltaX;
- real rz = (worldCoordinates[2] - x3Centre) / deltaX;
+ real rx = (worldCoordinates[0] - x1Centre) / deltaX;
+ real ry = (worldCoordinates[1] - x2Centre) / deltaX;
+ real rz = (worldCoordinates[2] - x3Centre) / deltaX;
+
+ // real nx = rx / sqrt(rx * rx + ry * ry + rz * rz);
+ // real ny = ry / sqrt(rx * rx + ry * ry + rz * rz);
+ // real nz = rz / sqrt(rx * rx + ry * ry + rz * rz);
+
+ UbTupleDouble3 forceVec = getForces(x1, x2, x3, distributions, bc);
+ //UbTupleDouble3 forceVec = getForcesFromMoments(x1, x2, x3, kernel, distributions, bc, nx, ny, nz);
+ //UbTupleDouble3 forceVec = getForcesFromStressTensor(x1, x2, x3, kernel, distributions, bc, nx, ny, nz);
+ /*real*/ Fx = val<1>(forceVec);
+ /*real*/ Fy = val<2>(forceVec);
+ /*real*/ Fz = val<3>(forceVec);
+
+
torqueX1 += ry * Fz - rz * Fy;
torqueX2 += rz * Fx - rx * Fz;
@@ -141,8 +153,6 @@ void CalculateTorqueCoProcessor::calculateForces()
}
}
- distributions->swap();
-
torqueX1global += torqueX1;
torqueX2global += torqueX2;
torqueX3global += torqueX3;
@@ -170,13 +180,10 @@ void CalculateTorqueCoProcessor::calculateForces()
}
}
//////////////////////////////////////////////////////////////////////////
-UbTupleDouble3 CalculateTorqueCoProcessor::getForces(int x1, int x2, int x3, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc)
+UbTupleDouble3 CalculateTorqueSimulationObserver::getForces(int x1, int x2, int x3, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc)
{
UbTupleDouble3 force(0.0,0.0,0.0);
- real fs[D3Q27System::ENDF + 1];
- distributions->getDistributionInv(fs, x1, x2, x3);
-
if(bc)
{
//references to tuple "force"
@@ -185,6 +192,8 @@ UbTupleDouble3 CalculateTorqueCoProcessor::getForces(int x1, int x2, int x3, SP
real& forceX3 = val<3>(force);
real f, fnbr;
+ dynamicPointerCast<EsoTwist3D>(distributions)->swap();
+
for(int fdir=D3Q27System::FSTARTDIR; fdir<=D3Q27System::FENDDIR; fdir++)
{
if(bc->hasNoSlipBoundaryFlag(fdir) || bc->hasVelocityBoundaryFlag(fdir))
@@ -198,12 +207,85 @@ UbTupleDouble3 CalculateTorqueCoProcessor::getForces(int x1, int x2, int x3, SP
forceX3 += (f + fnbr) * D3Q27System::DX3[invDir];
}
}
+
+ dynamicPointerCast<EsoTwist3D>(distributions)->swap();
+ }
+
+ return force;
+}
+//////////////////////////////////////////////////////////////////////////
+UbTupleDouble3 CalculateTorqueSimulationObserver::getForcesFromMoments(int x1, int x2, int x3, SPtr<ILBMKernel> kernel, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc, real nx, real ny, real nz)
+{
+ using namespace vf::basics::constant;
+ UbTupleDouble3 force(0.0, 0.0, 0.0);
+
+
+ if (bc) {
+ real f[D3Q27System::ENDF + 1];
+ distributions->getDistribution(f, x1, x2, x3);
+ real collFactor = kernel->getCollisionFactor();
+ real shearRate = D3Q27System::getShearRate(f, collFactor);
+ real rho = D3Q27System::getDensity(f);
+ real omega = Rheology::getBinghamCollFactor(collFactor, shearRate, rho);
+ std::array<real, 6> moments = D3Q27System::getSecondMoments(f, omega);
+
+ // references to tuple "force"
+ real &forceX1 = val<1>(force);
+ real &forceX2 = val<2>(force);
+ real &forceX3 = val<3>(force);
+
+ real mxx = (moments[0] + moments[1] + moments[2])*c1o3;
+ real myy = (-c2o1 * moments[1] + moments[2] + moments[0]) * c1o3;
+ real mzz = (-c2o1 * moments[2] + moments[1] + moments[0]) * c1o3;
+ real mxy = moments[3];
+ real mxz = moments[4];
+ real myz = moments[5];
+
+ forceX1 = mxx *nx + mxy*ny + mxz*nz;
+ forceX2 = mxy *nx + myy*ny + myz*nz;
+ forceX3 = mxz *nx + myz*ny + mzz*nz;
}
-
+
+ return force;
+}
+//////////////////////////////////////////////////////////////////////////
+UbTupleDouble3 CalculateTorqueSimulationObserver::getForcesFromStressTensor(int x1, int x2, int x3, SPtr<ILBMKernel> kernel, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc, real nx, real ny, real nz)
+{
+ using namespace vf::basics::constant;
+ UbTupleDouble3 force(0.0, 0.0, 0.0);
+
+ if (bc) {
+ real f[D3Q27System::ENDF + 1];
+ distributions->getDistribution(f, x1, x2, x3);
+ real collFactor = kernel->getCollisionFactor();
+ real shearRate = D3Q27System::getShearRate(f, collFactor);
+ real rho = D3Q27System::getDensity(f);
+ real omega = Rheology::getBinghamCollFactor(collFactor, shearRate, rho);
+ std::array<real, 6> stress = D3Q27System::getStressTensor(f, omega);
+
+ // references to tuple "force"
+ real &forceX1 = val<1>(force);
+ real &forceX2 = val<2>(force);
+ real &forceX3 = val<3>(force);
+
+ real &tauXX = stress[0];
+ real &tauYY = stress[1];
+ real &tauZZ = stress[2];
+ real &tauXY = stress[3];
+ real &tauXZ = stress[4];
+ real &tauYZ = stress[5];
+
+ //https: // journals.aps.org/pre/pdf/10.1103/PhysRevE.88.013303
+
+ forceX1 = tauXX * nx + tauXY * ny + tauXZ * nz;
+ forceX2 = tauXY * nx + tauYY * ny + tauYZ * nz;
+ forceX3 = tauXZ * nx + tauYZ * ny + tauZZ * nz;
+ }
+
return force;
}
//////////////////////////////////////////////////////////////////////////
-void CalculateTorqueCoProcessor::addInteractor( SPtr<D3Q27Interactor> interactor )
+void CalculateTorqueSimulationObserver::addInteractor( SPtr<D3Q27Interactor> interactor )
{
interactors.push_back(interactor);
}
diff --git a/src/cpu/NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.h b/src/cpu/NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.h
new file mode 100644
index 0000000000000000000000000000000000000000..d0cd9c41d5afc4e127f9be74e106960c86097f96
--- /dev/null
+++ b/src/cpu/NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.h
@@ -0,0 +1,55 @@
+/*
+ * D3Q27ForcesSimulationObserver.h
+ *
+ * Created on: 29.09.2012
+ * Author: K. Kucher
+ */
+
+#ifndef CalculateTorqueSimulationObserver_H
+#define CalculateTorqueSimulationObserver_H
+
+#include <PointerDefinitions.h>
+#include <string>
+#include <vector>
+
+#include "SimulationObserver.h"
+#include "UbTuple.h"
+#include "D3Q27System.h"
+
+class ForceCalculator;
+namespace vf::mpi {class Communicator;}
+class Grid3D;
+class UbScheduler;
+class D3Q27Interactor;
+class DistributionArray3D;
+class BoundaryConditions;
+class ILBMKernel;
+
+class CalculateTorqueSimulationObserver: public SimulationObserver
+{
+public:
+ //! Constructor
+ CalculateTorqueSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
+ virtual ~CalculateTorqueSimulationObserver();
+ void update(real step);
+ void addInteractor(SPtr<D3Q27Interactor> interactor);
+protected:
+ void collectData(real step);
+ void calculateForces();
+ UbTupleDouble3 getForces(int x1, int x2, int x3, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc);
+ UbTupleDouble3 getForcesFromMoments(int x1, int x2, int x3, SPtr<ILBMKernel> kernel, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc, real nx, real ny, real nz);
+ UbTupleDouble3 getForcesFromStressTensor(int x1, int x2, int x3, SPtr<ILBMKernel> kernel, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc, real nx, real ny, real nz);
+
+private:
+ std::string path;
+ std::shared_ptr<vf::mpi::Communicator> comm;
+ std::vector<SPtr<D3Q27Interactor> > interactors;
+ real torqueX1global;
+ real torqueX2global;
+ real torqueX3global;
+
+ real Fx, Fy, Fz;
+};
+
+
+#endif /* D3Q27ForcesSimulationObserver_H */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.cpp b/src/cpu/NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.cpp
similarity index 88%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.cpp
rename to src/cpu/NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.cpp
index 9ff3fe0982d43ed119e7cfb3fba497a61e2c201b..61f13299d914bb3fd15a8d0a69712c722c91ca6f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.cpp
+++ b/src/cpu/NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.cpp
@@ -30,9 +30,9 @@
//! \ingroup CoProcessors
//! \author Konstantin Kutscher
//=======================================================================================
-#include "WriteThixotropyQuantitiesCoProcessor.h"
+#include "WriteThixotropyQuantitiesSimulationObserver.h"
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "UbScheduler.h"
#include "DataSet3D.h"
#include "D3Q27System.h"
@@ -42,17 +42,14 @@
#include <algorithm>
#include <numeric>
#include "basics/writer/WbWriterVtkXmlASCII.h"
-#include "ThixotropyExpLBMKernel.h"
-#include "Rheology.h"
+#include "LBM/ThixotropyExpLBMKernel.h"
+#include "LBM/Rheology.h"
using namespace std;
-WriteThixotropyQuantitiesCoProcessor::WriteThixotropyQuantitiesCoProcessor()
-{
-
-}
+WriteThixotropyQuantitiesSimulationObserver::WriteThixotropyQuantitiesSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-WriteThixotropyQuantitiesCoProcessor::WriteThixotropyQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string& path, WbWriter* const writer, SPtr<LBMUnitConverter> conv, std::shared_ptr<vf::mpi::Communicator> comm) : CoProcessor(grid, s), path(path), writer(writer), conv(conv), comm(comm)
+WriteThixotropyQuantitiesSimulationObserver::WriteThixotropyQuantitiesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string& path, WbWriter* const writer, SPtr<LBMUnitConverter> conv, std::shared_ptr<vf::mpi::Communicator> comm) : SimulationObserver(grid, s), path(path), writer(writer), conv(conv), comm(comm)
{
gridRank = comm->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -66,20 +63,20 @@ WriteThixotropyQuantitiesCoProcessor::WriteThixotropyQuantitiesCoProcessor(SPtr<
}
}
//////////////////////////////////////////////////////////////////////////
-void WriteThixotropyQuantitiesCoProcessor::init()
+void WriteThixotropyQuantitiesSimulationObserver::init()
{
}
//////////////////////////////////////////////////////////////////////////
-void WriteThixotropyQuantitiesCoProcessor::process(real step)
+void WriteThixotropyQuantitiesSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "WriteThixotropyQuantitiesCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "WriteThixotropyQuantitiesSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void WriteThixotropyQuantitiesCoProcessor::collectData(real step)
+void WriteThixotropyQuantitiesSimulationObserver::collectData(real step)
{
int istep = static_cast<int>(step);
//ConcentrationSum = 0;
@@ -118,7 +115,7 @@ void WriteThixotropyQuantitiesCoProcessor::collectData(real step)
vector<string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin())
+ if (step == SimulationObserver::scheduler->getMinBegin())
{
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
}
@@ -126,13 +123,13 @@ void WriteThixotropyQuantitiesCoProcessor::collectData(real step)
{
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- UBLOG(logINFO, "WriteThixotropyQuantitiesCoProcessor step: " << istep);
+ UBLOG(logINFO, "WriteThixotropyQuantitiesSimulationObserver step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void WriteThixotropyQuantitiesCoProcessor::clearData()
+void WriteThixotropyQuantitiesSimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -140,7 +137,7 @@ void WriteThixotropyQuantitiesCoProcessor::clearData()
data.clear();
}
//////////////////////////////////////////////////////////////////////////
-void WriteThixotropyQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
+void WriteThixotropyQuantitiesSimulationObserver::addDataMQ(SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);;
UbTupleDouble3 nodeOffset = grid->getNodeOffset(block);
@@ -170,7 +167,7 @@ void WriteThixotropyQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributionsF = kernel->getDataSet()->getFdistributions();
//SPtr<DistributionArray3D> distributionsH = kernel->getDataSet()->getHdistributions();
//LBMReal collFactorF = staticPointerCast<ThixotropyExpLBMKernel>(kernel)->getCollisionFactorF();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.h b/src/cpu/NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.h
similarity index 80%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.h
rename to src/cpu/NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.h
index fbb2b6740c53b1d8a2ed9e37881fff98e4707a69..3ac9664e595adef9b45edaee662849a3ab63616f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteThixotropyQuantitiesCoProcessor.h
+++ b/src/cpu/NonNewtonianFluids/SimulationObservers/WriteThixotropyQuantitiesSimulationObserver.h
@@ -26,29 +26,29 @@
// 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 WriteMultiphaseQuantitiesCoProcessor.h
-//! \ingroup CoProcessors
+//! \file WriteMultiphaseQuantitiesSimulationObserver.h
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef WriteThixotropyQuantitiesCoProcessor_H
-#define WriteThixotropyQuantitiesCoProcessor_H
+#ifndef WriteThixotropyQuantitiesSimulationObserver_H
+#define WriteThixotropyQuantitiesSimulationObserver_H
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "Grid3D.h"
#include "Block3D.h"
#include "LBMUnitConverter.h"
#include <mpi/Communicator.h>
#include "WbWriter.h"
-class WriteThixotropyQuantitiesCoProcessor : public CoProcessor
+class WriteThixotropyQuantitiesSimulationObserver : public SimulationObserver
{
public:
- WriteThixotropyQuantitiesCoProcessor();
- WriteThixotropyQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string& path, WbWriter* const writer, SPtr<LBMUnitConverter> conv, std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteThixotropyQuantitiesCoProcessor() = default;
+ WriteThixotropyQuantitiesSimulationObserver();
+ WriteThixotropyQuantitiesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string& path, WbWriter* const writer, SPtr<LBMUnitConverter> conv, std::shared_ptr<vf::mpi::Communicator> comm);
+ ~WriteThixotropyQuantitiesSimulationObserver() = default;
- void process(real step) override;
+ void update(real step) override;
protected:
void collectData(real step);
diff --git a/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp b/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..69c65b6ecb26953e45671023af3c3a3407c40640
--- /dev/null
+++ b/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.cpp
@@ -0,0 +1,140 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 BoundaryConditionsBlockVisitor.cpp
+//! \ingroup Visitors
+//! \author Konstantin Kutscher
+//=======================================================================================
+
+#include "BoundaryConditionsBlockVisitor.h"
+#include "BC.h"
+#include "BCArray3D.h"
+#include "BCSet.h"
+#include "Block3D.h"
+#include "D3Q27EsoTwist3DSplittedVector.h"
+#include "DataSet3D.h"
+#include "Grid3D.h"
+#include "D3Q27System.h"
+#include "BC.h"
+#include "Block3D.h"
+#include "BCArray3D.h"
+#include "ILBMKernel.h"
+
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyDensityBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyNoSlipBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyNonReflectingOutflowBCStrategy.h"
+#include "NonNewtonianFluids/BoundaryConditions/ThixotropyVelocityWithDensityBCStrategy.h"
+
+
+BoundaryConditionsBlockVisitor::BoundaryConditionsBlockVisitor() : Block3DVisitor(0, D3Q27System::MAXLEVEL)
+{
+}
+//////////////////////////////////////////////////////////////////////////
+BoundaryConditionsBlockVisitor::~BoundaryConditionsBlockVisitor() = default;
+//////////////////////////////////////////////////////////////////////////
+void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
+{
+ if (block->getRank() == grid->getRank()) {
+ SPtr<ILBMKernel> kernel = block->getKernel();
+
+ if (!kernel) {
+ throw UbException(UB_EXARGS, "LBMKernel in " + block->toString() + "is not exist!");
+ }
+
+ SPtr<BCSet> bcSet = kernel->getBCSet();
+
+ if (!bcSet) {
+ throw UbException(UB_EXARGS, "Boundary Conditions Processor is not exist!");
+ }
+
+ SPtr<BCArray3D> bcArray = bcSet->getBCArray();
+
+ bool compressible = kernel->getCompressible();
+ real collFactor = kernel->getCollisionFactor();
+
+ int minX1 = 0;
+ int minX2 = 0;
+ int minX3 = 0;
+ int maxX1 = (int)bcArray->getNX1();
+ int maxX2 = (int)bcArray->getNX2();
+ int maxX3 = (int)bcArray->getNX3();
+ SPtr<BoundaryConditions> bcPtr;
+
+ bcSet->clearBC();
+
+ SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
+
+ 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)) {
+ if ((bcPtr = bcArray->getBC(x1, x2, x3)) != NULL) {
+ char alg = bcPtr->getBCStrategyType();
+ SPtr<BCStrategy> bca = bcMap[alg];
+
+ if (bca) {
+ bca = bca->clone();
+ bca->setBlock(block);
+ bca->setNodeIndex(x1, x2, x3);
+ bca->setBcPointer(bcPtr);
+ bca->addDistributions(distributions);
+
+ if (alg == BCStrategy::ThixotropyVelocityBCStrategy)
+ std::static_pointer_cast<ThixotropyVelocityBCStrategy>(bca)->addDistributionsH(
+ kernel->getDataSet()->getHdistributions());
+ if (alg == BCStrategy::ThixotropyDensityBCStrategy)
+ std::static_pointer_cast<ThixotropyDensityBCStrategy>(bca)->addDistributionsH(
+ kernel->getDataSet()->getHdistributions());
+ if (alg == BCStrategy::ThixotropyNoSlipBCStrategy)
+ std::static_pointer_cast<ThixotropyNoSlipBCStrategy>(bca)->addDistributionsH(
+ kernel->getDataSet()->getHdistributions());
+ if (alg == BCStrategy::ThixotropyNonReflectingOutflowBCStrategy)
+ std::static_pointer_cast<ThixotropyNonReflectingOutflowBCStrategy>(bca)
+ ->addDistributionsH(kernel->getDataSet()->getHdistributions());
+ if (alg == BCStrategy::ThixotropyVelocityWithDensityBCStrategy)
+ std::static_pointer_cast<ThixotropyVelocityWithDensityBCStrategy>(bca)
+ ->addDistributionsH(kernel->getDataSet()->getHdistributions());
+
+ bca->setCollFactor(collFactor);
+ bca->setCompressible(compressible);
+ bca->setBcArray(bcArray);
+ bcSet->addBC(bca);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+void BoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
+{
+ bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
+}
diff --git a/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.h b/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.h
new file mode 100644
index 0000000000000000000000000000000000000000..8954bf73a6a459a795e916f24192f5db698b1426
--- /dev/null
+++ b/src/cpu/NonNewtonianFluids/Visitors/RheologyBoundaryConditionsBlockVisitor.h
@@ -0,0 +1,61 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 BoundaryConditionsBlockVisitor.h
+//! \ingroup Visitors
+//! \author Konstantin Kutscher
+//=======================================================================================
+
+#ifndef BoundaryConditionBlockVisitor_h__
+#define BoundaryConditionBlockVisitor_h__
+
+#include <PointerDefinitions.h>
+#include <map>
+
+#include "Block3DVisitor.h"
+
+class Grid3D;
+class Block3D;
+class BCStrategy;
+class BC;
+
+//! \brief set boundary conditions
+class BoundaryConditionsBlockVisitor : public Block3DVisitor
+{
+public:
+ BoundaryConditionsBlockVisitor();
+ ~BoundaryConditionsBlockVisitor() override;
+
+ void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
+ void addBC(SPtr<BC> bc);
+
+protected:
+private:
+ std::map<char, SPtr<BCStrategy>> bcMap;
+};
+#endif // BoundaryConditionBlockVisitor_h__
diff --git a/src/cpu/VirtualFluids.h b/src/cpu/VirtualFluids.h
index 1ee4c7e78aded0e11ea723769d4515f0f1ec846d..6fa9b30bfc0e650f289d00a2970bdff545c71359 100644
--- a/src/cpu/VirtualFluids.h
+++ b/src/cpu/VirtualFluids.h
@@ -108,45 +108,34 @@
#include <muParserToken.h>
#include <muParserTokenReader.h>
-#include <BoundaryConditions/BCAdapter.h>
-#include <BoundaryConditions/BCAlgorithm.h>
+#include <BoundaryConditions/BC.h>
+#include <BoundaryConditions/BCStrategy.h>
#include <BoundaryConditions/BCArray3D.h>
#include <BoundaryConditions/BCFunction.h>
-#include <BoundaryConditions/BCProcessor.h>
+#include <BoundaryConditions/BCSet.h>
#include <BoundaryConditions/BoundaryConditions.h>
-#include <BoundaryConditions/DensityBCAdapter.h>
-#include <BoundaryConditions/EqDensityBCAlgorithm.h>
-#include <BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h>
-#include <BoundaryConditions/NoSlipBCAdapter.h>
-#include <BoundaryConditions/NoSlipBCAlgorithm.h>
-#include <BoundaryConditions/NonEqDensityBCAlgorithm.h>
-#include <BoundaryConditions/NonReflectingOutflowBCAlgorithm.h>
-#include <BoundaryConditions/NonReflectingOutflowBCAlgorithmWithRelaxation.h>
-#include <BoundaryConditions/NonReflectingInflowBCAlgorithm.h>
-#include <BoundaryConditions/SlipBCAdapter.h>
-#include <BoundaryConditions/SlipBCAlgorithm.h>
-#include <BoundaryConditions/ThinWallBCProcessor.h>
-#include <BoundaryConditions/ThinWallNoSlipBCAlgorithm.h>
-#include <BoundaryConditions/VelocityBCAdapter.h>
-#include <BoundaryConditions/VelocityBCAlgorithm.h>
-#include <BoundaryConditions/VelocityWithDensityBCAlgorithm.h>
-#include <BoundaryConditions/ThixotropyDensityBCAlgorithm.h>
-#include <BoundaryConditions/ThixotropyNoSlipBCAlgorithm.h>
-#include <BoundaryConditions/ThixotropyVelocityBCAlgorithm.h>
-#include <BoundaryConditions/ThixotropyNonReflectingOutflowBCAlgorithm.h>
-#include <BoundaryConditions/ThixotropyVelocityWithDensityBCAlgorithm.h>
-#include <BoundaryConditions/SimpleVelocityBCAlgorithm.h>
-#include <BoundaryConditions/RheologyNoSlipBCAlgorithm.h>
-#include <BoundaryConditions/RheologyBinghamModelNoSlipBCAlgorithm.h>
-#include <BoundaryConditions/RheologyHerschelBulkleyModelNoSlipBCAlgorithm.h>
-#include <BoundaryConditions/SimpleSlipBCAlgorithm.h>
-#include <BoundaryConditions/RheologyPowellEyringModelNoSlipBCAlgorithm.h>
-#include <BoundaryConditions/RheologyBinghamModelVelocityBCAlgorithm.h>
-#include <BoundaryConditions/MultiphaseNoSlipBCAlgorithm.h>
-#include <BoundaryConditions/MultiphaseNonReflectingOutflowBCAlgorithm.h>
-#include <BoundaryConditions/MultiphaseVelocityBCAdapter.h>
-#include <BoundaryConditions/MultiphaseVelocityBCAlgorithm.h>
-#include <BoundaryConditions/MultiphaseSlipBCAlgorithm.h>
+#include <BoundaryConditions/DensityBC.h>
+#include <BoundaryConditions/EqDensityBCStrategy.h>
+#include <BoundaryConditions/HighViscosityNoSlipBCStrategy.h>
+#include <BoundaryConditions/NoSlipBC.h>
+#include <BoundaryConditions/NoSlipBCStrategy.h>
+#include <BoundaryConditions/NonEqDensityBCStrategy.h>
+#include <BoundaryConditions/NonReflectingOutflowBCStrategy.h>
+#include <BoundaryConditions/NonReflectingOutflowWithRelaxationBCStrategy.h>
+#include <BoundaryConditions/NonReflectingInflowBCStrategy.h>
+#include <BoundaryConditions/SlipBC.h>
+#include <BoundaryConditions/SlipBCStrategy.h>
+#include <BoundaryConditions/ThinWallBCSet.h>
+#include <BoundaryConditions/ThinWallNoSlipBCStrategy.h>
+#include <BoundaryConditions/VelocityBC.h>
+#include <BoundaryConditions/VelocityBCStrategy.h>
+#include <BoundaryConditions/VelocityWithDensityBCStrategy.h>
+#include <BoundaryConditions/SimpleVelocityBCStrategy.h>
+#include <BoundaryConditions/SimpleSlipBCStrategy.h>
+
+
+
+
#include <Connectors/Block3DConnector.h>
//#include <Connectors/Block3DConnectorFactory.h>
@@ -173,51 +162,50 @@
#include <Data/EsoTwistD3Q27System.h>
#include <Data/VoidData3D.h>
-#include <Grid/BasicCalculator.h>
-#include <Grid/Block3D.h>
-#include <Grid/Calculator.h>
-#include <Grid/Grid3D.h>
+#include <Simulation/Block3D.h>
+#include <Simulation/Simulation.h>
+#include <Simulation/Grid3D.h>
#include <Interactors/D3Q27Interactor.h>
#include <Interactors/D3Q27TriFaceMeshInteractor.h>
#include <Interactors/Interactor3D.h>
#include <Interactors/InteractorsHelper.h>
-#include <CoProcessors/AdjustForcingCoProcessor.h>
-#include <CoProcessors/CalculateForcesCoProcessor.h>
-#include <CoProcessors/CalculateTorqueCoProcessor.h>
-#include <CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h>
-#include <CoProcessors/WriteMQFromSelectionCoProcessor.h>
-#include <CoProcessors/WriteBoundaryConditionsCoProcessor.h>
-#include <CoProcessors/WriteMQFromSelectionCoProcessor.h>
-#include <CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h>
-#include <WriteBlocksCoProcessor.h>
-//#include <CoProcessors/PathLineCoProcessor.h>
-//#include <CoProcessors/PathLineCoProcessorMcpart.h>
-#include <CoProcessors/EmergencyExitCoProcessor.h>
-#include <CoProcessors/NUPSCounterCoProcessor.h>
-#include <CoProcessors/PressureDifferenceCoProcessor.h>
-//#include <CoProcessors/Particles.h>
-#include <CoProcessors/AverageValuesCoProcessor.h>
-#include <CoProcessors/CoProcessor.h>
-#include <CoProcessors/DecreaseViscosityCoProcessor.h>
-#include <CoProcessors/InSituVTKCoProcessor.h>
-#include <CoProcessors/QCriterionCoProcessor.h>
-#include <CoProcessors/ShearStressCoProcessor.h>
-#include <CoProcessors/TimeseriesCoProcessor.h>
-#include <CoProcessors/TurbulenceIntensityCoProcessor.h>
-#include <CoProcessors/TimeAveragedValuesCoProcessor.h>
-
-//#include <CoProcessors/MeanValuesCoProcessor.h>
-#include <CoProcessors/InSituCatalystCoProcessor.h>
-#include <CoProcessors/LineTimeSeriesCoProcessor.h>
-#include <CoProcessors/MPIIOMigrationBECoProcessor.h>
-#include <CoProcessors/MPIIOMigrationCoProcessor.h>
-#include <CoProcessors/MPIIORestartCoProcessor.h>
-#include <CoProcessors/MicrophoneArrayCoProcessor.h>
-#include <WriteThixotropyQuantitiesCoProcessor.h>
-#include <WriteMultiphaseQuantitiesCoProcessor.h>
-#include <TimeDependentBCCoProcessor.h>
+#include <SimulationObservers/AdjustForcingSimulationObserver.h>
+#include <SimulationObservers/CalculateForcesSimulationObserver.h>
+
+#include <SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.h>
+#include <SimulationObservers/WriteMQFromSelectionSimulationObserver.h>
+#include <SimulationObservers/WriteBoundaryConditionsSimulationObserver.h>
+#include <SimulationObservers/WriteMQFromSelectionSimulationObserver.h>
+#include <SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.h>
+#include <WriteBlocksSimulationObserver.h>
+//#include <SimulationObservers/PathLineSimulationObserver.h>
+//#include <SimulationObservers/PathLineSimulationObserverMcpart.h>
+#include <SimulationObservers/EmergencyExitSimulationObserver.h>
+#include <SimulationObservers/NUPSCounterSimulationObserver.h>
+#include <SimulationObservers/PressureDifferenceSimulationObserver.h>
+//#include <SimulationObservers/Particles.h>
+#include <SimulationObservers/AverageValuesSimulationObserver.h>
+#include <SimulationObservers/SimulationObserver.h>
+#include <SimulationObservers/DecreaseViscositySimulationObserver.h>
+#include <SimulationObservers/InSituVTKSimulationObserver.h>
+#include <SimulationObservers/QCriterionSimulationObserver.h>
+#include <SimulationObservers/ShearStressSimulationObserver.h>
+#include <SimulationObservers/TimeseriesSimulationObserver.h>
+#include <SimulationObservers/TurbulenceIntensitySimulationObserver.h>
+#include <SimulationObservers/TimeAveragedValuesSimulationObserver.h>
+
+//#include <SimulationObservers/MeanValuesSimulationObserver.h>
+#include <SimulationObservers/InSituCatalystSimulationObserver.h>
+#include <SimulationObservers/LineTimeSeriesSimulationObserver.h>
+#include <SimulationObservers/MPIIOMigrationBESimulationObserver.h>
+#include <SimulationObservers/MPIIOMigrationSimulationObserver.h>
+#include <SimulationObservers/MPIIORestartSimulationObserver.h>
+#include <SimulationObservers/MicrophoneArraySimulationObserver.h>
+
+
+#include <TimeDependentBCSimulationObserver.h>
#include <IntegrateValuesHelper.h>
//#include <LBM/D3Q27CompactInterpolationProcessor.h>
@@ -241,26 +229,13 @@
#include <LBM/LBMSystem.h>
#include <LBM/LBMUnitConverter.h>
#include <LBM/BGKLBMKernel.h>
-#include <LBM/ThixotropyLBMKernel.h>
-#include <LBM/ThixotropyExpLBMKernel.h>
+
#include <LBM/CumulantLBMKernel.h>
#include <LBM/CumulantK17LBMKernel.h>
//#include <LBM/RheologyModelLBMKernel.h>
//#include <LBM/RheologyModelLBMKernel2.h>
-#include <LBM/RheologyBinghamModelLBMKernel.h>
-#include <LBM/RheologyHerschelBulkleyModelLBMKernel.h>
-#include <LBM/RheologyInterpolationProcessor.h>
-#include <LBM/Rheology.h>
-#include <LBM/RheologyK17LBMKernel.h>
-#include <LBM/RheologyPowellEyringModelLBMKernel.h>
-#include <LBM/MultiphaseCumulantLBMKernel.h>
-#include <LBM/MultiphaseScratchCumulantLBMKernel.h>
-#include <LBM/MultiphaseTwoPhaseFieldsCumulantLBMKernel.h>
-#include <LBM/MultiphaseTwoPhaseFieldsVelocityCumulantLBMKernel.h>
-#include <LBM/MultiphaseTwoPhaseFieldsPressureFilterLBMKernel.h>
-#include <LBM/MultiphasePressureFilterLBMKernel.h>
-#include <LBM/MultiphasePressureFilterCompressibleAirLBMKernel.h>
-#include <MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h>
+
+
@@ -349,10 +324,7 @@
#include <CheckRatioBlockVisitor.h>
#include <SpongeLayerBlockVisitor.h>
#include <ZoltanPartitioningGridVisitor.h>
-#include <Visitors/MultiphaseSetKernelBlockVisitor.h>
-#include <Visitors/MultiphaseBoundaryConditionsBlockVisitor.h>
-#include <Visitors/MultiphaseInitDistributionsBlockVisitor.h>
-#include <Visitors/MultiphaseVelocityFormInitDistributionsBlockVisitor.h>
+
#include <Visitors/SetInterpolationConnectorsBlockVisitor.h>
#include <RefineAroundGbObjectHelper.h>
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
index 625fb92149df067639b05435d9b8597b6f96e775..7dc4e4d4146231db144717bdc16b70b01bf59a8b 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAdapter.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BC.h
@@ -26,30 +26,30 @@
// 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 BCAdapter.h
+//! \file BC.h
//! \ingroup BoundarConditions
//! \author Sören Freudiger
//=======================================================================================
-#ifndef BCAdapter_H
-#define BCAdapter_H
+#ifndef BC_H
+#define BC_H
#include <PointerDefinitions.h>
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include "BoundaryConditions.h"
class D3Q27Interactor;
//! \brief Abstract class of baundary conditions adapter
-//! \details BCAdapter supports the definition of boundary conditions in grid generation
-class BCAdapter
+//! \details BC supports the definition of boundary conditions in grid generation
+class BC
{
public:
- BCAdapter() = default;
+ BC() = default;
//! \param secondaryBcOption additional option of boundary conditions
- BCAdapter(const short &secondaryBcOption) : secondaryBcOption(secondaryBcOption) {}
- virtual ~BCAdapter() = default;
+ BC(const short &secondaryBcOption) : secondaryBcOption(secondaryBcOption) {}
+ virtual ~BC() = default;
// methods
bool isTimeDependent() { return ((this->type & TIMEDEPENDENT) == TIMEDEPENDENT); }
@@ -66,20 +66,20 @@ public:
const real &worldX1, const real &worldX2, const real &worldX3,
const real &q, const int &fdirection, const real &time = 0) = 0;
- void setBcAlgorithm(SPtr<BCAlgorithm> alg)
+ void setBCStrategy(SPtr<BCStrategy> alg)
{
algorithmType = alg->getType();
algorithm = alg;
}
- SPtr<BCAlgorithm> getAlgorithm() { return algorithm; }
- char getBcAlgorithmType() { return algorithmType; }
+ SPtr<BCStrategy> getAlgorithm() { return algorithm; }
+ char getBCStrategyType() { return algorithmType; }
protected:
short secondaryBcOption{ 0 };
char type{ 0 };
- SPtr<BCAlgorithm> algorithm;
+ SPtr<BCStrategy> algorithm;
char algorithmType{ -1 };
static const char TIMEDEPENDENT = 1 << 0; //'1';
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h
index b9d08f7117d9dc41c008c9d92a5780aceedad21c..13d8fbad837d32982e466b8daa05afba9293b69d 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCArray3D.h
@@ -130,9 +130,9 @@ private:
//////////////////////////////////////////////////////////////////////////
void deleteBC(std::size_t x1, std::size_t x2, std::size_t x3);
- friend class MPIIORestartCoProcessor;
- friend class MPIIOMigrationCoProcessor;
- friend class MPIIOMigrationBECoProcessor;
+ friend class MPIIORestartSimulationObserver;
+ friend class MPIIOMigrationSimulationObserver;
+ friend class MPIIOMigrationBESimulationObserver;
protected:
//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.cpp
index 286c9a9f7b9ecd131f90a8c6853ed8e250e1f262..79ab89f0bfbbe8c797aacc8a35c8043a47156b20 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCFunction.cpp
@@ -32,6 +32,7 @@
//=======================================================================================
#include "BCFunction.h"
+#include "basics/constants/NumericConstants.h"
-const real BCFunction::INFTIMEDEPENDENT = -1.0;
-const real BCFunction::INFCONST = -10.0;
+const real BCFunction::INFTIMEDEPENDENT = -vf::basics::constant::c1o1;
+const real BCFunction::INFCONST = -vf::basics::constant::c10o1;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCSet.cpp
similarity index 82%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCSet.cpp
index de647a842d1ffcdb08d39988befe1ed19ebc5842..ca8bcadd14040219ced9e519e04a947bd3b8efdc 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCSet.cpp
@@ -26,21 +26,21 @@
// 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 BCProcessor.h
+//! \file BCSet.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "BCProcessor.h"
-#include "BCAlgorithm.h"
+#include "BCSet.h"
+#include "BCStrategy.h"
#include "BCArray3D.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "DataSet3D.h"
#include "ILBMKernel.h"
-BCProcessor::BCProcessor() = default;
+BCSet::BCSet() = default;
//////////////////////////////////////////////////////////////////////////
-BCProcessor::BCProcessor(SPtr<ILBMKernel> kernel)
+BCSet::BCSet(SPtr<ILBMKernel> kernel)
{
SPtr<DistributionArray3D> distributions =
std::dynamic_pointer_cast<EsoTwist3D>(kernel->getDataSet()->getFdistributions());
@@ -48,19 +48,19 @@ BCProcessor::BCProcessor(SPtr<ILBMKernel> kernel)
BCArray3D::FLUID);
}
//////////////////////////////////////////////////////////////////////////
-BCProcessor::~BCProcessor() = default;
+BCSet::~BCSet() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCProcessor> BCProcessor::clone(SPtr<ILBMKernel> kernel)
+SPtr<BCSet> BCSet::clone(SPtr<ILBMKernel> kernel)
{
- SPtr<BCProcessor> bcProcessor(new BCProcessor(kernel));
- return bcProcessor;
+ SPtr<BCSet> bcSet(new BCSet(kernel));
+ return bcSet;
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCArray3D> BCProcessor::getBCArray() { return bcArray; }
+SPtr<BCArray3D> BCSet::getBCArray() { return bcArray; }
//////////////////////////////////////////////////////////////////////////
-void BCProcessor::setBCArray(SPtr<BCArray3D> bcarray) { bcArray = bcarray; }
+void BCSet::setBCArray(SPtr<BCArray3D> bcarray) { bcArray = bcarray; }
//////////////////////////////////////////////////////////////////////////
-void BCProcessor::addBC(SPtr<BCAlgorithm> bc)
+void BCSet::addBC(SPtr<BCStrategy> bc)
{
if (bc->isPreCollision()) {
preBC.push_back(bc);
@@ -69,19 +69,19 @@ void BCProcessor::addBC(SPtr<BCAlgorithm> bc)
}
}
//////////////////////////////////////////////////////////////////////////
-void BCProcessor::applyPreCollisionBC()
+void BCSet::applyPreCollisionBC()
{
- for (SPtr<BCAlgorithm> bc : preBC)
+ for (SPtr<BCStrategy> bc : preBC)
bc->applyBC();
}
//////////////////////////////////////////////////////////////////////////
-void BCProcessor::applyPostCollisionBC()
+void BCSet::applyPostCollisionBC()
{
- for (SPtr<BCAlgorithm> bc : postBC)
+ for (SPtr<BCStrategy> bc : postBC)
bc->applyBC();
}
//////////////////////////////////////////////////////////////////////////
-void BCProcessor::clearBC()
+void BCSet::clearBC()
{
preBC.clear();
postBC.clear();
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCSet.h
similarity index 86%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCSet.h
index 266307305db6febd885d6e90a8385714947221ff..f3f464093eab5e6ba7945e07dc4f7c929fb1bb34 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCProcessor.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCSet.h
@@ -26,40 +26,40 @@
// 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 BCProcessor.h
+//! \file BCSet.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef BC_PROCESSSOR_H
-#define BC_PROCESSSOR_H
+#ifndef BCSet_H
+#define BCSet_H
#include <PointerDefinitions.h>
#include <vector>
class BCArray3D;
-class BCAlgorithm;
+class BCStrategy;
class ILBMKernel;
//! A class provides an interface for boundary conditions in the calculation loop.
-class BCProcessor
+class BCSet
{
public:
- BCProcessor();
- BCProcessor(SPtr<ILBMKernel> kernel);
- virtual ~BCProcessor();
+ BCSet();
+ BCSet(SPtr<ILBMKernel> kernel);
+ virtual ~BCSet();
virtual SPtr<BCArray3D> getBCArray();
virtual void setBCArray(SPtr<BCArray3D> bcarray);
- virtual SPtr<BCProcessor> clone(SPtr<ILBMKernel> kernel);
+ virtual SPtr<BCSet> clone(SPtr<ILBMKernel> kernel);
- void addBC(SPtr<BCAlgorithm> bc);
+ void addBC(SPtr<BCStrategy> bc);
void applyPreCollisionBC();
void applyPostCollisionBC();
void clearBC();
protected:
- std::vector<SPtr<BCAlgorithm>> preBC;
- std::vector<SPtr<BCAlgorithm>> postBC;
+ std::vector<SPtr<BCStrategy>> preBC;
+ std::vector<SPtr<BCStrategy>> postBC;
SPtr<BCArray3D> bcArray;
private:
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.cpp
similarity index 81%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.cpp
index 179007cb6f3f881517c55196420c2cf7135a62f1..3331f24538f421db95d12da0eb6f287ba858765a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.cpp
@@ -26,33 +26,33 @@
// 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 BCAlgorithm.cpp
+//! \file BCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include "BCArray3D.h"
#include "BoundaryConditions.h"
#include "EsoTwist3D.h"
#include "Block3D.h"
-void BCAlgorithm::setBlock(SPtr<Block3D> block)
+void BCStrategy::setBlock(SPtr<Block3D> block)
{
this->block = block;
}
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setNodeIndex(int x1, int x2, int x3)
+void BCStrategy::setNodeIndex(int x1, int x2, int x3)
{
this->x1 = x1;
this->x2 = x2;
this->x3 = x3;
}
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setBcPointer(SPtr<BoundaryConditions> bcPtr) { this->bcPtr = bcPtr; }
+void BCStrategy::setBcPointer(SPtr<BoundaryConditions> bcPtr) { this->bcPtr = bcPtr; }
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setCompressible(bool c)
+void BCStrategy::setCompressible(bool c)
{
compressible = c;
@@ -69,26 +69,26 @@ void BCAlgorithm::setCompressible(bool c)
}
}
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setCollFactor(real cf) { collFactor = cf; }
+void BCStrategy::setCollFactor(real cf) { collFactor = cf; }
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setCollFactorL(real cf) { collFactorL = cf; }
+void BCStrategy::setCollFactorL(real cf) { collFactorL = cf; }
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setCollFactorG(real cf) { collFactorG = cf; }
+void BCStrategy::setCollFactorG(real cf) { collFactorG = cf; }
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setCollFactorPh(real cf) { collFactorPh = cf; }
+void BCStrategy::setCollFactorPh(real cf) { collFactorPh = cf; }
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setDensityRatio(real dr) { densityRatio = dr; }
+void BCStrategy::setDensityRatio(real dr) { densityRatio = dr; }
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setPhiBound(real phiL, real phiH)
+void BCStrategy::setPhiBound(real phiL, real phiH)
{
this->phiL = phiL;
this->phiH = phiH;
}
//////////////////////////////////////////////////////////////////////////
-char BCAlgorithm::getType() { return type; }
+char BCStrategy::getType() { return type; }
//////////////////////////////////////////////////////////////////////////
-bool BCAlgorithm::isPreCollision() { return preCollision; }
+bool BCStrategy::isPreCollision() { return preCollision; }
//////////////////////////////////////////////////////////////////////////
-SPtr<BCArray3D> BCAlgorithm::getBcArray() { return bcArray; }
+SPtr<BCArray3D> BCStrategy::getBcArray() { return bcArray; }
//////////////////////////////////////////////////////////////////////////
-void BCAlgorithm::setBcArray(SPtr<BCArray3D> bcarray) { bcArray = bcarray; }
+void BCStrategy::setBcArray(SPtr<BCArray3D> bcarray) { bcArray = bcarray; }
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
similarity index 68%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
index f182546b0740cbff6b66b3849e2c67e42de1a98d..3cc53172a8291961cd5871458efe6869d79f8d00 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BCStrategy.h
@@ -26,7 +26,7 @@
// 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 BCAlgorithm.h
+//! \file BCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
@@ -44,38 +44,39 @@ class BoundaryConditions;
class Block3D;
//! \brief Abstract class of baundary conditions algorithm
-//! \details BCAlgorithm provides interface for implementation of diferent boundary conditions
-class BCAlgorithm
+//! \details BCStrategy provides interface for implementation of diferent boundary conditions
+class BCStrategy
{
public:
- static const char VelocityBCAlgorithm = 0;
- static const char EqDensityBCAlgorithm = 1;
- static const char NonEqDensityBCAlgorithm = 2;
- static const char NoSlipBCAlgorithm = 3;
- static const char SlipBCAlgorithm = 4;
- static const char HighViscosityNoSlipBCAlgorithm = 5;
- static const char ThinWallNoSlipBCAlgorithm = 6;
- static const char VelocityWithDensityBCAlgorithm = 7;
- static const char NonReflectingOutflowBCAlgorithm = 8;
- static const char ThixotropyVelocityBCAlgorithm = 9;
- static const char ThixotropyDensityBCAlgorithm = 10;
- static const char ThixotropyNoSlipBCAlgorithm = 11;
- static const char ThixotropyNonReflectingOutflowBCAlgorithm = 12;
- static const char ThixotropyVelocityWithDensityBCAlgorithm = 13;
- static const char RheologyBinghamModelNoSlipBCAlgorithm = 14;
- static const char RheologyHerschelBulkleyModelNoSlipBCAlgorithm = 15;
- static const char SimpleVelocityBCAlgorithm = 16;
- static const char SimpleSlipBCAlgorithm = 17;
- static const char RheologyPowellEyringModelNoSlipBCAlgorithm = 18;
- static const char RheologyBinghamModelVelocityBCAlgorithm = 19;
- static const char MultiphaseNoSlipBCAlgorithm = 20;
- static const char MultiphaseVelocityBCAlgorithm = 21;
- static const char NonReflectingInflowBCAlgorithm = 22;
- static const char NonReflectingOutflowBCAlgorithmWithRelaxation = 23;
+ static const char VelocityBCStrategy = 0;
+ static const char EqDensityBCStrategy = 1;
+ static const char NonEqDensityBCStrategy = 2;
+ static const char NoSlipBCStrategy = 3;
+ static const char SlipBCStrategy = 4;
+ static const char HighViscosityNoSlipBCStrategy = 5;
+ static const char ThinWallNoSlipBCStrategy = 6;
+ static const char VelocityWithDensityBCStrategy = 7;
+ static const char NonReflectingOutflowBCStrategy = 8;
+ static const char ThixotropyVelocityBCStrategy = 9;
+ static const char ThixotropyDensityBCStrategy = 10;
+ static const char ThixotropyNoSlipBCStrategy = 11;
+ static const char ThixotropyNonReflectingOutflowBCStrategy = 12;
+ static const char ThixotropyVelocityWithDensityBCStrategy = 13;
+ static const char RheologyBinghamModelNoSlipBCStrategy = 14;
+ static const char RheologyHerschelBulkleyModelNoSlipBCStrategy = 15;
+ static const char SimpleVelocityBCStrategy = 16;
+ static const char SimpleSlipBCStrategy = 17;
+ static const char RheologyPowellEyringModelNoSlipBCStrategy = 18;
+ static const char RheologyBinghamModelVelocityBCStrategy = 19;
+ static const char MultiphaseNoSlipBCStrategy = 20;
+ static const char MultiphaseVelocityBCStrategy = 21;
+ static const char NonReflectingInflowBCStrategy = 22;
+ static const char NonReflectingOutflowWithRelaxationBCStrategy = 23;
+ static const char MultiphasePressureBCStrategy = 24;
public:
- BCAlgorithm() = default;
- virtual ~BCAlgorithm() = default;
+ BCStrategy() = default;
+ virtual ~BCStrategy() = default;
virtual void addDistributions(SPtr<DistributionArray3D> distributions) = 0;
virtual void addDistributionsH(SPtr<DistributionArray3D> distributionsH) {}
@@ -94,7 +95,7 @@ public:
char getType();
bool isPreCollision();
- virtual SPtr<BCAlgorithm> clone() = 0;
+ virtual SPtr<BCStrategy> clone() = 0;
SPtr<BCArray3D> getBcArray();
void setBcArray(SPtr<BCArray3D> bcarray);
virtual void applyBC() = 0;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
index 2dcd667bddbd85cb0c07e74ec19d55f93f880157..92cfb6f3cbf347eee7e8fec95c27d7a5646db3b5 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/BoundaryConditions.h
@@ -42,6 +42,7 @@
#include "UbTuple.h"
#include "Vector3D.h"
#include <PointerDefinitions.h>
+#include "basics/constants/NumericConstants.h"
//! Difenition of baundary conditions in grid generation
class BoundaryConditions
@@ -310,8 +311,8 @@ public:
return (((flag >> (optionDigits * direction)) & maxOptionVal) != 0);
}
- void setBcAlgorithmType(char alg) { algorithmType = alg; }
- char getBcAlgorithmType() { return algorithmType; }
+ void setBCStrategyType(char alg) { algorithmType = alg; }
+ char getBCStrategyType() { return algorithmType; }
public:
static const int optionDigits = 2; //--> 2 bits for secondary Option --> maxOptionVal = 7
@@ -326,20 +327,20 @@ protected:
long long densityBoundaryFlags{ 0 };
long long wallModelBoundaryFlags{ 0 };
- float bcVelocityX1{ 0.0f };
- float bcVelocityX2{ 0.0f };
- float bcVelocityX3{ 0.0f };
- float bcDensity{ 0.0f };
- float bcPhaseField{ 0.0f };
+ float bcVelocityX1{ vf::basics::constant::c0o1 };
+ float bcVelocityX2{ vf::basics::constant::c0o1 };
+ float bcVelocityX3{ vf::basics::constant::c0o1 };
+ float bcDensity{ vf::basics::constant::c0o1 };
+ float bcPhaseField{ vf::basics::constant::c0o1 };
- float nx1{ 0.0f }, nx2{ 0.0f }, nx3{ 0.0f };
+ float nx1{ vf::basics::constant::c0o1 }, nx2{ vf::basics::constant::c0o1 }, nx3{ vf::basics::constant::c0o1 };
char algorithmType { -1 };
private:
- friend class MPIIORestartCoProcessor;
- friend class MPIIOMigrationCoProcessor;
- friend class MPIIOMigrationBECoProcessor;
+ friend class MPIIORestartSimulationObserver;
+ friend class MPIIOMigrationSimulationObserver;
+ friend class MPIIOMigrationBESimulationObserver;
};
#endif
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
similarity index 85%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
index 86ac7726170c2322e2749f1d4cfaa92033cf7ff9..ecfeff73bf83b94c4b61af8dc5e946bd3de3a81a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.cpp
@@ -26,47 +26,48 @@
// 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 DensityBCAdapter.cpp
+//! \file DensityBC.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "DensityBCAdapter.h"
+#include "DensityBC.h"
#include "basics/utilities/UbInfinity.h"
#include "basics/utilities/UbLogger.h"
+#include "basics/constants/NumericConstants.h"
using namespace std;
/*==========================================================*/
-DensityBCAdapter::DensityBCAdapter(const real &dens, const real &startTime, const real &endTime)
+DensityBC::DensityBC(const real &dens, const real &startTime, const real &endTime)
{
this->densBCs.emplace_back(dens, startTime, endTime);
this->init();
}
/*==========================================================*/
-DensityBCAdapter::DensityBCAdapter(const BCFunction &densBC)
+DensityBC::DensityBC(const BCFunction &densBC)
{
this->densBCs.push_back(densBC);
this->init();
}
/*==========================================================*/
-DensityBCAdapter::DensityBCAdapter(const std::vector<BCFunction> &densBCs)
+DensityBC::DensityBC(const std::vector<BCFunction> &densBCs)
{
this->densBCs = densBCs;
this->init();
}
/*==========================================================*/
-DensityBCAdapter::DensityBCAdapter(const mu::Parser &function, const real &startTime, const real &endTime)
+DensityBC::DensityBC(const mu::Parser &function, const real &startTime, const real &endTime)
{
this->densBCs.emplace_back(function, startTime, endTime);
this->init();
}
/*==========================================================*/
-void DensityBCAdapter::init()
+void DensityBC::init()
{
- this->timeStep = 0.0;
+ this->timeStep = vf::basics::constant::c0o1;
- this->x1 = 0.0;
- this->x2 = 0.0;
- this->x3 = 0.0;
+ this->x1 = vf::basics::constant::c0o1;
+ this->x2 = vf::basics::constant::c0o1;
+ this->x3 = vf::basics::constant::c0o1;
this->tmpDensityFunction = NULL;
@@ -96,7 +97,7 @@ void DensityBCAdapter::init()
}
}
/*==========================================================*/
-void DensityBCAdapter::init(const D3Q27Interactor *const & /*interactor*/, const real &time)
+void DensityBC::init(const D3Q27Interactor *const & /*interactor*/, const real &time)
{
this->timeStep = time;
this->tmpDensityFunction = NULL;
@@ -124,18 +125,18 @@ void DensityBCAdapter::init(const D3Q27Interactor *const & /*interactor*/, const
if (UbMath::greaterEqual(time, maxEndtime))
this->unsetTimeDependent();
- UBLOG(logDEBUG4, "D3Q27DensityBCAdapter::init(time="
+ UBLOG(logDEBUG4, "D3Q27DensityBC::init(time="
<< time << ") "
<< ", rho= \"" << (tmpDensityFunction ? tmpDensityFunction->GetExpr() : "-")
<< "\", timedependant=" << (this->isTimeDependent() ? "true" : "false"));
}
/*==========================================================*/
-void DensityBCAdapter::update(const D3Q27Interactor *const &interactor, const real &time)
+void DensityBC::update(const D3Q27Interactor *const &interactor, const real &time)
{
this->init(interactor, time);
}
/*==========================================================*/
-void DensityBCAdapter::adaptBCForDirection(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
+void DensityBC::adaptBCForDirection(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
const real & /*worldX1*/, const real & /*worldX2*/,
const real & /*worldX3*/, const real &q, const int &fdirection,
const real & /*time*/)
@@ -144,14 +145,14 @@ void DensityBCAdapter::adaptBCForDirection(const D3Q27Interactor & /*interactor*
bc->setQ((real)q, fdirection);
}
/*==========================================================*/
-void DensityBCAdapter::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions> bc, const real &worldX1,
+void DensityBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions> bc, const real &worldX1,
const real &worldX2, const real &worldX3, const real &time)
{
this->setNodeDensity(interactor, bc, worldX1, worldX2, worldX3, time);
- bc->setBcAlgorithmType(algorithmType);
+ bc->setBCStrategyType(algorithmType);
}
/*==========================================================*/
-void DensityBCAdapter::setNodeDensity(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
+void DensityBC::setNodeDensity(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
const real &worldX1, const real &worldX2, const real &worldX3,
const real ×tep)
{
@@ -176,7 +177,7 @@ void DensityBCAdapter::setNodeDensity(const D3Q27Interactor & /*interactor*/, SP
}
}
/*==========================================================*/
-real DensityBCAdapter::getDensity(const real &x1, const real &x2, const real &x3, const real &timeStep)
+real DensityBC::getDensity(const real &x1, const real &x2, const real &x3, const real &timeStep)
{
this->x1 = x1;
this->x2 = x2;
@@ -184,15 +185,15 @@ real DensityBCAdapter::getDensity(const real &x1, const real &x2, const real &x3
this->timeStep = timeStep;
if (!tmpDensityFunction)
- return 0.0;
+ return vf::basics::constant::c0o1;
return tmpDensityFunction->Eval();
}
/*==========================================================*/
-string DensityBCAdapter::toString()
+string DensityBC::toString()
{
stringstream info;
- info << "D3Q27DensityBCAdapter:\n";
+ info << "D3Q27DensityBC:\n";
info << " #dens-functions = " << (int)densBCs.size() << endl;
info << " protected variables: x1, x2, x3, t" << endl;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.h
similarity index 88%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.h
index 74bfea4dd533ca8bbe81a5941ab302e3ffb06a95..b51fb984a7b5ea1e463e06a43ff4d2691d444341 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBC.h
@@ -26,13 +26,13 @@
// 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 DensityBCAdapter.h
+//! \file DensityBC.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef DensityBCAdapter_H
-#define DensityBCAdapter_H
+#ifndef DensityBC_H
+#define DensityBC_H
#include <iostream>
#include <sstream>
@@ -42,10 +42,10 @@
//#include "basics/utilities/UbMath.h"
#include "basics/utilities/UbTuple.h"
-#include "BCAdapter.h"
+#include "BC.h"
#include "BCFunction.h"
-//* DensityBCAdapter */
+//* DensityBC */
//* */
//**
//<BR><BR>
@@ -57,15 +57,15 @@
// usage: ...
//*/
-class DensityBCAdapter : public BCAdapter
+class DensityBC : public BC
{
public:
// constructors
- DensityBCAdapter() { this->init(); }
- DensityBCAdapter(const real &dens, const real &startTime = 0.0, const real &endTime = BCFunction::INFCONST);
- DensityBCAdapter(const BCFunction &densBC);
- DensityBCAdapter(const std::vector<BCFunction> &densBCs);
- DensityBCAdapter(const mu::Parser &function, const real &startTime = 0.0,
+ DensityBC() { this->init(); }
+ DensityBC(const real &dens, const real &startTime = 0.0, const real &endTime = BCFunction::INFCONST);
+ DensityBC(const BCFunction &densBC);
+ DensityBC(const std::vector<BCFunction> &densBCs);
+ DensityBC(const mu::Parser &function, const real &startTime = 0.0,
const real &endTime = BCFunction::INFCONST);
//------------- implements D3Q27BoundaryConditionAdapter ----- start
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCStrategy.cpp
similarity index 88%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCStrategy.cpp
index fa5dc1bdeff9112a7a0c1a26b9c52ee5f27012a5..77a4601ea352efe1b25c9c509077f533e44f63dd 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCStrategy.cpp
@@ -26,34 +26,34 @@
// 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 EqDensityBCAlgorithm.cpp
+//! \file EqDensityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "EqDensityBCAlgorithm.h"
+#include "EqDensityBCStrategy.h"
#include "BoundaryConditions.h"
#include "DistributionArray3D.h"
-EqDensityBCAlgorithm::EqDensityBCAlgorithm()
+EqDensityBCStrategy::EqDensityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::EqDensityBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::EqDensityBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-EqDensityBCAlgorithm::~EqDensityBCAlgorithm() = default;
+EqDensityBCStrategy::~EqDensityBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> EqDensityBCAlgorithm::clone()
+SPtr<BCStrategy> EqDensityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new EqDensityBCAlgorithm());
+ SPtr<BCStrategy> bc(new EqDensityBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void EqDensityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void EqDensityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void EqDensityBCAlgorithm::applyBC()
+void EqDensityBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCStrategy.h
similarity index 88%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCStrategy.h
index 173b6b12f46fa46d021c17345b203a97862c7949..2de16acdd11665f1535611d3820f8f4909f5fc97 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCStrategy.h
@@ -26,25 +26,25 @@
// 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 EqDensityBCAlgorithm.h
+//! \file EqDensityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef EqDensityBCAlgorithm_h__
-#define EqDensityBCAlgorithm_h__
+#ifndef EqDensityBCStrategy_h__
+#define EqDensityBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
-class EqDensityBCAlgorithm : public BCAlgorithm
+class EqDensityBCStrategy : public BCStrategy
{
public:
- EqDensityBCAlgorithm();
- ~EqDensityBCAlgorithm() override;
- SPtr<BCAlgorithm> clone() override;
+ EqDensityBCStrategy();
+ ~EqDensityBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
-#endif // EqDensityBCAlgorithm_h__
+#endif // EqDensityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h
deleted file mode 100644
index bb033d409cd84a2b419aa46599a61ca1e8d29aad..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 HighViscosityNoSlipBCAlgorithm.h
-//! \ingroup BoundarConditions
-//! \author Konstantin Kutscher
-//=======================================================================================
-#ifndef HighViscosityNoSlipBCAlgorithm_h__
-#define HighViscosityNoSlipBCAlgorithm_h__
-
-#include "BCAlgorithm.h"
-#include <PointerDefinitions.h>
-
-class DistributionArray3D;
-
-class HighViscosityNoSlipBCAlgorithm : public BCAlgorithm
-{
-public:
- HighViscosityNoSlipBCAlgorithm();
- ~HighViscosityNoSlipBCAlgorithm() override;
- SPtr<BCAlgorithm> clone() override;
- void addDistributions(SPtr<DistributionArray3D> distributions) override;
- void applyBC() override;
-};
-#endif // HighViscosityNoSlipBCAlgorithm_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCStrategy.cpp
similarity index 84%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCStrategy.cpp
index 3ed53ee85f2047cedc5cdc6eb71f607ca8792b6f..cb8deaa00b7cf0f38095cef86f72b71656a4cac3 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCStrategy.cpp
@@ -26,34 +26,34 @@
// 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 HighViscosityNoSlipBCAlgorithm.cpp
+//! \file HighViscosityNoSlipBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "HighViscosityNoSlipBCAlgorithm.h"
+#include "HighViscosityNoSlipBCStrategy.h"
#include "BoundaryConditions.h"
#include "DistributionArray3D.h"
-HighViscosityNoSlipBCAlgorithm::HighViscosityNoSlipBCAlgorithm()
+HighViscosityNoSlipBCStrategy::HighViscosityNoSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::HighViscosityNoSlipBCAlgorithm;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::HighViscosityNoSlipBCStrategy;
+ BCStrategy::preCollision = true;
}
//////////////////////////////////////////////////////////////////////////
-HighViscosityNoSlipBCAlgorithm::~HighViscosityNoSlipBCAlgorithm() = default;
+HighViscosityNoSlipBCStrategy::~HighViscosityNoSlipBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> HighViscosityNoSlipBCAlgorithm::clone()
+SPtr<BCStrategy> HighViscosityNoSlipBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new HighViscosityNoSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new HighViscosityNoSlipBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void HighViscosityNoSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void HighViscosityNoSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void HighViscosityNoSlipBCAlgorithm::applyBC()
+void HighViscosityNoSlipBCStrategy::applyBC()
{
real f[D3Q27System::ENDF + 1];
real feq[D3Q27System::ENDF + 1];
@@ -69,7 +69,7 @@ void HighViscosityNoSlipBCAlgorithm::applyBC()
real q = bcPtr->getQ(invDir);
real fReturn =
(f[invDir] + q * f[fDir] + q * collFactor * (feq[invDir] - f[invDir] + feq[fDir] - f[fDir])) /
- (1.0 + q);
+ (vf::basics::constant::c1o1 + q);
distributions->setDistributionInvForDirection(fReturn, x1 + D3Q27System::DX1[invDir],
x2 + D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir],
invDir);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCStrategy.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCStrategy.h
new file mode 100644
index 0000000000000000000000000000000000000000..e153a67e644530f52977f1644c30426acce44843
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/HighViscosityNoSlipBCStrategy.h
@@ -0,0 +1,50 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 HighViscosityNoSlipBCStrategy.h
+//! \ingroup BoundarConditions
+//! \author Konstantin Kutscher
+//=======================================================================================
+#ifndef HighViscosityNoSlipBCStrategy_h__
+#define HighViscosityNoSlipBCStrategy_h__
+
+#include "BCStrategy.h"
+#include <PointerDefinitions.h>
+
+class DistributionArray3D;
+
+class HighViscosityNoSlipBCStrategy : public BCStrategy
+{
+public:
+ HighViscosityNoSlipBCStrategy();
+ ~HighViscosityNoSlipBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
+ void applyBC() override;
+};
+#endif // HighViscosityNoSlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.cpp.new b/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.cpp.new
deleted file mode 100644
index 7c21b30c8931e6f321abc3c9822eadb678f842f3..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/MultiphaseVelocityBCAlgorithm.cpp.new
+++ /dev/null
@@ -1,151 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 MultiphaseVelocityBCAlgorithm.cpp
-//! \ingroup BoundarConditions
-//! \author Hesameddin Safari
-//=======================================================================================
-
-#include "MultiphaseVelocityBCAlgorithm.h"
-#include "DistributionArray3D.h"
-#include "BoundaryConditions.h"
-
-MultiphaseVelocityBCAlgorithm::MultiphaseVelocityBCAlgorithm()
-{
- BCAlgorithm::type = BCAlgorithm::MultiphaseVelocityBCAlgorithm;
- BCAlgorithm::preCollision = false;
-}
-//////////////////////////////////////////////////////////////////////////
-MultiphaseVelocityBCAlgorithm::~MultiphaseVelocityBCAlgorithm()
-{
-}
-//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> MultiphaseVelocityBCAlgorithm::clone()
-{
- SPtr<BCAlgorithm> bc(new MultiphaseVelocityBCAlgorithm());
- return bc;
-}
-//////////////////////////////////////////////////////////////////////////
-void MultiphaseVelocityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
-{
- this->distributions = distributions;
-}
-//////////////////////////////////////////////////////////////////////////
-void MultiphaseVelocityBCAlgorithm::addDistributionsH(SPtr<DistributionArray3D> distributionsH)
-{
- this->distributionsH = distributionsH;
-}
-//////////////////////////////////////////////////////////////////////////
-void MultiphaseVelocityBCAlgorithm::addDistributionsH2(SPtr<DistributionArray3D> distributionsH)
-{
- this->distributionsH2 = distributionsH;
-}
-//////////////////////////////////////////////////////////////////////////
-void MultiphaseVelocityBCAlgorithm::applyBC()
-{
- LBMReal f[D3Q27System::ENDF+1];
- LBMReal h[D3Q27System::ENDF+1];
- LBMReal h2[D3Q27System::ENDF + 1];
- LBMReal feq[D3Q27System::ENDF+1];
- LBMReal heq[D3Q27System::ENDF+1];
- LBMReal htemp[D3Q27System::ENDF+1];
-
- distributions->getDistributionInv(f, x1, x2, x3);
- distributionsH->getDistributionInv(h, x1, x2, x3);
- if (distributionsH2)
- distributionsH2->getDistributionInv(h2, x1, x2, x3);
- LBMReal phi, vx1, vx2, vx3, p1, phiBC;
-
- D3Q27System::calcDensity(h, phi);
-
- calcMacrosFct(f, p1, vx1, vx2, vx3);
- vx1=bcPtr->getBoundaryVelocityX1();
- vx2 = bcPtr->getBoundaryVelocityX2();
- vx3 = bcPtr->getBoundaryVelocityX3();
- p1 = 0.0;
- D3Q27System::calcMultiphaseFeqVB(feq, p1, vx1, vx2, vx3);
- D3Q27System::calcMultiphaseHeq(heq, phi, vx1, vx2, vx3);
-
- ///// added for phase field //////
-
- int nx1 = x1;
- int nx2 = x2;
- int nx3 = x3;
-
- //flag points in direction of fluid
- if (bcPtr->hasVelocityBoundaryFlag(D3Q27System::E)) { nx1 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(D3Q27System::W)) { nx1 += 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(D3Q27System::N)) { nx2 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(D3Q27System::S)) { nx2 += 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(D3Q27System::T)) { nx3 -= 1; }
- else if (bcPtr->hasVelocityBoundaryFlag(D3Q27System::B)) { 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);
- //D3Q27System::calcMultiphaseHeq(htemp, phiBC, bcPtr->getBoundaryVelocityX1(), bcPtr->getBoundaryVelocityX2(), bcPtr->getBoundaryVelocityX2());//30.03.2021 EQ phase field BC!
- //for (int fdir = D3Q27System::STARTF; fdir<=D3Q27System::ENDF; fdir++)
- //{
- // if (bcPtr->hasVelocityBoundaryFlag(fdir))
- // {
- // LBMReal hReturn = htemp[fdir]+h[fdir]-heq[fdir];
- // //17.03.2021 Let us just set the plain eq
- // //LBMReal hReturn = htemp[fdir];
- // distributionsH->setDistributionForDirection(hReturn, nx1, nx2, nx3, fdir);
- // // if (distributionsH2)
- // // distributionsH2->setDistributionForDirection(0, nx1, nx2, nx3, fdir);
- // }
- //}
-
- for (int fdir = D3Q27System::FSTARTDIR; fdir<=D3Q27System::FENDDIR; fdir++)
- {
- if (bcPtr->hasVelocityBoundaryFlag(fdir))
- {
- const int invDir = D3Q27System::INVDIR[fdir];
- //LBMReal q = bcPtr->getQ(invDir);// m+m q=0 stabiler
- LBMReal velocity = bcPtr->getBoundaryVelocity(invDir);
- //16.03.2021 quick fix for velocity BC
- LBMReal fReturn = f[invDir] - velocity;
- //LBMReal fReturn = ((1.0-q)/(1.0+q))*((f[invDir]-feq[invDir])/(1.0-collFactor)+feq[invDir])+((q*(f[invDir]+f[fdir])-velocity)/(1.0+q));
- // distributions->setDistributionForDirection(fReturn, x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);//no delay BB
- distributions->setDistributionForDirection(fReturn, x1, x2, x3, invDir);//delay BB
-
- LBMReal hReturn = htemp[invDir]+h[invDir] - heq[invDir];
- distributionsH->setDistributionForDirection(hReturn, x1, x2, x3, invDir);//delay BB
- if (distributionsH2) {
- fReturn = h2[invDir] ;
- // distributionsH2->setDistributionForDirection(fReturn, x1 + D3Q27System::DX1[invDir], x2 + D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir], fdir);
- distributionsH2->setDistributionForDirection(fReturn, x1, x2, x3, invDir);//delay BB
- }
-
- }
- }
-
-}
-
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.cpp
similarity index 97%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.cpp
index 4b272878a4bd30d1031c2894ac9994db6a966a6f..d49cffe64085e9a5d5e865cde0c899bdab543791 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.cpp
@@ -26,8 +26,8 @@
// 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 NoSlipBCAdapter.cpp
+//! \file NoSlipBC.cpp
//! \ingroup BoundarConditions
//! \author Sören Freudiger
//=======================================================================================
-#include "NoSlipBCAdapter.h"
+#include "NoSlipBC.h"
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
similarity index 89%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
index 52eda33082e8031454b00f578a6f520b738c0d42..fe7eecebb9960107793f7bf034de5dd436d58613 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAdapter.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBC.h
@@ -26,22 +26,22 @@
// 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 NoSlipBCAdapter.cpp
+//! \file NoSlipBC.cpp
//! \ingroup BoundarConditions
//! \author Sören Freudiger
//=======================================================================================
-#ifndef NoSlipBCAdapter_H
-#define NoSlipBCAdapter_H
+#ifndef NoSlipBC_H
+#define NoSlipBC_H
-#include "BCAdapter.h"
+#include "BC.h"
//! A class provides an interface for no-slip boundary condition in grid generator
-class NoSlipBCAdapter : public BCAdapter
+class NoSlipBC : public BC
{
public:
- NoSlipBCAdapter() : BCAdapter() {}
- NoSlipBCAdapter(const short &secondaryBcOption) : BCAdapter(secondaryBcOption) {}
+ NoSlipBC() : BC() {}
+ NoSlipBC(const short &secondaryBcOption) : BC(secondaryBcOption) {}
void init(const D3Q27Interactor *const &interactor, const real &time = 0) override {}
void update(const D3Q27Interactor *const &interactor, const real &time = 0) override {}
@@ -56,9 +56,9 @@ public:
void adaptBC(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc, const real & /*worldX1*/,
const real & /*worldX2*/, const real & /*worldX3*/, const real & /*time*/ = 0) override
{
- bc->setBcAlgorithmType(algorithmType);
+ bc->setBCStrategyType(algorithmType);
}
private:
};
-#endif // NoSlipBCAdapter_H
+#endif // NoSlipBC_H
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.cpp
similarity index 82%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.cpp
index f89c74513289ab2787cbef0dbe504d913510afc5..cabd41b30dd31ac8751c60f00f46c899cbfa2334 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.cpp
@@ -26,33 +26,33 @@
// 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 NoSlipBCAlgorithm.cpp
+//! \file NoSlipBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "NoSlipBCAlgorithm.h"
+#include "NoSlipBCStrategy.h"
#include "BoundaryConditions.h"
#include "DistributionArray3D.h"
-NoSlipBCAlgorithm::NoSlipBCAlgorithm()
+NoSlipBCStrategy::NoSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::NoSlipBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::NoSlipBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> NoSlipBCAlgorithm::clone()
+SPtr<BCStrategy> NoSlipBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new NoSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new NoSlipBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void NoSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void NoSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void NoSlipBCAlgorithm::applyBC()
+void NoSlipBCStrategy::applyBC()
{
real f[D3Q27System::ENDF + 1];
real feq[D3Q27System::ENDF + 1];
@@ -66,8 +66,8 @@ void NoSlipBCAlgorithm::applyBC()
// quadratic bounce back
const int invDir = D3Q27System::INVDIR[fdir];
real q = bcPtr->getQ(invDir);
- real fReturn = ((1.0 - q) / (1.0 + q)) * ((f[invDir] - feq[invDir]) / (1.0 - collFactor) + feq[invDir]) +
- ((q / (1.0 + q)) * (f[invDir] + f[fdir]));
+ 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);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.h
similarity index 91%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.h
index dcf678b4f05bd2c50403bfd758cd27767f45d33a..d45526f373816f38a85ede287ffe975150bd96af 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NoSlipBCStrategy.h
@@ -26,25 +26,25 @@
// 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 NoSlipBCAlgorithm.h
+//! \file NoSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef NoSlipBCAlgorithm_h__
-#define NoSlipBCAlgorithm_h__
+#ifndef NoSlipBCStrategy_h__
+#define NoSlipBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
//! A class implements no-slip boundary condition
-class NoSlipBCAlgorithm : public BCAlgorithm
+class NoSlipBCStrategy : public BCStrategy
{
public:
- NoSlipBCAlgorithm();
- SPtr<BCAlgorithm> clone() override;
+ NoSlipBCStrategy();
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCStrategy.cpp
similarity index 88%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCStrategy.cpp
index 2787d685cbd3b71b879c3fabc1c114e0e61eef8d..d3f44c6ff7ce9d8acf913a8cebd3e42800b7a571 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCStrategy.cpp
@@ -26,35 +26,35 @@
// 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 NonEqDensityBCAlgorithm.cpp
+//! \file NonEqDensityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "NonEqDensityBCAlgorithm.h"
+#include "NonEqDensityBCStrategy.h"
#include "BoundaryConditions.h"
#include "DistributionArray3D.h"
-NonEqDensityBCAlgorithm::NonEqDensityBCAlgorithm()
+NonEqDensityBCStrategy::NonEqDensityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::NonEqDensityBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::NonEqDensityBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-NonEqDensityBCAlgorithm::~NonEqDensityBCAlgorithm() = default;
+NonEqDensityBCStrategy::~NonEqDensityBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> NonEqDensityBCAlgorithm::clone()
+SPtr<BCStrategy> NonEqDensityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new NonEqDensityBCAlgorithm());
+ SPtr<BCStrategy> bc(new NonEqDensityBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void NonEqDensityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void NonEqDensityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void NonEqDensityBCAlgorithm::applyBC()
+void NonEqDensityBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCStrategy.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCStrategy.h
index ca7d5b0432b74cf371659fee2c6da49f1ee8a9eb..d919a673e9cb344b51e826addf9b1fafe56b41f4 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCStrategy.h
@@ -26,25 +26,25 @@
// 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 NonEqDensityBCAlgorithm.h
+//! \file NonEqDensityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef NonEqDensityBCAlgorithm_h__
-#define NonEqDensityBCAlgorithm_h__
+#ifndef NonEqDensityBCStrategy_h__
+#define NonEqDensityBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
-class NonEqDensityBCAlgorithm : public BCAlgorithm
+class NonEqDensityBCStrategy : public BCStrategy
{
public:
- NonEqDensityBCAlgorithm();
- ~NonEqDensityBCAlgorithm() override;
- SPtr<BCAlgorithm> clone() override;
+ NonEqDensityBCStrategy();
+ ~NonEqDensityBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
-#endif // NonEqDensityBCAlgorithm_h__
+#endif // NonEqDensityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCStrategy.cpp
similarity index 97%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCStrategy.cpp
index 9fe55f9aa4ab87a8548ca04759fad16e809b682b..7f5eaf840c721f65cc030d5e6fad2995858af1b3 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCStrategy.cpp
@@ -26,36 +26,36 @@
// 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 NonReflectingInflowBCAlgorithm.cpp
+//! \file NonReflectingInflowBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Hussein Alihussein
//=======================================================================================
-#include "NonReflectingInflowBCAlgorithm.h"
+#include "NonReflectingInflowBCStrategy.h"
#include "BoundaryConditions.h"
#include "D3Q27System.h"
#include "DistributionArray3D.h"
-NonReflectingInflowBCAlgorithm::NonReflectingInflowBCAlgorithm()
+NonReflectingInflowBCStrategy::NonReflectingInflowBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::NonReflectingInflowBCAlgorithm;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::NonReflectingInflowBCStrategy;
+ BCStrategy::preCollision = true;
}
//////////////////////////////////////////////////////////////////////////
-NonReflectingInflowBCAlgorithm::~NonReflectingInflowBCAlgorithm() = default;
+NonReflectingInflowBCStrategy::~NonReflectingInflowBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> NonReflectingInflowBCAlgorithm::clone()
+SPtr<BCStrategy> NonReflectingInflowBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new NonReflectingInflowBCAlgorithm());
+ SPtr<BCStrategy> bc(new NonReflectingInflowBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void NonReflectingInflowBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void NonReflectingInflowBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void NonReflectingInflowBCAlgorithm::applyBC()
+void NonReflectingInflowBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
using namespace D3Q27System;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCStrategy.h
similarity index 85%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCStrategy.h
index 1f3e87ce3fff371fbec30dbbe90721bd5ff975cc..b3c9b6ba833d32d7fe551f561e366f581f518eee 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingInflowBCStrategy.h
@@ -26,25 +26,25 @@
// 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 NonReflectingInflowBCAlgorithm.h
+//! \file NonReflectingInflowBCStrategy.h
//! \ingroup BoundarConditions
//! \author Hussein Alihussein
//=======================================================================================
-#ifndef NonReflectingInflowBCAlgorithm_h__
-#define NonReflectingInflowBCAlgorithm_h__
+#ifndef NonReflectingInflowBCStrategy_h__
+#define NonReflectingInflowBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
-class NonReflectingInflowBCAlgorithm : public BCAlgorithm
+class NonReflectingInflowBCStrategy : public BCStrategy
{
public:
- NonReflectingInflowBCAlgorithm();
- ~NonReflectingInflowBCAlgorithm() override;
- SPtr<BCAlgorithm> clone() override;
+ NonReflectingInflowBCStrategy();
+ ~NonReflectingInflowBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
-#endif // NonReflectingDensityBCAlgorithm_h__
+#endif // NonReflectingDensityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.h
deleted file mode 100644
index d664b67fbf5f2d99258f0567f90b0dbd1e728fb5..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 NonReflectingOutflowBCAlgorithm.h
-//! \ingroup BoundarConditions
-//! \author Konstantin Kutscher
-//=======================================================================================
-#ifndef NonReflectingOutflowBCAlgorithm_h__
-#define NonReflectingOutflowBCAlgorithm_h__
-
-#include "BCAlgorithm.h"
-#include <PointerDefinitions.h>
-
-class DistributionArray3D;
-
-class NonReflectingOutflowBCAlgorithm : public BCAlgorithm
-{
-public:
- NonReflectingOutflowBCAlgorithm();
- ~NonReflectingOutflowBCAlgorithm() override;
- SPtr<BCAlgorithm> clone() override;
- void addDistributions(SPtr<DistributionArray3D> distributions) override;
- void applyBC() override;
-};
-#endif // NonReflectingDensityBCAlgorithm_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCStrategy.cpp
similarity index 56%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCStrategy.cpp
index 09adfefa8d246ff92f43eeeacb57ad3c4bd3ea16..b19b27ec1a5d22f835595020a26a76f194cc7ccb 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCStrategy.cpp
@@ -26,36 +26,36 @@
// 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 NonReflectingOutflowBCAlgorithm.cpp
+//! \file NonReflectingOutflowBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "NonReflectingOutflowBCAlgorithm.h"
+#include "NonReflectingOutflowBCStrategy.h"
#include "BoundaryConditions.h"
#include "D3Q27System.h"
#include "DistributionArray3D.h"
-NonReflectingOutflowBCAlgorithm::NonReflectingOutflowBCAlgorithm()
+NonReflectingOutflowBCStrategy::NonReflectingOutflowBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::NonReflectingOutflowBCAlgorithm;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::NonReflectingOutflowBCStrategy;
+ BCStrategy::preCollision = true;
}
//////////////////////////////////////////////////////////////////////////
-NonReflectingOutflowBCAlgorithm::~NonReflectingOutflowBCAlgorithm() = default;
+NonReflectingOutflowBCStrategy::~NonReflectingOutflowBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> NonReflectingOutflowBCAlgorithm::clone()
+SPtr<BCStrategy> NonReflectingOutflowBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new NonReflectingOutflowBCAlgorithm());
+ SPtr<BCStrategy> bc(new NonReflectingOutflowBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void NonReflectingOutflowBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void NonReflectingOutflowBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void NonReflectingOutflowBCAlgorithm::applyBC()
+void NonReflectingOutflowBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
@@ -101,15 +101,15 @@ void NonReflectingOutflowBCAlgorithm::applyBC()
switch (direction) {
case DIR_P00:
- f[DIR_P00] = ftemp[DIR_P00] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_P00];
- f[DIR_PP0] = ftemp[DIR_PP0] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PP0];
- f[DIR_PM0] = ftemp[DIR_PM0] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PM0];
- f[DIR_P0P] = ftemp[DIR_P0P] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_P0P];
- f[DIR_P0M] = ftemp[DIR_P0M] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_P0M];
- f[DIR_PPP] = ftemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PPP];
- f[DIR_PMP] = ftemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PMP];
- f[DIR_PPM] = ftemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PPM];
- f[DIR_PMM] = ftemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 + vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx1) * f[DIR_PMM];
+ f[DIR_P00] = ftemp[DIR_P00] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P00];
+ f[DIR_PP0] = ftemp[DIR_PP0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PP0];
+ f[DIR_PM0] = ftemp[DIR_PM0] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PM0];
+ f[DIR_P0P] = ftemp[DIR_P0P] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P0P];
+ f[DIR_P0M] = ftemp[DIR_P0M] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_P0M];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PPP];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PMP];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PPM];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 + vx1) + (c1o1 - one_over_sqrt3 - vx1) * f[DIR_PMM];
distributions->setDistributionInvForDirection(f[DIR_P00], x1 + DX1[DIR_M00], x2 + DX2[DIR_M00], x3 + DX3[DIR_M00], DIR_M00);
distributions->setDistributionInvForDirection(f[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -122,15 +122,15 @@ void NonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_PMM], x1 + DX1[DIR_MPP], x2 + DX2[DIR_MPP], x3 + DX3[DIR_MPP], DIR_MPP);
break;
case DIR_M00:
- f[DIR_M00] = ftemp[DIR_M00] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_M00];
- f[DIR_MP0] = ftemp[DIR_MP0] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MP0];
- f[DIR_MM0] = ftemp[DIR_MM0] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MM0];
- f[DIR_M0P] = ftemp[DIR_M0P] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_M0P];
- f[DIR_M0M] = ftemp[DIR_M0M] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_M0M];
- f[DIR_MPP] = ftemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MPP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MMP];
- f[DIR_MPM] = ftemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MPM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx1) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx1) * f[DIR_MMM];
+ f[DIR_M00] = ftemp[DIR_M00] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M00];
+ f[DIR_MP0] = ftemp[DIR_MP0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MP0];
+ f[DIR_MM0] = ftemp[DIR_MM0] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MM0];
+ f[DIR_M0P] = ftemp[DIR_M0P] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M0P];
+ f[DIR_M0M] = ftemp[DIR_M0M] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_M0M];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MPP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MMP];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MPM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx1) + (c1o1 - one_over_sqrt3 + vx1) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_M00], x1 + DX1[DIR_P00], x2 + DX2[DIR_P00], x3 + DX3[DIR_P00], DIR_P00);
distributions->setDistributionInvForDirection(f[DIR_MP0], x1 + DX1[DIR_PM0], x2 + DX2[DIR_PM0], x3 + DX3[DIR_PM0], DIR_PM0);
@@ -143,15 +143,15 @@ void NonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
break;
case DIR_0P0:
- f[DIR_0P0] = ftemp[DIR_0P0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_0P0];
- f[DIR_PP0] = ftemp[DIR_PP0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_PP0];
- f[DIR_MP0] = ftemp[DIR_MP0] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_MP0];
- f[DIR_0PP] = ftemp[DIR_0PP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_0PP];
- f[DIR_0PM] = ftemp[DIR_0PM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_0PM];
- f[DIR_PPP] = ftemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_PPP];
- f[DIR_MPP] = ftemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_MPP];
- f[DIR_PPM] = ftemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_PPM];
- f[DIR_MPM] = ftemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 + vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx2) * f[DIR_MPM];
+ f[DIR_0P0] = ftemp[DIR_0P0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0P0];
+ f[DIR_PP0] = ftemp[DIR_PP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PP0];
+ f[DIR_MP0] = ftemp[DIR_MP0] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MP0];
+ f[DIR_0PP] = ftemp[DIR_0PP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0PP];
+ f[DIR_0PM] = ftemp[DIR_0PM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_0PM];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PPP];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MPP];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_PPM];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 + vx2) + (c1o1 - one_over_sqrt3 - vx2) * f[DIR_MPM];
distributions->setDistributionInvForDirection(f[DIR_0P0], x1 + DX1[DIR_0M0], x2 + DX2[DIR_0M0], x3 + DX3[DIR_0M0], DIR_0M0);
distributions->setDistributionInvForDirection(f[DIR_PP0], x1 + DX1[DIR_MM0], x2 + DX2[DIR_MM0], x3 + DX3[DIR_MM0], DIR_MM0);
@@ -164,15 +164,15 @@ void NonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MPM], x1 + DX1[DIR_PMP], x2 + DX2[DIR_PMP], x3 + DX3[DIR_PMP], DIR_PMP);
break;
case DIR_0M0:
- f[DIR_0M0] = ftemp[DIR_0M0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_0M0];
- f[DIR_PM0] = ftemp[DIR_PM0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_PM0];
- f[DIR_MM0] = ftemp[DIR_MM0] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_MM0];
- f[DIR_0MP] = ftemp[DIR_0MP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_0MP];
- f[DIR_0MM] = ftemp[DIR_0MM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_0MM];
- f[DIR_PMP] = ftemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_PMP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_MMP];
- f[DIR_PMM] = ftemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_PMM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx2) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx2) * f[DIR_MMM];
+ f[DIR_0M0] = ftemp[DIR_0M0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0M0];
+ f[DIR_PM0] = ftemp[DIR_PM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PM0];
+ f[DIR_MM0] = ftemp[DIR_MM0] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MM0];
+ f[DIR_0MP] = ftemp[DIR_0MP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0MP];
+ f[DIR_0MM] = ftemp[DIR_0MM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_0MM];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PMP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MMP];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_PMM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx2) + (c1o1 - one_over_sqrt3 + vx2) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_0M0], x1 + DX1[DIR_0P0], x2 + DX2[DIR_0P0], x3 + DX3[DIR_0P0], DIR_0P0);
distributions->setDistributionInvForDirection(f[DIR_PM0], x1 + DX1[DIR_MP0], x2 + DX2[DIR_MP0], x3 + DX3[DIR_MP0], DIR_MP0);
@@ -185,15 +185,15 @@ void NonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MMM], x1 + DX1[DIR_PPP], x2 + DX2[DIR_PPP], x3 + DX3[DIR_PPP], DIR_PPP);
break;
case DIR_00P:
- f[DIR_00P] = ftemp[DIR_00P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_00P];
- f[DIR_P0P] = ftemp[DIR_P0P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_P0P];
- f[DIR_M0P] = ftemp[DIR_M0P] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_M0P];
- f[DIR_0PP] = ftemp[DIR_0PP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_0PP];
- f[DIR_0MP] = ftemp[DIR_0MP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_0MP];
- f[DIR_PPP] = ftemp[DIR_PPP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_PPP];
- f[DIR_MPP] = ftemp[DIR_MPP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_MPP];
- f[DIR_PMP] = ftemp[DIR_PMP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_PMP];
- f[DIR_MMP] = ftemp[DIR_MMP] * (vf::basics::constant::one_over_sqrt3 + vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 - vx3) * f[DIR_MMP];
+ f[DIR_00P] = ftemp[DIR_00P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_00P];
+ f[DIR_P0P] = ftemp[DIR_P0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_P0P];
+ f[DIR_M0P] = ftemp[DIR_M0P] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_M0P];
+ f[DIR_0PP] = ftemp[DIR_0PP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_0PP];
+ f[DIR_0MP] = ftemp[DIR_0MP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_0MP];
+ f[DIR_PPP] = ftemp[DIR_PPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_PPP];
+ f[DIR_MPP] = ftemp[DIR_MPP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_MPP];
+ f[DIR_PMP] = ftemp[DIR_PMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_PMP];
+ f[DIR_MMP] = ftemp[DIR_MMP] * (one_over_sqrt3 + vx3) + (c1o1 - one_over_sqrt3 - vx3) * f[DIR_MMP];
distributions->setDistributionInvForDirection(f[DIR_00P], x1 + DX1[DIR_00M], x2 + DX2[DIR_00M], x3 + DX3[DIR_00M], DIR_00M);
distributions->setDistributionInvForDirection(f[DIR_P0P], x1 + DX1[DIR_M0M], x2 + DX2[DIR_M0M], x3 + DX3[DIR_M0M], DIR_M0M);
@@ -206,15 +206,15 @@ void NonReflectingOutflowBCAlgorithm::applyBC()
distributions->setDistributionInvForDirection(f[DIR_MMP], x1 + DX1[DIR_PPM], x2 + DX2[DIR_PPM], x3 + DX3[DIR_PPM], DIR_PPM);
break;
case DIR_00M:
- f[DIR_00M] = ftemp[DIR_00M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_00M];
- f[DIR_P0M] = ftemp[DIR_P0M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_P0M];
- f[DIR_M0M] = ftemp[DIR_M0M] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_M0M];
- f[DIR_0PM] = ftemp[DIR_0PM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_0PM];
- f[DIR_0MM] = ftemp[DIR_0MM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_0MM];
- f[DIR_PPM] = ftemp[DIR_PPM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_PPM];
- f[DIR_MPM] = ftemp[DIR_MPM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_MPM];
- f[DIR_PMM] = ftemp[DIR_PMM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_PMM];
- f[DIR_MMM] = ftemp[DIR_MMM] * (vf::basics::constant::one_over_sqrt3 - vx3) + (1.0 - vf::basics::constant::one_over_sqrt3 + vx3) * f[DIR_MMM];
+ f[DIR_00M] = ftemp[DIR_00M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_00M];
+ f[DIR_P0M] = ftemp[DIR_P0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_P0M];
+ f[DIR_M0M] = ftemp[DIR_M0M] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_M0M];
+ f[DIR_0PM] = ftemp[DIR_0PM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_0PM];
+ f[DIR_0MM] = ftemp[DIR_0MM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_0MM];
+ f[DIR_PPM] = ftemp[DIR_PPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_PPM];
+ f[DIR_MPM] = ftemp[DIR_MPM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_MPM];
+ f[DIR_PMM] = ftemp[DIR_PMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_PMM];
+ f[DIR_MMM] = ftemp[DIR_MMM] * (one_over_sqrt3 - vx3) + (c1o1 - one_over_sqrt3 + vx3) * f[DIR_MMM];
distributions->setDistributionInvForDirection(f[DIR_00M], x1 + DX1[DIR_00P], x2 + DX2[DIR_00P], x3 + DX3[DIR_00P], DIR_00P);
distributions->setDistributionInvForDirection(f[DIR_P0M], x1 + DX1[DIR_M0P], x2 + DX2[DIR_M0P], x3 + DX3[DIR_M0P], DIR_M0P);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCStrategy.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCStrategy.h
new file mode 100644
index 0000000000000000000000000000000000000000..7fca99885755f78ca4088dd031511d774bfc4115
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCStrategy.h
@@ -0,0 +1,50 @@
+//=======================================================================================
+// ____ ____ __ ______ __________ __ __ __ __
+// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
+// \ \ | | | | | |_) | | | | | | | / \ | |
+// \ \ | | | | | _ / | | | | | | / /\ \ | |
+// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
+// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
+// \ \ | | ________________________________________________________________
+// \ \ | | | ______________________________________________________________|
+// \ \| | | | __ __ __ __ ______ _______
+// \ | | |_____ | | | | | | | | | _ \ / _____)
+// \ | | _____| | | | | | | | | | | \ \ \_______
+// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
+// \ _____| |__| |________| \_______/ |__| |______/ (_______/
+//
+// 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 NonReflectingOutflowBCStrategy.h
+//! \ingroup BoundarConditions
+//! \author Konstantin Kutscher
+//=======================================================================================
+#ifndef NonReflectingOutflowBCStrategy_h__
+#define NonReflectingOutflowBCStrategy_h__
+
+#include "BCStrategy.h"
+#include <PointerDefinitions.h>
+
+class DistributionArray3D;
+
+class NonReflectingOutflowBCStrategy : public BCStrategy
+{
+public:
+ NonReflectingOutflowBCStrategy();
+ ~NonReflectingOutflowBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
+ void applyBC() override;
+};
+#endif // NonReflectingDensityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithmWithRelaxation.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowWithRelaxationBCStrategy.cpp
similarity index 96%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithmWithRelaxation.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowWithRelaxationBCStrategy.cpp
index d36e07118248363c0a81bc7d907c70b3d1b4fcea..3e10421e59bac7e260e95ccf491d1f749f28c640 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithmWithRelaxation.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowWithRelaxationBCStrategy.cpp
@@ -26,36 +26,36 @@
// 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 NonReflectingOutflowBCAlgorithmWithRelaxation.cpp
+//! \file NonReflectingOutflowWithRelaxationBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher, Hussein Alihussein
//=======================================================================================
-#include "NonReflectingOutflowBCAlgorithmWithRelaxation.h"
+#include "NonReflectingOutflowWithRelaxationBCStrategy.h"
#include "BoundaryConditions.h"
#include "D3Q27System.h"
#include "DistributionArray3D.h"
-NonReflectingOutflowBCAlgorithmWithRelaxation::NonReflectingOutflowBCAlgorithmWithRelaxation()
+NonReflectingOutflowWithRelaxationBCStrategy::NonReflectingOutflowWithRelaxationBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::NonReflectingOutflowBCAlgorithmWithRelaxation;
- BCAlgorithm::preCollision = true;
+ BCStrategy::type = BCStrategy::NonReflectingOutflowWithRelaxationBCStrategy;
+ BCStrategy::preCollision = true;
}
//////////////////////////////////////////////////////////////////////////
-NonReflectingOutflowBCAlgorithmWithRelaxation::~NonReflectingOutflowBCAlgorithmWithRelaxation() = default;
+NonReflectingOutflowWithRelaxationBCStrategy::~NonReflectingOutflowWithRelaxationBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> NonReflectingOutflowBCAlgorithmWithRelaxation::clone()
+SPtr<BCStrategy> NonReflectingOutflowWithRelaxationBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new NonReflectingOutflowBCAlgorithmWithRelaxation());
+ SPtr<BCStrategy> bc(new NonReflectingOutflowWithRelaxationBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void NonReflectingOutflowBCAlgorithmWithRelaxation::addDistributions(SPtr<DistributionArray3D> distributions)
+void NonReflectingOutflowWithRelaxationBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void NonReflectingOutflowBCAlgorithmWithRelaxation::applyBC()
+void NonReflectingOutflowWithRelaxationBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithmWithRelaxation.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowWithRelaxationBCStrategy.h
similarity index 83%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithmWithRelaxation.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowWithRelaxationBCStrategy.h
index 97badb60dbe84e0b7a4a3fa82b950649e0a12d93..e8179c706f204494ac383b519fa22ef78de5d5ac 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowBCAlgorithmWithRelaxation.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonReflectingOutflowWithRelaxationBCStrategy.h
@@ -26,25 +26,25 @@
// 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 NonReflectingOutflowBCAlgorithmWithRelaxation.h
+//! \file NonReflectingOutflowWithRelaxationBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher, Hussein Alihussein
//=======================================================================================
-#ifndef NonReflectingOutflowBCAlgorithmWithRelaxation_h__
-#define NonReflectingOutflowBCAlgorithmWithRelaxation_h__
+#ifndef NonReflectingOutflowWithRelaxationBCStrategy_h__
+#define NonReflectingOutflowWithRelaxationBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
-class NonReflectingOutflowBCAlgorithmWithRelaxation : public BCAlgorithm
+class NonReflectingOutflowWithRelaxationBCStrategy : public BCStrategy
{
public:
- NonReflectingOutflowBCAlgorithmWithRelaxation();
- ~NonReflectingOutflowBCAlgorithmWithRelaxation() override;
- SPtr<BCAlgorithm> clone() override;
+ NonReflectingOutflowWithRelaxationBCStrategy();
+ ~NonReflectingOutflowWithRelaxationBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
-#endif // NonReflectingDensityBCAlgorithm_h__
+#endif // NonReflectingDensityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCStrategy.cpp
similarity index 91%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCStrategy.cpp
index e02ee9fb7766217411ac37a104bf8c59a60a741e..7bd97721771d1cd5f2d5121bc3776c6dad9b3900 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCStrategy.cpp
@@ -26,37 +26,37 @@
// 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 SimpleSlipBCAlgorithm.cpp
+//! \file SimpleSlipBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "SimpleSlipBCAlgorithm.h"
+#include "SimpleSlipBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-SimpleSlipBCAlgorithm::SimpleSlipBCAlgorithm()
+SimpleSlipBCStrategy::SimpleSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::SimpleSlipBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::SimpleSlipBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-SimpleSlipBCAlgorithm::~SimpleSlipBCAlgorithm()
+SimpleSlipBCStrategy::~SimpleSlipBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> SimpleSlipBCAlgorithm::clone()
+SPtr<BCStrategy> SimpleSlipBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new SimpleSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new SimpleSlipBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void SimpleSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void SimpleSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void SimpleSlipBCAlgorithm::applyBC()
+void SimpleSlipBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
@@ -67,7 +67,7 @@ void SimpleSlipBCAlgorithm::applyBC()
calcMacrosFct(f, drho, vx1, vx2, vx3);
calcFeqFct(feq, drho, vx1, vx2, vx3);
- rho = 1.0 + drho * compressibleFactor;
+ rho = vf::basics::constant::c1o1 + drho * compressibleFactor;
UbTupleFloat3 normale = bcPtr->getNormalVector();
real amp = vx1*val<1>(normale)+vx2*val<2>(normale)+vx3*val<3>(normale);
@@ -82,7 +82,7 @@ void SimpleSlipBCAlgorithm::applyBC()
{
//quadratic bounce back
const int invDir = D3Q27System::INVDIR[fdir];
- real velocity = 0.0;
+ real velocity = vf::basics::constant::c0o1;
switch (invDir)
{
case DIR_P00: velocity = (vf::basics::constant::c4o9*(+vx1)); break; //(2/cs^2)(=6)*rho_0(=1 bei imkompr)*wi*u*ei mit cs=1/sqrt(3)
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCStrategy.h
similarity index 88%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCStrategy.h
index bfe4a766bc4fe1f05cf55cb679cfb3900f574c39..294c7fdf648603359f14aa1a0bf4f769d6672f05 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleSlipBCStrategy.h
@@ -26,26 +26,26 @@
// 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 SimpleVelocityBCAlgorithm.h
+//! \file SimpleVelocityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef SimpleSlipBCAlgorithm_h__
-#define SimpleSlipBCAlgorithm_h__
+#ifndef SimpleSlipBCStrategy_h__
+#define SimpleSlipBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
//! \brief A class implements slip boundary condition by using simple bounce back
-class SimpleSlipBCAlgorithm : public BCAlgorithm
+class SimpleSlipBCStrategy : public BCStrategy
{
public:
- SimpleSlipBCAlgorithm();
- virtual ~SimpleSlipBCAlgorithm();
- SPtr<BCAlgorithm> clone() override;
+ SimpleSlipBCStrategy();
+ virtual ~SimpleSlipBCStrategy();
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
-#endif // SimpleSlipBCAlgorithm_h__
+#endif // SimpleSlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCStrategy.cpp
similarity index 86%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCStrategy.cpp
index 83badd723e2c9bda222abaccdb09fbc352bc46af..2206e71541d6d264fd91146be5641ba75ed5b4d3 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCStrategy.cpp
@@ -26,37 +26,37 @@
// 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 SimpleVelocityBCAlgorithm.cpp
+//! \file SimpleVelocityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "SimpleVelocityBCAlgorithm.h"
+#include "SimpleVelocityBCStrategy.h"
#include "DistributionArray3D.h"
#include "BoundaryConditions.h"
-SimpleVelocityBCAlgorithm::SimpleVelocityBCAlgorithm()
+SimpleVelocityBCStrategy::SimpleVelocityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::SimpleVelocityBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::SimpleVelocityBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-SimpleVelocityBCAlgorithm::~SimpleVelocityBCAlgorithm()
+SimpleVelocityBCStrategy::~SimpleVelocityBCStrategy()
{
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> SimpleVelocityBCAlgorithm::clone()
+SPtr<BCStrategy> SimpleVelocityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new SimpleVelocityBCAlgorithm());
+ SPtr<BCStrategy> bc(new SimpleVelocityBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void SimpleVelocityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void SimpleVelocityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void SimpleVelocityBCAlgorithm::applyBC()
+void SimpleVelocityBCStrategy::applyBC()
{
real f[D3Q27System::ENDF+1];
real feq[D3Q27System::ENDF+1];
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCStrategy.h
similarity index 89%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCStrategy.h
index b751d220c0cd15b597969fd9980184c16c5de36c..597e69a386ad03c0eb29ea62a77563b84c72435c 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SimpleVelocityBCStrategy.h
@@ -26,26 +26,26 @@
// 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 SimpleVelocityBCAlgorithm.h
+//! \file SimpleVelocityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef SimpleVelocityBCAlgorithm_H
-#define SimpleVelocityBCAlgorithm_H
+#ifndef SimpleVelocityBCStrategy_H
+#define SimpleVelocityBCStrategy_H
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
//! \brief A class implements velocyty boundary condition
-class SimpleVelocityBCAlgorithm : public BCAlgorithm
+class SimpleVelocityBCStrategy : public BCStrategy
{
public:
- SimpleVelocityBCAlgorithm();
- ~SimpleVelocityBCAlgorithm();
- SPtr<BCAlgorithm> clone() override;
+ SimpleVelocityBCStrategy();
+ ~SimpleVelocityBCStrategy();
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
similarity index 74%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
index 8f8299850d2299f75903a42a2b59512e093d6172..eb254160395ce1ba12e22bc6ff6d6e063ce8f316 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.cpp
@@ -26,27 +26,27 @@
// 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 SlipBCAdapter.cpp
+//! \file SlipBC.cpp
//! \ingroup BoundarConditions
-//! \author Sören Freudiger
+//! \author Soeren Freudiger
//=======================================================================================
-#include "SlipBCAdapter.h"
+#include "SlipBC.h"
#include "D3Q27Interactor.h"
#include "D3Q27System.h"
#include "geometry3d/GbCuboid3D.h"
//*==========================================================*/
-// ObObject* D3Q27SlipBCAdapterCreator::createObObject()
+// ObObject* D3Q27SlipBCCreator::createObObject()
//{
-// return new D3Q27SlipBCAdapter;
+// return new D3Q27SlipBC;
//}
//*==========================================================*/
-// ObObjectCreator* D3Q27SlipBCAdapter::getCreator()
+// ObObjectCreator* D3Q27SlipBC::getCreator()
//{
-// return D3Q27SlipBCAdapterCreator::getInstance();
+// return D3Q27SlipBCCreator::getInstance();
//}
//*==========================================================*/
-void SlipBCAdapter::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions> bc, const real & /*worldX1*/,
+void SlipBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions> bc, const real & /*worldX1*/,
const real & /*worldX2*/, const real & /*worldX3*/, const real & /*time*/)
{
using namespace vf::lbm::dir;
@@ -59,17 +59,17 @@ void SlipBCAdapter::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryCond
throw UbException(UB_EXARGS, "derzeit nur fuer Cubes valide");
if (bc->hasSlipBoundaryFlag(DIR_P00))
- bc->setNormalVector(1.0, 0.0, 0.0);
+ bc->setNormalVector(vf::basics::constant::c1o1, vf::basics::constant::c0o1, vf::basics::constant::c0o1);
else if (bc->hasSlipBoundaryFlag(DIR_M00))
- bc->setNormalVector(-1.0, 0.0, 0.0);
+ bc->setNormalVector(-vf::basics::constant::c1o1, vf::basics::constant::c0o1, vf::basics::constant::c0o1);
else if (bc->hasSlipBoundaryFlag(DIR_0P0))
- bc->setNormalVector(0.0, 1.0, 0.0);
+ bc->setNormalVector(vf::basics::constant::c0o1, vf::basics::constant::c1o1, vf::basics::constant::c0o1);
else if (bc->hasSlipBoundaryFlag(DIR_0M0))
- bc->setNormalVector(0.0, -1.0, 0.0);
+ bc->setNormalVector(vf::basics::constant::c0o1, -vf::basics::constant::c1o1, vf::basics::constant::c0o1);
else if (bc->hasSlipBoundaryFlag(DIR_00P))
- bc->setNormalVector(0.0, 0.0, 1.0);
+ bc->setNormalVector(vf::basics::constant::c0o1, vf::basics::constant::c0o1, vf::basics::constant::c1o1);
else if (bc->hasSlipBoundaryFlag(DIR_00M))
- bc->setNormalVector(0.0, 0.0, -1.0);
+ bc->setNormalVector(vf::basics::constant::c0o1, vf::basics::constant::c0o1, -vf::basics::constant::c1o1);
- bc->setBcAlgorithmType(algorithmType);
+ bc->setBCStrategyType(algorithmType);
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.h
similarity index 79%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.h
index 5c2225e0a1212931805207da7bacf1a1a797e290..8e8788db8ded7a2f9eb0e47135f9babbc69e37da 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBC.h
@@ -26,43 +26,43 @@
// 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 SlipBCAdapter.h
+//! \file SlipBC.h
//! \ingroup BoundarConditions
-//! \author Sören Freudiger
+//! \author Soeren Freudiger
//=======================================================================================
-#ifndef SlipBCAdapter_H
-#define SlipBCAdapter_H
+#ifndef SlipBC_H
+#define SlipBC_H
-#include "BCAdapter.h"
+#include "BC.h"
/*=======================================================*/
-// D3Q27SlipBCAdapterCreator
-// class D3Q27SlipBCAdapterCreator : public ObObjectCreator
+// D3Q27SlipBCCreator
+// class D3Q27SlipBCCreator : public ObObjectCreator
//{
// public:
-// static D3Q27SlipBCAdapterCreator* getInstance()
+// static D3Q27SlipBCCreator* getInstance()
// {
-// static D3Q27SlipBCAdapterCreator instance;
+// static D3Q27SlipBCCreator instance;
// return &instance;
// }
//
// ObObject* createObObject();
//
-// std::string getTypeID() { return "D3Q27SlipBCAdapter";}
-// std::string toString() { return "D3Q27SlipBCAdapterCreator"; }
+// std::string getTypeID() { return "D3Q27SlipBC";}
+// std::string toString() { return "D3Q27SlipBCCreator"; }
//
// private:
-// D3Q27SlipBCAdapterCreator( const D3Q27SlipBCAdapterCreator& ); //no copy allowed
-// const D3Q27SlipBCAdapterCreator& operator=( const D3Q27SlipBCAdapterCreator& ); //no copy allowed
-// D3Q27SlipBCAdapterCreator() : ObObjectCreator() {}
+// D3Q27SlipBCCreator( const D3Q27SlipBCCreator& ); //no copy allowed
+// const D3Q27SlipBCCreator& operator=( const D3Q27SlipBCCreator& ); //no copy allowed
+// D3Q27SlipBCCreator() : ObObjectCreator() {}
//};
//
-class SlipBCAdapter : public BCAdapter
+class SlipBC : public BC
{
public:
- SlipBCAdapter() : BCAdapter() {}
- SlipBCAdapter(const short &secondaryBcOption) : BCAdapter(secondaryBcOption) {}
+ SlipBC() : BC() {}
+ SlipBC(const short &secondaryBcOption) : BC(secondaryBcOption) {}
//------------- implements D3Q27BoundaryConditionAdapter ----- start
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.h
deleted file mode 100644
index b7a75969f6895f680bf17c08462f4b788fc31c65..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SlipBCAlgorithm_h__
-#define SlipBCAlgorithm_h__
-
-#include "BCAlgorithm.h"
-#include <PointerDefinitions.h>
-
-class DistributionArray3D;
-
-class SlipBCAlgorithm : public BCAlgorithm
-{
-public:
- SlipBCAlgorithm();
- ~SlipBCAlgorithm() override;
- SPtr<BCAlgorithm> clone() override;
- void addDistributions(SPtr<DistributionArray3D> distributions) override;
- void applyBC() override;
-};
-#endif // SlipBCAlgorithm_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCStrategy.cpp
similarity index 83%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCStrategy.cpp
index 4232ae91a8d4806e1615beacfb57c5eb5deb10ca..34093b6a86833266b7c589ce1ed88252ba608892 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCStrategy.cpp
@@ -1,24 +1,24 @@
-#include "SlipBCAlgorithm.h"
+#include "SlipBCStrategy.h"
#include "BoundaryConditions.h"
#include "DistributionArray3D.h"
-SlipBCAlgorithm::SlipBCAlgorithm()
+SlipBCStrategy::SlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::SlipBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::SlipBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-SlipBCAlgorithm::~SlipBCAlgorithm() = default;
+SlipBCStrategy::~SlipBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> SlipBCAlgorithm::clone()
+SPtr<BCStrategy> SlipBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new SlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new SlipBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void SlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions) { this->distributions = distributions; }
+void SlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions) { this->distributions = distributions; }
//////////////////////////////////////////////////////////////////////////
-void SlipBCAlgorithm::applyBC()
+void SlipBCStrategy::applyBC()
{
using namespace vf::lbm::dir;
@@ -36,7 +36,7 @@ void SlipBCAlgorithm::applyBC()
vx2 = vx2 - amp * val<2>(normale); // normale zeigt von struktur weg!
vx3 = vx3 - amp * val<3>(normale); // normale zeigt von struktur weg!
- rho = 1.0 + drho * compressibleFactor;
+ rho = vf::basics::constant::c1o1 + drho * compressibleFactor;
for (int fdir = D3Q27System::FSTARTDIR; fdir<=D3Q27System::FENDDIR; fdir++)
{
@@ -46,7 +46,7 @@ void SlipBCAlgorithm::applyBC()
const int invDir = D3Q27System::INVDIR[fdir];
real q = bcPtr->getQ(invDir);// m+m q=0 stabiler
//vx3=0;
- real velocity = 0.0;
+ real velocity = vf::basics::constant::c0o1;
switch (invDir)
{
case DIR_P00: velocity = (vf::basics::constant::c4o9*(+vx1)); break; //(2/cs^2)(=6)*rho_0(=1 bei imkompr)*wi*u*ei mit cs=1/sqrt(3)
@@ -77,7 +77,7 @@ void SlipBCAlgorithm::applyBC()
case DIR_MPP: velocity = (vf::basics::constant::c1o36*(-vx1+vx2+vx3)); break;
default: throw UbException(UB_EXARGS, "unknown error");
}
- real fReturn = ((1.0-q)/(1.0+q))*((f[invDir]-feq[invDir])/(1.0-collFactor)+feq[invDir])+((q*(f[invDir]+f[fdir])-velocity*rho)/(1.0+q));
+ real fReturn = ((vf::basics::constant::c1o1-q)/(vf::basics::constant::c1o1+q))*((f[invDir]-feq[invDir])/(vf::basics::constant::c1o1-collFactor)+feq[invDir])+((q*(f[invDir]+f[fdir])-velocity*rho)/(vf::basics::constant::c1o1+q));
distributions->setDistributionForDirection(fReturn, x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);
}
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCStrategy.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCStrategy.h
new file mode 100644
index 0000000000000000000000000000000000000000..6eeb43a9022737637c1fa8dd7b7a557af067eda8
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCStrategy.h
@@ -0,0 +1,18 @@
+#ifndef SlipBCStrategy_h__
+#define SlipBCStrategy_h__
+
+#include "BCStrategy.h"
+#include <PointerDefinitions.h>
+
+class DistributionArray3D;
+
+class SlipBCStrategy : public BCStrategy
+{
+public:
+ SlipBCStrategy();
+ ~SlipBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
+ void addDistributions(SPtr<DistributionArray3D> distributions) override;
+ void applyBC() override;
+};
+#endif // SlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCSet.cpp
similarity index 77%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCSet.cpp
index 7d4aa93295aabe45f4dea9d13a9c5b22dfac3b2a..aefbd97f1fc7cae230af6632432b1efce41829cd 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCSet.cpp
@@ -26,34 +26,34 @@
// 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 ThinWallBCProcessor.cpp
+//! \file ThinWallBCSet.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "ThinWallBCProcessor.h"
+#include "ThinWallBCSet.h"
-#include "ThinWallNoSlipBCAlgorithm.h"
+#include "ThinWallNoSlipBCStrategy.h"
#include "LBMKernel.h"
//////////////////////////////////////////////////////////////////////////
-ThinWallBCProcessor::ThinWallBCProcessor(SPtr<ILBMKernel> kernel) : BCProcessor(kernel) {}
+ThinWallBCSet::ThinWallBCSet(SPtr<ILBMKernel> kernel) : BCSet(kernel) {}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCProcessor> ThinWallBCProcessor::clone(SPtr<ILBMKernel> kernel)
+SPtr<BCSet> ThinWallBCSet::clone(SPtr<ILBMKernel> kernel)
{
- SPtr<BCProcessor> bcProcessor(new ThinWallBCProcessor(kernel));
- return bcProcessor;
+ SPtr<BCSet> BCSet(new ThinWallBCSet(kernel));
+ return BCSet;
}
//////////////////////////////////////////////////////////////////////////
-void ThinWallBCProcessor::applyPostCollisionBC()
+void ThinWallBCSet::applyPostCollisionBC()
{
- BCProcessor::applyPostCollisionBC();
+ BCSet::applyPostCollisionBC();
- for (SPtr<BCAlgorithm> bc : postBC) {
- if (bc->getType() == BCAlgorithm::ThinWallNoSlipBCAlgorithm) {
- dynamicPointerCast<ThinWallNoSlipBCAlgorithm>(bc)->setPass(2);
+ for (SPtr<BCStrategy> bc : postBC) {
+ if (bc->getType() == BCStrategy::ThinWallNoSlipBCStrategy) {
+ dynamicPointerCast<ThinWallNoSlipBCStrategy>(bc)->setPass(2);
bc->applyBC();
- dynamicPointerCast<ThinWallNoSlipBCAlgorithm>(bc)->setPass(1);
+ dynamicPointerCast<ThinWallNoSlipBCStrategy>(bc)->setPass(1);
}
}
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCSet.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCSet.h
index cb81e6c168748d9d4baf3cce1688f114e7d5faf8..45c76a23f3d1260f8231bce581ec72ba4587794a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCProcessor.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallBCSet.h
@@ -26,25 +26,25 @@
// 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 ThinWallBCProcessor.h
+//! \file ThinWallBCSet.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef ThinWallBCProcessor_H
-#define ThinWallBCProcessor_H
+#ifndef ThinWallBCSet_H
+#define ThinWallBCSet_H
#include <PointerDefinitions.h>
-#include "BCProcessor.h"
+#include "BCSet.h"
class ILBMKernel;
-class ThinWallBCProcessor : public BCProcessor
+class ThinWallBCSet : public BCSet
{
public:
- ThinWallBCProcessor() = default;
- explicit ThinWallBCProcessor(SPtr<ILBMKernel> kernel);
- SPtr<BCProcessor> clone(SPtr<ILBMKernel> kernel) override;
+ ThinWallBCSet() = default;
+ explicit ThinWallBCSet(SPtr<ILBMKernel> kernel);
+ SPtr<BCSet> clone(SPtr<ILBMKernel> kernel) override;
void applyPostCollisionBC(); // FIXME: should the base method virtual??
protected:
private:
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCStrategy.cpp
similarity index 83%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCStrategy.cpp
index b3c97393af0e21f5732ee2763c09f9fc60017862..2427983a121b4948167b20d2336dbc39a0d81b9a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCStrategy.cpp
@@ -26,31 +26,31 @@
// 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 ThinWallNoSlipBCAlgorithm.cpp
+//! \file ThinWallNoSlipBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "ThinWallNoSlipBCAlgorithm.h"
+#include "ThinWallNoSlipBCStrategy.h"
#include "BoundaryConditions.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
-ThinWallNoSlipBCAlgorithm::ThinWallNoSlipBCAlgorithm()
+ThinWallNoSlipBCStrategy::ThinWallNoSlipBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::ThinWallNoSlipBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::ThinWallNoSlipBCStrategy;
+ BCStrategy::preCollision = false;
pass = 1;
}
//////////////////////////////////////////////////////////////////////////
-ThinWallNoSlipBCAlgorithm::~ThinWallNoSlipBCAlgorithm() = default;
+ThinWallNoSlipBCStrategy::~ThinWallNoSlipBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> ThinWallNoSlipBCAlgorithm::clone()
+SPtr<BCStrategy> ThinWallNoSlipBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new ThinWallNoSlipBCAlgorithm());
+ SPtr<BCStrategy> bc(new ThinWallNoSlipBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void ThinWallNoSlipBCAlgorithm::applyBC()
+void ThinWallNoSlipBCStrategy::applyBC()
{
real f[D3Q27System::ENDF + 1];
real feq[D3Q27System::ENDF + 1];
@@ -66,9 +66,9 @@ void ThinWallNoSlipBCAlgorithm::applyBC()
const int invDir = D3Q27System::INVDIR[fdir];
if (pass == 1) {
real q = bcPtr->getQ(invDir);
- fReturn = ((1.0 - q) / (1.0 + q)) * 0.5 *
+ fReturn = ((vf::basics::constant::c1o1 - q) / (vf::basics::constant::c1o1 + q)) * vf::basics::constant::c1o2 *
(f[invDir] - f[fdir] +
- (f[invDir] + f[fdir] - collFactor * (feq[fdir] + feq[invDir])) / (1.0 - collFactor));
+ (f[invDir] + f[fdir] - collFactor * (feq[fdir] + feq[invDir])) / (vf::basics::constant::c1o1 - collFactor));
// distributionsTemp->setDistributionForDirection(fReturn, x1 + D3Q27System::DX1[invDir], x2 +
// D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir], fdir);
fTemp[fdir] = fReturn;
@@ -85,9 +85,9 @@ void ThinWallNoSlipBCAlgorithm::applyBC()
}
}
//////////////////////////////////////////////////////////////////////////
-void ThinWallNoSlipBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void ThinWallNoSlipBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void ThinWallNoSlipBCAlgorithm::setPass(int pass) { this->pass = pass; }
+void ThinWallNoSlipBCStrategy::setPass(int pass) { this->pass = pass; }
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCStrategy.h
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCStrategy.h
index f9995d49fae300b44e30df4b8e3f47cd7ac95929..deba685a3b2a4d28f32406c4f5048520a2c46959 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/ThinWallNoSlipBCStrategy.h
@@ -26,24 +26,24 @@
// 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 ThinWallNoSlipBCAlgorithm.h
+//! \file ThinWallNoSlipBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef ThinWallNoSlipBCAlgorithm_h__
-#define ThinWallNoSlipBCAlgorithm_h__
+#ifndef ThinWallNoSlipBCStrategy_h__
+#define ThinWallNoSlipBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
-class ThinWallNoSlipBCAlgorithm : public BCAlgorithm
+class ThinWallNoSlipBCStrategy : public BCStrategy
{
public:
- ThinWallNoSlipBCAlgorithm();
- ~ThinWallNoSlipBCAlgorithm() override;
- SPtr<BCAlgorithm> clone() override;
+ ThinWallNoSlipBCStrategy();
+ ~ThinWallNoSlipBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void setPass(int pass);
void applyBC() override;
@@ -55,4 +55,4 @@ private:
int pass;
real fTemp[D3Q27System::ENDF + 1];
};
-#endif // ThinWallNoSlipBCAlgorithm_h__
+#endif // ThinWallNoSlipBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
similarity index 87%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
index 6ed8affe2b907764b56ad9f186d7f8adba2b6867..1ffc4470032f6212db1e5f52195235b5b6100cc9 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.cpp
@@ -26,19 +26,19 @@
// 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 VelocityBCAdapter.cpp
+//! \file VelocityBC.cpp
//! \ingroup BoundarConditions
//! \author Sören Freudiger
//=======================================================================================
-#include "VelocityBCAdapter.h"
+#include "VelocityBC.h"
#include "basics/utilities/UbLogger.h"
#include "basics/utilities/UbMath.h"
#include "basics/utilities/UbTuple.h"
using namespace std;
-VelocityBCAdapter::VelocityBCAdapter(const bool &vx1, const bool &vx2, const bool &vx3, const BCFunction &velVxBC)
+VelocityBC::VelocityBC(const bool &vx1, const bool &vx2, const bool &vx3, const BCFunction &velVxBC)
{
if (vx1)
this->vx1BCs.push_back(velVxBC);
@@ -49,7 +49,7 @@ VelocityBCAdapter::VelocityBCAdapter(const bool &vx1, const bool &vx2, const boo
this->init();
}
/*==========================================================*/
-VelocityBCAdapter::VelocityBCAdapter(const bool &vx1, const bool &vx2, const bool &vx3, const mu::Parser &function,
+VelocityBC::VelocityBC(const bool &vx1, const bool &vx2, const bool &vx3, const mu::Parser &function,
const real &startTime, const real &endTime)
{
if (vx1)
@@ -61,7 +61,7 @@ VelocityBCAdapter::VelocityBCAdapter(const bool &vx1, const bool &vx2, const boo
this->init();
}
/*==========================================================*/
-VelocityBCAdapter::VelocityBCAdapter(const bool &vx1, const bool &vx2, const bool &vx3, const mu::Parser &function1,
+VelocityBC::VelocityBC(const bool &vx1, const bool &vx2, const bool &vx3, const mu::Parser &function1,
const mu::Parser &function2, const mu::Parser &function3, const real &startTime,
const real &endTime)
{
@@ -74,7 +74,7 @@ VelocityBCAdapter::VelocityBCAdapter(const bool &vx1, const bool &vx2, const boo
this->init();
}
/*==========================================================*/
-VelocityBCAdapter::VelocityBCAdapter(const bool &vx1, const bool &vx2, const bool &vx3, const string &functionstring,
+VelocityBC::VelocityBC(const bool &vx1, const bool &vx2, const bool &vx3, const string &functionstring,
const real &startTime, const real &endTime)
{
if (vx1)
@@ -86,7 +86,7 @@ VelocityBCAdapter::VelocityBCAdapter(const bool &vx1, const bool &vx2, const boo
this->init();
}
/*==========================================================*/
-VelocityBCAdapter::VelocityBCAdapter(const BCFunction &velBC, bool x1Dir, bool x2Dir, bool x3Dir)
+VelocityBC::VelocityBC(const BCFunction &velBC, bool x1Dir, bool x2Dir, bool x3Dir)
{
if (x1Dir)
this->vx1BCs.push_back(velBC);
@@ -97,7 +97,7 @@ VelocityBCAdapter::VelocityBCAdapter(const BCFunction &velBC, bool x1Dir, bool x
this->init();
}
/*==========================================================*/
-VelocityBCAdapter::VelocityBCAdapter(const BCFunction &velVx1BC, const BCFunction &velVx2BC, const BCFunction &velVx3BC)
+VelocityBC::VelocityBC(const BCFunction &velVx1BC, const BCFunction &velVx2BC, const BCFunction &velVx3BC)
{
if (velVx1BC.getEndTime() != -Ub::inf)
this->vx1BCs.push_back(velVx1BC);
@@ -108,7 +108,7 @@ VelocityBCAdapter::VelocityBCAdapter(const BCFunction &velVx1BC, const BCFunctio
this->init();
}
/*==========================================================*/
-VelocityBCAdapter::VelocityBCAdapter(const vector<BCFunction> &velVx1BCs, const vector<BCFunction> &velVx2BCs,
+VelocityBC::VelocityBC(const vector<BCFunction> &velVx1BCs, const vector<BCFunction> &velVx2BCs,
const vector<BCFunction> &velVx3BCs)
{
this->vx1BCs = velVx1BCs;
@@ -117,7 +117,7 @@ VelocityBCAdapter::VelocityBCAdapter(const vector<BCFunction> &velVx1BCs, const
this->init();
}
/*==========================================================*/
-VelocityBCAdapter::VelocityBCAdapter(const real &vx1, const real &vx1StartTime, const real &vx1EndTime,
+VelocityBC::VelocityBC(const real &vx1, const real &vx1StartTime, const real &vx1EndTime,
const real &vx2, const real &vx2StartTime, const real &vx2EndTime,
const real &vx3, const real &vx3StartTime, const real &vx3EndTime)
{
@@ -127,7 +127,7 @@ VelocityBCAdapter::VelocityBCAdapter(const real &vx1, const real &vx1StartTime,
this->init();
}
/*==========================================================*/
-VelocityBCAdapter::VelocityBCAdapter(const string &vx1Function, const real &vx1StartTime, const real &vx1EndTime,
+VelocityBC::VelocityBC(const string &vx1Function, const real &vx1StartTime, const real &vx1EndTime,
const string &vx2Function, const real &vx2StartTime, const real &vx2EndTime,
const string &vx3Function, const real &vx3StartTime, const real &vx3EndTime)
{
@@ -140,7 +140,7 @@ VelocityBCAdapter::VelocityBCAdapter(const string &vx1Function, const real &vx1S
this->init();
}
/*==========================================================*/
-void VelocityBCAdapter::setNewVelocities(const real &vx1, const real &vx1StartTime, const real &vx1EndTime,
+void VelocityBC::setNewVelocities(const real &vx1, const real &vx1StartTime, const real &vx1EndTime,
const real &vx2, const real &vx2StartTime, const real &vx2EndTime,
const real &vx3, const real &vx3StartTime, const real &vx3EndTime)
{
@@ -151,7 +151,7 @@ void VelocityBCAdapter::setNewVelocities(const real &vx1, const real &vx1StartTi
this->init();
}
/*==========================================================*/
-void VelocityBCAdapter::init()
+void VelocityBC::init()
{
this->unsetTimeDependent();
@@ -181,7 +181,7 @@ void VelocityBCAdapter::init()
}
}
/*==========================================================*/
-void VelocityBCAdapter::init(std::vector<BCFunction> &vxBCs)
+void VelocityBC::init(std::vector<BCFunction> &vxBCs)
{
for (size_t pos = 0; pos < vxBCs.size(); ++pos) {
if (!(UbMath::equal(BCFunction::INFCONST, vxBCs[pos].getEndTime()) &&
@@ -198,7 +198,7 @@ void VelocityBCAdapter::init(std::vector<BCFunction> &vxBCs)
}
}
/*==========================================================*/
-void VelocityBCAdapter::init(const D3Q27Interactor *const &interactor, const real &time)
+void VelocityBC::init(const D3Q27Interactor *const &interactor, const real &time)
{
this->timeStep = time;
this->tmpVx1Function = this->tmpVx2Function = this->tmpVx3Function = NULL;
@@ -276,7 +276,7 @@ void VelocityBCAdapter::init(const D3Q27Interactor *const &interactor, const rea
}
}
- UBLOG(logDEBUG4, "D3Q27VelocityBCAdapter::init(time="
+ UBLOG(logDEBUG4, "D3Q27VelocityBC::init(time="
<< time << ") "
<< ", vx1= \"" << (tmpVx1Function ? tmpVx1Function->GetExpr() : "-") << "\""
<< ", vx2= \"" << (tmpVx2Function ? tmpVx2Function->GetExpr() : "-") << "\""
@@ -284,12 +284,12 @@ void VelocityBCAdapter::init(const D3Q27Interactor *const &interactor, const rea
<< ", timedependent=" << boolalpha << this->isTimeDependent());
}
/*==========================================================*/
-void VelocityBCAdapter::update(const D3Q27Interactor *const &interactor, const real &time)
+void VelocityBC::update(const D3Q27Interactor *const &interactor, const real &time)
{
this->init(interactor, time);
}
/*==========================================================*/
-void VelocityBCAdapter::adaptBCForDirection(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
+void VelocityBC::adaptBCForDirection(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
const real & /*worldX1*/, const real & /*worldX2*/,
const real & /*worldX3*/, const real &q, const int &fdirection,
const real & /*time*/)
@@ -298,14 +298,14 @@ void VelocityBCAdapter::adaptBCForDirection(const D3Q27Interactor & /*interactor
bc->setQ((real)q, fdirection);
}
/*==========================================================*/
-void VelocityBCAdapter::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions> bc, const real &worldX1,
+void VelocityBC::adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions> bc, const real &worldX1,
const real &worldX2, const real &worldX3, const real &time)
{
this->setNodeVelocity(interactor, bc, worldX1, worldX2, worldX3, time);
- bc->setBcAlgorithmType(algorithmType);
+ bc->setBCStrategyType(algorithmType);
}
/*==========================================================*/
-void VelocityBCAdapter::setNodeVelocity(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
+void VelocityBC::setNodeVelocity(const D3Q27Interactor & /*interactor*/, SPtr<BoundaryConditions> bc,
const real &worldX1, const real &worldX2, const real &worldX3,
const real ×tep)
{
@@ -334,12 +334,12 @@ void VelocityBCAdapter::setNodeVelocity(const D3Q27Interactor & /*interactor*/,
}
}
/*==========================================================*/
-UbTupleDouble3 VelocityBCAdapter::getVelocity(const real &x1, const real &x2, const real &x3,
+UbTupleDouble3 VelocityBC::getVelocity(const real &x1, const real &x2, const real &x3,
const real &timeStep) const
{
- real vx1 = 0.0;
- real vx2 = 0.0;
- real vx3 = 0.0;
+ real vx1 = vf::basics::constant::c0o1;
+ real vx2 = vf::basics::constant::c0o1;
+ real vx3 = vf::basics::constant::c0o1;
this->x1 = x1;
this->x2 = x2;
this->x3 = x3;
@@ -355,10 +355,10 @@ UbTupleDouble3 VelocityBCAdapter::getVelocity(const real &x1, const real &x2, co
return { vx1, vx2, vx3 };
}
/*==========================================================*/
-string VelocityBCAdapter::toString()
+string VelocityBC::toString()
{
stringstream info;
- info << "D3Q27VelocityBCAdapter:\n";
+ info << "D3Q27VelocityBC:\n";
info << " #vx1-functions = " << (int)vx1BCs.size() << endl;
info << " #vx2-functions = " << (int)vx2BCs.size() << endl;
info << " #vx3-functions = " << (int)vx3BCs.size() << endl;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.h
similarity index 83%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.h
index c0596b8e234f581726243a8a95beb6eb71121be4..64e333ad86e1cc03c9295274c107387bf6583562 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAdapter.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBC.h
@@ -26,12 +26,12 @@
// 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 VelocityBCAdapter.h
+//! \file VelocityBC.h
//! \ingroup BoundarConditions
//! \author Sören Freudiger
//=======================================================================================
-#ifndef VelocityBCAdapter_H
-#define VelocityBCAdapter_H
+#ifndef VelocityBC_H
+#define VelocityBC_H
#include <iostream>
#include <sstream>
@@ -40,7 +40,7 @@
#include <basics/utilities/UbInfinity.h>
-#include <BCAdapter.h>
+#include <BC.h>
#include <BCFunction.h>
//! \brief A class provides an interface for velocity boundary condition in grid generator.
@@ -56,8 +56,8 @@
//! vx2BCs.push_back(BCFunction(0.002, 200, 300) ); //t=[200..300[ -> vx2 = 0.002
//! vx2BCs.push_back(BCFunction(0.043, 300, 600) ); //t=[300..600] -> vx2 = 0.043
//!
-//! VelocityBCAdapter bcAdapter(vx1BCs,vx2BCs,vx3BCs);
-//! bcAdapter.setTimePeriodic(); //-> t=[0 ..100[ -> vx1 = 0.01
+//! VelocityBC BC(vx1BCs,vx2BCs,vx3BCs);
+//! BC.setTimePeriodic(); //-> t=[0 ..100[ -> vx1 = 0.01
//! // t=[100..200[ -> vx1 = 0.004
//! // t=[200..400[ -> vx1 = 0.03
//! // t=[400..500[ -> vx1 = 0.01
@@ -76,39 +76,39 @@
//! 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 );
-//! VelocityBCAdapter velBC(true, false ,false ,fct, 0, BCFunction::INFCONST);
+//! VelocityBC velBC(true, false ,false ,fct, 0, BCFunction::INFCONST);
//! \endcode
-class VelocityBCAdapter : public BCAdapter
+class VelocityBC : public BC
{
public:
// constructors
- VelocityBCAdapter() { this->init(); }
+ VelocityBC() { this->init(); }
- VelocityBCAdapter(const bool &vx1, const bool &vx2, const bool &vx3, const BCFunction &velVxBC);
+ VelocityBC(const bool &vx1, const bool &vx2, const bool &vx3, const BCFunction &velVxBC);
- VelocityBCAdapter(const bool &vx1, const bool &vx2, const bool &vx3, const mu::Parser &function,
+ VelocityBC(const bool &vx1, const bool &vx2, const bool &vx3, const mu::Parser &function,
const real &startTime, const real &endTime);
- VelocityBCAdapter(const bool &vx1, const bool &vx2, const bool &vx3, const mu::Parser &function1,
+ VelocityBC(const bool &vx1, const bool &vx2, const bool &vx3, const mu::Parser &function1,
const mu::Parser &function2, const mu::Parser &function3, const real &startTime,
const real &endTime);
- VelocityBCAdapter(const bool &vx1, const bool &vx2, const bool &vx3, const std::string &functionstring,
+ VelocityBC(const bool &vx1, const bool &vx2, const bool &vx3, const std::string &functionstring,
const real &startTime, const real &endTime);
- VelocityBCAdapter(const BCFunction &velBC, bool x1Dir, bool x2Dir, bool x3Dir);
+ VelocityBC(const BCFunction &velBC, bool x1Dir, bool x2Dir, bool x3Dir);
- VelocityBCAdapter(const BCFunction &velVx1BC, const BCFunction &velVx2BC, const BCFunction &velVx3BC);
+ VelocityBC(const BCFunction &velVx1BC, const BCFunction &velVx2BC, const BCFunction &velVx3BC);
- VelocityBCAdapter(const std::vector<BCFunction> &velVx1BCs, const std::vector<BCFunction> &velVx2BCs,
+ VelocityBC(const std::vector<BCFunction> &velVx1BCs, const std::vector<BCFunction> &velVx2BCs,
const std::vector<BCFunction> &velVx3BCs);
- VelocityBCAdapter(const real &vx1, const real &vx1StartTime, const real &vx1EndTime, const real &vx2,
+ VelocityBC(const real &vx1, const real &vx1StartTime, const real &vx1EndTime, const real &vx2,
const real &vx2StartTime, const real &vx2EndTime, const real &vx3,
const real &vx3StartTime, const real &vx3EndTime);
- VelocityBCAdapter(const std::string &vx1Function, const real &vx1StartTime, const real &vx1EndTime,
+ VelocityBC(const std::string &vx1Function, const real &vx1StartTime, const real &vx1EndTime,
const std::string &vx2Function, const real &vx2StartTime, const real &vx2EndTime,
const std::string &vx3Function, const real &vx3StartTime, const real &vx3EndTime);
@@ -122,7 +122,7 @@ public:
const real &vx2StartTime, const real &vx2EndTime, const real &vx3,
const real &vx3StartTime, const real &vx3EndTime);
- //------------- implements BCAdapter ----- start
+ //------------- implements BC ----- start
std::string toString();
void init(const D3Q27Interactor *const &interactor, const real &time = 0) override;
@@ -134,7 +134,7 @@ public:
void adaptBC(const D3Q27Interactor &interactor, SPtr<BoundaryConditions> bc, const real &worldX1,
const real &worldX2, const real &worldX3, const real &time = 0) override;
- //------------- implements BCAdapter ----- end
+ //------------- implements BC ----- end
UbTupleDouble3 getVelocity(const real &x1, const real &x2, const real &x3, const real &timeStep) const;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCStrategy.cpp
similarity index 82%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCStrategy.cpp
index 9f1bf39d8d6d11747a71b04d9cfc7e3b70870802..4f4c1615d0b6386a2e3382959e73f1885c8e9af4 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCStrategy.cpp
@@ -26,34 +26,34 @@
// 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 VelocityBCAlgorithm.cpp
+//! \file VelocityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "VelocityBCAlgorithm.h"
+#include "VelocityBCStrategy.h"
#include "BoundaryConditions.h"
#include "DistributionArray3D.h"
#include "Block3D.h"
-VelocityBCAlgorithm::VelocityBCAlgorithm()
+VelocityBCStrategy::VelocityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::VelocityBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::VelocityBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> VelocityBCAlgorithm::clone()
+SPtr<BCStrategy> VelocityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new VelocityBCAlgorithm());
+ SPtr<BCStrategy> bc(new VelocityBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void VelocityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void VelocityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void VelocityBCAlgorithm::applyBC()
+void VelocityBCStrategy::applyBC()
{
real f[D3Q27System::ENDF + 1];
real feq[D3Q27System::ENDF + 1];
@@ -65,15 +65,15 @@ void VelocityBCAlgorithm::applyBC()
//DEBUG
//int blockID = block->getGlobalID();
- rho = 1.0 + drho * compressibleFactor;
+ rho = vf::basics::constant::c1o1 + drho * compressibleFactor;
for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
if (bcPtr->hasVelocityBoundaryFlag(fdir)) {
const int invDir = D3Q27System::INVDIR[fdir];
real q = bcPtr->getQ(invDir);
real velocity = bcPtr->getBoundaryVelocity(invDir);
- real fReturn = ((1.0 - q) / (1.0 + q)) * ((f[invDir] - feq[invDir]) / (1.0 - collFactor) + feq[invDir]) +
- ((q * (f[invDir] + f[fdir]) - velocity * rho) / (1.0 + q));
+ real fReturn = ((vf::basics::constant::c1o1 - q) / (vf::basics::constant::c1o1 + q)) * ((f[invDir] - feq[invDir]) / (vf::basics::constant::c1o1 - collFactor) + feq[invDir]) +
+ ((q * (f[invDir] + f[fdir]) - velocity * rho) / (vf::basics::constant::c1o1 + q));
distributions->setDistributionForDirection(fReturn, x1 + D3Q27System::DX1[invDir],
x2 + D3Q27System::DX2[invDir], x3 + D3Q27System::DX3[invDir],
fdir);
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCStrategy.h
similarity index 91%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCStrategy.h
index 44bbd2cee69c12a613e638f4173b371d1260964f..bc12cf937471726454c0de7b22d531a227d75696 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityBCStrategy.h
@@ -26,25 +26,25 @@
// 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 VelocityBCAlgorithm.h
+//! \file VelocityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef VelocityBCAlgorithm_H
-#define VelocityBCAlgorithm_H
+#ifndef VelocityBCStrategy_H
+#define VelocityBCStrategy_H
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
//! \brief A class implements velocyty boundary condition
-class VelocityBCAlgorithm : public BCAlgorithm
+class VelocityBCStrategy : public BCStrategy
{
public:
- VelocityBCAlgorithm();
- SPtr<BCAlgorithm> clone() override;
+ VelocityBCStrategy();
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCStrategy.cpp
similarity index 86%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCStrategy.cpp
index 09a52798e62013fdc5878678a4c47aec003b68a2..1b579877afa20ac6c3d82cce0ea2b5c6f00aef81 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCStrategy.cpp
@@ -26,34 +26,34 @@
// 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 VelocityWithDensityBCAlgorithm.cpp
+//! \file VelocityWithDensityBCStrategy.cpp
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#include "VelocityWithDensityBCAlgorithm.h"
+#include "VelocityWithDensityBCStrategy.h"
#include "BCArray3D.h"
#include "DistributionArray3D.h"
-VelocityWithDensityBCAlgorithm::VelocityWithDensityBCAlgorithm()
+VelocityWithDensityBCStrategy::VelocityWithDensityBCStrategy()
{
- BCAlgorithm::type = BCAlgorithm::VelocityWithDensityBCAlgorithm;
- BCAlgorithm::preCollision = false;
+ BCStrategy::type = BCStrategy::VelocityWithDensityBCStrategy;
+ BCStrategy::preCollision = false;
}
//////////////////////////////////////////////////////////////////////////
-VelocityWithDensityBCAlgorithm::~VelocityWithDensityBCAlgorithm() = default;
+VelocityWithDensityBCStrategy::~VelocityWithDensityBCStrategy() = default;
//////////////////////////////////////////////////////////////////////////
-SPtr<BCAlgorithm> VelocityWithDensityBCAlgorithm::clone()
+SPtr<BCStrategy> VelocityWithDensityBCStrategy::clone()
{
- SPtr<BCAlgorithm> bc(new VelocityWithDensityBCAlgorithm());
+ SPtr<BCStrategy> bc(new VelocityWithDensityBCStrategy());
return bc;
}
//////////////////////////////////////////////////////////////////////////
-void VelocityWithDensityBCAlgorithm::addDistributions(SPtr<DistributionArray3D> distributions)
+void VelocityWithDensityBCStrategy::addDistributions(SPtr<DistributionArray3D> distributions)
{
this->distributions = distributions;
}
//////////////////////////////////////////////////////////////////////////
-void VelocityWithDensityBCAlgorithm::applyBC()
+void VelocityWithDensityBCStrategy::applyBC()
{
//velocity bc for non reflecting pressure bc
real f[D3Q27System::ENDF+1];
@@ -92,7 +92,7 @@ void VelocityWithDensityBCAlgorithm::applyBC()
// if q=1
// LBMReal fReturn = ((q*(f[fdir] + f[invDir]) - velocity*rho) / (1.0 +
// q))-drho*D3Q27System::WEIGTH[invDir];
- real fReturn = (f[fdir] + f[invDir] - velocity * rho) / 2.0 - drho * D3Q27System::WEIGTH[invDir];
+ real fReturn = (f[fdir] + f[invDir] - velocity * rho) / vf::basics::constant::c2o1 - drho * D3Q27System::WEIGTH[invDir];
distributions->setDistributionForDirection(fReturn, nX1, nX2, nX3, invDir);
}
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCStrategy.h
similarity index 86%
rename from src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.h
rename to src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCStrategy.h
index 7ab57d2b892af9db0e0e42327b970b381710edf3..6d91f2ced18e647449c7ba732aa09c4f5fe25f8d 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCAlgorithm.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/VelocityWithDensityBCStrategy.h
@@ -26,15 +26,15 @@
// 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 VelocityWithDensityBCAlgorithm.h
+//! \file VelocityWithDensityBCStrategy.h
//! \ingroup BoundarConditions
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef VelocityWithDensityBCAlgorithm_h__
-#define VelocityWithDensityBCAlgorithm_h__
+#ifndef VelocityWithDensityBCStrategy_h__
+#define VelocityWithDensityBCStrategy_h__
-#include "BCAlgorithm.h"
+#include "BCStrategy.h"
#include <PointerDefinitions.h>
class DistributionArray3D;
@@ -42,13 +42,13 @@ class DistributionArray3D;
//! \brief Class implements Dirichlet boundary condition for velocity. Set density in system. It is used together with
//! non reflecting outflow.
-class VelocityWithDensityBCAlgorithm : public BCAlgorithm
+class VelocityWithDensityBCStrategy : public BCStrategy
{
public:
- VelocityWithDensityBCAlgorithm();
- ~VelocityWithDensityBCAlgorithm() override;
- SPtr<BCAlgorithm> clone() override;
+ VelocityWithDensityBCStrategy();
+ ~VelocityWithDensityBCStrategy() override;
+ SPtr<BCStrategy> clone() override;
void addDistributions(SPtr<DistributionArray3D> distributions) override;
void applyBC() override;
};
-#endif // VelocityWithDensityBCAlgorithm_h__
+#endif // VelocityWithDensityBCStrategy_h__
diff --git a/src/cpu/VirtualFluidsCore/CMakeLists.txt b/src/cpu/VirtualFluidsCore/CMakeLists.txt
index 0485e00ec407dcfe0e2ac1c2a58da044fb33f42d..9f3cd96e889097a32ce737e56e3f1fa31dddaee0 100644
--- a/src/cpu/VirtualFluidsCore/CMakeLists.txt
+++ b/src/cpu/VirtualFluidsCore/CMakeLists.txt
@@ -1,33 +1,25 @@
set(VF_LIBRARIES)
-IF(${USE_METIS} AND METIS_RELEASE_LIBRARY AND METIS_DEBUG_LIBRARY)
+IF(${VFCPU_USE_METIS} AND METIS_RELEASE_LIBRARY AND METIS_DEBUG_LIBRARY)
list(APPEND VF_LIBRARIES optimized ${METIS_RELEASE_LIBRARY} debug ${METIS_DEBUG_LIBRARY})
ELSE()
list(APPEND VF_LIBRARIES metis)
ENDIF()
-IF(${USE_VTK})
+IF(${VFCPU_USE_VTK})
list(APPEND VF_LIBRARIES optimized ${VTK_LIBRARIES} debug ${VTK_LIBRARIES})
ENDIF()
-IF(${USE_CATALYST})
+IF(${VFCPU_USE_CATALYST})
list(APPEND VF_LIBRARIES optimized vtkPVPythonCatalyst debug vtkPVPythonCatalyst)
list(APPEND VF_LIBRARIES optimized vtkParallelMPI debug vtkParallelMPI )
ENDIF()
-IF(${USE_DEM_COUPLING})
- INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/../DemCoupling/DemCoupling.cmake)
-ENDIF()
-
if(BUILD_USE_OPENMP)
list(APPEND VF_LIBRARIES OpenMP::OpenMP_CXX)
endif()
-IF(${USE_LIGGGHTS})
- list(APPEND VF_LIBRARIES optimized ${LIGGGHTS_RELEASE_LIBRARY} debug ${LIGGGHTS_DEBUG_LIBRARY})
-ENDIF()
-
vf_add_library(BUILDTYPE static PUBLIC_LINK basics muparser ${VF_LIBRARIES} PRIVATE_LINK lbm mpi logger)
vf_add_tests()
@@ -40,23 +32,18 @@ target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Da
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}/Parallel)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Grid)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Simulation)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Visitors)
-target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/CoProcessors)
+target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/SimulationObservers)
target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Utilities)
-
-IF(${USE_METIS} AND METIS_INCLUDEDIR)
+IF(${VFCPU_USE_METIS} AND METIS_INCLUDEDIR)
target_include_directories(${library_name} PUBLIC ${METIS_INCLUDEDIR})
ENDIF()
target_include_directories(${library_name} PRIVATE ${ZOLTAN_INCLUDEDIR})
-IF(${USE_VTK})
+IF(${VFCPU_USE_VTK})
target_include_directories(${library_name} PRIVATE ${VTK_INCLUDE_DIRS})
ENDIF()
-IF(${USE_LIGGGHTS})
- target_include_directories(${library_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../LiggghtsCoupling)
- target_include_directories(${library_name} PUBLIC ${LIGGGHTS_SOURCE_DIR})
-ENDIF()
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.h
deleted file mode 100644
index 26686239bdca68a047c4f8c8f4c33f5a09f53bb5..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateTorqueCoProcessor.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * D3Q27ForcesCoProcessor.h
- *
- * Created on: 29.09.2012
- * Author: K. Kucher
- */
-
-#ifndef CalculateTorqueCoProcessor_H
-#define CalculateTorqueCoProcessor_H
-
-#include <PointerDefinitions.h>
-#include <string>
-#include <vector>
-
-#include "CoProcessor.h"
-#include "UbTuple.h"
-#include "D3Q27System.h"
-
-class ForceCalculator;
-namespace vf::mpi {class Communicator;}
-class Grid3D;
-class UbScheduler;
-class D3Q27Interactor;
-class DistributionArray3D;
-class BoundaryConditions;
-
-class CalculateTorqueCoProcessor: public CoProcessor
-{
-public:
- //! Constructor
- CalculateTorqueCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
- virtual ~CalculateTorqueCoProcessor();
- void process(real step);
- void addInteractor(SPtr<D3Q27Interactor> interactor);
-protected:
- void collectData(real step);
- void calculateForces();
- UbTupleDouble3 getForces(int x1, int x2, int x3, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc);
-private:
- std::string path;
- std::shared_ptr<vf::mpi::Communicator> comm;
- std::vector<SPtr<D3Q27Interactor> > interactors;
- real torqueX1global;
- real torqueX2global;
- real torqueX3global;
-};
-
-
-#endif /* D3Q27ForcesCoProcessor_H */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.h
deleted file mode 100644
index 13eaa7832cf5815005d30910332a7d382f047186..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * EmergencyExitCoProcessor.h
- *
- * Created on: 05.10.2012
- * Author: K. Kucher
- */
-
-#ifndef EmergencyExitCoProcessor_H
-#define EmergencyExitCoProcessor_H
-
-#include <PointerDefinitions.h>
-#include <string>
-
-#include "CoProcessor.h"
-
-class MPIIORestartCoProcessor;
-namespace vf::mpi {class Communicator;}
-class Grid3D;
-class UbScheduler;
-
-class EmergencyExitCoProcessor : public CoProcessor
-{
-public:
- EmergencyExitCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
- SPtr<MPIIORestartCoProcessor> rp, std::shared_ptr<vf::mpi::Communicator> comm);
- ~EmergencyExitCoProcessor() override;
-
- void process(real step) override;
-
-protected:
- void collectData(real step);
- void writeMetafile(int status);
- bool readMetafile();
- void checkMetafile();
-
-private:
- std::string path;
- std::shared_ptr<vf::mpi::Communicator> comm;
- SPtr<MPIIORestartCoProcessor> rp;
- std::string metafile;
-};
-
-#endif /* EmergencyExitCoProcessor_H */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp
deleted file mode 100644
index 22158269d3d622fd4dd0f6c943b7e28b871b5172..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "TimeDependentBCCoProcessor.h"
-
-#include "Grid3D.h"
-#include "Interactor3D.h"
-#include "UbScheduler.h"
-
-TimeDependentBCCoProcessor::TimeDependentBCCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s) : CoProcessor(grid, s) {}
-//////////////////////////////////////////////////////////////////////////
-TimeDependentBCCoProcessor::~TimeDependentBCCoProcessor() = default;
-//////////////////////////////////////////////////////////////////////////
-void TimeDependentBCCoProcessor::process(real step)
-{
- if (scheduler->isDue(step)) {
- for (SPtr<Interactor3D> inter : interactors)
- inter->updateInteractor(step);
- UBLOG(logDEBUG3, "TimeDependentBCCoProcessor::update:" << step);
- }
-}
-//////////////////////////////////////////////////////////////////////////
-void TimeDependentBCCoProcessor::addInteractor(SPtr<Interactor3D> interactor) { interactors.push_back(interactor); }
-
-//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.h
deleted file mode 100644
index cb41ca9622759f99d701d1d97865d9754d9bf5e6..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeDependentBCCoProcessor.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef TimeDependentBCCoProcessor_H
-#define TimeDependentBCCoProcessor_H
-
-#include <PointerDefinitions.h>
-#include <vector>
-
-#include "CoProcessor.h"
-
-class Interactor3D;
-class Grid3D;
-
-//! \brief The class update interactors depend of time step.
-//! \details TimeDependentBCCoProcessor update every time step information in BCAdapters throw Interactors
-//! \author Sonja Uphoff, Kostyantyn Kucher
-class TimeDependentBCCoProcessor : public CoProcessor
-{
-public:
- TimeDependentBCCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s);
- ~TimeDependentBCCoProcessor() override;
-
- void process(real step) override;
-
- //! add interactors to CoProcessor
- void addInteractor(SPtr<Interactor3D> interactor);
-
-private:
- std::vector<SPtr<Interactor3D>> interactors;
-};
-
-#endif /* TimeDependentBCCoProcessor_H */
diff --git a/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineVectorConnector.h
index c2ba596a7bdb20c24fa373064e09854c4f6d95eb..d7f9f72c4f86f5d849fa4f2c0cd703333007091a 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineVectorConnector.h
@@ -48,7 +48,7 @@
#include "basics/transmitter/TbTransmitterLocal.h"
#include <PointerDefinitions.h>
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "FineToCoarseVectorConnector.h"
class Block3D;
@@ -833,7 +833,7 @@ void CoarseToFineVectorConnector<VectorTransmitter>::fillSendVectorExt(SPtr<Dist
return;
int ix1, ix2, ix3;
real xoff, yoff, zoff;
- SPtr<BCArray3D> bcArray = block.lock()->getKernel()->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = block.lock()->getKernel()->getBCSet()->getBCArray();
for (ix3 = lMinX3; ix3 < lMaxX3; ix3++) {
for (ix2 = lMinX2; ix2 < lMaxX2; ix2++) {
@@ -1979,7 +1979,7 @@ void CoarseToFineVectorConnector<VectorTransmitter>::findCFnodes(SPtr<Distributi
return;
int ix1, ix2, ix3;
real xoff, yoff, zoff;
- SPtr<BCArray3D> bcArray = block.lock()->getKernel()->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = block.lock()->getKernel()->getBCSet()->getBCArray();
for (ix3 = lMinX3; ix3 < lMaxX3; ix3++) {
for (ix2 = lMinX2; ix2 < lMaxX2; ix2++) {
diff --git a/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseVectorConnector.h
index f4f4080215869cdd4ae1c75e750daa2419af9240..ffab5008241e7f8f4457c7385c83872a296ee748 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseVectorConnector.h
@@ -46,7 +46,7 @@
#include "basics/transmitter/TbTransmitter.h"
#include <PointerDefinitions.h>
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "DataSet3D.h"
class Block3D;
@@ -795,7 +795,7 @@ void FineToCoarseVectorConnector<VectorTransmitter>::fillSendVector(SPtr<Distrib
{
int ix1, ix2, ix3;
real xoff, yoff, zoff;
- SPtr<BCArray3D> bcArray = block.lock()->getKernel()->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = block.lock()->getKernel()->getBCSet()->getBCArray();
for (ix3 = lMinX3; ix3 < lMaxX3; ix3 += 2) {
for (ix2 = lMinX2; ix2 < lMaxX2; ix2 += 2) {
diff --git a/src/cpu/VirtualFluidsCore/Connectors/TwoDistributionsDoubleGhostLayerFullDirectConnector.h b/src/cpu/VirtualFluidsCore/Connectors/TwoDistributionsDoubleGhostLayerFullDirectConnector.h
index bbd1c5a346ac50b08c78794ea3b00457ba4836b7..40f119cd61a80126cf80853ab9f7511d38132215 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/TwoDistributionsDoubleGhostLayerFullDirectConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/TwoDistributionsDoubleGhostLayerFullDirectConnector.h
@@ -162,6 +162,7 @@ inline void TwoDistributionsDoubleGhostLayerFullDirectConnector::exchangeData(in
(*this->zeroDistributionsToh)(x1To, x2To, x3To) = (*this->zeroDistributionsFromh)(x1From, x2From, x3From);
- (*this->pressureTo)(x1To, x2To, x3To) = (*this->pressureFrom)(x1From, x2From, x3From);
+ if (this->pressureTo)
+ (*this->pressureTo)(x1To, x2To, x3To) = (*this->pressureFrom)(x1From, x2From, x3From);
}
#endif
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.h b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.h
index 060e2cb3ad367d31d6b30577f370cd1b692daecd..21f1610641706dac82e1314b1a01be5959c8b0b2 100644
--- a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.h
+++ b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSplittedVector.h
@@ -103,8 +103,8 @@ protected:
CbArray3D<real, IndexerX3X2X1>::CbArray3DPtr zeroDistributions;
size_t NX1, NX2, NX3;
- friend class MPIIORestartCoProcessor;
- friend class MPIIOMigrationCoProcessor;
+ friend class MPIIORestartSimulationObserver;
+ friend class MPIIOMigrationSimulationObserver;
};
#endif
diff --git a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.h b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.h
deleted file mode 100644
index 3ef1f4c712e552ea5d5b5e82306e2bd94d74d7ab..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 BasicCalculator.h
-//! \ingroup Grid
-//! \author Konstantin Kutscher
-//=======================================================================================
-
-#ifndef BasicCalculator_h__
-#define BasicCalculator_h__
-
-#include "Calculator.h"
-
-class Block3DConnector;
-
-//! \class BasicCalculator
-//! \brief Class implements basic functionality with MPI + OpenMP parallelization for main calculation loop
-//! \author Konstantin Kutscher
-
-class BasicCalculator : public Calculator
-{
-public:
- BasicCalculator(SPtr<Grid3D> grid, SPtr<UbScheduler> additionalGhostLayerUpdateScheduler, int numberOfTimeSteps);
- ~BasicCalculator() override = default;
- void calculate() override;
-
-protected:
- void calculateBlocks(int startLevel, int maxInitLevel, int calcStep);
- void swapDistributions(int startLevel, int maxInitLevel);
- void exchangeBlockData(int startLevel, int maxInitLevel);
- void connectorsPrepareLocal(std::vector<SPtr<Block3DConnector>> &connectors);
- void connectorsSendLocal(std::vector<SPtr<Block3DConnector>> &connectors);
- void connectorsReceiveLocal(std::vector<SPtr<Block3DConnector>> &connectors);
- void connectorsPrepareRemote(std::vector<SPtr<Block3DConnector>> &connectors);
- void connectorsSendRemote(std::vector<SPtr<Block3DConnector>> &connectors);
- void connectorsReceiveRemote(std::vector<SPtr<Block3DConnector>> &connectors);
- void interpolation(int startLevel, int maxInitLevel);
- void applyPreCollisionBC(int startLevel, int maxInitLevel);
- void applyPostCollisionBC(int startLevel, int maxInitLevel);
-
-private:
-};
-
-#endif // BasicCalculator_h__
diff --git a/src/cpu/VirtualFluidsCore/Grid/Calculator.cpp b/src/cpu/VirtualFluidsCore/Grid/Calculator.cpp
deleted file mode 100644
index 85235867a3352c8277e6e279b7dbb6058d03020a..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/Grid/Calculator.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-//=======================================================================================
-// ____ ____ __ ______ __________ __ __ __ __
-// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-// \ \ | | | | | |_) | | | | | | | / \ | |
-// \ \ | | | | | _ / | | | | | | / /\ \ | |
-// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-// \ \ | | ________________________________________________________________
-// \ \ | | | ______________________________________________________________|
-// \ \| | | | __ __ __ __ ______ _______
-// \ | | |_____ | | | | | | | | | _ \ / _____)
-// \ | | _____| | | | | | | | | | | \ \ \_______
-// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-//
-// 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 Calculator.cpp
-//! \ingroup Grid
-//! \author Konstantin Kutscher
-//=======================================================================================
-
-#include "Calculator.h"
-
-#include "Block3D.h"
-#include "Block3DConnector.h"
-#include "CoProcessor.h"
-#include "Grid3D.h"
-#include "UbScheduler.h"
-
-#include <basics/utilities/UbException.h>
-
-Calculator::Calculator(SPtr<Grid3D> grid, SPtr<UbScheduler> additionalGhostLayerUpdateScheduler, int numberOfTimeSteps)
- : grid(grid), additionalGhostLayerUpdateScheduler(additionalGhostLayerUpdateScheduler),
- numberOfTimeSteps(numberOfTimeSteps)
-{
- this->grid = grid;
- startTimeStep = int(grid->getTimeStep()) + 1;
- minLevel = grid->getCoarsestInitializedLevel();
- maxLevel = grid->getFinestInitializedLevel();
- if (maxLevel > 0)
- refinement = true;
- else
- refinement = false;
- blocks.resize(maxLevel + 1);
- localConns.resize(maxLevel + 1);
- remoteConns.resize(maxLevel + 1);
- localInterConns.resize(maxLevel);
- remoteInterConns.resize(maxLevel);
-
- int gridRank = grid->getRank();
-
- for (int level = minLevel; level <= maxLevel; level++) {
- std::vector<SPtr<Block3D>> blockVector;
- grid->getBlocks(level, gridRank, true, blockVector);
- for (const auto &block : blockVector)
- if (block)
- blocks[block->getLevel()].push_back(block);
- }
-
- initLocalConnectors();
- initRemoteConnectors();
-}
-//////////////////////////////////////////////////////////////////////////
-Calculator::~Calculator() = default;
-//////////////////////////////////////////////////////////////////////////
-void Calculator::addCoProcessor(SPtr<CoProcessor> coProcessor) { coProcessors.push_back(coProcessor); }
-//////////////////////////////////////////////////////////////////////////
-void Calculator::coProcess(real step)
-{
- for (SPtr<CoProcessor> cp : coProcessors) {
- cp->process(step);
- }
-}
-//////////////////////////////////////////////////////////////////////////
-void Calculator::initLocalConnectors()
-{
- UBLOG(logDEBUG1, "Calculator::initLocalConnectors() - start");
-
- for (int l = minLevel; l <= maxLevel; l++) {
- for (SPtr<Block3D> block : blocks[l]) {
- block->pushBackLocalSameLevelConnectors(localConns[l]);
-
- if (l != maxLevel)
- block->pushBackLocalInterpolationConnectorsCF(localInterConns[l]);
- }
- if (l != maxLevel) {
- for (SPtr<Block3D> block : blocks[l + 1]) {
- block->pushBackLocalInterpolationConnectorsFC(localInterConns[l]);
- }
- }
- UBLOG(logDEBUG5, "Calculator::initConnectors()-initConnectors(localConns[" << l << "])");
- initConnectors(localConns[l]);
-
- if (l != maxLevel) {
- UBLOG(logDEBUG5, "Calculator::initConnectors()-initConnectors(localInterConns[" << l << "])");
- initConnectors(localInterConns[l]);
- }
- }
-
- UBLOG(logDEBUG1, "Calculator::initLocalConnectors() - end");
-}
-//////////////////////////////////////////////////////////////////////////
-void Calculator::initRemoteConnectors()
-{
- std::vector<std::vector<SPtr<Block3DConnector>>> remoteInterConnsCF;
- std::vector<std::vector<SPtr<Block3DConnector>>> remoteInterConnsFC;
- remoteInterConnsCF.resize(maxLevel + 1);
- remoteInterConnsFC.resize(maxLevel + 1);
-
- for (int l = minLevel; l <= maxLevel; l++) {
- std::vector<SPtr<Block3D>> blockVector;
- // grid->getBlocks(level, gridRank, true, blockVector);
- grid->getBlocks(l, blockVector);
- for (SPtr<Block3D> block : blockVector) {
- int block_level = block->getLevel();
- block->pushBackRemoteSameLevelConnectors(remoteConns[block_level]);
-
- block->pushBackRemoteInterpolationConnectorsCF(remoteInterConnsCF[block_level]);
- block->pushBackRemoteInterpolationConnectorsFC(remoteInterConnsFC[block_level]);
- }
- }
-
- for (int l = minLevel; l <= maxLevel; l++) {
- UBLOG(logDEBUG5, "Calculator::initRemoteConnectors()-initConnectors(remoteConns[" << l << "])");
- initConnectors(remoteConns[l]);
- if (l != maxLevel) {
- for (size_t i = 0; i < remoteInterConnsCF[l].size(); i++)
- remoteInterConns[l].push_back(remoteInterConnsCF[l][i]);
- for (size_t i = 0; i < remoteInterConnsFC[l + 1].size(); i++)
- remoteInterConns[l].push_back(remoteInterConnsFC[l + 1][i]);
- }
- }
- //////////////////////////////////////////////////////////////////////////
- // UBLOG(logDEBUG5, "Calculator::initConnectors() - connectoren initialisieren - start");
- for (int l = minLevel; l <= maxLevel; l++) {
- if (l != maxLevel) {
- UBLOG(logDEBUG5, "Calculator::initRemoteConnectors()-initConnectors(remoteInterConns[" << l << "])");
- for (SPtr<Block3DConnector> c : remoteInterConns[l])
- c->init();
- }
- }
- // UBLOG(logDEBUG5, "Calculator::initConnectors() - connectoren initialisieren - end");
- //////////////////////////////////////////////////////////////////////////
- // sendTransmitterDataSize
- // UBLOG(logDEBUG5, "Calculator::initConnectors() - sendTransmitterDataSize - start");
- for (int l = minLevel; l <= maxLevel; l++) {
- if (l != maxLevel) {
- UBLOG(logDEBUG5,
- "Calculator::initRemoteConnectors()-sendTransmitterDataSize(remoteInterConns[" << l << "])");
- for (SPtr<Block3DConnector> c : remoteInterConns[l])
- c->sendTransmitterDataSize();
- }
- }
- // UBLOG(logDEBUG5, "Calculator::initConnectors() - sendTransmitterDataSize - end");
- //////////////////////////////////////////////////////////////////////////
- // receiveTransmitterDataSize
- // wenn er hier bei verteilten berechnungen stopped, dann ist vermutlich auf einer seite ein nicht aktiver block!!!
- // UBLOG(logDEBUG5, "Calculator::initConnectors() - receiveTransmitterDataSize - start");
- for (int l = minLevel; l <= maxLevel; l++) {
- if (l != maxLevel) {
- UBLOG(logDEBUG5,
- "Calculator::initRemoteConnectors()-receiveTransmitterDataSize(remoteInterConns[" << l << "])");
- for (SPtr<Block3DConnector> c : remoteInterConns[l])
- c->receiveTransmitterDataSize();
- }
- }
- // UBLOG(logDEBUG5, "Calculator::initConnectors() - receiveTransmitterDataSize - end");
- //////////////////////////////////////////////////////////////////////////
-}
-//////////////////////////////////////////////////////////////////////////
-void Calculator::initConnectors(std::vector<SPtr<Block3DConnector>> &connectors)
-{
- UBLOG(logDEBUG1, "Calculator::initConnectors() - start");
-
- // initialization
- //////////////////////////////////////////////////////////////////////////
- // initialize connectors
- UBLOG(logDEBUG5, "Calculator::initConnectors() - connectoren initialisieren - start");
- for (SPtr<Block3DConnector> c : connectors)
- c->init();
- UBLOG(logDEBUG5, "Calculator::initConnectors() - connectoren initialisieren - end");
- //////////////////////////////////////////////////////////////////////////
- // sendTransmitterDataSize
- UBLOG(logDEBUG5, "Calculator::initConnectors() - sendTransmitterDataSize - start");
- for (SPtr<Block3DConnector> c : connectors)
- c->sendTransmitterDataSize();
- UBLOG(logDEBUG5, "Calculator::initConnectors() - sendTransmitterDataSize - end");
- //////////////////////////////////////////////////////////////////////////
- // receiveTransmitterDataSize
- // wenn er hier bei verteilten berechnungen stopped, dann ist vermutlich auf einer seite ein nicht aktiver block!!!
- UBLOG(logDEBUG5, "Calculator::initConnectors() - receiveTransmitterDataSize - start");
- for (SPtr<Block3DConnector> c : connectors)
- c->receiveTransmitterDataSize();
- UBLOG(logDEBUG5, "Calculator::initConnectors() - receiveTransmitterDataSize - end");
-
- UBLOG(logDEBUG1, "Calculator::initConnectors() - end");
-}
-//////////////////////////////////////////////////////////////////////////
-void Calculator::deleteBlocks()
-{
- for (std::vector<SPtr<Block3D>> &bs : blocks)
- bs.resize(0);
-}
-//////////////////////////////////////////////////////////////////////////
-void Calculator::deleteConnectors()
-{
- deleteConnectors(localConns);
- deleteConnectors(remoteConns);
-
- deleteConnectors(localInterConns);
- deleteConnectors(remoteInterConns);
-}
-//////////////////////////////////////////////////////////////////////////
-void Calculator::deleteConnectors(std::vector<std::vector<SPtr<Block3DConnector>>> &conns)
-{
- for (std::vector<SPtr<Block3DConnector>> &c : conns)
- c.resize(0);
-}
-//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
index c4a1ab11ef476891a7339a8ab2ae3c63556c8cd1..02a94f573ed04a5509c71fb7890fe418d230f0fe 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.cpp
@@ -39,9 +39,9 @@
#include <basics/writer/WbWriterVtkXmlBinary.h>
-#include "BCAdapter.h"
+#include "BC.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "BoundaryConditions.h"
#include "Grid3D.h"
@@ -66,20 +66,20 @@ D3Q27Interactor::D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid
this->initRayVectors();
}
//////////////////////////////////////////////////////////////////////////
-D3Q27Interactor::D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, SPtr<BCAdapter> bcAdapter, int type)
+D3Q27Interactor::D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, SPtr<BC> BC, int type)
: Interactor3D(geoObject3D, grid, type), relevantForForces(false)
{
this->reinitWithStoredQsFlag = false;
- this->addBCAdapter(bcAdapter);
+ this->addBC(BC);
this->initRayVectors();
}
//////////////////////////////////////////////////////////////////////////
-D3Q27Interactor::D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, SPtr<BCAdapter> bcAdapter, int type,
+D3Q27Interactor::D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, SPtr<BC> BC, int type,
Interactor3D::Accuracy a)
: Interactor3D(geoObject3D, grid, type, a), relevantForForces(false)
{
this->reinitWithStoredQsFlag = false;
- this->addBCAdapter(bcAdapter);
+ this->addBC(BC);
this->initRayVectors();
}
//////////////////////////////////////////////////////////////////////////
@@ -206,14 +206,14 @@ void D3Q27Interactor::initInteractor(const real &timeStep)
//////////////////////////////////////////////////////////////////////////
// init bcs
- int nofAdapter = (int)bcAdapters.size();
+ int nofAdapter = (int)BCs.size();
if (nofAdapter == 0) {
UBLOG(logWARNING, "WARNING - D3Q27Interactor::initInteractor Warning - no nodeAdapter available");
}
bool needTimeDependence = false;
for (int pos = 0; pos < nofAdapter; ++pos) {
- bcAdapters[pos]->init(this, timeStep);
- if (bcAdapters[pos]->isTimeDependent())
+ BCs[pos]->init(this, timeStep);
+ if (BCs[pos]->isTimeDependent())
needTimeDependence = true;
}
if (needTimeDependence)
@@ -230,7 +230,7 @@ void D3Q27Interactor::updateInteractor(const real ×tep)
//////////////////////////////////////////////////////////////////////////
// update bcs
- int nofAdapter = (int)bcAdapters.size();
+ int nofAdapter = (int)BCs.size();
if (nofAdapter == 0) {
UBLOG(logERROR, "WARNING - D3Q27Interactor::updateInteractor Warning - no nodeAdapter available for ");
}
@@ -238,8 +238,8 @@ void D3Q27Interactor::updateInteractor(const real ×tep)
bool needTimeDependence = false;
for (int pos = 0; pos < nofAdapter; ++pos) {
- bcAdapters[pos]->update(this, timestep);
- if (bcAdapters[pos]->isTimeDependent())
+ BCs[pos]->update(this, timestep);
+ if (BCs[pos]->isTimeDependent())
needTimeDependence = true;
}
if (needTimeDependence)
@@ -255,7 +255,7 @@ void D3Q27Interactor::updateInteractor(const real ×tep)
continue;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
set<std::vector<int>>::iterator setPos;
@@ -271,8 +271,8 @@ void D3Q27Interactor::updateInteractor(const real ×tep)
SPtr<BoundaryConditions> bc = bcArray->getBC(x1, x2, x3);
if (bc) // may be that the BC has been deleted by the solid setting of another interactor
{
- for (size_t i = 0; i < bcAdapters.size(); i++)
- bcAdapters[i]->adaptBC(*this, bc, worldX1, worldX2, worldX3, timestep);
+ for (size_t i = 0; i < BCs.size(); i++)
+ BCs[i]->adaptBC(*this, bc, worldX1, worldX2, worldX3, timestep);
}
}
}
@@ -303,7 +303,7 @@ bool D3Q27Interactor::setDifferencesToGbObject3D(const SPtr<Block3D> block)
SPtr<BoundaryConditions> bc;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
real internX1, internX2, internX3;
@@ -415,8 +415,8 @@ bool D3Q27Interactor::setDifferencesToGbObject3D(const SPtr<Block3D> block)
bc->setBoundaryVelocityX3(0.0);
}
- for (int index = (int)bcAdapters.size() - 1; index >= 0; --index)
- bcAdapters[index]->adaptBCForDirection(*this, bc, internX1, internX2, internX3,
+ for (int index = (int)BCs.size() - 1; index >= 0; --index)
+ BCs[index]->adaptBCForDirection(*this, bc, internX1, internX2, internX3,
q, fdir, timestep);
}
@@ -434,8 +434,8 @@ bool D3Q27Interactor::setDifferencesToGbObject3D(const SPtr<Block3D> block)
p[2] = ix3;
transNodeIndices.insert(p);
- for (int index = (int)bcAdapters.size() - 1; index >= 0; --index)
- bcAdapters[index]->adaptBC(*this, bc, internX1, internX2, internX3, timestep);
+ for (int index = (int)BCs.size() - 1; index >= 0; --index)
+ BCs[index]->adaptBC(*this, bc, internX1, internX2, internX3, timestep);
}
}
} else if (this->isInverseSolid()) {
@@ -534,8 +534,8 @@ bool D3Q27Interactor::setDifferencesToGbObject3D(const SPtr<Block3D> block)
bc = std::make_shared<BoundaryConditions>();
bcArray->setBC(ix1, ix2, ix3, bc);
}
- for (int index = (int)bcAdapters.size() - 1; index >= 0; --index)
- bcAdapters[index]->adaptBCForDirection(*this, bc, internX1, internX2,
+ for (int index = (int)BCs.size() - 1; index >= 0; --index)
+ BCs[index]->adaptBCForDirection(*this, bc, internX1, internX2,
internX3, q, fdir, timestep);
}
@@ -558,8 +558,8 @@ bool D3Q27Interactor::setDifferencesToGbObject3D(const SPtr<Block3D> block)
p[2] = ix3;
transNodeIndices.insert(p);
- for (int index = (int)bcAdapters.size() - 1; index >= 0; --index)
- bcAdapters[index]->adaptBC(*this, bc, internX1, internX2, internX3, timestep);
+ for (int index = (int)BCs.size() - 1; index >= 0; --index)
+ BCs[index]->adaptBC(*this, bc, internX1, internX2, internX3, timestep);
}
}
}
@@ -583,7 +583,7 @@ void D3Q27Interactor::addQsLineSet(std::vector<UbTupleFloat3> &nodes, std::vecto
UbTupleDouble3 orgDelta = grid.lock()->getNodeOffset(block);
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
map<SPtr<Block3D>, set<std::vector<int>>>::iterator pos = bcNodeIndicesMap.find(block);
if (pos == bcNodeIndicesMap.end()) {
@@ -779,7 +779,7 @@ vector<pair<GbPoint3D, GbPoint3D>> D3Q27Interactor::getQsLineSet()
for (SPtr<Block3D> block : bcBlocks) {
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcMatrix = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcMatrix = kernel->getBCSet()->getBCArray();
UbTupleDouble3 nodeOffset = grid.lock()->getNodeOffset(block);
// Check whether top row is real in the system or not
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.h b/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.h
index 80a58efccb36588111ddf5301f3fb68068e20958..e0094d646a4dd621e7d5815fc7fc6ce6e4450dbe 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.h
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27Interactor.h
@@ -48,7 +48,7 @@
#include "UbException.h"
#include "UbTuple.h"
-class BCAdapter;
+class BC;
class Block3D;
class Grid3D;
class GbObject3D;
@@ -63,8 +63,8 @@ class D3Q27Interactor : public Interactor3D
public:
D3Q27Interactor();
D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, int type);
- D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, SPtr<BCAdapter> bcAdapter, int type);
- D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, SPtr<BCAdapter> bcAdapter, int type,
+ D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, SPtr<BC> BC, int type);
+ D3Q27Interactor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, SPtr<BC> BC, int type,
Interactor3D::Accuracy a);
~D3Q27Interactor() override;
@@ -72,8 +72,8 @@ public:
void setRelevantForForces(const bool &value) { this->relevantForForces = value; }
bool isRelevantForForces() { return this->relevantForForces; }
- virtual void addBCAdapter(const SPtr<BCAdapter> bcAdapter) { bcAdapters.push_back(bcAdapter); }
- void deleteBCAdapter() { bcAdapters.clear(); }
+ virtual void addBC(const SPtr<BC> BC) { BCs.push_back(BC); }
+ void deleteBC() { BCs.clear(); }
void initInteractor(const real &timeStep = 0) override;
void updateInteractor(const real ×tep = 0) override;
@@ -106,7 +106,7 @@ protected:
bool relevantForForces;
bool reinitWithStoredQsFlag;
- std::vector<SPtr<BCAdapter>> bcAdapters;
+ std::vector<SPtr<BC>> BCs;
SolidNodeIndicesMap solidNodeIndicesMap;
BcNodeIndicesMap bcNodeIndicesMap;
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index d569d3c0f16b24ea7592c09b26a06b8be69e126c..c30a4cc8ceab72accc75238ea1535e923b3a3bee 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -8,12 +8,12 @@
#include <basics/writer/WbWriterVtkXmlBinary.h>
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "BoundaryConditions.h"
#include "Grid3D.h"
#include "LBMKernel.h"
-#include "VelocityBCAdapter.h"
+#include "VelocityBC.h"
#include "basics/utilities/UbTiming.h"
#include <geometry3d/GbCuboid3D.h>
#include <geometry3d/GbHalfSpace3D.h>
@@ -37,15 +37,15 @@ D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<Grid3D> /*grid*/, st
}
//////////////////////////////////////////////////////////////////////////
D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, SPtr<Grid3D> grid,
- SPtr<BCAdapter> bcAdapter, int type)
- : D3Q27Interactor(triFaceMesh, grid, bcAdapter, type)
+ SPtr<BC> BC, int type)
+ : D3Q27Interactor(triFaceMesh, grid, BC, type)
{
this->stressMode = STRESSNORMAL;
}
//////////////////////////////////////////////////////////////////////////
D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, SPtr<Grid3D> grid,
- SPtr<BCAdapter> bcAdapter, int type, Interactor3D::Accuracy a)
- : D3Q27Interactor(triFaceMesh, grid, bcAdapter, type, a)
+ SPtr<BC> BC, int type, Interactor3D::Accuracy a)
+ : D3Q27Interactor(triFaceMesh, grid, BC, type, a)
{
this->stressMode = STRESSNORMAL;
}
@@ -75,7 +75,7 @@ bool D3Q27TriFaceMeshInteractor::setDifferencesToGbObject3D(const SPtr<Block3D>
SPtr<BoundaryConditions> bc;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
real internX1, internX2, internX3;
@@ -138,15 +138,15 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
//////////////////////////////////////////////////////////////////////////
// init bcs
//////////////////////////////////////////////////////////////////////////
- int nofAdapter = (int)this->bcAdapters.size();
+ int nofAdapter = (int)this->BCs.size();
if (nofAdapter == 0)
std::cout
<< "WARNING - D3Q27TriFaceMeshInteractor::initInteractor Warning - no nodeAdapter available for " /*<<this->getName()*/
<< std::endl;
bool needTimeDependence = false;
for (int pos = 0; pos < nofAdapter; ++pos) {
- this->bcAdapters[pos]->init(this, timeStep);
- if (this->bcAdapters[pos]->isTimeDependent())
+ this->BCs[pos]->init(this, timeStep);
+ if (this->BCs[pos]->isTimeDependent())
needTimeDependence = true;
}
if (needTimeDependence)
@@ -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;
}
@@ -351,7 +349,7 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
bool blockGotBCs = false;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcMatrix = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcMatrix = kernel->getBCSet()->getBCArray();
int indexMinX1 = 0;
int indexMinX2 = 0;
@@ -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;
}
@@ -539,8 +534,8 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
bc->setBoundaryVelocityX2(vx2);
bc->setBoundaryVelocityX3(vx3);
- for (int index = (int)this->bcAdapters.size() - 1; index >= 0; --index)
- this->bcAdapters[index]->adaptBCForDirection(*this, bc, internX1, internX2,
+ for (int index = (int)this->BCs.size() - 1; index >= 0; --index)
+ this->BCs[index]->adaptBCForDirection(*this, bc, internX1, internX2,
internX3, q, fdir);
// fuer beschleunigtes wiedereinlesen
@@ -565,8 +560,8 @@ void D3Q27TriFaceMeshInteractor::setQs(const real &timeStep)
p[2] = ix3;
bcNodeIndices.insert(p);
- for (int index = (int)this->bcAdapters.size() - 1; index >= 0; --index)
- this->bcAdapters[index]->adaptBC(*this, bc, internX1, internX2, internX3);
+ for (int index = (int)this->BCs.size() - 1; index >= 0; --index)
+ this->BCs[index]->adaptBC(*this, bc, internX1, internX2, internX3);
}
}
}
@@ -617,15 +612,15 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
//////////////////////////////////////////////////////////////////////////
// init bcs
//////////////////////////////////////////////////////////////////////////
- int nofAdapter = (int)this->bcAdapters.size();
+ int nofAdapter = (int)this->BCs.size();
if (nofAdapter == 0)
std::cout
<< "WARNING - D3Q27TriFaceMeshInteractor::initInteractor Warning - no nodeAdapter available for " /*<<this->getName()*/
<< std::endl;
bool needTimeDependence = false;
for (int pos = 0; pos < nofAdapter; ++pos) {
- this->bcAdapters[pos]->init(this, timeStep);
- if (this->bcAdapters[pos]->isTimeDependent())
+ this->BCs[pos]->init(this, timeStep);
+ if (this->BCs[pos]->isTimeDependent())
needTimeDependence = true;
}
if (needTimeDependence)
@@ -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);
@@ -870,7 +865,7 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
bool blockGotBCs = false;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcMatrix = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcMatrix = kernel->getBCSet()->getBCArray();
int indexMinX1 = 0;
int indexMinX2 = 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?
{
@@ -1066,8 +1060,8 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
bc->setBoundaryVelocityX2(vx2);
bc->setBoundaryVelocityX3(vx3);
- for (int index = (int)this->bcAdapters.size() - 1; index >= 0; --index)
- this->bcAdapters[index]->adaptBCForDirection(*this, bc, internX1, internX2,
+ for (int index = (int)this->BCs.size() - 1; index >= 0; --index)
+ this->BCs[index]->adaptBCForDirection(*this, bc, internX1, internX2,
internX3, q, fdir);
// SG 26.08.2010 gotQs=blockGotBCs=true;
@@ -1094,8 +1088,8 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
p[2] = ix3;
bcNodeIndices.insert(p);
- for (int index = (int)this->bcAdapters.size() - 1; index >= 0; --index)
- this->bcAdapters[index]->adaptBC(*this, bc, internX1, internX2, internX3);
+ for (int index = (int)this->BCs.size() - 1; index >= 0; --index)
+ this->BCs[index]->adaptBC(*this, bc, internX1, internX2, internX3);
}
}
}
@@ -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
@@ -1168,7 +1162,7 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const real &timeStep)
SPtr<ILBMKernel> kernel = block->getKernel();
if (!kernel)
throw UbException(UB_EXARGS, "na sowas kein kernel bzw. kernel=NULL (2)");
- SPtr<BCArray3D> bcMatrix = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcMatrix = kernel->getBCSet()->getBCArray();
// bvd->getTimer().start();
// int indexMinX1 = 0;
@@ -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");
@@ -1847,7 +1841,7 @@ void D3Q27TriFaceMeshInteractor::reinitWithStoredQs(const real & /*timeStep*/)
SPtr<Block3D> block = it1->first;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcMatrix = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcMatrix = kernel->getBCSet()->getBCArray();
std::set<UbTupleInt3> &indicesSet = it1->second;
for (std::set<UbTupleInt3>::iterator setIt = indicesSet.begin(); setIt != indicesSet.end(); ++setIt) {
@@ -1860,7 +1854,7 @@ void D3Q27TriFaceMeshInteractor::reinitWithStoredQs(const real & /*timeStep*/)
for (it = bcNodeIndicesAndQsMap.begin(); it != bcNodeIndicesAndQsMap.end(); ++it) {
SPtr<Block3D> block = it->first;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcMatrix = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcMatrix = kernel->getBCSet()->getBCArray();
std::map<UbTupleInt3, std::vector<float>>::iterator it2;
for (it2 = it->second.begin(); it2 != it->second.end(); ++it2) {
@@ -1894,14 +1888,14 @@ void D3Q27TriFaceMeshInteractor::reinitWithStoredQs(const real & /*timeStep*/)
for (int fdir = D3Q27System::FSTARTDIR; fdir <= D3Q27System::FENDDIR; fdir++) {
if (UbMath::greater(qs[fdir], -1.0) && UbMath::less(qs[fdir], bc->getQ(fdir))) {
gotQs = true;
- for (size_t index = 0; index < this->bcAdapters.size(); index++)
- this->bcAdapters[index]->adaptBCForDirection(*this, bc, x1w, x2w, x3w, qs[fdir], fdir);
+ for (size_t index = 0; index < this->BCs.size(); index++)
+ this->BCs[index]->adaptBCForDirection(*this, bc, x1w, x2w, x3w, qs[fdir], fdir);
}
}
if (gotQs)
- for (size_t index = 0; index < this->bcAdapters.size(); index++)
- this->bcAdapters[index]->adaptBC(*this, bc, x1w, x2w, x3w);
+ for (size_t index = 0; index < this->BCs.size(); index++)
+ this->BCs[index]->adaptBC(*this, bc, x1w, x2w, x3w);
}
}
}
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
index 9e42de660502b33048abf31f5e831902134d3826..ddcac4ad22a50f31f1c1f884bc234b9bd49c6080 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.h
@@ -11,7 +11,7 @@
class GbObject3D;
class Grid3D;
-class BCAdapter;
+class BC;
class GbTriFaceMesh3D;
class Block3D;
@@ -24,11 +24,11 @@ public:
D3Q27TriFaceMeshInteractor();
D3Q27TriFaceMeshInteractor(SPtr<Grid3D> grid, std::string name = "D3Q27TriFaceMeshInteractor");
D3Q27TriFaceMeshInteractor(SPtr<GbObject3D> geoObject3D, SPtr<Grid3D> grid, int type);
- D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, SPtr<Grid3D> grid, SPtr<BCAdapter> bcAdapter,
+ D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, SPtr<Grid3D> grid, SPtr<BC> BC,
int type);
- D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, SPtr<Grid3D> grid, SPtr<BCAdapter> bcAdapter,
+ D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, SPtr<Grid3D> grid, SPtr<BC> BC,
int type, Interactor3D::Accuracy a);
- // D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, D3Q27BoundaryConditionAdapterPtr bcAdapter, int
+ // D3Q27TriFaceMeshInteractor(SPtr<GbTriFaceMesh3D> triFaceMesh, D3Q27BoundaryConditionAdapterPtr BC, int
// type, std::string name="D3Q27TriFaceMeshInteractor");
~D3Q27TriFaceMeshInteractor() override;
diff --git a/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
index d27564c49cd2b115b9e4b4609b0ecf8f1a8a941b..b50103ff86077ef9079a66600935927d16e0037c 100644
--- a/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
@@ -1,6 +1,6 @@
#include "BGKLBMKernel.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27EsoTwist3DSoA.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "D3Q27System.h"
@@ -27,7 +27,7 @@ SPtr<LBMKernel> BGKLBMKernel::clone()
kernel->setNX(nx);
std::dynamic_pointer_cast<BGKLBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -69,7 +69,7 @@ void BGKLBMKernel::calculate(int step)
zeroDistributions =
std::dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
real f[D3Q27System::ENDF + 1];
real feq[D3Q27System::ENDF + 1];
real drho, vx1, vx2, vx3;
@@ -141,39 +141,39 @@ void BGKLBMKernel::calculate(int step)
real cu_sq = 1.5 * (vx1 * vx1 + vx2 * vx2 + vx3 * vx3);
feq[DIR_000] = c8o27 * (drho - cu_sq);
- feq[DIR_P00] = c2o27 * (drho + 3.0 * (vx1) + c9o2 * (vx1) * (vx1)-cu_sq);
- feq[DIR_M00] = c2o27 * (drho + 3.0 * (-vx1) + c9o2 * (-vx1) * (-vx1) - cu_sq);
- feq[DIR_0P0] = c2o27 * (drho + 3.0 * (vx2) + c9o2 * (vx2) * (vx2)-cu_sq);
- feq[DIR_0M0] = c2o27 * (drho + 3.0 * (-vx2) + c9o2 * (-vx2) * (-vx2) - cu_sq);
- feq[DIR_00P] = c2o27 * (drho + 3.0 * (vx3) + c9o2 * (vx3) * (vx3)-cu_sq);
- feq[DIR_00M] = c2o27 * (drho + 3.0 * (-vx3) + c9o2 * (-vx3) * (-vx3) - cu_sq);
- feq[DIR_PP0] = c1o54 * (drho + 3.0 * (vx1 + vx2) + c9o2 * (vx1 + vx2) * (vx1 + vx2) - cu_sq);
- feq[DIR_MM0] = c1o54 * (drho + 3.0 * (-vx1 - vx2) + c9o2 * (-vx1 - vx2) * (-vx1 - vx2) - cu_sq);
- feq[DIR_PM0] = c1o54 * (drho + 3.0 * (vx1 - vx2) + c9o2 * (vx1 - vx2) * (vx1 - vx2) - cu_sq);
- feq[DIR_MP0] = c1o54 * (drho + 3.0 * (-vx1 + vx2) + c9o2 * (-vx1 + vx2) * (-vx1 + vx2) - cu_sq);
- feq[DIR_P0P] = c1o54 * (drho + 3.0 * (vx1 + vx3) + c9o2 * (vx1 + vx3) * (vx1 + vx3) - cu_sq);
- feq[DIR_M0M] = c1o54 * (drho + 3.0 * (-vx1 - vx3) + c9o2 * (-vx1 - vx3) * (-vx1 - vx3) - cu_sq);
- feq[DIR_P0M] = c1o54 * (drho + 3.0 * (vx1 - vx3) + c9o2 * (vx1 - vx3) * (vx1 - vx3) - cu_sq);
- feq[DIR_M0P] = c1o54 * (drho + 3.0 * (-vx1 + vx3) + c9o2 * (-vx1 + vx3) * (-vx1 + vx3) - cu_sq);
- feq[DIR_0PP] = c1o54 * (drho + 3.0 * (vx2 + vx3) + c9o2 * (vx2 + vx3) * (vx2 + vx3) - cu_sq);
- feq[DIR_0MM] = c1o54 * (drho + 3.0 * (-vx2 - vx3) + c9o2 * (-vx2 - vx3) * (-vx2 - vx3) - cu_sq);
- feq[DIR_0PM] = c1o54 * (drho + 3.0 * (vx2 - vx3) + c9o2 * (vx2 - vx3) * (vx2 - vx3) - cu_sq);
- feq[DIR_0MP] = c1o54 * (drho + 3.0 * (-vx2 + vx3) + c9o2 * (-vx2 + vx3) * (-vx2 + vx3) - cu_sq);
+ feq[DIR_P00] = c2o27 * (drho + c3o1 * (vx1) + c9o2 * (vx1) * (vx1)-cu_sq);
+ feq[DIR_M00] = c2o27 * (drho + c3o1 * (-vx1) + c9o2 * (-vx1) * (-vx1) - cu_sq);
+ feq[DIR_0P0] = c2o27 * (drho + c3o1 * (vx2) + c9o2 * (vx2) * (vx2)-cu_sq);
+ feq[DIR_0M0] = c2o27 * (drho + c3o1 * (-vx2) + c9o2 * (-vx2) * (-vx2) - cu_sq);
+ feq[DIR_00P] = c2o27 * (drho + c3o1 * (vx3) + c9o2 * (vx3) * (vx3)-cu_sq);
+ feq[DIR_00M] = c2o27 * (drho + c3o1 * (-vx3) + c9o2 * (-vx3) * (-vx3) - cu_sq);
+ feq[DIR_PP0] = c1o54 * (drho + c3o1 * (vx1 + vx2) + c9o2 * (vx1 + vx2) * (vx1 + vx2) - cu_sq);
+ feq[DIR_MM0] = c1o54 * (drho + c3o1 * (-vx1 - vx2) + c9o2 * (-vx1 - vx2) * (-vx1 - vx2) - cu_sq);
+ feq[DIR_PM0] = c1o54 * (drho + c3o1 * (vx1 - vx2) + c9o2 * (vx1 - vx2) * (vx1 - vx2) - cu_sq);
+ feq[DIR_MP0] = c1o54 * (drho + c3o1 * (-vx1 + vx2) + c9o2 * (-vx1 + vx2) * (-vx1 + vx2) - cu_sq);
+ feq[DIR_P0P] = c1o54 * (drho + c3o1 * (vx1 + vx3) + c9o2 * (vx1 + vx3) * (vx1 + vx3) - cu_sq);
+ feq[DIR_M0M] = c1o54 * (drho + c3o1 * (-vx1 - vx3) + c9o2 * (-vx1 - vx3) * (-vx1 - vx3) - cu_sq);
+ feq[DIR_P0M] = c1o54 * (drho + c3o1 * (vx1 - vx3) + c9o2 * (vx1 - vx3) * (vx1 - vx3) - cu_sq);
+ feq[DIR_M0P] = c1o54 * (drho + c3o1 * (-vx1 + vx3) + c9o2 * (-vx1 + vx3) * (-vx1 + vx3) - cu_sq);
+ feq[DIR_0PP] = c1o54 * (drho + c3o1 * (vx2 + vx3) + c9o2 * (vx2 + vx3) * (vx2 + vx3) - cu_sq);
+ feq[DIR_0MM] = c1o54 * (drho + c3o1 * (-vx2 - vx3) + c9o2 * (-vx2 - vx3) * (-vx2 - vx3) - cu_sq);
+ feq[DIR_0PM] = c1o54 * (drho + c3o1 * (vx2 - vx3) + c9o2 * (vx2 - vx3) * (vx2 - vx3) - cu_sq);
+ feq[DIR_0MP] = c1o54 * (drho + c3o1 * (-vx2 + vx3) + c9o2 * (-vx2 + vx3) * (-vx2 + vx3) - cu_sq);
feq[DIR_PPP] = c1o216 *
- (drho + 3.0 * (vx1 + vx2 + vx3) + c9o2 * (vx1 + vx2 + vx3) * (vx1 + vx2 + vx3) - cu_sq);
- feq[DIR_MMM] = c1o216 * (drho + 3.0 * (-vx1 - vx2 - vx3) +
+ (drho + c3o1 * (vx1 + vx2 + vx3) + c9o2 * (vx1 + vx2 + vx3) * (vx1 + vx2 + vx3) - cu_sq);
+ feq[DIR_MMM] = c1o216 * (drho + c3o1 * (-vx1 - vx2 - vx3) +
c9o2 * (-vx1 - vx2 - vx3) * (-vx1 - vx2 - vx3) - cu_sq);
feq[DIR_PPM] = c1o216 *
- (drho + 3.0 * (vx1 + vx2 - vx3) + c9o2 * (vx1 + vx2 - vx3) * (vx1 + vx2 - vx3) - cu_sq);
- feq[DIR_MMP] = c1o216 * (drho + 3.0 * (-vx1 - vx2 + vx3) +
+ (drho + c3o1 * (vx1 + vx2 - vx3) + c9o2 * (vx1 + vx2 - vx3) * (vx1 + vx2 - vx3) - cu_sq);
+ feq[DIR_MMP] = c1o216 * (drho + c3o1 * (-vx1 - vx2 + vx3) +
c9o2 * (-vx1 - vx2 + vx3) * (-vx1 - vx2 + vx3) - cu_sq);
feq[DIR_PMP] = c1o216 *
- (drho + 3.0 * (vx1 - vx2 + vx3) + c9o2 * (vx1 - vx2 + vx3) * (vx1 - vx2 + vx3) - cu_sq);
- feq[DIR_MPM] = c1o216 * (drho + 3.0 * (-vx1 + vx2 - vx3) +
+ (drho + c3o1 * (vx1 - vx2 + vx3) + c9o2 * (vx1 - vx2 + vx3) * (vx1 - vx2 + vx3) - cu_sq);
+ feq[DIR_MPM] = c1o216 * (drho + c3o1 * (-vx1 + vx2 - vx3) +
c9o2 * (-vx1 + vx2 - vx3) * (-vx1 + vx2 - vx3) - cu_sq);
feq[DIR_PMM] = c1o216 *
- (drho + 3.0 * (vx1 - vx2 - vx3) + c9o2 * (vx1 - vx2 - vx3) * (vx1 - vx2 - vx3) - cu_sq);
- feq[DIR_MPP] = c1o216 * (drho + 3.0 * (-vx1 + vx2 + vx3) +
+ (drho + c3o1 * (vx1 - vx2 - vx3) + c9o2 * (vx1 - vx2 - vx3) * (vx1 - vx2 - vx3) - cu_sq);
+ feq[DIR_MPP] = c1o216 * (drho + c3o1 * (-vx1 + vx2 + vx3) +
c9o2 * (-vx1 + vx2 + vx3) * (-vx1 + vx2 + vx3) - cu_sq);
// Relaxation
@@ -217,33 +217,33 @@ void BGKLBMKernel::calculate(int step)
forcingX2 = muForcingX2.Eval();
forcingX3 = muForcingX3.Eval();
- f[DIR_000] += 0.0;
- f[DIR_P00] += 3.0 * c2o27 * (forcingX1);
- f[DIR_M00] += 3.0 * c2o27 * (-forcingX1);
- f[DIR_0P0] += 3.0 * c2o27 * (forcingX2);
- f[DIR_0M0] += 3.0 * c2o27 * (-forcingX2);
- f[DIR_00P] += 3.0 * c2o27 * (forcingX3);
- f[DIR_00M] += 3.0 * c2o27 * (-forcingX3);
- f[DIR_PP0] += 3.0 * c1o54 * (forcingX1 + forcingX2);
- f[DIR_MM0] += 3.0 * c1o54 * (-forcingX1 - forcingX2);
- f[DIR_PM0] += 3.0 * c1o54 * (forcingX1 - forcingX2);
- f[DIR_MP0] += 3.0 * c1o54 * (-forcingX1 + forcingX2);
- f[DIR_P0P] += 3.0 * c1o54 * (forcingX1 + forcingX3);
- f[DIR_M0M] += 3.0 * c1o54 * (-forcingX1 - forcingX3);
- f[DIR_P0M] += 3.0 * c1o54 * (forcingX1 - forcingX3);
- f[DIR_M0P] += 3.0 * c1o54 * (-forcingX1 + forcingX3);
- f[DIR_0PP] += 3.0 * c1o54 * (forcingX2 + forcingX3);
- f[DIR_0MM] += 3.0 * c1o54 * (-forcingX2 - forcingX3);
- f[DIR_0PM] += 3.0 * c1o54 * (forcingX2 - forcingX3);
- f[DIR_0MP] += 3.0 * c1o54 * (-forcingX2 + forcingX3);
- f[DIR_PPP] += 3.0 * c1o216 * (forcingX1 + forcingX2 + forcingX3);
- f[DIR_MMM] += 3.0 * c1o216 * (-forcingX1 - forcingX2 - forcingX3);
- f[DIR_PPM] += 3.0 * c1o216 * (forcingX1 + forcingX2 - forcingX3);
- f[DIR_MMP] += 3.0 * c1o216 * (-forcingX1 - forcingX2 + forcingX3);
- f[DIR_PMP] += 3.0 * c1o216 * (forcingX1 - forcingX2 + forcingX3);
- f[DIR_MPM] += 3.0 * c1o216 * (-forcingX1 + forcingX2 - forcingX3);
- f[DIR_PMM] += 3.0 * c1o216 * (forcingX1 - forcingX2 - forcingX3);
- f[DIR_MPP] += 3.0 * c1o216 * (-forcingX1 + forcingX2 + forcingX3);
+ f[DIR_000] += c0o1;
+ f[DIR_P00] += c3o1 * c2o27 * (forcingX1);
+ f[DIR_M00] += c3o1 * c2o27 * (-forcingX1);
+ f[DIR_0P0] += c3o1 * c2o27 * (forcingX2);
+ f[DIR_0M0] += c3o1 * c2o27 * (-forcingX2);
+ f[DIR_00P] += c3o1 * c2o27 * (forcingX3);
+ f[DIR_00M] += c3o1 * c2o27 * (-forcingX3);
+ f[DIR_PP0] += c3o1 * c1o54 * (forcingX1 + forcingX2);
+ f[DIR_MM0] += c3o1 * c1o54 * (-forcingX1 - forcingX2);
+ f[DIR_PM0] += c3o1 * c1o54 * (forcingX1 - forcingX2);
+ f[DIR_MP0] += c3o1 * c1o54 * (-forcingX1 + forcingX2);
+ f[DIR_P0P] += c3o1 * c1o54 * (forcingX1 + forcingX3);
+ f[DIR_M0M] += c3o1 * c1o54 * (-forcingX1 - forcingX3);
+ f[DIR_P0M] += c3o1 * c1o54 * (forcingX1 - forcingX3);
+ f[DIR_M0P] += c3o1 * c1o54 * (-forcingX1 + forcingX3);
+ f[DIR_0PP] += c3o1 * c1o54 * (forcingX2 + forcingX3);
+ f[DIR_0MM] += c3o1 * c1o54 * (-forcingX2 - forcingX3);
+ f[DIR_0PM] += c3o1 * c1o54 * (forcingX2 - forcingX3);
+ f[DIR_0MP] += c3o1 * c1o54 * (-forcingX2 + forcingX3);
+ f[DIR_PPP] += c3o1 * c1o216 * (forcingX1 + forcingX2 + forcingX3);
+ f[DIR_MMM] += c3o1 * c1o216 * (-forcingX1 - forcingX2 - forcingX3);
+ f[DIR_PPM] += c3o1 * c1o216 * (forcingX1 + forcingX2 - forcingX3);
+ f[DIR_MMP] += c3o1 * c1o216 * (-forcingX1 - forcingX2 + forcingX3);
+ f[DIR_PMP] += c3o1 * c1o216 * (forcingX1 - forcingX2 + forcingX3);
+ f[DIR_MPM] += c3o1 * c1o216 * (-forcingX1 + forcingX2 - forcingX3);
+ f[DIR_PMM] += c3o1 * c1o216 * (forcingX1 - forcingX2 - forcingX3);
+ f[DIR_MPP] += c3o1 * c1o216 * (-forcingX1 + forcingX2 + forcingX3);
}
//////////////////////////////////////////////////////////////////////////
#ifdef PROOF_CORRECTNESS
@@ -302,4 +302,4 @@ void BGKLBMKernel::calculate(int step)
}
}
//////////////////////////////////////////////////////////////////////////
-real BGKLBMKernel::getCalculationTime() { return 0.0; }
+real BGKLBMKernel::getCalculationTime() { return vf::basics::constant::c0o1; }
diff --git a/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.cpp
index 12c4b6e891214a683e3e4ac23b52e14e72e093a2..97659e93ebe0970a7ffb0a01dd8c9d1b0d45721e 100644
--- a/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/BasicLBMKernel.cpp
@@ -1,7 +1,7 @@
#include "BasicLBMKernel.h"
#include "D3Q27System.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
BasicLBMKernel::BasicLBMKernel()
{
@@ -28,7 +28,7 @@ void BasicLBMKernel::calculate(int step)
initData();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
index 4f5ce06af1a85555933b7b3cd9413e1daee727a0..421f81a1ac3301d982178a06b4b8c6378f626e57 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.cpp
@@ -16,8 +16,8 @@ using namespace vf::basics::constant;
CompressibleCumulant4thOrderViscosityLBMKernel::CompressibleCumulant4thOrderViscosityLBMKernel()
{
this->compressible = true;
- this->bulkViscosity = 0;
- this->OxxPyyPzz = 1.0;
+ this->bulkViscosity = vf::basics::constant::c0o1;
+ this->OxxPyyPzz = vf::basics::constant::c1o1;
}
//////////////////////////////////////////////////////////////////////////
CompressibleCumulant4thOrderViscosityLBMKernel::~CompressibleCumulant4thOrderViscosityLBMKernel(void)
@@ -35,7 +35,7 @@ SPtr<LBMKernel> CompressibleCumulant4thOrderViscosityLBMKernel::clone()
kernel->setNX(nx);
dynamicPointerCast<CompressibleCumulant4thOrderViscosityLBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -77,7 +77,7 @@ void CompressibleCumulant4thOrderViscosityLBMKernel::calculate(int step)
muForcingX2.DefineVar("dt", &muDeltaT);
muForcingX3.DefineVar("dt", &muDeltaT);
- muNu = (1.0/3.0)*(1.0/collFactor - 1.0/2.0);
+ muNu = (c1o1/c3o1)*(c1o1/collFactor - c1o1/c2o1);
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
@@ -93,7 +93,7 @@ void CompressibleCumulant4thOrderViscosityLBMKernel::calculate(int step)
nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -110,16 +110,16 @@ void CompressibleCumulant4thOrderViscosityLBMKernel::calculate(int step)
//LBMReal OxyyPxzz = eight*(-two+omega)*(one+two*omega)/(-eight-fourteen*omega+seven*omega*omega);//one;
//LBMReal OxyyMxzz = eight*(-two+omega)*(-seven+four*omega)/(fiftysix-fifty*omega+nine*omega*omega);//one;
//LBMReal Oxyz = twentyfour*(-two+omega)*(-two-seven*omega+three*omega*omega)/(fourtyeight+c152*omega-c130*omega*omega+twentynine*omega*omega*omega);
- real OxyyPxzz = 8.0*(omega-2.0)*(OxxPyyPzz*(3.0*omega-1.0)-5.0*omega)/(8.0*(5.0-2.0*omega)*omega+OxxPyyPzz*(8.0+omega*(9.0*omega-26.0)));
- real OxyyMxzz = 8.0*(omega-2.0)*(omega+OxxPyyPzz*(3.0*omega-7.0))/(OxxPyyPzz*(56.0-42.0*omega+9.0*omega*omega)-8.0*omega);
- real Oxyz = 24.0*(omega-2.0)*(4.0*omega*omega+omega*OxxPyyPzz*(18.0-13.0*omega)+OxxPyyPzz*OxxPyyPzz*(2.0+omega*(6.0*omega-11.0)))/(16.0*omega*omega*(omega-6.0)-2.0*omega*OxxPyyPzz*(216.0+5.0*omega*(9.0*omega-46.0))+OxxPyyPzz*OxxPyyPzz*(omega*(3.0*omega-10.0)*(15.0*omega-28.0)-48.0));
+ real OxyyPxzz = c8o1*(omega-c2o1)*(OxxPyyPzz*(c3o1*omega-c1o1)-c5o1*omega)/(c8o1 *(c5o1-c2o1*omega)*omega+OxxPyyPzz*(c8o1+omega*(c9o1*omega-c26o1)));
+ real OxyyMxzz = c8o1*(omega-c2o1)*(omega+OxxPyyPzz*(c3o1*omega-c7o1))/(OxxPyyPzz*(c56o1-c42o1*omega+c9o1*omega*omega)-c8o1*omega);
+ real Oxyz = c24o1*(omega-c2o1)*(c4o1*omega*omega+omega*OxxPyyPzz*(c18o1-c13o1*omega)+OxxPyyPzz*OxxPyyPzz*(c2o1+omega*(c6o1*omega-c11o1)))/(c16o1*omega*omega*(omega-c6o1)-c2o1*omega*OxxPyyPzz*(c216o1+c5o1*omega*(c9o1*omega-c46o1))+OxxPyyPzz*OxxPyyPzz*(omega*(c3o1*omega-c10o1)*(c15o1*omega-c28o1)-c48o1));
//LBMReal A = (four + two*omega - three*omega*omega) / (two - seven*omega + five*omega*omega);
//LBMReal B = (four + twentyeight*omega - fourteen*omega*omega) / (six - twentyone*omega + fiveteen*omega*omega);
- real A = (4.0*omega*omega+2.0*omega*OxxPyyPzz*(omega-6.0)+OxxPyyPzz*OxxPyyPzz*(omega*(10.0-3.0*omega)-4.0))/((omega-OxxPyyPzz)*(OxxPyyPzz*(2.0+3.0*omega)-8.0*omega));
+ real A = (c4o1*omega*omega+c2o1*omega*OxxPyyPzz*(omega-c6o1)+OxxPyyPzz*OxxPyyPzz*(omega*(c10o1-c3o1*omega)-c4o1))/((omega-OxxPyyPzz)*(OxxPyyPzz*(c2o1+c3o1*omega)-c8o1*omega));
//FIXME: warning C4459: declaration of 'B' hides global declaration (message : see declaration of 'D3Q27System::DIR_00M' )
- real B = (4.0*omega*OxxPyyPzz*(9.0*omega-16.0)-4.0*omega*omega-2.0*OxxPyyPzz*OxxPyyPzz*(2.0+9.0*omega*(omega-2.0)))/(3.0*(omega-OxxPyyPzz)*(OxxPyyPzz*(2.0+3.0*omega)-8.0*omega));
+ real B = (c4o1*omega*OxxPyyPzz*(c9o1*omega-c16o1)-c4o1*omega*omega-c2o1*OxxPyyPzz*OxxPyyPzz*(c2o1+c9o1*omega*(omega-c2o1)))/(c3o1*(omega-OxxPyyPzz)*(OxxPyyPzz*(c2o1+c3o1*omega)-c8o1*omega));
for (int x3 = minX3; x3 < maxX3; x3++)
{
@@ -213,9 +213,9 @@ void CompressibleCumulant4thOrderViscosityLBMKernel::calculate(int step)
forcingX2 = muForcingX2.Eval();
forcingX3 = muForcingX3.Eval();
- vvx += forcingX1*deltaT*0.5; // X
- vvy += forcingX2*deltaT*0.5; // Y
- vvz += forcingX3*deltaT*0.5; // Z
+ vvx += forcingX1*deltaT*c1o2; // X
+ vvy += forcingX2*deltaT*c1o2; // Y
+ vvz += forcingX3*deltaT*c1o2; // Z
}
///////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
@@ -230,9 +230,9 @@ void CompressibleCumulant4thOrderViscosityLBMKernel::calculate(int step)
vz2 = vvz*vvz;
////////////////////////////////////////////////////////////////////////////////////
real wadjust;
- real qudricLimitP = 0.01;// * 0.0001f;
- real qudricLimitM = 0.01;// * 0.0001f;
- real qudricLimitD = 0.01;// * 0.001f;
+ real qudricLimitP = c1o100;// * 0.0001f;
+ real qudricLimitM = c1o100;// * 0.0001f;
+ real qudricLimitD = c1o100;// * 0.001f;
//LBMReal s9 = minusomega;
//test
//s9 = 0.;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
index fc3e0dffb6abf836995aaecc95f07fc4fcaf1d64..3b7ee8f849187b2c40fc8f5803bdd04ad4982344 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulant4thOrderViscosityLBMKernel.h
@@ -2,7 +2,7 @@
#define CompressibleCumulant4thOrderViscosityLBMKernel_h__
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
index 1c806225b9730e3f6b42c3487e20edf298199bf1..3c0795c21ed41c1f22dc06268e5fc1fa7922c845 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.cpp
@@ -15,9 +15,9 @@ CompressibleCumulantLBMKernel::CompressibleCumulantLBMKernel()
{
this->compressible = true;
this->parameter = CompressibleCumulantLBMKernel::NORMAL;
- this->OxyyMxzz = 1.0;
+ this->OxyyMxzz = c1o1;
this->bulkOmegaToOmega = false;
- this->OxxPyyPzz = 1.0;
+ this->OxxPyyPzz = c1o1;
}
//////////////////////////////////////////////////////////////////////////
CompressibleCumulantLBMKernel::~CompressibleCumulantLBMKernel(void)
@@ -35,7 +35,7 @@ SPtr<LBMKernel> CompressibleCumulantLBMKernel::clone()
kernel->setNX(nx);
dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -47,10 +47,10 @@ SPtr<LBMKernel> CompressibleCumulantLBMKernel::clone()
switch (parameter)
{
case NORMAL:
- dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->OxyyMxzz = 1.0;
+ dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->OxyyMxzz = c1o1;
break;
case MAGIC:
- dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->OxyyMxzz = 2.0 +(-collFactor);
+ dynamicPointerCast<CompressibleCumulantLBMKernel>(kernel)->OxyyMxzz = c2o1 +(-collFactor);
break;
}
@@ -85,7 +85,7 @@ void CompressibleCumulantLBMKernel::calculate(int step)
muForcingX2.DefineVar("dt", &muDeltaT);
muForcingX3.DefineVar("dt", &muDeltaT);
- muNu = (1.0/3.0)*(1.0/collFactor - 1.0/2.0);
+ muNu = (c1o1 / c3o1)*(c1o1 /collFactor - c1o1 / c2o1);
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
@@ -101,7 +101,7 @@ void CompressibleCumulantLBMKernel::calculate(int step)
nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -215,9 +215,9 @@ void CompressibleCumulantLBMKernel::calculate(int step)
forcingX2 = muForcingX2.Eval();
forcingX3 = muForcingX3.Eval();
- vvx += forcingX1*deltaT*0.5; // X
- vvy += forcingX2*deltaT*0.5; // Y
- vvz += forcingX3*deltaT*0.5; // Z
+ vvx += forcingX1*deltaT*c1o2; // X
+ vvy += forcingX2*deltaT*c1o2; // Y
+ vvz += forcingX3*deltaT*c1o2; // Z
}
///////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
index 7af69201cde7bd8812173f1b6bd9d397e731686b..84910ef267efcba7f4cb90cba8a7514642461420 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleCumulantLBMKernel.h
@@ -2,7 +2,7 @@
#define CompressibleCumulantLBMKernel_h__
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
index d98d7489a7fbe466a31278cc7ca555168e962f6d..5cf501e20012804b7e84090243dad466e06ad06c 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
@@ -39,21 +39,21 @@ void CompressibleOffsetInterpolationProcessor::setOffsets(real xoff, real yoff,
void CompressibleOffsetInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5);
- calcInterpolatedNodeCF(icellF.BSW, omegaF, -0.25, -0.25, -0.25, calcPressBSW(), -1, -1, -1);
- calcInterpolatedNodeCF(icellF.BNE, omegaF, 0.25, 0.25, -0.25, calcPressBNE(), 1, 1, -1);
- calcInterpolatedNodeCF(icellF.TNW, omegaF, -0.25, 0.25, 0.25, calcPressTNW(), -1, 1, 1);
- calcInterpolatedNodeCF(icellF.TSE, omegaF, 0.25, -0.25, 0.25, calcPressTSE(), 1, -1, 1);
- calcInterpolatedNodeCF(icellF.BNW, omegaF, -0.25, 0.25, -0.25, calcPressBNW(), -1, 1, -1);
- calcInterpolatedNodeCF(icellF.BSE, omegaF, 0.25, -0.25, -0.25, calcPressBSE(), 1, -1, -1);
- calcInterpolatedNodeCF(icellF.TSW, omegaF, -0.25, -0.25, 0.25, calcPressTSW(), -1, -1, 1);
- calcInterpolatedNodeCF(icellF.TNE, omegaF, 0.25, 0.25, 0.25, calcPressTNE(), 1, 1, 1);
+ 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 CompressibleOffsetInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellF, omegaF, 2.0);
+ calcInterpolatedCoefficiets(icellF, omegaF, c2o1);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
@@ -64,16 +64,16 @@ void CompressibleOffsetInterpolationProcessor::calcMoments(const real* const f,
using namespace vf::lbm::dir;
using namespace vf::basics::constant;
- real drho = 0.0;
+ real drho = c0o1;
D3Q27System::calcCompMacroscopicValues(f,drho,vx1,vx2,vx3);
press = drho; //interpolate rho!
- kxy = -3.*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 = -3.*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 = -3.*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 = -3./2.*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 = -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]))/(c1o1 + drho)-(vx1*vx1-vx3*vx3));
+ 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 CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
@@ -166,122 +166,122 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
-
+
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 -
- 2.*kxyFromfcNEQ_NEB - 2.*kxyFromfcNEQ_NET - 2.*kxyFromfcNEQ_NWB - 2.*kxyFromfcNEQ_NWT +
- 2.*kxyFromfcNEQ_SEB + 2.*kxyFromfcNEQ_SET + 2.*kxyFromfcNEQ_SWB + 2.*kxyFromfcNEQ_SWT +
- 2.*kxzFromfcNEQ_NEB - 2.*kxzFromfcNEQ_NET + 2.*kxzFromfcNEQ_NWB - 2.*kxzFromfcNEQ_NWT +
- 2.*kxzFromfcNEQ_SEB - 2.*kxzFromfcNEQ_SET + 2.*kxzFromfcNEQ_SWB - 2.*kxzFromfcNEQ_SWT +
- 8.*vx1_NEB + 8.*vx1_NET + 8.*vx1_NWB + 8.*vx1_NWT + 8.*vx1_SEB +
- 8.*vx1_SET + 8.*vx1_SWB + 8.*vx1_SWT + 2.*vx2_NEB + 2.*vx2_NET -
- 2.*vx2_NWB - 2.*vx2_NWT - 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB +
- 2.*vx2_SWT - 2.*vx3_NEB + 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/64.;
- b0 = (2.*kxxMyyFromfcNEQ_NEB + 2.*kxxMyyFromfcNEQ_NET + 2.*kxxMyyFromfcNEQ_NWB + 2.*kxxMyyFromfcNEQ_NWT -
- 2.*kxxMyyFromfcNEQ_SEB - 2.*kxxMyyFromfcNEQ_SET - 2.*kxxMyyFromfcNEQ_SWB - 2.*kxxMyyFromfcNEQ_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 -
- 2.*kxyFromfcNEQ_NEB - 2.*kxyFromfcNEQ_NET + 2.*kxyFromfcNEQ_NWB + 2.*kxyFromfcNEQ_NWT -
- 2.*kxyFromfcNEQ_SEB - 2.*kxyFromfcNEQ_SET + 2.*kxyFromfcNEQ_SWB + 2.*kxyFromfcNEQ_SWT +
- 2.*kyzFromfcNEQ_NEB - 2.*kyzFromfcNEQ_NET + 2.*kyzFromfcNEQ_NWB - 2.*kyzFromfcNEQ_NWT +
- 2.*kyzFromfcNEQ_SEB - 2.*kyzFromfcNEQ_SET + 2.*kyzFromfcNEQ_SWB - 2.*kyzFromfcNEQ_SWT +
- 2.*vx1_NEB + 2.*vx1_NET - 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB - 2.*vx1_SET + 2.*vx1_SWB + 2.*vx1_SWT +
- 8.*vx2_NEB + 8.*vx2_NET + 8.*vx2_NWB + 8.*vx2_NWT +
- 8.*vx2_SEB + 8.*vx2_SET + 8.*vx2_SWB + 8.*vx2_SWT -
- 2.*vx3_NEB + 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/64.;
+ 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 -
- 2.*kxxMzzFromfcNEQ_NEB + 2.*kxxMzzFromfcNEQ_NET - 2.*kxxMzzFromfcNEQ_NWB + 2.*kxxMzzFromfcNEQ_NWT -
- 2.*kxxMzzFromfcNEQ_SEB + 2.*kxxMzzFromfcNEQ_SET - 2.*kxxMzzFromfcNEQ_SWB + 2.*kxxMzzFromfcNEQ_SWT -
- 2.*kxzFromfcNEQ_NEB - 2.*kxzFromfcNEQ_NET + 2.*kxzFromfcNEQ_NWB + 2.*kxzFromfcNEQ_NWT -
- 2.*kxzFromfcNEQ_SEB - 2.*kxzFromfcNEQ_SET + 2.*kxzFromfcNEQ_SWB + 2.*kxzFromfcNEQ_SWT -
- 2.*kyzFromfcNEQ_NEB - 2.*kyzFromfcNEQ_NET - 2.*kyzFromfcNEQ_NWB - 2.*kyzFromfcNEQ_NWT +
- 2.*kyzFromfcNEQ_SEB + 2.*kyzFromfcNEQ_SET + 2.*kyzFromfcNEQ_SWB + 2.*kyzFromfcNEQ_SWT -
- 2.*vx1_NEB + 2.*vx1_NET + 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB + 2.*vx1_SET + 2.*vx1_SWB - 2.*vx1_SWT -
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB - 2.*vx2_SWT +
- 8.*vx3_NEB + 8.*vx3_NET + 8.*vx3_NWB + 8.*vx3_NWT +
- 8.*vx3_SEB + 8.*vx3_SET + 8.*vx3_SWB + 8.*vx3_SWT)/64.;
- ax = (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT + vx1_SEB + vx1_SET - vx1_SWB - vx1_SWT)/4.;
- bx = (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT + vx2_SEB + vx2_SET - vx2_SWB - vx2_SWT)/4.;
- cx = (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT + vx3_SEB + vx3_SET - vx3_SWB - vx3_SWT)/4.;
+ 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 +
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB - 2.*vx2_NWT -
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB + 2.*vx2_SWT -
- 2.*vx3_NEB + 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/16.;
+ 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 -
- 2.*vx1_NEB - 2.*vx1_NET + 2.*vx1_NWB + 2.*vx1_NWT +
- 2.*vx1_SEB + 2.*vx1_SET - 2.*vx1_SWB - 2.*vx1_SWT)/8.;
+ 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 +
- 2.*vx1_NEB - 2.*vx1_NET - 2.*vx1_NWB + 2.*vx1_NWT +
- 2.*vx1_SEB - 2.*vx1_SET - 2.*vx1_SWB + 2.*vx1_SWT)/8.;
- ay = (vx1_NEB + vx1_NET + vx1_NWB + vx1_NWT - vx1_SEB - vx1_SET - vx1_SWB - vx1_SWT)/4.;
- by = (vx2_NEB + vx2_NET + vx2_NWB + vx2_NWT - vx2_SEB - vx2_SET - vx2_SWB - vx2_SWT)/4.;
- cy = (vx3_NEB + vx3_NET + vx3_NWB + vx3_NWT - vx3_SEB - vx3_SET - vx3_SWB - vx3_SWT)/4.;
+ 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 -
- 2.*vx2_NEB - 2.*vx2_NET + 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB + 2.*vx2_SET - 2.*vx2_SWB - 2.*vx2_SWT)/8.;
- byy= (-2.*kxxMyyFromfcNEQ_NEB - 2.*kxxMyyFromfcNEQ_NET - 2.*kxxMyyFromfcNEQ_NWB - 2.*kxxMyyFromfcNEQ_NWT +
- 2.*kxxMyyFromfcNEQ_SEB + 2.*kxxMyyFromfcNEQ_SET + 2.*kxxMyyFromfcNEQ_SWB + 2.*kxxMyyFromfcNEQ_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 +
- 2.*vx1_NEB + 2.*vx1_NET - 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB - 2.*vx1_SET + 2.*vx1_SWB + 2.*vx1_SWT -
- 2.*vx3_NEB + 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/16.;
+ 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 +
- 2.*vx2_NEB - 2.*vx2_NET + 2.*vx2_NWB - 2.*vx2_NWT -
- 2.*vx2_SEB + 2.*vx2_SET - 2.*vx2_SWB + 2.*vx2_SWT)/8.;
- az = (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT - vx1_SEB + vx1_SET - vx1_SWB + vx1_SWT)/4.;
- bz = (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT - vx2_SEB + vx2_SET - vx2_SWB + vx2_SWT)/4.;
- cz = (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT - vx3_SEB + vx3_SET - vx3_SWB + vx3_SWT)/4.;
+ 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 +
- 2.*vx3_NEB - 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET - 2.*vx3_SWB + 2.*vx3_SWT)/8.;
+ 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 +
- 2.*vx3_NEB - 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET - 2.*vx3_SWB + 2.*vx3_SWT)/8.;
+ 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 +
- 2.*kxxMzzFromfcNEQ_NEB - 2.*kxxMzzFromfcNEQ_NET + 2.*kxxMzzFromfcNEQ_NWB - 2.*kxxMzzFromfcNEQ_NWT +
- 2.*kxxMzzFromfcNEQ_SEB - 2.*kxxMzzFromfcNEQ_SET + 2.*kxxMzzFromfcNEQ_SWB - 2.*kxxMzzFromfcNEQ_SWT -
- 2.*vx1_NEB + 2.*vx1_NET + 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB + 2.*vx1_SET + 2.*vx1_SWB - 2.*vx1_SWT -
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB - 2.*vx2_SWT)/16.;
- axy= (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT - vx1_SEB - vx1_SET + vx1_SWB + vx1_SWT)/2.;
- bxy= (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT - vx2_SEB - vx2_SET + vx2_SWB + vx2_SWT)/2.;
- cxy= (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT - vx3_SEB - vx3_SET + vx3_SWB + vx3_SWT)/2.;
- axz= (-vx1_NEB + vx1_NET + vx1_NWB - vx1_NWT - vx1_SEB + vx1_SET + vx1_SWB - vx1_SWT)/2.;
- bxz= (-vx2_NEB + vx2_NET + vx2_NWB - vx2_NWT - vx2_SEB + vx2_SET + vx2_SWB - vx2_SWT)/2.;
- cxz= (-vx3_NEB + vx3_NET + vx3_NWB - vx3_NWT - vx3_SEB + vx3_SET + vx3_SWB - vx3_SWT)/2.;
- ayz= (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT + vx1_SEB - vx1_SET + vx1_SWB - vx1_SWT)/2.;
- byz= (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT + vx2_SEB - vx2_SET + vx2_SWB - vx2_SWT)/2.;
- cyz= (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT + vx3_SEB - vx3_SET + vx3_SWB - vx3_SWT)/2.;
+ 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 =0;//(kxyFromfcNEQ_SWB+
+ kxyAverage = c0o1;//(kxyFromfcNEQ_SWB+
//kxyFromfcNEQ_SWT+
//kxyFromfcNEQ_SET+
//kxyFromfcNEQ_SEB+
@@ -289,7 +289,7 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
//kxyFromfcNEQ_NWT+
//kxyFromfcNEQ_NET+
//kxyFromfcNEQ_NEB)*c1o8-(ay+bx);
- kyzAverage =0;//(kyzFromfcNEQ_SWB+
+ kyzAverage = c0o1;//(kyzFromfcNEQ_SWB+
//kyzFromfcNEQ_SWT+
//kyzFromfcNEQ_SET+
//kyzFromfcNEQ_SEB+
@@ -297,7 +297,7 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
//kyzFromfcNEQ_NWT+
//kyzFromfcNEQ_NET+
//kyzFromfcNEQ_NEB)*c1o8-(bz+cy);
- kxzAverage =0;//(kxzFromfcNEQ_SWB+
+ kxzAverage = c0o1;//(kxzFromfcNEQ_SWB+
//kxzFromfcNEQ_SWT+
//kxzFromfcNEQ_SET+
//kxzFromfcNEQ_SEB+
@@ -305,7 +305,7 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
//kxzFromfcNEQ_NWT+
//kxzFromfcNEQ_NET+
//kxzFromfcNEQ_NEB)*c1o8-(az+cx);
- kxxMyyAverage =0;//(kxxMyyFromfcNEQ_SWB+
+ kxxMyyAverage = c0o1;//(kxxMyyFromfcNEQ_SWB+
//kxxMyyFromfcNEQ_SWT+
//kxxMyyFromfcNEQ_SET+
//kxxMyyFromfcNEQ_SEB+
@@ -313,7 +313,7 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
//kxxMyyFromfcNEQ_NWT+
//kxxMyyFromfcNEQ_NET+
//kxxMyyFromfcNEQ_NEB)*c1o8-(ax-by);
- kxxMzzAverage =0;//(kxxMzzFromfcNEQ_SWB+
+ kxxMzzAverage = c0o1;//(kxxMzzFromfcNEQ_SWB+
//kxxMzzFromfcNEQ_SWT+
//kxxMzzFromfcNEQ_SET+
//kxxMzzFromfcNEQ_SEB+
@@ -327,17 +327,17 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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 + 2. * xoff * axx + yoff * axy + zoff * axz + yoff*zoff*axyz;
- ay = ay + 2. * yoff * ayy + xoff * axy + zoff * ayz + xoff*zoff*axyz;
- az = az + 2. * zoff * azz + xoff * axz + yoff * ayz + xoff*yoff*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 + 2. * xoff * bxx + yoff * bxy + zoff * bxz + yoff*zoff*bxyz;
- by = by + 2. * yoff * byy + xoff * bxy + zoff * byz + xoff*zoff*bxyz;
- bz = bz + 2. * zoff * bzz + xoff * bxz + yoff * byz + xoff*yoff*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 + 2. * xoff * cxx + yoff * cxy + zoff * cxz + yoff*zoff*cxyz;
- cy = cy + 2. * yoff * cyy + xoff * cxy + zoff * cyz + xoff*zoff*cxyz;
- cz = cz + 2. * zoff * czz + xoff * cxz + yoff * cyz + xoff*yoff*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;
@@ -351,110 +351,110 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
const real o = omega;
- f_E = eps_new*((2*(-2*ax + by + cz-kxxMzzAverage-kxxMyyAverage))/(27.*o));
- f_N = eps_new*((2*(ax - 2*by + cz+2*kxxMyyAverage-kxxMzzAverage))/(27.*o));
- f_T = eps_new*((2*(ax + by - 2*cz-kxxMyyAverage+2*kxxMzzAverage))/(27.*o));
- f_NE = eps_new*(-(ax + 3*ay + 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage+3*kxyAverage)/(54.*o));
- f_SE = eps_new*(-(ax - 3*ay - 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage-3*kxyAverage)/(54.*o));
- f_TE = eps_new*(-(ax + 3*az - 2*by + 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage+3*kxzAverage)/(54.*o));
- f_BE = eps_new*(-(ax - 3*az - 2*by - 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage-3*kxzAverage)/(54.*o));
- f_TN = eps_new*(-(-2*ax + by + 3*bz + 3*cy + cz-kxxMyyAverage-kxxMzzAverage+3*kyzAverage)/(54.*o));
- f_BN = eps_new*(-(-2*ax + by - 3*bz - 3*cy + cz-kxxMyyAverage-kxxMzzAverage-3*kyzAverage)/(54.*o));
- f_ZERO = 0.;
- f_TNE = eps_new*(-(ay + az + bx + bz + cx + cy+kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSW = eps_new*((-ay + az - bx + bz + cx + cy-kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSE = eps_new*((ay - az + bx + bz - cx + cy+kxyAverage-kxzAverage+kyzAverage)/(72.*o));
- f_TNW = eps_new*((ay + az + bx - bz + cx - cy+kxyAverage+kxzAverage-kyzAverage)/(72.*o));
-
- x_E = 0.25*eps_new*((2*(-4*axx + bxy + cxz))/(27.*o));
- x_N = 0.25*eps_new*((2*(2*axx - 2*bxy + cxz))/(27.*o));
- x_T = 0.25*eps_new*((2*(2*axx + bxy - 2*cxz))/(27.*o));
- x_NE = 0.25*eps_new*(-((2*axx + 3*axy + 6*bxx + bxy - 2*cxz))/(54.*o));
- x_SE = 0.25*eps_new*(-((2*axx - 3*axy - 6*bxx + bxy - 2*cxz))/(54.*o));
- x_TE = 0.25*eps_new*(-((2*axx + 3*axz - 2*bxy + 6*cxx + cxz))/(54.*o));
- x_BE = 0.25*eps_new*(-((2*axx - 3*axz - 2*bxy - 6*cxx + cxz))/(54.*o));
- x_TN = 0.25*eps_new*(-((-4*axx + bxy + 3*bxz + 3*cxy + cxz))/(54.*o));
- x_BN = 0.25*eps_new*(-((-4*axx + bxy - 3*bxz - 3*cxy + cxz))/(54.*o));
+ 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 = c0o1;
+ 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 = 0.;
- x_TNE = 0.25*eps_new*(-((axy + axz + 2*bxx + bxz + 2*cxx + cxy))/(72.*o));
- x_TSW = 0.25*eps_new*(((-axy + axz - 2*bxx + bxz + 2*cxx + cxy))/(72.*o));
- x_TSE = 0.25*eps_new*(((axy - axz + 2*bxx + bxz - 2*cxx + cxy))/(72.*o));
- x_TNW = 0.25*eps_new*(((axy + axz + 2*bxx - bxz + 2*cxx - cxy))/(72.*o));
-
- y_E = 0.25*eps_new*(2*(-2*axy + 2*byy + cyz))/(27.*o);
- y_N = 0.25*eps_new*(2*(axy - 4*byy + cyz))/(27.*o);
- y_T = 0.25*eps_new*(2*(axy + 2*byy - 2*cyz))/(27.*o);
- y_NE = 0.25*eps_new*(-((axy + 6*ayy + 3*bxy + 2*byy - 2*cyz))/(54.*o));
- y_SE = 0.25*eps_new*(-((axy - 6*ayy - 3*bxy + 2*byy - 2*cyz))/(54.*o));
- y_TE = 0.25*eps_new*(-((axy + 3*ayz - 4*byy + 3*cxy + cyz))/(54.*o));
- y_BE = 0.25*eps_new*(-((axy - 3*ayz - 4*byy - 3*cxy + cyz))/(54.*o));
- y_TN = 0.25*eps_new*(-((-2*axy + 2*byy + 3*byz + 6*cyy + cyz))/(54.*o));
- y_BN = 0.25*eps_new*(-((-2*axy + 2*byy - 3*byz - 6*cyy + cyz))/(54.*o));
+ 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 = 0.;
- y_TNE = 0.25*eps_new*(-((2*ayy + ayz + bxy + byz + cxy + 2*cyy))/(72.*o));
- y_TSW = 0.25*eps_new*(((-2*ayy + ayz - bxy + byz + cxy + 2*cyy))/(72.*o));
- y_TSE = 0.25*eps_new*(((2*ayy - ayz + bxy + byz - cxy + 2*cyy))/(72.*o));
- y_TNW = 0.25*eps_new*(((2*ayy + ayz + bxy - byz + cxy - 2*cyy))/(72.*o));
-
- z_E = 0.25*eps_new*((2*(-2*axz + byz + 2*czz))/(27.*o));
- z_N = 0.25*eps_new*((2*(axz - 2*byz + 2*czz))/(27.*o));
- z_T = 0.25*eps_new*((2*(axz + byz - 4*czz))/(27.*o));
- z_NE = 0.25*eps_new*(-((axz + 3*ayz + 3*bxz + byz - 4*czz))/(54.*o));
- z_SE = 0.25*eps_new*(-((axz - 3*ayz - 3*bxz + byz - 4*czz))/(54.*o));
- z_TE = 0.25*eps_new*(-((axz + 6*azz - 2*byz + 3*cxz + 2*czz))/(54.*o));
- z_BE = 0.25*eps_new*(-((axz - 6*azz - 2*byz - 3*cxz + 2*czz))/(54.*o));
- z_TN = 0.25*eps_new*(-((-2*axz + byz + 6*bzz + 3*cyz + 2*czz))/(54.*o));
- z_BN = 0.25*eps_new*(-((-2*axz + byz - 6*bzz - 3*cyz + 2*czz))/(54.*o));
+ 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 = 0.;
- z_TNE = 0.25*eps_new*(-((ayz + 2*azz + bxz + 2*bzz + cxz + cyz))/(72.*o));
- z_TSW = 0.25*eps_new*(((-ayz + 2*azz - bxz + 2*bzz + cxz + cyz))/(72.*o));
- z_TSE = 0.25*eps_new*(((ayz - 2*azz + bxz + 2*bzz - cxz + cyz))/(72.*o));
- z_TNW = 0.25*eps_new*(((ayz + 2*azz + bxz - 2*bzz + cxz - cyz))/(72.*o));
-
- xy_E = 0.0625*eps_new *(( 2.*cxyz)/(27.*o));
- xy_N = 0.0625*eps_new *(( 2.*cxyz)/(27.*o));
- xy_T = -(0.0625*eps_new *(( 4.*cxyz)/(27.*o)));
- xy_NE = 0.0625*eps_new *( cxyz /(27.*o));
- xy_SE = 0.0625*eps_new *( cxyz /(27.*o));
- xy_TE = -(0.0625*eps_new *(( 3.*axyz + cxyz)/(54.*o)));
- xy_BE = -(0.0625*eps_new *((-3.*axyz + cxyz)/(54.*o)));
- xy_TN = -(0.0625*eps_new *(( 3.*bxyz + cxyz)/(54.*o)));
- xy_BN = -(0.0625*eps_new *(( - 3.*bxyz + cxyz)/(54.*o)));
- //xy_ZERO= 0.0625*eps_new;
- xy_TNE = -(0.0625*eps_new *(( axyz + bxyz )/(72.*o)));
- xy_TSW = 0.0625*eps_new *(( axyz + bxyz )/(72.*o));
- xy_TSE = 0.0625*eps_new *((- axyz + bxyz )/(72.*o));
- xy_TNW = 0.0625*eps_new *(( axyz - bxyz )/(72.*o));
-
- xz_E = 0.0625*eps_new *(( 2.*bxyz )/(27.*o));
- xz_N = -(0.0625*eps_new *(( 4.*bxyz )/(27.*o)));
- xz_T = 0.0625*eps_new *(( 2.*bxyz )/(27.*o));
- xz_NE = -(0.0625*eps_new *(( 3.*axyz + bxyz )/(54.*o)));
- xz_SE = -(0.0625*eps_new *((-3.*axyz + bxyz )/(54.*o)));
- xz_TE = 0.0625*eps_new *(( bxyz )/(27.*o));
- xz_BE = 0.0625*eps_new *(( bxyz )/(27.*o));
- xz_TN = -(0.0625*eps_new *(( bxyz + 3.*cxyz)/(54.*o)));
- xz_BN = -(0.0625*eps_new *(( bxyz - 3.*cxyz)/(54.*o)));
- //xz_ZERO= 0.0625*eps_new;
- xz_TNE = -(0.0625*eps_new *(( axyz + cxyz)/(72.*o)));
- xz_TSW = 0.0625*eps_new *((- axyz + cxyz)/(72.*o));
- xz_TSE = 0.0625*eps_new *(( axyz + cxyz)/(72.*o));
- xz_TNW = 0.0625*eps_new *(( axyz - cxyz)/(72.*o));
-
- yz_E = -(0.0625*eps_new *(( 4.*axyz )/(27.*o)));
- yz_N = 0.0625*eps_new *(( 2.*axyz )/(27.*o));
- yz_T = 0.0625*eps_new *(( 2.*axyz )/(27.*o));
- yz_NE = -(0.0625*eps_new *(( axyz + 3.*bxyz )/(54.*o)));
- yz_SE = -(0.0625*eps_new *(( axyz - 3.*bxyz )/(54.*o)));
- yz_TE = -(0.0625*eps_new *(( axyz + 3.*cxyz)/(54.*o)));
- yz_BE = -(0.0625*eps_new *(( axyz - 3.*cxyz)/(54.*o)));
- yz_TN = 0.0625*eps_new *(( axyz )/(27.*o));
- yz_BN = 0.0625*eps_new *(( axyz )/(27.*o));
- //yz_ZERO= 0.0625*eps_new;
- yz_TNE = -(0.0625*eps_new *(( bxyz + cxyz)/(72.*o)));
- yz_TSW = 0.0625*eps_new *(( - bxyz + cxyz)/(72.*o));
- yz_TSE = 0.0625*eps_new *(( bxyz - cxyz)/(72.*o));
- yz_TNW = 0.0625*eps_new *(( bxyz + cxyz)/(72.*o));
+ 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 CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeCF(real* f, real /*omega*/, real /*x*/, real /*y*/, real /*z*/, real press, real xs, real ys, real zs)
@@ -463,9 +463,9 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeCF(real* f, r
using namespace vf::lbm::dir;
real rho = press ;//+ (2.*axx*x+axy*y+axz*z+axyz*y*z+ax + 2.*byy*y+bxy*x+byz*z+bxyz*x*z+by + 2.*czz*z+cxz*x+cyz*y+cxyz*x*y+cz)/3.;
- real vx1 = a0 + 0.25*( xs*ax + ys*ay + zs*az) + 0.0625*(axx + xs*ys*axy + xs*zs*axz + ayy + ys*zs*ayz + azz) + 0.015625*(xs*ys*zs*axyz);
- real vx2 = b0 + 0.25*( xs*bx + ys*by + zs*bz) + 0.0625*(bxx + xs*ys*bxy + xs*zs*bxz + byy + ys*zs*byz + bzz) + 0.015625*(xs*ys*zs*bxyz);
- real vx3 = c0 + 0.25*( xs*cx + ys*cy + zs*cz) + 0.0625*(cxx + xs*ys*cxy + xs*zs*cxz + cyy + ys*zs*cyz + czz) + 0.015625*(xs*ys*zs*cxyz);
+ 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);
//////////////////////////////////////////////////////////////////////////
//DRAFT
@@ -504,108 +504,108 @@ 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 -0.25, -0.25, -0.25
+//Position SWB -c1o4, -c1o4, -c1o4
real CompressibleOffsetInterpolationProcessor::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) +
- press_SET * (0.046875 - 0.1875 * xoff + 0.0625 * yoff - 0.1875 * zoff) +
- press_NET * (0.015625 - 0.0625 * xoff - 0.0625 * yoff - 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.1875 * xoff - 0.1875 * yoff + 0.0625 * zoff) +
- press_NWB * (0.140625 + 0.1875 * xoff - 0.5625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.5625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.421875 + 0.5625 * xoff + 0.5625 * yoff + 0.5625 * zoff);
+ 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
+//Position SWT -c1o4, -c1o4, c1o4
real CompressibleOffsetInterpolationProcessor::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) +
- press_SET * (0.140625 - 0.5625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_NET * (0.046875 - 0.1875 * xoff - 0.1875 * yoff - 0.0625 * zoff) +
- press_NEB * (0.015625 - 0.0625 * xoff - 0.0625 * yoff + 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.0625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.046875 - 0.1875 * xoff + 0.0625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.1875 * xoff + 0.1875 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetInterpolationProcessor::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) +
- press_SWT * (0.140625 + 0.5625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_NWT * (0.046875 + 0.1875 * xoff - 0.1875 * yoff - 0.0625 * zoff) +
- press_NWB * (0.015625 + 0.0625 * xoff - 0.0625 * yoff + 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.0625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.046875 + 0.1875 * xoff + 0.0625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.1875 * xoff + 0.1875 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetInterpolationProcessor::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) +
- press_SWT * (0.046875 + 0.1875 * xoff + 0.0625 * yoff - 0.1875 * zoff) +
- press_NWT * (0.015625 + 0.0625 * xoff - 0.0625 * yoff - 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.1875 * xoff - 0.1875 * yoff + 0.0625 * zoff) +
- press_NEB * (0.140625 - 0.1875 * xoff - 0.5625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.5625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.421875 - 0.5625 * xoff + 0.5625 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetInterpolationProcessor::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) +
- press_SWT * (0.046875 + 0.0625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_SET * (0.015625 - 0.0625 * xoff + 0.0625 * yoff - 0.0625 * zoff) +
- press_SEB * (0.046875 - 0.1875 * xoff + 0.1875 * yoff + 0.0625 * zoff) +
- press_NEB * (0.140625 - 0.5625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.1875 * xoff + 0.5625 * yoff + 0.1875 * zoff) +
- press_NWB * (0.421875 + 0.5625 * xoff - 0.5625 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetInterpolationProcessor::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) +
- press_SWT * (0.140625 + 0.1875 * xoff + 0.5625 * yoff - 0.1875 * zoff) +
- press_SET * (0.046875 - 0.1875 * xoff + 0.1875 * yoff - 0.0625 * zoff) +
- press_SEB * (0.015625 - 0.0625 * xoff + 0.0625 * yoff + 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.1875 * xoff - 0.0625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.046875 + 0.0625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_NWB * (0.140625 + 0.1875 * xoff - 0.1875 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetInterpolationProcessor::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) +
- press_SET * (0.140625 - 0.1875 * xoff + 0.5625 * yoff - 0.1875 * zoff) +
- press_SWT * (0.046875 + 0.1875 * xoff + 0.1875 * yoff - 0.0625 * zoff) +
- press_SWB * (0.015625 + 0.0625 * xoff + 0.0625 * yoff + 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.1875 * xoff - 0.0625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.046875 - 0.0625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_NEB * (0.140625 - 0.1875 * xoff - 0.1875 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetInterpolationProcessor::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) +
- press_SET * (0.046875 - 0.0625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_SWT * (0.015625 + 0.0625 * xoff + 0.0625 * yoff - 0.0625 * zoff) +
- press_SWB * (0.046875 + 0.1875 * xoff + 0.1875 * yoff + 0.0625 * zoff) +
- press_NWB * (0.140625 + 0.5625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.1875 * xoff + 0.5625 * yoff + 0.1875 * zoff) +
- press_NEB * (0.421875 - 0.5625 * xoff - 0.5625 * yoff + 0.5625 * zoff);
+ 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
@@ -614,14 +614,14 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f, r
using namespace D3Q27System;
using namespace vf::lbm::dir;
- real press = press_NET * (0.125 - 0.25 * xoff - 0.25 * yoff - 0.25 * zoff) +
- press_NWT * (0.125 + 0.25 * xoff - 0.25 * yoff - 0.25 * zoff) +
- press_SET * (0.125 - 0.25 * xoff + 0.25 * yoff - 0.25 * zoff) +
- press_SWT * (0.125 + 0.25 * xoff + 0.25 * yoff - 0.25 * zoff) +
- press_NEB * (0.125 - 0.25 * xoff - 0.25 * yoff + 0.25 * zoff) +
- press_NWB * (0.125 + 0.25 * xoff - 0.25 * yoff + 0.25 * zoff) +
- press_SEB * (0.125 - 0.25 * xoff + 0.25 * yoff + 0.25 * zoff) +
- press_SWB * (0.125 + 0.25 * xoff + 0.25 * yoff + 0.25 * zoff);
+ 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;
@@ -636,7 +636,7 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f, r
real feq[ENDF+1];
D3Q27System::calcCompFeq(feq,rho,vx1,vx2,vx3);
- real eps_new = 2.;
+ real eps_new = c2o1;
real o = omega;
// LBMReal op = 1.;
@@ -655,20 +655,20 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f, r
//f_TSE = - eps_new *((az + cx)/(36.*o)) - f_TNE;
//f_TNW = - eps_new *((bz + cy)/(36.*o)) - f_TNE;
- f_E = eps_new*((2*(-2*ax + by + cz-kxxMzzAverage-kxxMyyAverage))/(27.*o));
- f_N = eps_new*((2*(ax - 2*by + cz+2*kxxMyyAverage-kxxMzzAverage))/(27.*o));
- f_T = eps_new*((2*(ax + by - 2*cz-kxxMyyAverage+2*kxxMzzAverage))/(27.*o));
- f_NE = eps_new*(-(ax + 3*ay + 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage+3*kxyAverage)/(54.*o));
- f_SE = eps_new*(-(ax - 3*ay - 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage-3*kxyAverage)/(54.*o));
- f_TE = eps_new*(-(ax + 3*az - 2*by + 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage+3*kxzAverage)/(54.*o));
- f_BE = eps_new*(-(ax - 3*az - 2*by - 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage-3*kxzAverage)/(54.*o));
- f_TN = eps_new*(-(-2*ax + by + 3*bz + 3*cy + cz-kxxMyyAverage-kxxMzzAverage+3*kyzAverage)/(54.*o));
- f_BN = eps_new*(-(-2*ax + by - 3*bz - 3*cy + cz-kxxMyyAverage-kxxMzzAverage-3*kyzAverage)/(54.*o));
- f_ZERO = 0.;
- f_TNE = eps_new*(-(ay + az + bx + bz + cx + cy+kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSW = eps_new*((-ay + az - bx + bz + cx + cy-kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSE = eps_new*((ay - az + bx + bz - cx + cy+kxyAverage-kxzAverage+kyzAverage)/(72.*o));
- f_TNW = eps_new*((ay + az + bx - bz + cx - cy+kxyAverage+kxzAverage-kyzAverage)/(72.*o));
+ 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 = c0o1;
+ 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));
f[DIR_P00] = f_E + feq[DIR_P00];
f[DIR_M00] = f_E + feq[DIR_M00];
@@ -708,10 +708,10 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedVelocity(real x,
//////////////////////////////////////////////////////////////////////////
void CompressibleOffsetInterpolationProcessor::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;
- tauzz=cz+2*czz*z+cxz*x+cyz*y+cxyz*x*y;
- tauxy=0.5*((ay+2.0*ayy*y+axy*x+ayz*z+axyz*x*z)+(bx+2.0*bxx*x+bxy*y+bxz*z+bxyz*y*z));
- tauxz=0.5*((az+2.0*azz*z+axz*x+ayz*y+axyz*x*y)+(cx+2.0*cxx*x+cxy*y+cxz*z+cxyz*y*z));
- tauyz=0.5*((bz+2.0*bzz*z+bxz*x+byz*y+bxyz*x*y)+(cy+2.0*cyy*y+cxy*x+cyz*z+cxyz*x*z));
+ 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));
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
index 68b8506d896c3d5c93c9021a7a03ab3fe7a8621e..74527c0c39d5255a4ca3e647a288fffa027373ac 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetMomentsInterpolationProcessor.cpp
@@ -7,8 +7,8 @@ using namespace vf::basics::constant;
CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterpolationProcessor()
{
- this->bulkViscosity = 0.0;
- this->shearViscosity = 0.0;
+ this->bulkViscosity = c0o1;
+ this->shearViscosity = c0o1;
this->OxxPyyPzzC = c1o1;
this->OxxPyyPzzF = c1o1;
}
@@ -16,8 +16,8 @@ CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterp
CompressibleOffsetMomentsInterpolationProcessor::CompressibleOffsetMomentsInterpolationProcessor(real omegaC, real omegaF)
: omegaC(omegaC), omegaF(omegaF)
{
- this->bulkViscosity = 0.0;
- this->shearViscosity = 0.0;
+ this->bulkViscosity = c0o1;
+ this->shearViscosity = c0o1;
this->OxxPyyPzzC = c1o1;
this->OxxPyyPzzF = c1o1;
}
@@ -40,8 +40,8 @@ void CompressibleOffsetMomentsInterpolationProcessor::setOmegas( real omegaC, re
this->omegaC = omegaC;
this->omegaF = omegaF;
- real dtC = (3.0*shearViscosity)/((1/omegaC)-0.5);
- real dtF = (3.0*shearViscosity)/((1/omegaF)-0.5);
+ real dtC = (c3o1 *shearViscosity)/((c1o1/omegaC)-c1o2);
+ real dtF = (c3o1 *shearViscosity)/((c1o1/omegaF)-c1o2);
if (bulkViscosity != 0)
{
@@ -68,21 +68,21 @@ void CompressibleOffsetMomentsInterpolationProcessor::setOffsets(real xoff, real
void CompressibleOffsetMomentsInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5);
- calcInterpolatedNodeCF(icellF.BSW, omegaF, -0.25, -0.25, -0.25, calcPressBSW(), -1, -1, -1);
- calcInterpolatedNodeCF(icellF.BNE, omegaF, 0.25, 0.25, -0.25, calcPressBNE(), 1, 1, -1);
- calcInterpolatedNodeCF(icellF.TNW, omegaF, -0.25, 0.25, 0.25, calcPressTNW(), -1, 1, 1);
- calcInterpolatedNodeCF(icellF.TSE, omegaF, 0.25, -0.25, 0.25, calcPressTSE(), 1, -1, 1);
- calcInterpolatedNodeCF(icellF.BNW, omegaF, -0.25, 0.25, -0.25, calcPressBNW(), -1, 1, -1);
- calcInterpolatedNodeCF(icellF.BSE, omegaF, 0.25, -0.25, -0.25, calcPressBSE(), 1, -1, -1);
- calcInterpolatedNodeCF(icellF.TSW, omegaF, -0.25, -0.25, 0.25, calcPressTSW(), -1, -1, 1);
- calcInterpolatedNodeCF(icellF.TNE, omegaF, 0.25, 0.25, 0.25, calcPressTNE(), 1, 1, 1);
+ 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, 2.0);
+ calcInterpolatedCoefficiets(icellF, omegaF, c2o1);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
@@ -92,16 +92,16 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcMoments(const real* co
using namespace D3Q27System;
using namespace vf::lbm::dir;
- real drho = 0.0;
+ real drho = c0o1;
D3Q27System::calcCompMacroscopicValues(f,drho,vx1,vx2,vx3);
press = drho; //interpolate rho!
- kxy = -3.*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 = -3.*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 = -3.*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 = -3./2.*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 = -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]))/(c1o1 + drho)-(vx1*vx1-vx3*vx3));
+ 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)
@@ -200,116 +200,116 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedCoefficiet
kxxMyyFromfcNEQ_SEB - kxxMyyFromfcNEQ_SET + kxxMyyFromfcNEQ_SWB + kxxMyyFromfcNEQ_SWT -
kxxMzzFromfcNEQ_NEB - kxxMzzFromfcNEQ_NET + kxxMzzFromfcNEQ_NWB + kxxMzzFromfcNEQ_NWT -
kxxMzzFromfcNEQ_SEB - kxxMzzFromfcNEQ_SET + kxxMzzFromfcNEQ_SWB + kxxMzzFromfcNEQ_SWT -
- 2.*kxyFromfcNEQ_NEB - 2.*kxyFromfcNEQ_NET - 2.*kxyFromfcNEQ_NWB - 2.*kxyFromfcNEQ_NWT +
- 2.*kxyFromfcNEQ_SEB + 2.*kxyFromfcNEQ_SET + 2.*kxyFromfcNEQ_SWB + 2.*kxyFromfcNEQ_SWT +
- 2.*kxzFromfcNEQ_NEB - 2.*kxzFromfcNEQ_NET + 2.*kxzFromfcNEQ_NWB - 2.*kxzFromfcNEQ_NWT +
- 2.*kxzFromfcNEQ_SEB - 2.*kxzFromfcNEQ_SET + 2.*kxzFromfcNEQ_SWB - 2.*kxzFromfcNEQ_SWT +
- 8.*vx1_NEB + 8.*vx1_NET + 8.*vx1_NWB + 8.*vx1_NWT + 8.*vx1_SEB +
- 8.*vx1_SET + 8.*vx1_SWB + 8.*vx1_SWT + 2.*vx2_NEB + 2.*vx2_NET -
- 2.*vx2_NWB - 2.*vx2_NWT - 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB +
- 2.*vx2_SWT - 2.*vx3_NEB + 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/64.;
- b0 = (2.*kxxMyyFromfcNEQ_NEB + 2.*kxxMyyFromfcNEQ_NET + 2.*kxxMyyFromfcNEQ_NWB + 2.*kxxMyyFromfcNEQ_NWT -
- 2.*kxxMyyFromfcNEQ_SEB - 2.*kxxMyyFromfcNEQ_SET - 2.*kxxMyyFromfcNEQ_SWB - 2.*kxxMyyFromfcNEQ_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 -
- 2.*kxyFromfcNEQ_NEB - 2.*kxyFromfcNEQ_NET + 2.*kxyFromfcNEQ_NWB + 2.*kxyFromfcNEQ_NWT -
- 2.*kxyFromfcNEQ_SEB - 2.*kxyFromfcNEQ_SET + 2.*kxyFromfcNEQ_SWB + 2.*kxyFromfcNEQ_SWT +
- 2.*kyzFromfcNEQ_NEB - 2.*kyzFromfcNEQ_NET + 2.*kyzFromfcNEQ_NWB - 2.*kyzFromfcNEQ_NWT +
- 2.*kyzFromfcNEQ_SEB - 2.*kyzFromfcNEQ_SET + 2.*kyzFromfcNEQ_SWB - 2.*kyzFromfcNEQ_SWT +
- 2.*vx1_NEB + 2.*vx1_NET - 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB - 2.*vx1_SET + 2.*vx1_SWB + 2.*vx1_SWT +
- 8.*vx2_NEB + 8.*vx2_NET + 8.*vx2_NWB + 8.*vx2_NWT +
- 8.*vx2_SEB + 8.*vx2_SET + 8.*vx2_SWB + 8.*vx2_SWT -
- 2.*vx3_NEB + 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/64.;
+ 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 -
- 2.*kxxMzzFromfcNEQ_NEB + 2.*kxxMzzFromfcNEQ_NET - 2.*kxxMzzFromfcNEQ_NWB + 2.*kxxMzzFromfcNEQ_NWT -
- 2.*kxxMzzFromfcNEQ_SEB + 2.*kxxMzzFromfcNEQ_SET - 2.*kxxMzzFromfcNEQ_SWB + 2.*kxxMzzFromfcNEQ_SWT -
- 2.*kxzFromfcNEQ_NEB - 2.*kxzFromfcNEQ_NET + 2.*kxzFromfcNEQ_NWB + 2.*kxzFromfcNEQ_NWT -
- 2.*kxzFromfcNEQ_SEB - 2.*kxzFromfcNEQ_SET + 2.*kxzFromfcNEQ_SWB + 2.*kxzFromfcNEQ_SWT -
- 2.*kyzFromfcNEQ_NEB - 2.*kyzFromfcNEQ_NET - 2.*kyzFromfcNEQ_NWB - 2.*kyzFromfcNEQ_NWT +
- 2.*kyzFromfcNEQ_SEB + 2.*kyzFromfcNEQ_SET + 2.*kyzFromfcNEQ_SWB + 2.*kyzFromfcNEQ_SWT -
- 2.*vx1_NEB + 2.*vx1_NET + 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB + 2.*vx1_SET + 2.*vx1_SWB - 2.*vx1_SWT -
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB - 2.*vx2_SWT +
- 8.*vx3_NEB + 8.*vx3_NET + 8.*vx3_NWB + 8.*vx3_NWT +
- 8.*vx3_SEB + 8.*vx3_SET + 8.*vx3_SWB + 8.*vx3_SWT)/64.;
- ax = (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT + vx1_SEB + vx1_SET - vx1_SWB - vx1_SWT)/4.;
- bx = (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT + vx2_SEB + vx2_SET - vx2_SWB - vx2_SWT)/4.;
- cx = (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT + vx3_SEB + vx3_SET - vx3_SWB - vx3_SWT)/4.;
+ 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 +
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB - 2.*vx2_NWT -
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB + 2.*vx2_SWT -
- 2.*vx3_NEB + 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/16.;
+ 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 -
- 2.*vx1_NEB - 2.*vx1_NET + 2.*vx1_NWB + 2.*vx1_NWT +
- 2.*vx1_SEB + 2.*vx1_SET - 2.*vx1_SWB - 2.*vx1_SWT)/8.;
+ 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 +
- 2.*vx1_NEB - 2.*vx1_NET - 2.*vx1_NWB + 2.*vx1_NWT +
- 2.*vx1_SEB - 2.*vx1_SET - 2.*vx1_SWB + 2.*vx1_SWT)/8.;
- ay = (vx1_NEB + vx1_NET + vx1_NWB + vx1_NWT - vx1_SEB - vx1_SET - vx1_SWB - vx1_SWT)/4.;
- by = (vx2_NEB + vx2_NET + vx2_NWB + vx2_NWT - vx2_SEB - vx2_SET - vx2_SWB - vx2_SWT)/4.;
- cy = (vx3_NEB + vx3_NET + vx3_NWB + vx3_NWT - vx3_SEB - vx3_SET - vx3_SWB - vx3_SWT)/4.;
+ 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 -
- 2.*vx2_NEB - 2.*vx2_NET + 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB + 2.*vx2_SET - 2.*vx2_SWB - 2.*vx2_SWT)/8.;
- byy= (-2.*kxxMyyFromfcNEQ_NEB - 2.*kxxMyyFromfcNEQ_NET - 2.*kxxMyyFromfcNEQ_NWB - 2.*kxxMyyFromfcNEQ_NWT +
- 2.*kxxMyyFromfcNEQ_SEB + 2.*kxxMyyFromfcNEQ_SET + 2.*kxxMyyFromfcNEQ_SWB + 2.*kxxMyyFromfcNEQ_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 +
- 2.*vx1_NEB + 2.*vx1_NET - 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB - 2.*vx1_SET + 2.*vx1_SWB + 2.*vx1_SWT -
- 2.*vx3_NEB + 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/16.;
+ 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 +
- 2.*vx2_NEB - 2.*vx2_NET + 2.*vx2_NWB - 2.*vx2_NWT -
- 2.*vx2_SEB + 2.*vx2_SET - 2.*vx2_SWB + 2.*vx2_SWT)/8.;
- az = (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT - vx1_SEB + vx1_SET - vx1_SWB + vx1_SWT)/4.;
- bz = (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT - vx2_SEB + vx2_SET - vx2_SWB + vx2_SWT)/4.;
- cz = (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT - vx3_SEB + vx3_SET - vx3_SWB + vx3_SWT)/4.;
+ 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 +
- 2.*vx3_NEB - 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET - 2.*vx3_SWB + 2.*vx3_SWT)/8.;
+ 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 +
- 2.*vx3_NEB - 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET - 2.*vx3_SWB + 2.*vx3_SWT)/8.;
+ 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 +
- 2.*kxxMzzFromfcNEQ_NEB - 2.*kxxMzzFromfcNEQ_NET + 2.*kxxMzzFromfcNEQ_NWB - 2.*kxxMzzFromfcNEQ_NWT +
- 2.*kxxMzzFromfcNEQ_SEB - 2.*kxxMzzFromfcNEQ_SET + 2.*kxxMzzFromfcNEQ_SWB - 2.*kxxMzzFromfcNEQ_SWT -
- 2.*vx1_NEB + 2.*vx1_NET + 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB + 2.*vx1_SET + 2.*vx1_SWB - 2.*vx1_SWT -
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB - 2.*vx2_SWT)/16.;
- axy= (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT - vx1_SEB - vx1_SET + vx1_SWB + vx1_SWT)/2.;
- bxy= (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT - vx2_SEB - vx2_SET + vx2_SWB + vx2_SWT)/2.;
- cxy= (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT - vx3_SEB - vx3_SET + vx3_SWB + vx3_SWT)/2.;
- axz= (-vx1_NEB + vx1_NET + vx1_NWB - vx1_NWT - vx1_SEB + vx1_SET + vx1_SWB - vx1_SWT)/2.;
- bxz= (-vx2_NEB + vx2_NET + vx2_NWB - vx2_NWT - vx2_SEB + vx2_SET + vx2_SWB - vx2_SWT)/2.;
- cxz= (-vx3_NEB + vx3_NET + vx3_NWB - vx3_NWT - vx3_SEB + vx3_SET + vx3_SWB - vx3_SWT)/2.;
- ayz= (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT + vx1_SEB - vx1_SET + vx1_SWB - vx1_SWT)/2.;
- byz= (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT + vx2_SEB - vx2_SET + vx2_SWB - vx2_SWT)/2.;
- cyz= (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT + vx3_SEB - vx3_SET + vx3_SWB - vx3_SWT)/2.;
+ 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 =0;//(kxyFromfcNEQ_SWB+
+ kxyAverage = c0o1;//(kxyFromfcNEQ_SWB+
//kxyFromfcNEQ_SWT+
//kxyFromfcNEQ_SET+
//kxyFromfcNEQ_SEB+
@@ -317,7 +317,7 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedCoefficiet
//kxyFromfcNEQ_NWT+
//kxyFromfcNEQ_NET+
//kxyFromfcNEQ_NEB)*c1o8-(ay+bx);
- kyzAverage =0;//(kyzFromfcNEQ_SWB+
+ kyzAverage = c0o1;//(kyzFromfcNEQ_SWB+
//kyzFromfcNEQ_SWT+
//kyzFromfcNEQ_SET+
//kyzFromfcNEQ_SEB+
@@ -325,7 +325,7 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedCoefficiet
//kyzFromfcNEQ_NWT+
//kyzFromfcNEQ_NET+
//kyzFromfcNEQ_NEB)*c1o8-(bz+cy);
- kxzAverage =0;//(kxzFromfcNEQ_SWB+
+ kxzAverage = c0o1;//(kxzFromfcNEQ_SWB+
//kxzFromfcNEQ_SWT+
//kxzFromfcNEQ_SET+
//kxzFromfcNEQ_SEB+
@@ -333,7 +333,7 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedCoefficiet
//kxzFromfcNEQ_NWT+
//kxzFromfcNEQ_NET+
//kxzFromfcNEQ_NEB)*c1o8-(az+cx);
- kxxMyyAverage =0;//(kxxMyyFromfcNEQ_SWB+
+ kxxMyyAverage = c0o1;//(kxxMyyFromfcNEQ_SWB+
//kxxMyyFromfcNEQ_SWT+
//kxxMyyFromfcNEQ_SET+
//kxxMyyFromfcNEQ_SEB+
@@ -341,7 +341,7 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedCoefficiet
//kxxMyyFromfcNEQ_NWT+
//kxxMyyFromfcNEQ_NET+
//kxxMyyFromfcNEQ_NEB)*c1o8-(ax-by);
- kxxMzzAverage =0;//(kxxMzzFromfcNEQ_SWB+
+ kxxMzzAverage = c0o1;//(kxxMzzFromfcNEQ_SWB+
//kxxMzzFromfcNEQ_SWT+
//kxxMzzFromfcNEQ_SET+
//kxxMzzFromfcNEQ_SEB+
@@ -355,17 +355,17 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedCoefficiet
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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 + 2. * xoff * axx + yoff * axy + zoff * axz + yoff*zoff*axyz;
- ay = ay + 2. * yoff * ayy + xoff * axy + zoff * ayz + xoff*zoff*axyz;
- az = az + 2. * zoff * azz + xoff * axz + yoff * ayz + xoff*yoff*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 + 2. * xoff * bxx + yoff * bxy + zoff * bxz + yoff*zoff*bxyz;
- by = by + 2. * yoff * byy + xoff * bxy + zoff * byz + xoff*zoff*bxyz;
- bz = bz + 2. * zoff * bzz + xoff * bxz + yoff * byz + xoff*yoff*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 + 2. * xoff * cxx + yoff * cxy + zoff * cxz + yoff*zoff*cxyz;
- cy = cy + 2. * yoff * cyy + xoff * cxy + zoff * cyz + xoff*zoff*cxyz;
- cz = cz + 2. * zoff * czz + xoff * cxz + yoff * cyz + xoff*yoff*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;
@@ -379,110 +379,110 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedCoefficiet
const real o = omega;
- f_E = eps_new*((2*(-2*ax + by + cz-kxxMzzAverage-kxxMyyAverage))/(27.*o));
- f_N = eps_new*((2*(ax - 2*by + cz+2*kxxMyyAverage-kxxMzzAverage))/(27.*o));
- f_T = eps_new*((2*(ax + by - 2*cz-kxxMyyAverage+2*kxxMzzAverage))/(27.*o));
- f_NE = eps_new*(-(ax + 3*ay + 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage+3*kxyAverage)/(54.*o));
- f_SE = eps_new*(-(ax - 3*ay - 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage-3*kxyAverage)/(54.*o));
- f_TE = eps_new*(-(ax + 3*az - 2*by + 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage+3*kxzAverage)/(54.*o));
- f_BE = eps_new*(-(ax - 3*az - 2*by - 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage-3*kxzAverage)/(54.*o));
- f_TN = eps_new*(-(-2*ax + by + 3*bz + 3*cy + cz-kxxMyyAverage-kxxMzzAverage+3*kyzAverage)/(54.*o));
- f_BN = eps_new*(-(-2*ax + by - 3*bz - 3*cy + cz-kxxMyyAverage-kxxMzzAverage-3*kyzAverage)/(54.*o));
+ 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)/(72.*o));
- f_TSW = eps_new*((-ay + az - bx + bz + cx + cy-kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSE = eps_new*((ay - az + bx + bz - cx + cy+kxyAverage-kxzAverage+kyzAverage)/(72.*o));
- f_TNW = eps_new*((ay + az + bx - bz + cx - cy+kxyAverage+kxzAverage-kyzAverage)/(72.*o));
-
- x_E = 0.25*eps_new*((2*(-4*axx + bxy + cxz))/(27.*o));
- x_N = 0.25*eps_new*((2*(2*axx - 2*bxy + cxz))/(27.*o));
- x_T = 0.25*eps_new*((2*(2*axx + bxy - 2*cxz))/(27.*o));
- x_NE = 0.25*eps_new*(-((2*axx + 3*axy + 6*bxx + bxy - 2*cxz))/(54.*o));
- x_SE = 0.25*eps_new*(-((2*axx - 3*axy - 6*bxx + bxy - 2*cxz))/(54.*o));
- x_TE = 0.25*eps_new*(-((2*axx + 3*axz - 2*bxy + 6*cxx + cxz))/(54.*o));
- x_BE = 0.25*eps_new*(-((2*axx - 3*axz - 2*bxy - 6*cxx + cxz))/(54.*o));
- x_TN = 0.25*eps_new*(-((-4*axx + bxy + 3*bxz + 3*cxy + cxz))/(54.*o));
- x_BN = 0.25*eps_new*(-((-4*axx + bxy - 3*bxz - 3*cxy + cxz))/(54.*o));
- x_ZERO = 0.;
- x_TNE = 0.25*eps_new*(-((axy + axz + 2*bxx + bxz + 2*cxx + cxy))/(72.*o));
- x_TSW = 0.25*eps_new*(((-axy + axz - 2*bxx + bxz + 2*cxx + cxy))/(72.*o));
- x_TSE = 0.25*eps_new*(((axy - axz + 2*bxx + bxz - 2*cxx + cxy))/(72.*o));
- x_TNW = 0.25*eps_new*(((axy + axz + 2*bxx - bxz + 2*cxx - cxy))/(72.*o));
-
- y_E = 0.25*eps_new*(2*(-2*axy + 2*byy + cyz))/(27.*o);
- y_N = 0.25*eps_new*(2*(axy - 4*byy + cyz))/(27.*o);
- y_T = 0.25*eps_new*(2*(axy + 2*byy - 2*cyz))/(27.*o);
- y_NE = 0.25*eps_new*(-((axy + 6*ayy + 3*bxy + 2*byy - 2*cyz))/(54.*o));
- y_SE = 0.25*eps_new*(-((axy - 6*ayy - 3*bxy + 2*byy - 2*cyz))/(54.*o));
- y_TE = 0.25*eps_new*(-((axy + 3*ayz - 4*byy + 3*cxy + cyz))/(54.*o));
- y_BE = 0.25*eps_new*(-((axy - 3*ayz - 4*byy - 3*cxy + cyz))/(54.*o));
- y_TN = 0.25*eps_new*(-((-2*axy + 2*byy + 3*byz + 6*cyy + cyz))/(54.*o));
- y_BN = 0.25*eps_new*(-((-2*axy + 2*byy - 3*byz - 6*cyy + cyz))/(54.*o));
- y_ZERO = 0.;
- y_TNE = 0.25*eps_new*(-((2*ayy + ayz + bxy + byz + cxy + 2*cyy))/(72.*o));
- y_TSW = 0.25*eps_new*(((-2*ayy + ayz - bxy + byz + cxy + 2*cyy))/(72.*o));
- y_TSE = 0.25*eps_new*(((2*ayy - ayz + bxy + byz - cxy + 2*cyy))/(72.*o));
- y_TNW = 0.25*eps_new*(((2*ayy + ayz + bxy - byz + cxy - 2*cyy))/(72.*o));
-
- z_E = 0.25*eps_new*((2*(-2*axz + byz + 2*czz))/(27.*o));
- z_N = 0.25*eps_new*((2*(axz - 2*byz + 2*czz))/(27.*o));
- z_T = 0.25*eps_new*((2*(axz + byz - 4*czz))/(27.*o));
- z_NE = 0.25*eps_new*(-((axz + 3*ayz + 3*bxz + byz - 4*czz))/(54.*o));
- z_SE = 0.25*eps_new*(-((axz - 3*ayz - 3*bxz + byz - 4*czz))/(54.*o));
- z_TE = 0.25*eps_new*(-((axz + 6*azz - 2*byz + 3*cxz + 2*czz))/(54.*o));
- z_BE = 0.25*eps_new*(-((axz - 6*azz - 2*byz - 3*cxz + 2*czz))/(54.*o));
- z_TN = 0.25*eps_new*(-((-2*axz + byz + 6*bzz + 3*cyz + 2*czz))/(54.*o));
- z_BN = 0.25*eps_new*(-((-2*axz + byz - 6*bzz - 3*cyz + 2*czz))/(54.*o));
- z_ZERO = 0.;
- z_TNE = 0.25*eps_new*(-((ayz + 2*azz + bxz + 2*bzz + cxz + cyz))/(72.*o));
- z_TSW = 0.25*eps_new*(((-ayz + 2*azz - bxz + 2*bzz + cxz + cyz))/(72.*o));
- z_TSE = 0.25*eps_new*(((ayz - 2*azz + bxz + 2*bzz - cxz + cyz))/(72.*o));
- z_TNW = 0.25*eps_new*(((ayz + 2*azz + bxz - 2*bzz + cxz - cyz))/(72.*o));
-
- xy_E = 0.0625*eps_new *(( 2.*cxyz)/(27.*o));
- xy_N = 0.0625*eps_new *(( 2.*cxyz)/(27.*o));
- xy_T = -(0.0625*eps_new *(( 4.*cxyz)/(27.*o)));
- xy_NE = 0.0625*eps_new *( cxyz /(27.*o));
- xy_SE = 0.0625*eps_new *( cxyz /(27.*o));
- xy_TE = -(0.0625*eps_new *(( 3.*axyz + cxyz)/(54.*o)));
- xy_BE = -(0.0625*eps_new *((-3.*axyz + cxyz)/(54.*o)));
- xy_TN = -(0.0625*eps_new *(( 3.*bxyz + cxyz)/(54.*o)));
- xy_BN = -(0.0625*eps_new *(( - 3.*bxyz + cxyz)/(54.*o)));
- //xy_ZERO= 0.0625*eps_new;
- xy_TNE = -(0.0625*eps_new *(( axyz + bxyz )/(72.*o)));
- xy_TSW = 0.0625*eps_new *(( axyz + bxyz )/(72.*o));
- xy_TSE = 0.0625*eps_new *((- axyz + bxyz )/(72.*o));
- xy_TNW = 0.0625*eps_new *(( axyz - bxyz )/(72.*o));
-
- xz_E = 0.0625*eps_new *(( 2.*bxyz )/(27.*o));
- xz_N = -(0.0625*eps_new *(( 4.*bxyz )/(27.*o)));
- xz_T = 0.0625*eps_new *(( 2.*bxyz )/(27.*o));
- xz_NE = -(0.0625*eps_new *(( 3.*axyz + bxyz )/(54.*o)));
- xz_SE = -(0.0625*eps_new *((-3.*axyz + bxyz )/(54.*o)));
- xz_TE = 0.0625*eps_new *(( bxyz )/(27.*o));
- xz_BE = 0.0625*eps_new *(( bxyz )/(27.*o));
- xz_TN = -(0.0625*eps_new *(( bxyz + 3.*cxyz)/(54.*o)));
- xz_BN = -(0.0625*eps_new *(( bxyz - 3.*cxyz)/(54.*o)));
- //xz_ZERO= 0.0625*eps_new;
- xz_TNE = -(0.0625*eps_new *(( axyz + cxyz)/(72.*o)));
- xz_TSW = 0.0625*eps_new *((- axyz + cxyz)/(72.*o));
- xz_TSE = 0.0625*eps_new *(( axyz + cxyz)/(72.*o));
- xz_TNW = 0.0625*eps_new *(( axyz - cxyz)/(72.*o));
-
- yz_E = -(0.0625*eps_new *(( 4.*axyz )/(27.*o)));
- yz_N = 0.0625*eps_new *(( 2.*axyz )/(27.*o));
- yz_T = 0.0625*eps_new *(( 2.*axyz )/(27.*o));
- yz_NE = -(0.0625*eps_new *(( axyz + 3.*bxyz )/(54.*o)));
- yz_SE = -(0.0625*eps_new *(( axyz - 3.*bxyz )/(54.*o)));
- yz_TE = -(0.0625*eps_new *(( axyz + 3.*cxyz)/(54.*o)));
- yz_BE = -(0.0625*eps_new *(( axyz - 3.*cxyz)/(54.*o)));
- yz_TN = 0.0625*eps_new *(( axyz )/(27.*o));
- yz_BN = 0.0625*eps_new *(( axyz )/(27.*o));
- //yz_ZERO= 0.0625*eps_new;
- yz_TNE = -(0.0625*eps_new *(( bxyz + cxyz)/(72.*o)));
- yz_TSW = 0.0625*eps_new *(( - bxyz + cxyz)/(72.*o));
- yz_TSE = 0.0625*eps_new *(( bxyz - cxyz)/(72.*o));
- yz_TNW = 0.0625*eps_new *(( bxyz + cxyz)/(72.*o));
+ 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)
@@ -491,15 +491,15 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedNodeCF(rea
using namespace vf::lbm::dir;
using namespace vf::basics::constant;
- real eps_new = 0.5;
+ real eps_new = c1o2;
real o = omega;
//bulk viscosity
real oP = OxxPyyPzzF;
-// LBMReal rho = press ;//+ (2.*axx*x+axy*y+axz*z+axyz*y*z+ax + 2.*byy*y+bxy*x+byz*z+bxyz*x*z+by + 2.*czz*z+cxz*x+cyz*y+cxyz*x*y+cz)/3.;
- real vx1 = a0 + 0.25*( xs*ax + ys*ay + zs*az) + 0.0625*(axx + xs*ys*axy + xs*zs*axz + ayy + ys*zs*ayz + azz) + 0.015625*(xs*ys*zs*axyz);
- real vx2 = b0 + 0.25*( xs*bx + ys*by + zs*bz) + 0.0625*(bxx + xs*ys*bxy + xs*zs*bxz + byy + ys*zs*byz + bzz) + 0.015625*(xs*ys*zs*bxyz);
- real vx3 = c0 + 0.25*( xs*cx + ys*cy + zs*cz) + 0.0625*(cxx + xs*ys*cxy + xs*zs*cxz + cyy + ys*zs*cyz + czz) + 0.015625*(xs*ys*zs*cxyz);
+// 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;
@@ -536,7 +536,7 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedNodeCF(rea
real vx3Sq = vx3*vx3;
real oMdrho = c1o1;
- //2.f
+ //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);
@@ -821,105 +821,105 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedNodeCF(rea
//Position SWB -0.25, -0.25, -0.25
real CompressibleOffsetMomentsInterpolationProcessor::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) +
- press_SET * (0.046875 - 0.1875 * xoff + 0.0625 * yoff - 0.1875 * zoff) +
- press_NET * (0.015625 - 0.0625 * xoff - 0.0625 * yoff - 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.1875 * xoff - 0.1875 * yoff + 0.0625 * zoff) +
- press_NWB * (0.140625 + 0.1875 * xoff - 0.5625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.5625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.421875 + 0.5625 * xoff + 0.5625 * yoff + 0.5625 * zoff);
+ 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 * (0.421875 + 0.5625 * xoff + 0.5625 * yoff - 0.5625 * zoff) +
- press_NWT * (0.140625 + 0.1875 * xoff - 0.5625 * yoff - 0.1875 * zoff) +
- press_SET * (0.140625 - 0.5625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_NET * (0.046875 - 0.1875 * xoff - 0.1875 * yoff - 0.0625 * zoff) +
- press_NEB * (0.015625 - 0.0625 * xoff - 0.0625 * yoff + 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.0625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.046875 - 0.1875 * xoff + 0.0625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.1875 * xoff + 0.1875 * yoff + 0.5625 * zoff);
+ 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 * (0.421875 - 0.5625 * xoff + 0.5625 * yoff - 0.5625 * zoff) +
- press_NET * (0.140625 - 0.1875 * xoff - 0.5625 * yoff - 0.1875 * zoff) +
- press_SWT * (0.140625 + 0.5625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_NWT * (0.046875 + 0.1875 * xoff - 0.1875 * yoff - 0.0625 * zoff) +
- press_NWB * (0.015625 + 0.0625 * xoff - 0.0625 * yoff + 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.0625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.046875 + 0.1875 * xoff + 0.0625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.1875 * xoff + 0.1875 * yoff + 0.5625 * zoff);
+ 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 * (0.140625 - 0.1875 * xoff + 0.1875 * yoff - 0.5625 * zoff) +
- press_NET * (0.046875 - 0.0625 * xoff - 0.1875 * yoff - 0.1875 * zoff) +
- press_SWT * (0.046875 + 0.1875 * xoff + 0.0625 * yoff - 0.1875 * zoff) +
- press_NWT * (0.015625 + 0.0625 * xoff - 0.0625 * yoff - 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.1875 * xoff - 0.1875 * yoff + 0.0625 * zoff) +
- press_NEB * (0.140625 - 0.1875 * xoff - 0.5625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.5625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.421875 - 0.5625 * xoff + 0.5625 * yoff + 0.5625 * zoff);
+ 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 * (0.140625 + 0.1875 * xoff - 0.1875 * yoff - 0.5625 * zoff) +
- press_NET * (0.046875 - 0.1875 * xoff - 0.0625 * yoff - 0.1875 * zoff) +
- press_SWT * (0.046875 + 0.0625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_SET * (0.015625 - 0.0625 * xoff + 0.0625 * yoff - 0.0625 * zoff) +
- press_SEB * (0.046875 - 0.1875 * xoff + 0.1875 * yoff + 0.0625 * zoff) +
- press_NEB * (0.140625 - 0.5625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.1875 * xoff + 0.5625 * yoff + 0.1875 * zoff) +
- press_NWB * (0.421875 + 0.5625 * xoff - 0.5625 * yoff + 0.5625 * zoff);
+ 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 * (0.421875 + 0.5625 * xoff - 0.5625 * yoff - 0.5625 * zoff) +
- press_NET * (0.140625 - 0.5625 * xoff - 0.1875 * yoff - 0.1875 * zoff) +
- press_SWT * (0.140625 + 0.1875 * xoff + 0.5625 * yoff - 0.1875 * zoff) +
- press_SET * (0.046875 - 0.1875 * xoff + 0.1875 * yoff - 0.0625 * zoff) +
- press_SEB * (0.015625 - 0.0625 * xoff + 0.0625 * yoff + 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.1875 * xoff - 0.0625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.046875 + 0.0625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_NWB * (0.140625 + 0.1875 * xoff - 0.1875 * yoff + 0.5625 * zoff);
+ 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 * (0.421875 - 0.5625 * xoff - 0.5625 * yoff - 0.5625 * zoff) +
- press_NWT * (0.140625 + 0.5625 * xoff - 0.1875 * yoff - 0.1875 * zoff) +
- press_SET * (0.140625 - 0.1875 * xoff + 0.5625 * yoff - 0.1875 * zoff) +
- press_SWT * (0.046875 + 0.1875 * xoff + 0.1875 * yoff - 0.0625 * zoff) +
- press_SWB * (0.015625 + 0.0625 * xoff + 0.0625 * yoff + 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.1875 * xoff - 0.0625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.046875 - 0.0625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_NEB * (0.140625 - 0.1875 * xoff - 0.1875 * yoff + 0.5625 * zoff);
+ 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 * (0.140625 - 0.1875 * xoff - 0.1875 * yoff - 0.5625 * zoff) +
- press_NWT * (0.046875 + 0.1875 * xoff - 0.0625 * yoff - 0.1875 * zoff) +
- press_SET * (0.046875 - 0.0625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_SWT * (0.015625 + 0.0625 * xoff + 0.0625 * yoff - 0.0625 * zoff) +
- press_SWB * (0.046875 + 0.1875 * xoff + 0.1875 * yoff + 0.0625 * zoff) +
- press_NWB * (0.140625 + 0.5625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.1875 * xoff + 0.5625 * yoff + 0.1875 * zoff) +
- press_NEB * (0.421875 - 0.5625 * xoff - 0.5625 * yoff + 0.5625 * zoff);
+ 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
@@ -928,21 +928,21 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedNodeFC(rea
using namespace D3Q27System;
using namespace vf::lbm::dir;
- real press = press_NET * (0.125 - 0.25 * xoff - 0.25 * yoff - 0.25 * zoff) +
- press_NWT * (0.125 + 0.25 * xoff - 0.25 * yoff - 0.25 * zoff) +
- press_SET * (0.125 - 0.25 * xoff + 0.25 * yoff - 0.25 * zoff) +
- press_SWT * (0.125 + 0.25 * xoff + 0.25 * yoff - 0.25 * zoff) +
- press_NEB * (0.125 - 0.25 * xoff - 0.25 * yoff + 0.25 * zoff) +
- press_NWB * (0.125 + 0.25 * xoff - 0.25 * yoff + 0.25 * zoff) +
- press_SEB * (0.125 - 0.25 * xoff + 0.25 * yoff + 0.25 * zoff) +
- press_SWB * (0.125 + 0.25 * xoff + 0.25 * yoff + 0.25 * zoff);
+ 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)/3.;
+// LBMReal rho = press ;//+ (ax+by+cz)/c3o1;
- real eps_new = 2.;
+ real eps_new = c2o1;
real o = omega;
//bulk viscosity
real oP = OxxPyyPzzC;
@@ -1276,12 +1276,12 @@ void CompressibleOffsetMomentsInterpolationProcessor::calcInterpolatedVelocity(r
//////////////////////////////////////////////////////////////////////////
void CompressibleOffsetMomentsInterpolationProcessor::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;
- tauzz=cz+2*czz*z+cxz*x+cyz*y+cxyz*x*y;
- tauxy=0.5*((ay+2.0*ayy*y+axy*x+ayz*z+axyz*x*z)+(bx+2.0*bxx*x+bxy*y+bxz*z+bxyz*y*z));
- tauxz=0.5*((az+2.0*azz*z+axz*x+ayz*y+axyz*x*y)+(cx+2.0*cxx*x+cxy*y+cxz*z+cxyz*y*z));
- tauyz=0.5*((bz+2.0*bzz*z+bxz*x+byz*y+bxyz*x*y)+(cy+2.0*cyy*y+cxy*x+cyz*z+cxyz*x*z));
+ 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)
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
index 80eb84112dc43ab2a502c9213636b7f8dde18a35..dee6d12a5812e29d91aa1c12c25d61ade0759ef8 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetSquarePressureInterpolationProcessor.cpp
@@ -58,21 +58,21 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::setOffsets(real xof
void CompressibleOffsetSquarePressureInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5);
- calcInterpolatedNodeCF(icellF.BSW, omegaF, -0.25, -0.25, -0.25, calcPressBSW(), -1, -1, -1);
- calcInterpolatedNodeCF(icellF.BNE, omegaF, 0.25, 0.25, -0.25, calcPressBNE(), 1, 1, -1);
- calcInterpolatedNodeCF(icellF.TNW, omegaF, -0.25, 0.25, 0.25, calcPressTNW(), -1, 1, 1);
- calcInterpolatedNodeCF(icellF.TSE, omegaF, 0.25, -0.25, 0.25, calcPressTSE(), 1, -1, 1);
- calcInterpolatedNodeCF(icellF.BNW, omegaF, -0.25, 0.25, -0.25, calcPressBNW(), -1, 1, -1);
- calcInterpolatedNodeCF(icellF.BSE, omegaF, 0.25, -0.25, -0.25, calcPressBSE(), 1, -1, -1);
- calcInterpolatedNodeCF(icellF.TSW, omegaF, -0.25, -0.25, 0.25, calcPressTSW(), -1, -1, 1);
- calcInterpolatedNodeCF(icellF.TNE, omegaF, 0.25, 0.25, 0.25, calcPressTNE(), 1, 1, 1);
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellF, omegaF, 2.0);
+ calcInterpolatedCoefficiets(icellF, omegaF, c2o1);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
@@ -82,16 +82,16 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcMoments(const r
using namespace D3Q27System;
using namespace vf::lbm::dir;
- real drho = 0.0;
+ real drho = c0o1;
D3Q27System::calcCompMacroscopicValues(f,drho,vx1,vx2,vx3);
press = drho; //interpolate rho!
- kxy = -3.*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 = -3.*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 = -3.*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 = -3./2.*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 = -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]))/(c1o1 + drho)-(vx1*vx1-vx3*vx3));
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
@@ -190,116 +190,116 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoe
kxxMyyFromfcNEQ_SEB - kxxMyyFromfcNEQ_SET + kxxMyyFromfcNEQ_SWB + kxxMyyFromfcNEQ_SWT -
kxxMzzFromfcNEQ_NEB - kxxMzzFromfcNEQ_NET + kxxMzzFromfcNEQ_NWB + kxxMzzFromfcNEQ_NWT -
kxxMzzFromfcNEQ_SEB - kxxMzzFromfcNEQ_SET + kxxMzzFromfcNEQ_SWB + kxxMzzFromfcNEQ_SWT -
- 2.*kxyFromfcNEQ_NEB - 2.*kxyFromfcNEQ_NET - 2.*kxyFromfcNEQ_NWB - 2.*kxyFromfcNEQ_NWT +
- 2.*kxyFromfcNEQ_SEB + 2.*kxyFromfcNEQ_SET + 2.*kxyFromfcNEQ_SWB + 2.*kxyFromfcNEQ_SWT +
- 2.*kxzFromfcNEQ_NEB - 2.*kxzFromfcNEQ_NET + 2.*kxzFromfcNEQ_NWB - 2.*kxzFromfcNEQ_NWT +
- 2.*kxzFromfcNEQ_SEB - 2.*kxzFromfcNEQ_SET + 2.*kxzFromfcNEQ_SWB - 2.*kxzFromfcNEQ_SWT +
- 8.*vx1_NEB + 8.*vx1_NET + 8.*vx1_NWB + 8.*vx1_NWT + 8.*vx1_SEB +
- 8.*vx1_SET + 8.*vx1_SWB + 8.*vx1_SWT + 2.*vx2_NEB + 2.*vx2_NET -
- 2.*vx2_NWB - 2.*vx2_NWT - 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB +
- 2.*vx2_SWT - 2.*vx3_NEB + 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/64.;
- b0 = (2.*kxxMyyFromfcNEQ_NEB + 2.*kxxMyyFromfcNEQ_NET + 2.*kxxMyyFromfcNEQ_NWB + 2.*kxxMyyFromfcNEQ_NWT -
- 2.*kxxMyyFromfcNEQ_SEB - 2.*kxxMyyFromfcNEQ_SET - 2.*kxxMyyFromfcNEQ_SWB - 2.*kxxMyyFromfcNEQ_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 -
- 2.*kxyFromfcNEQ_NEB - 2.*kxyFromfcNEQ_NET + 2.*kxyFromfcNEQ_NWB + 2.*kxyFromfcNEQ_NWT -
- 2.*kxyFromfcNEQ_SEB - 2.*kxyFromfcNEQ_SET + 2.*kxyFromfcNEQ_SWB + 2.*kxyFromfcNEQ_SWT +
- 2.*kyzFromfcNEQ_NEB - 2.*kyzFromfcNEQ_NET + 2.*kyzFromfcNEQ_NWB - 2.*kyzFromfcNEQ_NWT +
- 2.*kyzFromfcNEQ_SEB - 2.*kyzFromfcNEQ_SET + 2.*kyzFromfcNEQ_SWB - 2.*kyzFromfcNEQ_SWT +
- 2.*vx1_NEB + 2.*vx1_NET - 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB - 2.*vx1_SET + 2.*vx1_SWB + 2.*vx1_SWT +
- 8.*vx2_NEB + 8.*vx2_NET + 8.*vx2_NWB + 8.*vx2_NWT +
- 8.*vx2_SEB + 8.*vx2_SET + 8.*vx2_SWB + 8.*vx2_SWT -
- 2.*vx3_NEB + 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/64.;
+ 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 -
- 2.*kxxMzzFromfcNEQ_NEB + 2.*kxxMzzFromfcNEQ_NET - 2.*kxxMzzFromfcNEQ_NWB + 2.*kxxMzzFromfcNEQ_NWT -
- 2.*kxxMzzFromfcNEQ_SEB + 2.*kxxMzzFromfcNEQ_SET - 2.*kxxMzzFromfcNEQ_SWB + 2.*kxxMzzFromfcNEQ_SWT -
- 2.*kxzFromfcNEQ_NEB - 2.*kxzFromfcNEQ_NET + 2.*kxzFromfcNEQ_NWB + 2.*kxzFromfcNEQ_NWT -
- 2.*kxzFromfcNEQ_SEB - 2.*kxzFromfcNEQ_SET + 2.*kxzFromfcNEQ_SWB + 2.*kxzFromfcNEQ_SWT -
- 2.*kyzFromfcNEQ_NEB - 2.*kyzFromfcNEQ_NET - 2.*kyzFromfcNEQ_NWB - 2.*kyzFromfcNEQ_NWT +
- 2.*kyzFromfcNEQ_SEB + 2.*kyzFromfcNEQ_SET + 2.*kyzFromfcNEQ_SWB + 2.*kyzFromfcNEQ_SWT -
- 2.*vx1_NEB + 2.*vx1_NET + 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB + 2.*vx1_SET + 2.*vx1_SWB - 2.*vx1_SWT -
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB - 2.*vx2_SWT +
- 8.*vx3_NEB + 8.*vx3_NET + 8.*vx3_NWB + 8.*vx3_NWT +
- 8.*vx3_SEB + 8.*vx3_SET + 8.*vx3_SWB + 8.*vx3_SWT)/64.;
- ax = (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT + vx1_SEB + vx1_SET - vx1_SWB - vx1_SWT)/4.;
- bx = (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT + vx2_SEB + vx2_SET - vx2_SWB - vx2_SWT)/4.;
- cx = (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT + vx3_SEB + vx3_SET - vx3_SWB - vx3_SWT)/4.;
+ 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 +
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB - 2.*vx2_NWT -
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB + 2.*vx2_SWT -
- 2.*vx3_NEB + 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/16.;
+ 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 -
- 2.*vx1_NEB - 2.*vx1_NET + 2.*vx1_NWB + 2.*vx1_NWT +
- 2.*vx1_SEB + 2.*vx1_SET - 2.*vx1_SWB - 2.*vx1_SWT)/8.;
+ 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 +
- 2.*vx1_NEB - 2.*vx1_NET - 2.*vx1_NWB + 2.*vx1_NWT +
- 2.*vx1_SEB - 2.*vx1_SET - 2.*vx1_SWB + 2.*vx1_SWT)/8.;
- ay = (vx1_NEB + vx1_NET + vx1_NWB + vx1_NWT - vx1_SEB - vx1_SET - vx1_SWB - vx1_SWT)/4.;
- by = (vx2_NEB + vx2_NET + vx2_NWB + vx2_NWT - vx2_SEB - vx2_SET - vx2_SWB - vx2_SWT)/4.;
- cy = (vx3_NEB + vx3_NET + vx3_NWB + vx3_NWT - vx3_SEB - vx3_SET - vx3_SWB - vx3_SWT)/4.;
+ 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 -
- 2.*vx2_NEB - 2.*vx2_NET + 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB + 2.*vx2_SET - 2.*vx2_SWB - 2.*vx2_SWT)/8.;
- byy= (-2.*kxxMyyFromfcNEQ_NEB - 2.*kxxMyyFromfcNEQ_NET - 2.*kxxMyyFromfcNEQ_NWB - 2.*kxxMyyFromfcNEQ_NWT +
- 2.*kxxMyyFromfcNEQ_SEB + 2.*kxxMyyFromfcNEQ_SET + 2.*kxxMyyFromfcNEQ_SWB + 2.*kxxMyyFromfcNEQ_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 +
- 2.*vx1_NEB + 2.*vx1_NET - 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB - 2.*vx1_SET + 2.*vx1_SWB + 2.*vx1_SWT -
- 2.*vx3_NEB + 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/16.;
+ 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 +
- 2.*vx2_NEB - 2.*vx2_NET + 2.*vx2_NWB - 2.*vx2_NWT -
- 2.*vx2_SEB + 2.*vx2_SET - 2.*vx2_SWB + 2.*vx2_SWT)/8.;
- az = (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT - vx1_SEB + vx1_SET - vx1_SWB + vx1_SWT)/4.;
- bz = (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT - vx2_SEB + vx2_SET - vx2_SWB + vx2_SWT)/4.;
- cz = (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT - vx3_SEB + vx3_SET - vx3_SWB + vx3_SWT)/4.;
+ 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 +
- 2.*vx3_NEB - 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET - 2.*vx3_SWB + 2.*vx3_SWT)/8.;
+ 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 +
- 2.*vx3_NEB - 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET - 2.*vx3_SWB + 2.*vx3_SWT)/8.;
+ 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 +
- 2.*kxxMzzFromfcNEQ_NEB - 2.*kxxMzzFromfcNEQ_NET + 2.*kxxMzzFromfcNEQ_NWB - 2.*kxxMzzFromfcNEQ_NWT +
- 2.*kxxMzzFromfcNEQ_SEB - 2.*kxxMzzFromfcNEQ_SET + 2.*kxxMzzFromfcNEQ_SWB - 2.*kxxMzzFromfcNEQ_SWT -
- 2.*vx1_NEB + 2.*vx1_NET + 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB + 2.*vx1_SET + 2.*vx1_SWB - 2.*vx1_SWT -
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB - 2.*vx2_SWT)/16.;
- axy= (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT - vx1_SEB - vx1_SET + vx1_SWB + vx1_SWT)/2.;
- bxy= (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT - vx2_SEB - vx2_SET + vx2_SWB + vx2_SWT)/2.;
- cxy= (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT - vx3_SEB - vx3_SET + vx3_SWB + vx3_SWT)/2.;
- axz= (-vx1_NEB + vx1_NET + vx1_NWB - vx1_NWT - vx1_SEB + vx1_SET + vx1_SWB - vx1_SWT)/2.;
- bxz= (-vx2_NEB + vx2_NET + vx2_NWB - vx2_NWT - vx2_SEB + vx2_SET + vx2_SWB - vx2_SWT)/2.;
- cxz= (-vx3_NEB + vx3_NET + vx3_NWB - vx3_NWT - vx3_SEB + vx3_SET + vx3_SWB - vx3_SWT)/2.;
- ayz= (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT + vx1_SEB - vx1_SET + vx1_SWB - vx1_SWT)/2.;
- byz= (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT + vx2_SEB - vx2_SET + vx2_SWB - vx2_SWT)/2.;
- cyz= (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT + vx3_SEB - vx3_SET + vx3_SWB - vx3_SWT)/2.;
+ 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 =0;//(kxyFromfcNEQ_SWB+
+ kxyAverage = c0o1;//(kxyFromfcNEQ_SWB+
//kxyFromfcNEQ_SWT+
//kxyFromfcNEQ_SET+
//kxyFromfcNEQ_SEB+
@@ -307,7 +307,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoe
//kxyFromfcNEQ_NWT+
//kxyFromfcNEQ_NET+
//kxyFromfcNEQ_NEB)*c1o8-(ay+bx);
- kyzAverage =0;//(kyzFromfcNEQ_SWB+
+ kyzAverage = c0o1;//(kyzFromfcNEQ_SWB+
//kyzFromfcNEQ_SWT+
//kyzFromfcNEQ_SET+
//kyzFromfcNEQ_SEB+
@@ -315,7 +315,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoe
//kyzFromfcNEQ_NWT+
//kyzFromfcNEQ_NET+
//kyzFromfcNEQ_NEB)*c1o8-(bz+cy);
- kxzAverage =0;//(kxzFromfcNEQ_SWB+
+ kxzAverage = c0o1;//(kxzFromfcNEQ_SWB+
//kxzFromfcNEQ_SWT+
//kxzFromfcNEQ_SET+
//kxzFromfcNEQ_SEB+
@@ -323,7 +323,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoe
//kxzFromfcNEQ_NWT+
//kxzFromfcNEQ_NET+
//kxzFromfcNEQ_NEB)*c1o8-(az+cx);
- kxxMyyAverage =0;//(kxxMyyFromfcNEQ_SWB+
+ kxxMyyAverage = c0o1;//(kxxMyyFromfcNEQ_SWB+
//kxxMyyFromfcNEQ_SWT+
//kxxMyyFromfcNEQ_SET+
//kxxMyyFromfcNEQ_SEB+
@@ -331,7 +331,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoe
//kxxMyyFromfcNEQ_NWT+
//kxxMyyFromfcNEQ_NET+
//kxxMyyFromfcNEQ_NEB)*c1o8-(ax-by);
- kxxMzzAverage =0;//(kxxMzzFromfcNEQ_SWB+
+ kxxMzzAverage = c0o1;//(kxxMzzFromfcNEQ_SWB+
//kxxMzzFromfcNEQ_SWT+
//kxxMzzFromfcNEQ_SET+
//kxxMzzFromfcNEQ_SEB+
@@ -345,17 +345,17 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoe
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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 + 2. * xoff * axx + yoff * axy + zoff * axz + yoff*zoff*axyz;
- ay = ay + 2. * yoff * ayy + xoff * axy + zoff * ayz + xoff*zoff*axyz;
- az = az + 2. * zoff * azz + xoff * axz + yoff * ayz + xoff*yoff*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 + 2. * xoff * bxx + yoff * bxy + zoff * bxz + yoff*zoff*bxyz;
- by = by + 2. * yoff * byy + xoff * bxy + zoff * byz + xoff*zoff*bxyz;
- bz = bz + 2. * zoff * bzz + xoff * bxz + yoff * byz + xoff*yoff*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 + 2. * xoff * cxx + yoff * cxy + zoff * cxz + yoff*zoff*cxyz;
- cy = cy + 2. * yoff * cyy + xoff * cxy + zoff * cyz + xoff*zoff*cxyz;
- cz = cz + 2. * zoff * czz + xoff * cxz + yoff * cyz + xoff*yoff*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;
@@ -369,110 +369,110 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedCoe
const real o = omega;
- f_E = eps_new*((2*(-2*ax + by + cz-kxxMzzAverage-kxxMyyAverage))/(27.*o));
- f_N = eps_new*((2*(ax - 2*by + cz+2*kxxMyyAverage-kxxMzzAverage))/(27.*o));
- f_T = eps_new*((2*(ax + by - 2*cz-kxxMyyAverage+2*kxxMzzAverage))/(27.*o));
- f_NE = eps_new*(-(ax + 3*ay + 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage+3*kxyAverage)/(54.*o));
- f_SE = eps_new*(-(ax - 3*ay - 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage-3*kxyAverage)/(54.*o));
- f_TE = eps_new*(-(ax + 3*az - 2*by + 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage+3*kxzAverage)/(54.*o));
- f_BE = eps_new*(-(ax - 3*az - 2*by - 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage-3*kxzAverage)/(54.*o));
- f_TN = eps_new*(-(-2*ax + by + 3*bz + 3*cy + cz-kxxMyyAverage-kxxMzzAverage+3*kyzAverage)/(54.*o));
- f_BN = eps_new*(-(-2*ax + by - 3*bz - 3*cy + cz-kxxMyyAverage-kxxMzzAverage-3*kyzAverage)/(54.*o));
+ 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)/(72.*o));
- f_TSW = eps_new*((-ay + az - bx + bz + cx + cy-kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSE = eps_new*((ay - az + bx + bz - cx + cy+kxyAverage-kxzAverage+kyzAverage)/(72.*o));
- f_TNW = eps_new*((ay + az + bx - bz + cx - cy+kxyAverage+kxzAverage-kyzAverage)/(72.*o));
-
- x_E = 0.25*eps_new*((2*(-4*axx + bxy + cxz))/(27.*o));
- x_N = 0.25*eps_new*((2*(2*axx - 2*bxy + cxz))/(27.*o));
- x_T = 0.25*eps_new*((2*(2*axx + bxy - 2*cxz))/(27.*o));
- x_NE = 0.25*eps_new*(-((2*axx + 3*axy + 6*bxx + bxy - 2*cxz))/(54.*o));
- x_SE = 0.25*eps_new*(-((2*axx - 3*axy - 6*bxx + bxy - 2*cxz))/(54.*o));
- x_TE = 0.25*eps_new*(-((2*axx + 3*axz - 2*bxy + 6*cxx + cxz))/(54.*o));
- x_BE = 0.25*eps_new*(-((2*axx - 3*axz - 2*bxy - 6*cxx + cxz))/(54.*o));
- x_TN = 0.25*eps_new*(-((-4*axx + bxy + 3*bxz + 3*cxy + cxz))/(54.*o));
- x_BN = 0.25*eps_new*(-((-4*axx + bxy - 3*bxz - 3*cxy + cxz))/(54.*o));
+ 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 = 0.;
- x_TNE = 0.25*eps_new*(-((axy + axz + 2*bxx + bxz + 2*cxx + cxy))/(72.*o));
- x_TSW = 0.25*eps_new*(((-axy + axz - 2*bxx + bxz + 2*cxx + cxy))/(72.*o));
- x_TSE = 0.25*eps_new*(((axy - axz + 2*bxx + bxz - 2*cxx + cxy))/(72.*o));
- x_TNW = 0.25*eps_new*(((axy + axz + 2*bxx - bxz + 2*cxx - cxy))/(72.*o));
-
- y_E = 0.25*eps_new*(2*(-2*axy + 2*byy + cyz))/(27.*o);
- y_N = 0.25*eps_new*(2*(axy - 4*byy + cyz))/(27.*o);
- y_T = 0.25*eps_new*(2*(axy + 2*byy - 2*cyz))/(27.*o);
- y_NE = 0.25*eps_new*(-((axy + 6*ayy + 3*bxy + 2*byy - 2*cyz))/(54.*o));
- y_SE = 0.25*eps_new*(-((axy - 6*ayy - 3*bxy + 2*byy - 2*cyz))/(54.*o));
- y_TE = 0.25*eps_new*(-((axy + 3*ayz - 4*byy + 3*cxy + cyz))/(54.*o));
- y_BE = 0.25*eps_new*(-((axy - 3*ayz - 4*byy - 3*cxy + cyz))/(54.*o));
- y_TN = 0.25*eps_new*(-((-2*axy + 2*byy + 3*byz + 6*cyy + cyz))/(54.*o));
- y_BN = 0.25*eps_new*(-((-2*axy + 2*byy - 3*byz - 6*cyy + cyz))/(54.*o));
+ 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 = 0.;
- y_TNE = 0.25*eps_new*(-((2*ayy + ayz + bxy + byz + cxy + 2*cyy))/(72.*o));
- y_TSW = 0.25*eps_new*(((-2*ayy + ayz - bxy + byz + cxy + 2*cyy))/(72.*o));
- y_TSE = 0.25*eps_new*(((2*ayy - ayz + bxy + byz - cxy + 2*cyy))/(72.*o));
- y_TNW = 0.25*eps_new*(((2*ayy + ayz + bxy - byz + cxy - 2*cyy))/(72.*o));
-
- z_E = 0.25*eps_new*((2*(-2*axz + byz + 2*czz))/(27.*o));
- z_N = 0.25*eps_new*((2*(axz - 2*byz + 2*czz))/(27.*o));
- z_T = 0.25*eps_new*((2*(axz + byz - 4*czz))/(27.*o));
- z_NE = 0.25*eps_new*(-((axz + 3*ayz + 3*bxz + byz - 4*czz))/(54.*o));
- z_SE = 0.25*eps_new*(-((axz - 3*ayz - 3*bxz + byz - 4*czz))/(54.*o));
- z_TE = 0.25*eps_new*(-((axz + 6*azz - 2*byz + 3*cxz + 2*czz))/(54.*o));
- z_BE = 0.25*eps_new*(-((axz - 6*azz - 2*byz - 3*cxz + 2*czz))/(54.*o));
- z_TN = 0.25*eps_new*(-((-2*axz + byz + 6*bzz + 3*cyz + 2*czz))/(54.*o));
- z_BN = 0.25*eps_new*(-((-2*axz + byz - 6*bzz - 3*cyz + 2*czz))/(54.*o));
+ 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 = 0.;
- z_TNE = 0.25*eps_new*(-((ayz + 2*azz + bxz + 2*bzz + cxz + cyz))/(72.*o));
- z_TSW = 0.25*eps_new*(((-ayz + 2*azz - bxz + 2*bzz + cxz + cyz))/(72.*o));
- z_TSE = 0.25*eps_new*(((ayz - 2*azz + bxz + 2*bzz - cxz + cyz))/(72.*o));
- z_TNW = 0.25*eps_new*(((ayz + 2*azz + bxz - 2*bzz + cxz - cyz))/(72.*o));
-
- xy_E = 0.0625*eps_new *(( 2.*cxyz)/(27.*o));
- xy_N = 0.0625*eps_new *(( 2.*cxyz)/(27.*o));
- xy_T = -(0.0625*eps_new *(( 4.*cxyz)/(27.*o)));
- xy_NE = 0.0625*eps_new *( cxyz /(27.*o));
- xy_SE = 0.0625*eps_new *( cxyz /(27.*o));
- xy_TE = -(0.0625*eps_new *(( 3.*axyz + cxyz)/(54.*o)));
- xy_BE = -(0.0625*eps_new *((-3.*axyz + cxyz)/(54.*o)));
- xy_TN = -(0.0625*eps_new *(( 3.*bxyz + cxyz)/(54.*o)));
- xy_BN = -(0.0625*eps_new *(( - 3.*bxyz + cxyz)/(54.*o)));
- //xy_ZERO= 0.0625*eps_new;
- xy_TNE = -(0.0625*eps_new *(( axyz + bxyz )/(72.*o)));
- xy_TSW = 0.0625*eps_new *(( axyz + bxyz )/(72.*o));
- xy_TSE = 0.0625*eps_new *((- axyz + bxyz )/(72.*o));
- xy_TNW = 0.0625*eps_new *(( axyz - bxyz )/(72.*o));
-
- xz_E = 0.0625*eps_new *(( 2.*bxyz )/(27.*o));
- xz_N = -(0.0625*eps_new *(( 4.*bxyz )/(27.*o)));
- xz_T = 0.0625*eps_new *(( 2.*bxyz )/(27.*o));
- xz_NE = -(0.0625*eps_new *(( 3.*axyz + bxyz )/(54.*o)));
- xz_SE = -(0.0625*eps_new *((-3.*axyz + bxyz )/(54.*o)));
- xz_TE = 0.0625*eps_new *(( bxyz )/(27.*o));
- xz_BE = 0.0625*eps_new *(( bxyz )/(27.*o));
- xz_TN = -(0.0625*eps_new *(( bxyz + 3.*cxyz)/(54.*o)));
- xz_BN = -(0.0625*eps_new *(( bxyz - 3.*cxyz)/(54.*o)));
- //xz_ZERO= 0.0625*eps_new;
- xz_TNE = -(0.0625*eps_new *(( axyz + cxyz)/(72.*o)));
- xz_TSW = 0.0625*eps_new *((- axyz + cxyz)/(72.*o));
- xz_TSE = 0.0625*eps_new *(( axyz + cxyz)/(72.*o));
- xz_TNW = 0.0625*eps_new *(( axyz - cxyz)/(72.*o));
-
- yz_E = -(0.0625*eps_new *(( 4.*axyz )/(27.*o)));
- yz_N = 0.0625*eps_new *(( 2.*axyz )/(27.*o));
- yz_T = 0.0625*eps_new *(( 2.*axyz )/(27.*o));
- yz_NE = -(0.0625*eps_new *(( axyz + 3.*bxyz )/(54.*o)));
- yz_SE = -(0.0625*eps_new *(( axyz - 3.*bxyz )/(54.*o)));
- yz_TE = -(0.0625*eps_new *(( axyz + 3.*cxyz)/(54.*o)));
- yz_BE = -(0.0625*eps_new *(( axyz - 3.*cxyz)/(54.*o)));
- yz_TN = 0.0625*eps_new *(( axyz )/(27.*o));
- yz_BN = 0.0625*eps_new *(( axyz )/(27.*o));
- //yz_ZERO= 0.0625*eps_new;
- yz_TNE = -(0.0625*eps_new *(( bxyz + cxyz)/(72.*o)));
- yz_TSW = 0.0625*eps_new *(( - bxyz + cxyz)/(72.*o));
- yz_TSE = 0.0625*eps_new *(( bxyz - cxyz)/(72.*o));
- yz_TNW = 0.0625*eps_new *(( bxyz + cxyz)/(72.*o));
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNodeCF(real* f, real omega, real x, real y, real z, real press, real xs, real ys, real zs)
@@ -480,20 +480,20 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNod
using namespace D3Q27System;
using namespace vf::lbm::dir;
- real eps_new = 0.5;
+ real eps_new = c1o2;
real o = omega;
//bulk viscosity
real oP = OxxPyyPzzF;
- real rho = press ;//+ (2.*axx*x+axy*y+axz*z+axyz*y*z+ax + 2.*byy*y+bxy*x+byz*z+bxyz*x*z+by + 2.*czz*z+cxz*x+cyz*y+cxyz*x*y+cz)/3.;
+ real 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)/3.;
- real laplaceRho = (xoff!=0.0 || yoff!=0.0 || zoff!= 0.0) ? 0.0 :(-3.0*(by*by+ax*ax+cz*cz)-6.0*(ay*bx+bz*cy+az*cx))*(1.0+rho);
+ real laplaceRho = (xoff!=c0o1 || yoff!=c0o1 || zoff!= c0o1) ? c0o1 :(-c3o1*(by*by+ax*ax+cz*cz)-c6o1*(ay*bx+bz*cy+az*cx))*(c1o1+rho);
- rho=rho+laplaceRho*(3.0/16.0);
+ rho=rho+laplaceRho*(c3o1/c16o1);
- real vx1 = a0 + 0.25*( xs*ax + ys*ay + zs*az) + 0.0625*(axx + xs*ys*axy + xs*zs*axz + ayy + ys*zs*ayz + azz) + 0.015625*(xs*ys*zs*axyz);
- real vx2 = b0 + 0.25*( xs*bx + ys*by + zs*bz) + 0.0625*(bxx + xs*ys*bxy + xs*zs*bxz + byy + ys*zs*byz + bzz) + 0.015625*(xs*ys*zs*bxyz);
- real vx3 = c0 + 0.25*( xs*cx + ys*cy + zs*cz) + 0.0625*(cxx + xs*ys*cxy + xs*zs*cxz + cyy + ys*zs*cyz + czz) + 0.015625*(xs*ys*zs*cxyz);
+ 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;
@@ -812,108 +812,108 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNod
f[DIR_MMM] = mfaaa;
}
//////////////////////////////////////////////////////////////////////////
-//Position SWB -0.25, -0.25, -0.25
+//Position SWB -c1o4, -c1o4, -c1o4
real CompressibleOffsetSquarePressureInterpolationProcessor::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) +
- press_SET * (0.046875 - 0.1875 * xoff + 0.0625 * yoff - 0.1875 * zoff) +
- press_NET * (0.015625 - 0.0625 * xoff - 0.0625 * yoff - 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.1875 * xoff - 0.1875 * yoff + 0.0625 * zoff) +
- press_NWB * (0.140625 + 0.1875 * xoff - 0.5625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.5625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.421875 + 0.5625 * xoff + 0.5625 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::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) +
- press_SET * (0.140625 - 0.5625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_NET * (0.046875 - 0.1875 * xoff - 0.1875 * yoff - 0.0625 * zoff) +
- press_NEB * (0.015625 - 0.0625 * xoff - 0.0625 * yoff + 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.0625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.046875 - 0.1875 * xoff + 0.0625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.1875 * xoff + 0.1875 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::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) +
- press_SWT * (0.140625 + 0.5625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_NWT * (0.046875 + 0.1875 * xoff - 0.1875 * yoff - 0.0625 * zoff) +
- press_NWB * (0.015625 + 0.0625 * xoff - 0.0625 * yoff + 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.0625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.046875 + 0.1875 * xoff + 0.0625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.1875 * xoff + 0.1875 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::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) +
- press_SWT * (0.046875 + 0.1875 * xoff + 0.0625 * yoff - 0.1875 * zoff) +
- press_NWT * (0.015625 + 0.0625 * xoff - 0.0625 * yoff - 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.1875 * xoff - 0.1875 * yoff + 0.0625 * zoff) +
- press_NEB * (0.140625 - 0.1875 * xoff - 0.5625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.5625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.421875 - 0.5625 * xoff + 0.5625 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::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) +
- press_SWT * (0.046875 + 0.0625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_SET * (0.015625 - 0.0625 * xoff + 0.0625 * yoff - 0.0625 * zoff) +
- press_SEB * (0.046875 - 0.1875 * xoff + 0.1875 * yoff + 0.0625 * zoff) +
- press_NEB * (0.140625 - 0.5625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.1875 * xoff + 0.5625 * yoff + 0.1875 * zoff) +
- press_NWB * (0.421875 + 0.5625 * xoff - 0.5625 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::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) +
- press_SWT * (0.140625 + 0.1875 * xoff + 0.5625 * yoff - 0.1875 * zoff) +
- press_SET * (0.046875 - 0.1875 * xoff + 0.1875 * yoff - 0.0625 * zoff) +
- press_SEB * (0.015625 - 0.0625 * xoff + 0.0625 * yoff + 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.1875 * xoff - 0.0625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.046875 + 0.0625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_NWB * (0.140625 + 0.1875 * xoff - 0.1875 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::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) +
- press_SET * (0.140625 - 0.1875 * xoff + 0.5625 * yoff - 0.1875 * zoff) +
- press_SWT * (0.046875 + 0.1875 * xoff + 0.1875 * yoff - 0.0625 * zoff) +
- press_SWB * (0.015625 + 0.0625 * xoff + 0.0625 * yoff + 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.1875 * xoff - 0.0625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.046875 - 0.0625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_NEB * (0.140625 - 0.1875 * xoff - 0.1875 * yoff + 0.5625 * zoff);
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::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) +
- press_SET * (0.046875 - 0.0625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_SWT * (0.015625 + 0.0625 * xoff + 0.0625 * yoff - 0.0625 * zoff) +
- press_SWB * (0.046875 + 0.1875 * xoff + 0.1875 * yoff + 0.0625 * zoff) +
- press_NWB * (0.140625 + 0.5625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.1875 * xoff + 0.5625 * yoff + 0.1875 * zoff) +
- press_NEB * (0.421875 - 0.5625 * xoff - 0.5625 * yoff + 0.5625 * zoff);
+ 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
@@ -922,14 +922,14 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNod
using namespace D3Q27System;
using namespace vf::lbm::dir;
- real press = press_NET * (0.125 - 0.25 * xoff - 0.25 * yoff - 0.25 * zoff) +
- press_NWT * (0.125 + 0.25 * xoff - 0.25 * yoff - 0.25 * zoff) +
- press_SET * (0.125 - 0.25 * xoff + 0.25 * yoff - 0.25 * zoff) +
- press_SWT * (0.125 + 0.25 * xoff + 0.25 * yoff - 0.25 * zoff) +
- press_NEB * (0.125 - 0.25 * xoff - 0.25 * yoff + 0.25 * zoff) +
- press_NWB * (0.125 + 0.25 * xoff - 0.25 * yoff + 0.25 * zoff) +
- press_SEB * (0.125 - 0.25 * xoff + 0.25 * yoff + 0.25 * zoff) +
- press_SWB * (0.125 + 0.25 * xoff + 0.25 * yoff + 0.25 * zoff);
+ real press = press_NET * (c1o8 - c1o4 * xoff - c1o4 * yoff - c1o4 * zoff) +
+ press_NWT * (c1o8 + c1o4 * xoff - c1o4 * yoff - c1o4 * zoff) +
+ press_SET * (c1o8 - c1o4 * xoff + c1o4 * yoff - c1o4 * zoff) +
+ press_SWT * (c1o8 + c1o4 * xoff + c1o4 * yoff - c1o4 * zoff) +
+ press_NEB * (c1o8 - c1o4 * xoff - c1o4 * yoff + c1o4 * zoff) +
+ press_NWB * (c1o8 + c1o4 * xoff - c1o4 * yoff + c1o4 * zoff) +
+ press_SEB * (c1o8 - c1o4 * xoff + c1o4 * yoff + c1o4 * zoff) +
+ press_SWB * (c1o8 + c1o4 * xoff + c1o4 * yoff + c1o4 * zoff);
real vx1 = a0;
real vx2 = b0;
real vx3 = c0;
@@ -937,11 +937,11 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNod
real rho = press ;//+ (ax+by+cz)/3.;
- real laplaceRho = (xoff!=0.0 || yoff!=0.0 || zoff!= 0.0) ? 0.0 :(-3.0*(by*by+ax*ax+cz*cz)-6.0*(ay*bx+bz*cy+az*cx))*(1.0+rho);
+ real laplaceRho = (xoff!=c0o1 || yoff!=c0o1 || zoff!= c0o1) ? c0o1 :(-c3o1*(by*by+ax*ax+cz*cz)-c6o1*(ay*bx+bz*cy+az*cx))*(c1o1+rho);
- rho=rho-laplaceRho*0.25;
+ rho=rho-laplaceRho*c1o4;
- real eps_new = 2.0;
+ real eps_new = c2o1;
real o = omega;
//bulk viscosity
real oP = OxxPyyPzzC;
@@ -1008,7 +1008,7 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedNod
real mxxyMyzz = c0o1;
real mxxzPyyz = c0o1;
real mxxzMyyz = c0o1;
- real mxyyPxzz = c0o1;
+ real mxyyPxzz = c0o1;
real mxyyMxzz = c0o1;
// linear combinations back
@@ -1275,12 +1275,12 @@ void CompressibleOffsetSquarePressureInterpolationProcessor::calcInterpolatedVel
//////////////////////////////////////////////////////////////////////////
void CompressibleOffsetSquarePressureInterpolationProcessor::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;
- tauzz=cz+2*czz*z+cxz*x+cyz*y+cxyz*x*y;
- tauxy=0.5*((ay+2.0*ayy*y+axy*x+ayz*z+axyz*x*z)+(bx+2.0*bxx*x+bxy*y+bxz*z+bxyz*y*z));
- tauxz=0.5*((az+2.0*azz*z+axz*x+ayz*y+axyz*x*y)+(cx+2.0*cxx*x+cxy*y+cxz*z+cxyz*y*z));
- tauyz=0.5*((bz+2.0*bzz*z+bxz*x+byz*y+bxyz*x*y)+(cy+2.0*cyy*y+cxy*x+cyz*z+cxyz*x*z));
+ 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 CompressibleOffsetSquarePressureInterpolationProcessor::setBulkOmegaToOmega(bool value)
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
index 736dbb791547633f22e0e9a0efd572271f28552c..9c89f6c6b549fed93fca097232bcc086e3c380a8 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.cpp
@@ -62,7 +62,7 @@ SPtr<LBMKernel> CumulantK17LBMKernel::clone()
kernel->setNX(nx);
std::dynamic_pointer_cast<CumulantK17LBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -103,7 +103,7 @@ void CumulantK17LBMKernel::calculate(int step)
muForcingX2.DefineVar("dt", &muDeltaT);
muForcingX3.DefineVar("dt", &muDeltaT);
- muNu = (1.0 / 3.0) * (1.0 / collFactor - 1.0 / 2.0);
+ muNu = (c1o1 / c3o1) * (c1o1 / collFactor - c1o1 / c2o1);
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
@@ -115,7 +115,7 @@ void CumulantK17LBMKernel::calculate(int step)
nonLocalDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
restDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
index 84b14553dc2100aa244a5f7e3fc0d5025d93e195..2bcdf8551bef28aa46932a180268f05873d7ecc0 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernel.h
@@ -35,7 +35,7 @@
#define CumulantK17LBMKernel_h__
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp
index e95271b949ff91dc7ec2c62a4a45227f8e25f519..2a791636d42e8f17761873cd5e95c8dcf933e0b6 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.cpp
@@ -67,7 +67,7 @@ SPtr<LBMKernel> CumulantK17LBMKernelUnified::clone()
kernel->setNX(nx);
std::dynamic_pointer_cast<CumulantK17LBMKernelUnified>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -108,7 +108,7 @@ void CumulantK17LBMKernelUnified::calculate(int step)
muForcingX2.DefineVar("dt", &muDeltaT);
muForcingX3.DefineVar("dt", &muDeltaT);
- muNu = (1.0 / 3.0) * (1.0 / collFactor - 1.0 / 2.0);
+ muNu = (c1o1 / c3o1) * (c1o1 / collFactor - c1o1 / c2o1);
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
@@ -120,7 +120,7 @@ void CumulantK17LBMKernelUnified::calculate(int step)
nonLocalDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
restDistributions = dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -201,7 +201,7 @@ void CumulantK17LBMKernelUnified::calculate(int step)
real mfbbb = (*this->restDistributions)(x1, x2, x3);
- real forces[3] = {0., 0., 0.};
+ real forces[3] = { c0o1, c0o1, c0o1 };
if (withForcing)
{
muX1 = static_cast<real>(x1 - 1 + ix1 * maxX1);
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.h b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.h
index d13e82efce5f5bc9211476ea86d989fe8663ab8c..9c6876f4d4de855f931ea90e8764cb1e9a39202a 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantK17LBMKernelUnified.h
@@ -35,7 +35,7 @@
#define CumulantK17LBMKernelUnified_h__
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
index d2f25ad275a5c01d685e915f2b37f101b40d556d..548339f940d45ab2239ce6cb1cebbfa9bf0082b5 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.cpp
@@ -16,9 +16,9 @@ CumulantLBMKernel::CumulantLBMKernel()
{
this->compressible = true;
this->parameter = CumulantLBMKernel::NORMAL;
- this->OxyyMxzz = 1.0;
+ this->OxyyMxzz = c1o1;
this->bulkOmegaToOmega = false;
- this->OxxPyyPzz = 1.0;
+ this->OxxPyyPzz = c1o1;
}
//////////////////////////////////////////////////////////////////////////
void CumulantLBMKernel::initDataSet()
@@ -33,7 +33,7 @@ SPtr<LBMKernel> CumulantLBMKernel::clone()
kernel->setNX(nx);
dynamicPointerCast<CumulantLBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -45,10 +45,10 @@ SPtr<LBMKernel> CumulantLBMKernel::clone()
switch (parameter)
{
case NORMAL:
- dynamicPointerCast<CumulantLBMKernel>(kernel)->OxyyMxzz = 1.0;
+ dynamicPointerCast<CumulantLBMKernel>(kernel)->OxyyMxzz = c1o1;
break;
case MAGIC:
- dynamicPointerCast<CumulantLBMKernel>(kernel)->OxyyMxzz = 2.0 + (-collFactor);
+ dynamicPointerCast<CumulantLBMKernel>(kernel)->OxyyMxzz = c2o1 + (-collFactor);
break;
}
@@ -99,7 +99,7 @@ SPtr<LBMKernel> CumulantLBMKernel::clone()
// nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
// zeroDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
//
-// SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+// SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
//
// const int bcArrayMaxX1 = (int)bcArray->getNX1();
// const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -1060,7 +1060,7 @@ void CumulantLBMKernel::initData()
muForcingX2.DefineVar("dt", &muDeltaT);
muForcingX3.DefineVar("dt", &muDeltaT);
- muNu = (1.0 / 3.0) * (1.0 / collFactor - 1.0 / 2.0);
+ muNu = (c1o1 / c3o1) * (c1o1 / collFactor - c1o1 / c2o1);
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
@@ -1158,9 +1158,9 @@ void CumulantLBMKernel::nodeCollision(int step, int x1, int x2, int x3)
forcingX2 = muForcingX2.Eval();
forcingX3 = muForcingX3.Eval();
- vvx += forcingX1 * deltaT * 0.5; // X
- vvy += forcingX2 * deltaT * 0.5; // Y
- vvz += forcingX3 * deltaT * 0.5; // Z
+ vvx += forcingX1 * deltaT * c1o2; // X
+ vvy += forcingX2 * deltaT * c1o2; // Y
+ vvz += forcingX3 * deltaT * c1o2; // Z
}
///////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.h
index 9fb6d834fc8904af84e20798b03ea23b68ad63a4..3ba644ccccd6d2fef780f8175b8140e9053d77e6 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/CumulantLBMKernel.h
@@ -2,7 +2,7 @@
#define CumulantLBMKernel_h__
#include "BasicLBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp b/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
index 5c9be26b7b1ace78e81f1a1c1f28a1e089c9a013..a35465e8cfde1f84a5446e4bbfcb02fc5478b8f1 100644
--- a/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/D3Q27System.cpp
@@ -6,6 +6,7 @@ namespace D3Q27System
{
//using namespace UbMath;
using namespace vf::basics::constant;
+ using namespace vf::lbm::dir;
// index 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
// f: E, W, N, S, T, B, NE, SW, SE, NW, TE, BW, BE, TW, TN, BS, BN, TS, TNE TNW TSE TSW BNE BNW BSE BSW
@@ -24,9 +25,9 @@ const real WEIGTH[] = { c8o27,
c1o54, c1o54, c1o54, c1o54, c1o54, c1o54, c1o54, c1o54, c1o54, c1o54, c1o54, c1o54,
c1o216, c1o216, c1o216, c1o216, c1o216, c1o216, c1o216, c1o216 };
-const int INVDIR[] = { vf::lbm::dir::DIR_000, vf::lbm::dir::INV_P00, vf::lbm::dir::INV_M00, vf::lbm::dir::INV_0P0, vf::lbm::dir::INV_0M0, vf::lbm::dir::INV_00P, vf::lbm::dir::INV_00M, vf::lbm::dir::INV_PP0, vf::lbm::dir::INV_MM0, vf::lbm::dir::INV_PM0,
- vf::lbm::dir::INV_MP0, vf::lbm::dir::INV_P0P, vf::lbm::dir::INV_M0M, vf::lbm::dir::INV_P0M, vf::lbm::dir::INV_M0P, vf::lbm::dir::INV_0PP, vf::lbm::dir::INV_0MM, vf::lbm::dir::INV_0PM, vf::lbm::dir::INV_0MP,
- vf::lbm::dir::INV_PPP, vf::lbm::dir::INV_MPP, vf::lbm::dir::INV_PMP, vf::lbm::dir::INV_MMP, vf::lbm::dir::INV_PPM, vf::lbm::dir::INV_MPM, vf::lbm::dir::INV_PMM, vf::lbm::dir::INV_MMM };
+const int INVDIR[] = { DIR_000, INV_P00, INV_M00, INV_0P0, INV_0M0, INV_00P, INV_00M,
+ INV_PP0, INV_MM0, INV_PM0, INV_MP0, INV_P0P, INV_M0M, INV_P0M, INV_M0P, INV_0PP, INV_0MM, INV_0PM, INV_0MP,
+ INV_PPP, INV_MPP, INV_PMP, INV_MMP, INV_PPM, INV_MPM, INV_PMM, INV_MMM };
// index 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
// direction: E, W, N, S, T, B, NE, SW, SE, NW, TE, BW, BE, TW, TN, BS, BN, TS, TNE TNW TSE TSW BNE BNW BSE
diff --git a/src/cpu/VirtualFluidsCore/LBM/D3Q27System.h b/src/cpu/VirtualFluidsCore/LBM/D3Q27System.h
index 2843a77a21310a9569c3abb3552eea42bbd4f250..2f5cbdc30ea8ae1368b59b6888a464700c1d8af5 100644
--- a/src/cpu/VirtualFluidsCore/LBM/D3Q27System.h
+++ b/src/cpu/VirtualFluidsCore/LBM/D3Q27System.h
@@ -37,6 +37,7 @@
#include <cmath>
#include <string>
#include <iostream>
+#include <array>
#include "lbm/constants/D3Q27.h"
#include "LBMSystem.h"
@@ -1393,6 +1394,662 @@ static inline real getShearRate(const real *const f, real collFactorF)
return sqrt(vf::basics::constant::c2o1 * (dxux * dxux + dyuy * dyuy + dzuz * dzuz) + Dxy * Dxy + Dxz * Dxz + Dyz * Dyz) /
(rho + vf::basics::constant::c1o1);
}
+
+static inline std::array<real,6> getSecondMoments(const real *const f, real collFactorF)
+{
+ using namespace vf::lbm::dir;
+ using namespace vf::basics::constant;
+
+ real mfcbb = f[DIR_P00];
+ real mfbcb = f[DIR_0P0];
+ real mfbbc = f[DIR_00P];
+ real mfccb = f[DIR_PP0];
+ real mfacb = f[DIR_MP0];
+ real mfcbc = f[DIR_P0P];
+ real mfabc = f[DIR_M0P];
+ real mfbcc = f[DIR_0PP];
+ real mfbac = f[DIR_0MP];
+ real mfccc = f[DIR_PPP];
+ real mfacc = f[DIR_MPP];
+ real mfcac = f[DIR_PMP];
+ real mfaac = f[DIR_MMP];
+
+ real mfabb = f[DIR_M00];
+ real mfbab = f[DIR_0M0];
+ real mfbba = f[DIR_00M];
+ real mfaab = f[DIR_MM0];
+ real mfcab = f[DIR_PM0];
+ real mfaba = f[DIR_M0M];
+ real mfcba = f[DIR_P0M];
+ real mfbaa = f[DIR_0MM];
+ real mfbca = f[DIR_0PM];
+ real mfaaa = f[DIR_MMM];
+ real mfcaa = f[DIR_PMM];
+ real mfaca = f[DIR_MPM];
+ real mfcca = f[DIR_PPM];
+
+ real mfbbb = f[DIR_000];
+
+ real m0, m1, m2;
+
+ //real rho = (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;
+
+ real vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) + (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) + (mfcbb - mfabb));
+ real vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) + (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) + (mfbcb - mfbab));
+ real vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) + (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) + (mfbbc - mfbba));
+
+ 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 = 1. - (oMdrho + m0);
+
+ real vx2;
+ real vy2;
+ real vz2;
+ vx2 = vvx * vvx;
+ vy2 = vvy * vvy;
+ vz2 = vvz * vvz;
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Hin
+ ////////////////////////////////////////////////////////////////////////////////////
+ // mit 1/36, 1/9, 1/36, 1/9, 4/9, 1/9, 1/36, 1/9, 1/36 Konditionieren
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ m2 = mfaaa + mfaac;
+ m1 = mfaac - mfaaa;
+ m0 = m2 + mfaab;
+ mfaaa = m0;
+ m0 += c1o36 * oMdrho;
+ mfaab = m1 - m0 * vvz;
+ mfaac = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaba + mfabc;
+ m1 = mfabc - mfaba;
+ m0 = m2 + mfabb;
+ mfaba = m0;
+ m0 += c1o9 * oMdrho;
+ mfabb = m1 - m0 * vvz;
+ mfabc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaca + mfacc;
+ m1 = mfacc - mfaca;
+ m0 = m2 + mfacb;
+ mfaca = m0;
+ m0 += c1o36 * oMdrho;
+ mfacb = m1 - m0 * vvz;
+ mfacc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbaa + mfbac;
+ m1 = mfbac - mfbaa;
+ m0 = m2 + mfbab;
+ mfbaa = m0;
+ m0 += c1o9 * oMdrho;
+ mfbab = m1 - m0 * vvz;
+ mfbac = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbba + mfbbc;
+ m1 = mfbbc - mfbba;
+ m0 = m2 + mfbbb;
+ mfbba = m0;
+ m0 += c4o9 * oMdrho;
+ mfbbb = m1 - m0 * vvz;
+ mfbbc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbca + mfbcc;
+ m1 = mfbcc - mfbca;
+ m0 = m2 + mfbcb;
+ mfbca = m0;
+ m0 += c1o9 * oMdrho;
+ mfbcb = m1 - m0 * vvz;
+ mfbcc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcaa + mfcac;
+ m1 = mfcac - mfcaa;
+ m0 = m2 + mfcab;
+ mfcaa = m0;
+ m0 += c1o36 * oMdrho;
+ mfcab = m1 - m0 * vvz;
+ mfcac = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcba + mfcbc;
+ m1 = mfcbc - mfcba;
+ m0 = m2 + mfcbb;
+ mfcba = m0;
+ m0 += c1o9 * oMdrho;
+ mfcbb = m1 - m0 * vvz;
+ mfcbc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcca + mfccc;
+ m1 = mfccc - mfcca;
+ m0 = m2 + mfccb;
+ mfcca = m0;
+ m0 += c1o36 * oMdrho;
+ mfccb = m1 - m0 * vvz;
+ mfccc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ // mit 1/6, 0, 1/18, 2/3, 0, 2/9, 1/6, 0, 1/18 Konditionieren
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ m2 = mfaaa + mfaca;
+ m1 = mfaca - mfaaa;
+ m0 = m2 + mfaba;
+ mfaaa = m0;
+ m0 += c1o6 * oMdrho;
+ mfaba = m1 - m0 * vvy;
+ mfaca = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaab + mfacb;
+ m1 = mfacb - mfaab;
+ m0 = m2 + mfabb;
+ mfaab = m0;
+ mfabb = m1 - m0 * vvy;
+ mfacb = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaac + mfacc;
+ m1 = mfacc - mfaac;
+ m0 = m2 + mfabc;
+ mfaac = m0;
+ m0 += c1o18 * oMdrho;
+ mfabc = m1 - m0 * vvy;
+ mfacc = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbaa + mfbca;
+ m1 = mfbca - mfbaa;
+ m0 = m2 + mfbba;
+ mfbaa = m0;
+ m0 += c2o3 * oMdrho;
+ mfbba = m1 - m0 * vvy;
+ mfbca = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbab + mfbcb;
+ m1 = mfbcb - mfbab;
+ m0 = m2 + mfbbb;
+ mfbab = m0;
+ mfbbb = m1 - m0 * vvy;
+ mfbcb = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbac + mfbcc;
+ m1 = mfbcc - mfbac;
+ m0 = m2 + mfbbc;
+ mfbac = m0;
+ m0 += c2o9 * oMdrho;
+ mfbbc = m1 - m0 * vvy;
+ mfbcc = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcaa + mfcca;
+ m1 = mfcca - mfcaa;
+ m0 = m2 + mfcba;
+ mfcaa = m0;
+ m0 += c1o6 * oMdrho;
+ mfcba = m1 - m0 * vvy;
+ mfcca = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcab + mfccb;
+ m1 = mfccb - mfcab;
+ m0 = m2 + mfcbb;
+ mfcab = m0;
+ mfcbb = m1 - m0 * vvy;
+ mfccb = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcac + mfccc;
+ m1 = mfccc - mfcac;
+ m0 = m2 + mfcbc;
+ mfcac = m0;
+ m0 += c1o18 * oMdrho;
+ mfcbc = m1 - m0 * vvy;
+ mfccc = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ // mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ m2 = mfaaa + mfcaa;
+ m1 = mfcaa - mfaaa;
+ m0 = m2 + mfbaa;
+ mfaaa = m0;
+ m0 += 1. * oMdrho;
+ mfbaa = m1 - m0 * vvx;
+ mfcaa = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaba + mfcba;
+ m1 = mfcba - mfaba;
+ m0 = m2 + mfbba;
+ mfaba = m0;
+ mfbba = m1 - m0 * vvx;
+ mfcba = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaca + mfcca;
+ m1 = mfcca - mfaca;
+ m0 = m2 + mfbca;
+ mfaca = m0;
+ m0 += c1o3 * oMdrho;
+ mfbca = m1 - m0 * vvx;
+ mfcca = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaab + mfcab;
+ m1 = mfcab - mfaab;
+ m0 = m2 + mfbab;
+ mfaab = m0;
+ mfbab = m1 - m0 * vvx;
+ mfcab = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfabb + mfcbb;
+ m1 = mfcbb - mfabb;
+ m0 = m2 + mfbbb;
+ mfabb = m0;
+ mfbbb = m1 - m0 * vvx;
+ mfcbb = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfacb + mfccb;
+ m1 = mfccb - mfacb;
+ m0 = m2 + mfbcb;
+ mfacb = m0;
+ mfbcb = m1 - m0 * vvx;
+ mfccb = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaac + mfcac;
+ m1 = mfcac - mfaac;
+ m0 = m2 + mfbac;
+ mfaac = m0;
+ m0 += c1o3 * oMdrho;
+ mfbac = m1 - m0 * vvx;
+ mfcac = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfabc + mfcbc;
+ m1 = mfcbc - mfabc;
+ m0 = m2 + mfbbc;
+ mfabc = m0;
+ mfbbc = m1 - m0 * vvx;
+ mfcbc = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfacc + mfccc;
+ m1 = mfccc - mfacc;
+ m0 = m2 + mfbcc;
+ mfacc = m0;
+ m0 += c1o9 * oMdrho;
+ mfbcc = m1 - m0 * vvx;
+ mfccc = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Cumulants
+ ////////////////////////////////////////////////////////////////////////////////////
+ real OxxPyyPzz = 1.; // omega2 or bulk viscosity
+
+ real mxxPyyPzz = mfcaa + mfaca + mfaac;
+ real mxxMyy = mfcaa - mfaca;
+ real mxxMzz = mfcaa - mfaac;
+
+ // average pre and post collision
+ std::array<real, 6> moments = {
+ (mxxPyyPzz-mfaaa) * (c1o1 - c1o2 * OxxPyyPzz),
+ (mxxMyy) * (c1o1 - c1o2 * collFactorF),
+ (mxxMzz) * (c1o1 - c1o2 * collFactorF),
+ (mfbba) * (c1o1 - c1o2 * collFactorF),
+ (mfbab) * (c1o1 - c1o2 * collFactorF),
+ (mfabb) * (c1o1 - c1o2 * collFactorF)
+ };
+
+ return moments;
+}
+static inline std::array<real, 6> getStressTensor(const real *const f, real collFactorF)
+{
+ using namespace vf::lbm::dir;
+ using namespace vf::basics::constant;
+
+ real mfcbb = f[DIR_P00];
+ real mfbcb = f[DIR_0P0];
+ real mfbbc = f[DIR_00P];
+ real mfccb = f[DIR_PP0];
+ real mfacb = f[DIR_MP0];
+ real mfcbc = f[DIR_P0P];
+ real mfabc = f[DIR_M0P];
+ real mfbcc = f[DIR_0PP];
+ real mfbac = f[DIR_0MP];
+ real mfccc = f[DIR_PPP];
+ real mfacc = f[DIR_MPP];
+ real mfcac = f[DIR_PMP];
+ real mfaac = f[DIR_MMP];
+
+ real mfabb = f[DIR_M00];
+ real mfbab = f[DIR_0M0];
+ real mfbba = f[DIR_00M];
+ real mfaab = f[DIR_MM0];
+ real mfcab = f[DIR_PM0];
+ real mfaba = f[DIR_M0M];
+ real mfcba = f[DIR_P0M];
+ real mfbaa = f[DIR_0MM];
+ real mfbca = f[DIR_0PM];
+ real mfaaa = f[DIR_MMM];
+ real mfcaa = f[DIR_PMM];
+ real mfaca = f[DIR_MPM];
+ real mfcca = f[DIR_PPM];
+
+ real mfbbb = f[DIR_000];
+
+ real m0, m1, m2;
+
+ //real rho = (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;
+
+ real vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) + (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) + (mfcbb - mfabb));
+ real vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) + (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) + (mfbcb - mfbab));
+ real vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) + (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) + (mfbbc - mfbba));
+
+ 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 = 1. - (oMdrho + m0);
+
+ real vx2;
+ real vy2;
+ real vz2;
+ vx2 = vvx * vvx;
+ vy2 = vvy * vvy;
+ vz2 = vvz * vvz;
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Hin
+ ////////////////////////////////////////////////////////////////////////////////////
+ // mit 1/36, 1/9, 1/36, 1/9, 4/9, 1/9, 1/36, 1/9, 1/36 Konditionieren
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Z - Dir
+ m2 = mfaaa + mfaac;
+ m1 = mfaac - mfaaa;
+ m0 = m2 + mfaab;
+ mfaaa = m0;
+ m0 += c1o36 * oMdrho;
+ mfaab = m1 - m0 * vvz;
+ mfaac = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaba + mfabc;
+ m1 = mfabc - mfaba;
+ m0 = m2 + mfabb;
+ mfaba = m0;
+ m0 += c1o9 * oMdrho;
+ mfabb = m1 - m0 * vvz;
+ mfabc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaca + mfacc;
+ m1 = mfacc - mfaca;
+ m0 = m2 + mfacb;
+ mfaca = m0;
+ m0 += c1o36 * oMdrho;
+ mfacb = m1 - m0 * vvz;
+ mfacc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbaa + mfbac;
+ m1 = mfbac - mfbaa;
+ m0 = m2 + mfbab;
+ mfbaa = m0;
+ m0 += c1o9 * oMdrho;
+ mfbab = m1 - m0 * vvz;
+ mfbac = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbba + mfbbc;
+ m1 = mfbbc - mfbba;
+ m0 = m2 + mfbbb;
+ mfbba = m0;
+ m0 += c4o9 * oMdrho;
+ mfbbb = m1 - m0 * vvz;
+ mfbbc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbca + mfbcc;
+ m1 = mfbcc - mfbca;
+ m0 = m2 + mfbcb;
+ mfbca = m0;
+ m0 += c1o9 * oMdrho;
+ mfbcb = m1 - m0 * vvz;
+ mfbcc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcaa + mfcac;
+ m1 = mfcac - mfcaa;
+ m0 = m2 + mfcab;
+ mfcaa = m0;
+ m0 += c1o36 * oMdrho;
+ mfcab = m1 - m0 * vvz;
+ mfcac = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcba + mfcbc;
+ m1 = mfcbc - mfcba;
+ m0 = m2 + mfcbb;
+ mfcba = m0;
+ m0 += c1o9 * oMdrho;
+ mfcbb = m1 - m0 * vvz;
+ mfcbc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcca + mfccc;
+ m1 = mfccc - mfcca;
+ m0 = m2 + mfccb;
+ mfcca = m0;
+ m0 += c1o36 * oMdrho;
+ mfccb = m1 - m0 * vvz;
+ mfccc = m2 - 2. * m1 * vvz + vz2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ // mit 1/6, 0, 1/18, 2/3, 0, 2/9, 1/6, 0, 1/18 Konditionieren
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Y - Dir
+ m2 = mfaaa + mfaca;
+ m1 = mfaca - mfaaa;
+ m0 = m2 + mfaba;
+ mfaaa = m0;
+ m0 += c1o6 * oMdrho;
+ mfaba = m1 - m0 * vvy;
+ mfaca = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaab + mfacb;
+ m1 = mfacb - mfaab;
+ m0 = m2 + mfabb;
+ mfaab = m0;
+ mfabb = m1 - m0 * vvy;
+ mfacb = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaac + mfacc;
+ m1 = mfacc - mfaac;
+ m0 = m2 + mfabc;
+ mfaac = m0;
+ m0 += c1o18 * oMdrho;
+ mfabc = m1 - m0 * vvy;
+ mfacc = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbaa + mfbca;
+ m1 = mfbca - mfbaa;
+ m0 = m2 + mfbba;
+ mfbaa = m0;
+ m0 += c2o3 * oMdrho;
+ mfbba = m1 - m0 * vvy;
+ mfbca = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbab + mfbcb;
+ m1 = mfbcb - mfbab;
+ m0 = m2 + mfbbb;
+ mfbab = m0;
+ mfbbb = m1 - m0 * vvy;
+ mfbcb = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfbac + mfbcc;
+ m1 = mfbcc - mfbac;
+ m0 = m2 + mfbbc;
+ mfbac = m0;
+ m0 += c2o9 * oMdrho;
+ mfbbc = m1 - m0 * vvy;
+ mfbcc = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcaa + mfcca;
+ m1 = mfcca - mfcaa;
+ m0 = m2 + mfcba;
+ mfcaa = m0;
+ m0 += c1o6 * oMdrho;
+ mfcba = m1 - m0 * vvy;
+ mfcca = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcab + mfccb;
+ m1 = mfccb - mfcab;
+ m0 = m2 + mfcbb;
+ mfcab = m0;
+ mfcbb = m1 - m0 * vvy;
+ mfccb = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfcac + mfccc;
+ m1 = mfccc - mfcac;
+ m0 = m2 + mfcbc;
+ mfcac = m0;
+ m0 += c1o18 * oMdrho;
+ mfcbc = m1 - m0 * vvy;
+ mfccc = m2 - 2. * m1 * vvy + vy2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ // mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
+ ////////////////////////////////////////////////////////////////////////////////////
+ // X - Dir
+ m2 = mfaaa + mfcaa;
+ m1 = mfcaa - mfaaa;
+ m0 = m2 + mfbaa;
+ mfaaa = m0;
+ m0 += 1. * oMdrho;
+ mfbaa = m1 - m0 * vvx;
+ mfcaa = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaba + mfcba;
+ m1 = mfcba - mfaba;
+ m0 = m2 + mfbba;
+ mfaba = m0;
+ mfbba = m1 - m0 * vvx;
+ mfcba = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaca + mfcca;
+ m1 = mfcca - mfaca;
+ m0 = m2 + mfbca;
+ mfaca = m0;
+ m0 += c1o3 * oMdrho;
+ mfbca = m1 - m0 * vvx;
+ mfcca = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaab + mfcab;
+ m1 = mfcab - mfaab;
+ m0 = m2 + mfbab;
+ mfaab = m0;
+ mfbab = m1 - m0 * vvx;
+ mfcab = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfabb + mfcbb;
+ m1 = mfcbb - mfabb;
+ m0 = m2 + mfbbb;
+ mfabb = m0;
+ mfbbb = m1 - m0 * vvx;
+ mfcbb = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfacb + mfccb;
+ m1 = mfccb - mfacb;
+ m0 = m2 + mfbcb;
+ mfacb = m0;
+ mfbcb = m1 - m0 * vvx;
+ mfccb = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfaac + mfcac;
+ m1 = mfcac - mfaac;
+ m0 = m2 + mfbac;
+ mfaac = m0;
+ m0 += c1o3 * oMdrho;
+ mfbac = m1 - m0 * vvx;
+ mfcac = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfabc + mfcbc;
+ m1 = mfcbc - mfabc;
+ m0 = m2 + mfbbc;
+ mfabc = m0;
+ mfbbc = m1 - m0 * vvx;
+ mfcbc = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ m2 = mfacc + mfccc;
+ m1 = mfccc - mfacc;
+ m0 = m2 + mfbcc;
+ mfacc = m0;
+ m0 += c1o9 * oMdrho;
+ mfbcc = m1 - m0 * vvx;
+ mfccc = m2 - 2. * m1 * vvx + vx2 * m0;
+ ////////////////////////////////////////////////////////////////////////////////////
+ // Cumulants
+ ////////////////////////////////////////////////////////////////////////////////////
+ real OxxPyyPzz = 1.; // omega2 or bulk viscosity
+
+ real mxxPyyPzz = mfcaa + mfaca + mfaac;
+ real mxxMyy = mfcaa - mfaca;
+ real mxxMzz = mfcaa - mfaac;
+
+ real dxux = -c1o2 * collFactorF * (mxxMyy + mxxMzz) + c1o2 * OxxPyyPzz * (mfaaa - mxxPyyPzz);
+ real dyuy = dxux + collFactorF * c3o2 * mxxMyy;
+ real dzuz = dxux + collFactorF * c3o2 * mxxMzz;
+
+ real Dxy = -c3o1 * collFactorF * mfbba;
+ real Dxz = -c3o1 * collFactorF * mfbab;
+ real Dyz = -c3o1 * collFactorF * mfabb;
+ real nu = c1o3 * (c1o1 / collFactorF - c1o2);
+
+ // average pre and post collision
+ std::array<real, 6> moments = { -c1o3 * mfaaa + c2o1*nu*dxux,
+ -c1o3 * mfaaa + c2o1*nu*dyuy,
+ -c1o3 * mfaaa + c2o1*nu*dzuz,
+ nu*Dxy,nu*Dxz,nu*Dyz};
+
+ return moments;
+}
//Multiphase stuff
//////////////////////////////////////////////////////////////////////////
static void calcMultiphaseFeq(real *const &feq /*[27]*/, const real &rho, const real &p1, const real &vx1,
diff --git a/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h
index ab047a86081f9afc1a099eea0087f2728bfa519d..490aafc1c54d806a997021415004eec9c4579168 100644
--- a/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/ILBMKernel.h
@@ -38,7 +38,7 @@
#include "LBMSystem.h"
-class BCProcessor;
+class BCSet;
class DataSet3D;
//! Abstract class provides interface for LBM kernel
@@ -52,8 +52,8 @@ public:
virtual void swapDistributions() = 0;
virtual bool getCompressible() const = 0;
- virtual SPtr<BCProcessor> getBCProcessor() const = 0;
- virtual void setBCProcessor(SPtr<BCProcessor> bcProcessor) = 0;
+ virtual SPtr<BCSet> getBCSet() const = 0;
+ virtual void setBCSet(SPtr<BCSet> BCSet) = 0;
virtual SPtr<DataSet3D> getDataSet() const = 0;
virtual real getCollisionFactor() const = 0;
virtual void setCollisionFactor(real collFactor) = 0;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
index abac1e285d7945c5180d1acb62457a2a9a718c46..990bb8f89f4b6abb1a0e77b550af4d751ad49a40 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.cpp
@@ -15,7 +15,7 @@ using namespace vf::basics::constant;
IncompressibleCumulantLBMKernel::IncompressibleCumulantLBMKernel()
{
this->parameter = NORMAL;
- this->OxyyMxzz = 1.0;
+ this->OxyyMxzz = c1o1;
this->compressible = false;
}
//////////////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@ SPtr<LBMKernel> IncompressibleCumulantLBMKernel::clone()
kernel->setNX(nx);
dynamicPointerCast<IncompressibleCumulantLBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -46,10 +46,10 @@ SPtr<LBMKernel> IncompressibleCumulantLBMKernel::clone()
switch (parameter)
{
case NORMAL:
- dynamicPointerCast<IncompressibleCumulantLBMKernel>(kernel)->OxyyMxzz = 1.0;
+ dynamicPointerCast<IncompressibleCumulantLBMKernel>(kernel)->OxyyMxzz = c1o1;
break;
case MAGIC:
- dynamicPointerCast<IncompressibleCumulantLBMKernel>(kernel)->OxyyMxzz = 2.0 +(-collFactor);
+ dynamicPointerCast<IncompressibleCumulantLBMKernel>(kernel)->OxyyMxzz = c2o1 +(-collFactor);
break;
}
return kernel;
@@ -75,7 +75,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
muForcingX2.DefineVar("dt", &muDeltaT);
muForcingX3.DefineVar("dt", &muDeltaT);
- muNu = (1.0/3.0)*(1.0/collFactor - 1.0/2.0);
+ muNu = (c1o1/c3o1)*(c1o1/collFactor - c1o1/c2o1);
muForcingX1.DefineVar("nu", &muNu);
muForcingX2.DefineVar("nu", &muNu);
@@ -91,7 +91,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -194,9 +194,9 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
forcingX2 = muForcingX2.Eval();
forcingX3 = muForcingX3.Eval();
- vvx += forcingX1*deltaT*0.5; // X
- vvy += forcingX2*deltaT*0.5; // Y
- vvz += forcingX3*deltaT*0.5; // Z
+ vvx += forcingX1*deltaT*c1o2; // X
+ vvy += forcingX2*deltaT*c1o2; // Y
+ vvz += forcingX3*deltaT*c1o2; // Z
}
///////////////////////////////////////////////////////////////////////////////////////////
real oMdrho;
@@ -225,7 +225,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
m2=mfbba+mfbbc;
m0+=m1+m2;
m0+=mfbbb; //hat gefehlt
- oMdrho = 1. - (oMdrho + m0);
+ oMdrho = c1o1 - (oMdrho + m0);
real vx2;
real vy2;
@@ -235,7 +235,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
vz2=vvz*vvz;
////////////////////////////////////////////////////////////////////////////////////
real wadjust;
- real qudricLimit = 0.01;
+ real qudricLimit = c1o100;
////////////////////////////////////////////////////////////////////////////////////
//Hin
////////////////////////////////////////////////////////////////////////////////////
@@ -248,7 +248,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfaaa = m0;
m0 += c1o36 * oMdrho;
mfaab = m1 - m0 * vvz;
- mfaac = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfaac = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaba + mfabc;
m1 = mfabc - mfaba;
@@ -256,7 +256,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfaba = m0;
m0 += c1o9 * oMdrho;
mfabb = m1 - m0 * vvz;
- mfabc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfabc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaca + mfacc;
m1 = mfacc - mfaca;
@@ -264,7 +264,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfaca = m0;
m0 += c1o36 * oMdrho;
mfacb = m1 - m0 * vvz;
- mfacc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfacc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbaa + mfbac;
@@ -273,7 +273,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfbaa = m0;
m0 += c1o9 * oMdrho;
mfbab = m1 - m0 * vvz;
- mfbac = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfbac = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbba + mfbbc;
m1 = mfbbc - mfbba;
@@ -281,7 +281,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfbba = m0;
m0 += c4o9 * oMdrho;
mfbbb = m1 - m0 * vvz;
- mfbbc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfbbc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbca + mfbcc;
m1 = mfbcc - mfbca;
@@ -289,7 +289,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfbca = m0;
m0 += c1o9 * oMdrho;
mfbcb = m1 - m0 * vvz;
- mfbcc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfbcc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcaa + mfcac;
@@ -298,7 +298,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfcaa = m0;
m0 += c1o36 * oMdrho;
mfcab = m1 - m0 * vvz;
- mfcac = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfcac = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcba + mfcbc;
m1 = mfcbc - mfcba;
@@ -306,7 +306,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfcba = m0;
m0 += c1o9 * oMdrho;
mfcbb = m1 - m0 * vvz;
- mfcbc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfcbc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcca + mfccc;
m1 = mfccc - mfcca;
@@ -314,7 +314,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfcca = m0;
m0 += c1o36 * oMdrho;
mfccb = m1 - m0 * vvz;
- mfccc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfccc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
// mit 1/6, 0, 1/18, 2/3, 0, 2/9, 1/6, 0, 1/18 Konditionieren
@@ -326,14 +326,14 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfaaa = m0;
m0 += c1o6 * oMdrho;
mfaba = m1 - m0 * vvy;
- mfaca = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfaca = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaab + mfacb;
m1 = mfacb - mfaab;
m0 = m2 + mfabb;
mfaab = m0;
mfabb = m1 - m0 * vvy;
- mfacb = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfacb = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaac + mfacc;
m1 = mfacc - mfaac;
@@ -341,7 +341,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfaac = m0;
m0 += c1o18 * oMdrho;
mfabc = m1 - m0 * vvy;
- mfacc = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfacc = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbaa + mfbca;
@@ -350,14 +350,14 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfbaa = m0;
m0 += c2o3 * oMdrho;
mfbba = m1 - m0 * vvy;
- mfbca = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfbca = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbab + mfbcb;
m1 = mfbcb - mfbab;
m0 = m2 + mfbbb;
mfbab = m0;
mfbbb = m1 - m0 * vvy;
- mfbcb = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfbcb = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbac + mfbcc;
m1 = mfbcc - mfbac;
@@ -365,7 +365,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfbac = m0;
m0 += c2o9 * oMdrho;
mfbbc = m1 - m0 * vvy;
- mfbcc = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfbcc = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcaa + mfcca;
@@ -374,14 +374,14 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfcaa = m0;
m0 += c1o6 * oMdrho;
mfcba = m1 - m0 * vvy;
- mfcca = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfcca = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcab + mfccb;
m1 = mfccb - mfcab;
m0 = m2 + mfcbb;
mfcab = m0;
mfcbb = m1 - m0 * vvy;
- mfccb = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfccb = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcac + mfccc;
m1 = mfccc - mfcac;
@@ -389,7 +389,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfcac = m0;
m0 += c1o18 * oMdrho;
mfcbc = m1 - m0 * vvy;
- mfccc = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfccc = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
// mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
@@ -399,16 +399,16 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
m1 = mfcaa - mfaaa;
m0 = m2 + mfbaa;
mfaaa = m0;
- m0 += 1. * oMdrho;
+ m0 += c1o1 * oMdrho;
mfbaa = m1 - m0 * vvx;
- mfcaa = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcaa = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaba + mfcba;
m1 = mfcba - mfaba;
m0 = m2 + mfbba;
mfaba = m0;
mfbba = m1 - m0 * vvx;
- mfcba = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcba = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaca + mfcca;
m1 = mfcca - mfaca;
@@ -416,7 +416,7 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfaca = m0;
m0 += c1o3 * oMdrho;
mfbca = m1 - m0 * vvx;
- mfcca = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcca = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaab + mfcab;
@@ -424,21 +424,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
m0 = m2 + mfbab;
mfaab = m0;
mfbab = m1 - m0 * vvx;
- mfcab = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcab = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfabb + mfcbb;
m1 = mfcbb - mfabb;
m0 = m2 + mfbbb;
mfabb = m0;
mfbbb = m1 - m0 * vvx;
- mfcbb = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcbb = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfacb + mfccb;
m1 = mfccb - mfacb;
m0 = m2 + mfbcb;
mfacb = m0;
mfbcb = m1 - m0 * vvx;
- mfccb = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfccb = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaac + mfcac;
@@ -447,14 +447,14 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfaac = m0;
m0 += c1o3 * oMdrho;
mfbac = m1 - m0 * vvx;
- mfcac = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcac = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfabc + mfcbc;
m1 = mfcbc - mfabc;
m0 = m2 + mfbbc;
mfabc = m0;
mfbbc = m1 - m0 * vvx;
- mfcbc = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcbc = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfacc + mfccc;
m1 = mfccc - mfacc;
@@ -462,46 +462,46 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
mfacc = m0;
m0 += c1o9 * oMdrho;
mfbcc = m1 - m0 * vvx;
- mfccc = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfccc = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
// Cumulants
////////////////////////////////////////////////////////////////////////////////////
- real OxxPyyPzz = 1.; //omega2 or bulk viscosity
- real OxyyPxzz = 1.;//-s9;//2+s9;//
- //real OxyyMxzz = 1.;//2+s9;//
- real O4 = 1.;
- real O5 = 1.;
- real O6 = 1.;
+ real OxxPyyPzz = c1o1; //omega2 or bulk viscosity
+ real OxyyPxzz = c1o1;//-s9;//2+s9;//
+ //real OxyyMxzz = c1o1;//2+s9;//
+ real O4 = c1o1;
+ real O5 = c1o1;
+ real O6 = c1o1;
//Cum 4.
//LBMReal CUMcbb = mfcbb - ((mfcaa + c1o3 * oMdrho) * mfabb + 2. * mfbba * mfbab); // till 18.05.2015
//LBMReal CUMbcb = mfbcb - ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb); // till 18.05.2015
//LBMReal CUMbbc = mfbbc - ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb); // till 18.05.2015
- 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 CUMcbb = mfcbb - ((mfcaa + c1o3) * mfabb + c2o1 * mfbba * mfbab);
+ real CUMbcb = mfbcb - ((mfaca + c1o3) * mfbab + c2o1 * mfbba * mfabb);
+ real CUMbbc = mfbbc - ((mfaac + c1o3) * mfbba + c2o1 * mfbab * mfabb);
- real CUMcca = mfcca - ((mfcaa * mfaca + 2. * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9*(oMdrho-1.)*oMdrho);
- real CUMcac = mfcac - ((mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9*(oMdrho-1.)*oMdrho);
- real CUMacc = mfacc - ((mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9*(oMdrho-1.)*oMdrho);
+ real CUMcca = mfcca - ((mfcaa * mfaca + c2o1 * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9*(oMdrho-c1o1)*oMdrho);
+ real CUMcac = mfcac - ((mfcaa * mfaac + c2o1 * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9*(oMdrho-c1o1)*oMdrho);
+ real CUMacc = mfacc - ((mfaac * mfaca + c2o1 * 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;
+ real CUMbcc = mfbcc - (mfaac * mfbca + mfaca * mfbac + c4o1 * mfabb * mfbbb + c2o1 * (mfbab * mfacb + mfbba * mfabc)) - c1o3 * (mfbca + mfbac) * oMdrho;
+ real CUMcbc = mfcbc - (mfaac * mfcba + mfcaa * mfabc + c4o1 * mfbab * mfbbb + c2o1 * (mfabb * mfcab + mfbba * mfbac)) - c1o3 * (mfcba + mfabc) * oMdrho;
+ real CUMccb = mfccb - (mfcaa * mfacb + mfaca * mfcab + c4o1 * mfbba * mfbbb + c2o1 * (mfbab * mfbca + mfabb * mfcba)) - c1o3 * (mfacb + mfcab) * oMdrho;
//Cum 6.
- real CUMccc = mfccc +((-4. * mfbbb * mfbbb
+ real CUMccc = mfccc +((-c4o1 * 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)
+ - c4o1 * (mfabb * mfcbb + mfbab * mfbcb + mfbba * mfbbc)
+ - c2o1 * (mfbca * mfbac + mfcba * mfabc + mfcab * mfacb))
+ +(c4o1 * (mfbab * mfbab * mfaca + mfabb * mfabb * mfcaa + mfbba * mfbba * mfaac)
+ + c2o1 * (mfcaa * mfaca * mfaac)
+ + c16o1 * 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)
+ - c1o9* (mfcaa + mfaca + mfaac) * oMdrho*(c1o1-c2o1* oMdrho)- c1o27* oMdrho * oMdrho*(-c2o1* oMdrho)
+ +(c2o1 * (mfbab * mfbab + mfabb * mfabb + mfbba * mfbba)
+ (mfaac * mfaca + mfaac * mfcaa + mfaca * mfcaa)) * c2o3*oMdrho) +c1o27*oMdrho;
//2.
@@ -515,9 +515,9 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
real dzuz = dxux + collFactor * c3o2 * mxxMzz;
//relax
- mxxPyyPzz += OxxPyyPzz*(mfaaa - mxxPyyPzz)- 3. * (1. - c1o2 * OxxPyyPzz) * (vx2 * dxux + vy2 * dyuy + vz2 * dzuz);
- mxxMyy += collFactor * (-mxxMyy) - 3. * (1. - c1o2 * collFactor) * (vx2 * dxux - vy2 * dyuy);
- mxxMzz += collFactor * (-mxxMzz) - 3. * (1. - c1o2 * collFactor) * (vx2 * dxux - vz2 * dzuz);
+ mxxPyyPzz += OxxPyyPzz*(mfaaa - mxxPyyPzz)- c3o1 * (c1o1 - c1o2 * OxxPyyPzz) * (vx2 * dxux + vy2 * dyuy + vz2 * dzuz);
+ mxxMyy += collFactor * (-mxxMyy) - c3o1 * (c1o1 - c1o2 * collFactor) * (vx2 * dxux - vy2 * dyuy);
+ mxxMzz += collFactor * (-mxxMzz) - c3o1 * (c1o1 - c1o2 * collFactor) * (vx2 * dxux - vz2 * dzuz);
mfabb += collFactor * (-mfabb);
mfbab += collFactor * (-mfbab);
@@ -525,8 +525,8 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
// linear combinations back
mfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
- mfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
- mfaac = c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz);
+ mfaca = c1o3 * (-c2o1 * mxxMyy + mxxMzz + mxxPyyPzz);
+ mfaac = c1o3 * (mxxMyy - c2o1 * mxxMzz + mxxPyyPzz);
//3.
// linear combinations
@@ -540,19 +540,19 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
real mxyyMxzz = mfbca - mfbac;
//relax
- wadjust = OxyyMxzz+(1.-OxyyMxzz)*fabs(mfbbb)/(fabs(mfbbb)+qudricLimit);
+ wadjust = OxyyMxzz+(c1o1-OxyyMxzz)*fabs(mfbbb)/(fabs(mfbbb)+qudricLimit);
mfbbb += wadjust * (-mfbbb);
- wadjust = OxyyPxzz+(1.-OxyyPxzz)*fabs(mxxyPyzz)/(fabs(mxxyPyzz)+qudricLimit);
+ wadjust = OxyyPxzz+(c1o1-OxyyPxzz)*fabs(mxxyPyzz)/(fabs(mxxyPyzz)+qudricLimit);
mxxyPyzz += wadjust * (-mxxyPyzz);
- wadjust = OxyyMxzz+(1.-OxyyMxzz)*fabs(mxxyMyzz)/(fabs(mxxyMyzz)+qudricLimit);
+ wadjust = OxyyMxzz+(c1o1-OxyyMxzz)*fabs(mxxyMyzz)/(fabs(mxxyMyzz)+qudricLimit);
mxxyMyzz += wadjust * (-mxxyMyzz);
- wadjust = OxyyPxzz+(1.-OxyyPxzz)*fabs(mxxzPyyz)/(fabs(mxxzPyyz)+qudricLimit);
+ wadjust = OxyyPxzz+(c1o1-OxyyPxzz)*fabs(mxxzPyyz)/(fabs(mxxzPyyz)+qudricLimit);
mxxzPyyz += wadjust * (-mxxzPyyz);
- wadjust = OxyyMxzz+(1.-OxyyMxzz)*fabs(mxxzMyyz)/(fabs(mxxzMyyz)+qudricLimit);
+ wadjust = OxyyMxzz+(c1o1-OxyyMxzz)*fabs(mxxzMyyz)/(fabs(mxxzMyyz)+qudricLimit);
mxxzMyyz += wadjust * (-mxxzMyyz);
- wadjust = OxyyPxzz+(1.-OxyyPxzz)*fabs(mxyyPxzz)/(fabs(mxyyPxzz)+qudricLimit);
+ wadjust = OxyyPxzz+(c1o1-OxyyPxzz)*fabs(mxyyPxzz)/(fabs(mxyyPxzz)+qudricLimit);
mxyyPxzz += wadjust * (-mxyyPxzz);
- wadjust = OxyyMxzz+(1.-OxyyMxzz)*fabs(mxyyMxzz)/(fabs(mxyyMxzz)+qudricLimit);
+ wadjust = OxyyMxzz+(c1o1-OxyyMxzz)*fabs(mxyyMxzz)/(fabs(mxyyMxzz)+qudricLimit);
mxyyMxzz += wadjust * (-mxyyMxzz);
// linear combinations back
@@ -586,30 +586,30 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
//mfbcb = CUMbcb + ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb); // till 18.05.2015
//mfbbc = CUMbbc + ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb); // till 18.05.2015
- mfcbb = CUMcbb + ((mfcaa + c1o3) * mfabb + 2. * mfbba * mfbab);
- mfbcb = CUMbcb + ((mfaca + c1o3) * mfbab + 2. * mfbba * mfabb);
- mfbbc = CUMbbc + ((mfaac + c1o3) * mfbba + 2. * mfbab * mfabb);
+ mfcbb = CUMcbb + ((mfcaa + c1o3) * mfabb + c2o1 * mfbba * mfbab);
+ mfbcb = CUMbcb + ((mfaca + c1o3) * mfbab + c2o1 * mfbba * mfabb);
+ mfbbc = CUMbbc + ((mfaac + c1o3) * mfbba + c2o1 * mfbab * mfabb);
- mfcca = CUMcca + (mfcaa * mfaca + 2. * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
- mfcac = CUMcac + (mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
- mfacc = CUMacc + (mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ mfcca = CUMcca + (mfcaa * mfaca + c2o1 * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ mfcac = CUMcac + (mfcaa * mfaac + c2o1 * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ mfacc = CUMacc + (mfaac * mfaca + c2o1 * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9*(oMdrho-1)*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;
+ mfbcc = CUMbcc + (mfaac * mfbca + mfaca * mfbac + c4o1 * mfabb * mfbbb + c2o1 * (mfbab * mfacb + mfbba * mfabc)) + c1o3 * (mfbca + mfbac) * oMdrho;
+ mfcbc = CUMcbc + (mfaac * mfcba + mfcaa * mfabc + c4o1 * mfbab * mfbbb + c2o1 * (mfabb * mfcab + mfbba * mfbac)) + c1o3 * (mfcba + mfabc) * oMdrho;
+ mfccb = CUMccb + (mfcaa * mfacb + mfaca * mfcab + c4o1 * mfbba * mfbbb + c2o1 * (mfbab * mfbca + mfabb * mfcba)) + c1o3 * (mfacb + mfcab) * oMdrho;
//6.
- mfccc = CUMccc -((-4. * mfbbb * mfbbb
+ mfccc = CUMccc -((-c4o1 * 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)
+ - c4o1 * (mfabb * mfcbb + mfbac * mfbca + mfbba * mfbbc)
+ - c2o1 * (mfbca * mfbac + mfcba * mfabc + mfcab * mfacb))
+ +(c4o1 * (mfbab * mfbab * mfaca + mfabb * mfabb * mfcaa + mfbba * mfbba * mfaac)
+ + c2o1 * (mfcaa * mfaca * mfaac)
+ + c16o1 * 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)
+ - c1o9* (mfcaa + mfaca + mfaac) * oMdrho*(c1o1-c2o1* oMdrho)- c1o27* oMdrho * oMdrho*(-c2o1* oMdrho)
+ +(c2o1 * (mfbab * mfbab + mfabb * mfabb + mfbba * mfbba)
+ (mfaac * mfaca + mfaac * mfcaa + mfaca * mfcaa)) * c2o3*oMdrho) -c1o27*oMdrho;
////////////////////////////////////////////////////////////////////////////////////
@@ -625,22 +625,22 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
//mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
////////////////////////////////////////////////////////////////////////////////////
// Z - Dir
- m0 = mfaac * c1o2 + mfaab * (vvz - c1o2) + (mfaaa + 1. * oMdrho) * (vz2 - vvz) * c1o2;
- m1 = -mfaac - 2. * mfaab * vvz + mfaaa * (1. - vz2) - 1. * oMdrho * vz2;
- m2 = mfaac * c1o2 + mfaab * (vvz + c1o2) + (mfaaa + 1. * oMdrho) * (vz2 + vvz) * c1o2;
+ m0 = mfaac * c1o2 + mfaab * (vvz - c1o2) + (mfaaa + c1o1 * oMdrho) * (vz2 - vvz) * c1o2;
+ m1 = -mfaac - c2o1 * mfaab * vvz + mfaaa * (c1o1 - vz2) - c1o1 * oMdrho * vz2;
+ m2 = mfaac * c1o2 + mfaab * (vvz + c1o2) + (mfaaa + c1o1 * oMdrho) * (vz2 + vvz) * c1o2;
mfaaa = m0;
mfaab = m1;
mfaac = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfabc * c1o2 + mfabb * (vvz - c1o2) + mfaba * (vz2 - vvz) * c1o2;
- m1 = -mfabc - 2. * mfabb * vvz + mfaba * (1. - vz2);
+ m1 = -mfabc - c2o1 * mfabb * vvz + mfaba * (c1o1 - vz2);
m2 = mfabc * c1o2 + mfabb * (vvz + c1o2) + mfaba * (vz2 + vvz) * c1o2;
mfaba = m0;
mfabb = m1;
mfabc = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfacc * c1o2 + mfacb * (vvz - c1o2) + (mfaca + c1o3 * oMdrho) * (vz2 - vvz) * c1o2;
- m1 = -mfacc - 2. * mfacb * vvz + mfaca * (1. - vz2) - c1o3 * oMdrho * vz2;
+ m1 = -mfacc - c2o1 * mfacb * vvz + mfaca * (c1o1 - vz2) - c1o3 * oMdrho * vz2;
m2 = mfacc * c1o2 + mfacb * (vvz + c1o2) + (mfaca + c1o3 * oMdrho) * (vz2 + vvz) * c1o2;
mfaca = m0;
mfacb = m1;
@@ -648,21 +648,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfbac * c1o2 + mfbab * (vvz - c1o2) + mfbaa * (vz2 - vvz) * c1o2;
- m1 = -mfbac - 2. * mfbab * vvz + mfbaa * (1. - vz2);
+ m1 = -mfbac - c2o1 * mfbab * vvz + mfbaa * (c1o1 - vz2);
m2 = mfbac * c1o2 + mfbab * (vvz + c1o2) + mfbaa * (vz2 + vvz) * c1o2;
mfbaa = m0;
mfbab = m1;
mfbac = m2;
/////////b//////////////////////////////////////////////////////////////////////////
m0 = mfbbc * c1o2 + mfbbb * (vvz - c1o2) + mfbba * (vz2 - vvz) * c1o2;
- m1 = -mfbbc - 2. * mfbbb * vvz + mfbba * (1. - vz2);
+ m1 = -mfbbc - c2o1 * mfbbb * vvz + mfbba * (c1o1 - vz2);
m2 = mfbbc * c1o2 + mfbbb * (vvz + c1o2) + mfbba * (vz2 + vvz) * c1o2;
mfbba = m0;
mfbbb = m1;
mfbbc = m2;
/////////b//////////////////////////////////////////////////////////////////////////
m0 = mfbcc * c1o2 + mfbcb * (vvz - c1o2) + mfbca * (vz2 - vvz) * c1o2;
- m1 = -mfbcc - 2. * mfbcb * vvz + mfbca * (1. - vz2);
+ m1 = -mfbcc - c2o1 * mfbcb * vvz + mfbca * (c1o1 - vz2);
m2 = mfbcc * c1o2 + mfbcb * (vvz + c1o2) + mfbca * (vz2 + vvz) * c1o2;
mfbca = m0;
mfbcb = m1;
@@ -670,21 +670,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcac * c1o2 + mfcab * (vvz - c1o2) + (mfcaa + c1o3 * oMdrho) * (vz2 - vvz) * c1o2;
- m1 = -mfcac - 2. * mfcab * vvz + mfcaa * (1. - vz2) - c1o3 * oMdrho * vz2;
+ m1 = -mfcac - c2o1 * mfcab * vvz + mfcaa * (c1o1 - vz2) - c1o3 * oMdrho * vz2;
m2 = mfcac * c1o2 + mfcab * (vvz + c1o2) + (mfcaa + c1o3 * oMdrho) * (vz2 + vvz) * c1o2;
mfcaa = m0;
mfcab = m1;
mfcac = m2;
/////////c//////////////////////////////////////////////////////////////////////////
m0 = mfcbc * c1o2 + mfcbb * (vvz - c1o2) + mfcba * (vz2 - vvz) * c1o2;
- m1 = -mfcbc - 2. * mfcbb * vvz + mfcba * (1. - vz2);
+ m1 = -mfcbc - c2o1 * mfcbb * vvz + mfcba * (c1o1 - vz2);
m2 = mfcbc * c1o2 + mfcbb * (vvz + c1o2) + mfcba * (vz2 + vvz) * c1o2;
mfcba = m0;
mfcbb = m1;
mfcbc = m2;
/////////c//////////////////////////////////////////////////////////////////////////
m0 = mfccc * c1o2 + mfccb * (vvz - c1o2) + (mfcca + c1o9 * oMdrho) * (vz2 - vvz) * c1o2;
- m1 = -mfccc - 2. * mfccb * vvz + mfcca * (1. - vz2) - c1o9 * oMdrho * vz2;
+ m1 = -mfccc - c2o1 * mfccb * vvz + mfcca * (c1o1 - vz2) - c1o9 * oMdrho * vz2;
m2 = mfccc * c1o2 + mfccb * (vvz + c1o2) + (mfcca + c1o9 * oMdrho) * (vz2 + vvz) * c1o2;
mfcca = m0;
mfccb = m1;
@@ -695,21 +695,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
// Y - Dir
m0 = mfaca * c1o2 + mfaba * (vvy - c1o2) + (mfaaa + c1o6 * oMdrho) * (vy2 - vvy) * c1o2;
- m1 = -mfaca - 2. * mfaba * vvy + mfaaa * (1. - vy2) - c1o6 * oMdrho * vy2;
+ m1 = -mfaca - c2o1 * mfaba * vvy + mfaaa * (c1o1 - vy2) - c1o6 * oMdrho * vy2;
m2 = mfaca * c1o2 + mfaba * (vvy + c1o2) + (mfaaa + c1o6 * oMdrho) * (vy2 + vvy) * c1o2;
mfaaa = m0;
mfaba = m1;
mfaca = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfacb * c1o2 + mfabb * (vvy - c1o2) + (mfaab + c2o3 * oMdrho) * (vy2 - vvy) * c1o2;
- m1 = -mfacb - 2. * mfabb * vvy + mfaab * (1. - vy2) - c2o3 * oMdrho * vy2;
+ m1 = -mfacb - c2o1 * mfabb * vvy + mfaab * (c1o1 - vy2) - c2o3 * oMdrho * vy2;
m2 = mfacb * c1o2 + mfabb * (vvy + c1o2) + (mfaab + c2o3 * oMdrho) * (vy2 + vvy) * c1o2;
mfaab = m0;
mfabb = m1;
mfacb = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfacc * c1o2 + mfabc * (vvy - c1o2) + (mfaac + c1o6 * oMdrho) * (vy2 - vvy) * c1o2;
- m1 = -mfacc - 2. * mfabc * vvy + mfaac * (1. - vy2) - c1o6 * oMdrho * vy2;
+ m1 = -mfacc - c2o1 * mfabc * vvy + mfaac * (c1o1 - vy2) - c1o6 * oMdrho * vy2;
m2 = mfacc * c1o2 + mfabc * (vvy + c1o2) + (mfaac + c1o6 * oMdrho) * (vy2 + vvy) * c1o2;
mfaac = m0;
mfabc = m1;
@@ -717,21 +717,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfbca * c1o2 + mfbba * (vvy - c1o2) + mfbaa * (vy2 - vvy) * c1o2;
- m1 = -mfbca - 2. * mfbba * vvy + mfbaa * (1. - vy2);
+ m1 = -mfbca - c2o1 * mfbba * vvy + mfbaa * (c1o1 - vy2);
m2 = mfbca * c1o2 + mfbba * (vvy + c1o2) + mfbaa * (vy2 + vvy) * c1o2;
mfbaa = m0;
mfbba = m1;
mfbca = m2;
/////////b//////////////////////////////////////////////////////////////////////////
m0 = mfbcb * c1o2 + mfbbb * (vvy - c1o2) + mfbab * (vy2 - vvy) * c1o2;
- m1 = -mfbcb - 2. * mfbbb * vvy + mfbab * (1. - vy2);
+ m1 = -mfbcb - c2o1 * mfbbb * vvy + mfbab * (c1o1 - vy2);
m2 = mfbcb * c1o2 + mfbbb * (vvy + c1o2) + mfbab * (vy2 + vvy) * c1o2;
mfbab = m0;
mfbbb = m1;
mfbcb = m2;
/////////b//////////////////////////////////////////////////////////////////////////
m0 = mfbcc * c1o2 + mfbbc * (vvy - c1o2) + mfbac * (vy2 - vvy) * c1o2;
- m1 = -mfbcc - 2. * mfbbc * vvy + mfbac * (1. - vy2);
+ m1 = -mfbcc - c2o1 * mfbbc * vvy + mfbac * (c1o1 - vy2);
m2 = mfbcc * c1o2 + mfbbc * (vvy + c1o2) + mfbac * (vy2 + vvy) * c1o2;
mfbac = m0;
mfbbc = m1;
@@ -739,21 +739,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcca * c1o2 + mfcba * (vvy - c1o2) + (mfcaa + c1o18 * oMdrho) * (vy2 - vvy) * c1o2;
- m1 = -mfcca - 2. * mfcba * vvy + mfcaa * (1. - vy2) - c1o18 * oMdrho * vy2;
+ m1 = -mfcca - c2o1 * mfcba * vvy + mfcaa * (c1o1 - vy2) - c1o18 * oMdrho * vy2;
m2 = mfcca * c1o2 + mfcba * (vvy + c1o2) + (mfcaa + c1o18 * oMdrho) * (vy2 + vvy) * c1o2;
mfcaa = m0;
mfcba = m1;
mfcca = m2;
/////////c//////////////////////////////////////////////////////////////////////////
m0 = mfccb * c1o2 + mfcbb * (vvy - c1o2) + (mfcab + c2o9 * oMdrho) * (vy2 - vvy) * c1o2;
- m1 = -mfccb - 2. * mfcbb * vvy + mfcab * (1. - vy2) - c2o9 * oMdrho * vy2;
+ m1 = -mfccb - c2o1 * mfcbb * vvy + mfcab * (c1o1 - vy2) - c2o9 * oMdrho * vy2;
m2 = mfccb * c1o2 + mfcbb * (vvy + c1o2) + (mfcab + c2o9 * oMdrho) * (vy2 + vvy) * c1o2;
mfcab = m0;
mfcbb = m1;
mfccb = m2;
/////////c//////////////////////////////////////////////////////////////////////////
m0 = mfccc * c1o2 + mfcbc * (vvy - c1o2) + (mfcac + c1o18 * oMdrho) * (vy2 - vvy) * c1o2;
- m1 = -mfccc - 2. * mfcbc * vvy + mfcac * (1. - vy2) - c1o18 * oMdrho * vy2;
+ m1 = -mfccc - c2o1 * mfcbc * vvy + mfcac * (c1o1 - vy2) - c1o18 * oMdrho * vy2;
m2 = mfccc * c1o2 + mfcbc * (vvy + c1o2) + (mfcac + c1o18 * oMdrho) * (vy2 + vvy) * c1o2;
mfcac = m0;
mfcbc = m1;
@@ -764,21 +764,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
// X - Dir
m0 = mfcaa * c1o2 + mfbaa * (vvx - c1o2) + (mfaaa + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfcaa - 2. * mfbaa * vvx + mfaaa * (1. - vx2) - c1o36 * oMdrho * vx2;
+ m1 = -mfcaa - c2o1 * mfbaa * vvx + mfaaa * (c1o1 - vx2) - c1o36 * oMdrho * vx2;
m2 = mfcaa * c1o2 + mfbaa * (vvx + c1o2) + (mfaaa + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
mfaaa = m0;
mfbaa = m1;
mfcaa = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcba * c1o2 + mfbba * (vvx - c1o2) + (mfaba + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfcba - 2. * mfbba * vvx + mfaba * (1. - vx2) - c1o9 * oMdrho * vx2;
+ m1 = -mfcba - c2o1 * mfbba * vvx + mfaba * (c1o1 - vx2) - c1o9 * oMdrho * vx2;
m2 = mfcba * c1o2 + mfbba * (vvx + c1o2) + (mfaba + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
mfaba = m0;
mfbba = m1;
mfcba = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcca * c1o2 + mfbca * (vvx - c1o2) + (mfaca + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfcca - 2. * mfbca * vvx + mfaca * (1. - vx2) - c1o36 * oMdrho * vx2;
+ m1 = -mfcca - c2o1 * mfbca * vvx + mfaca * (c1o1 - vx2) - c1o36 * oMdrho * vx2;
m2 = mfcca * c1o2 + mfbca * (vvx + c1o2) + (mfaca + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
mfaca = m0;
mfbca = m1;
@@ -786,21 +786,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcab * c1o2 + mfbab * (vvx - c1o2) + (mfaab + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfcab - 2. * mfbab * vvx + mfaab * (1. - vx2) - c1o9 * oMdrho * vx2;
+ m1 = -mfcab - c2o1 * mfbab * vvx + mfaab * (c1o1 - vx2) - c1o9 * oMdrho * vx2;
m2 = mfcab * c1o2 + mfbab * (vvx + c1o2) + (mfaab + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
mfaab = m0;
mfbab = m1;
mfcab = m2;
///////////b////////////////////////////////////////////////////////////////////////
m0 = mfcbb * c1o2 + mfbbb * (vvx - c1o2) + (mfabb + c4o9 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfcbb - 2. * mfbbb * vvx + mfabb * (1. - vx2) - c4o9 * oMdrho * vx2;
+ m1 = -mfcbb - c2o1 * mfbbb * vvx + mfabb * (c1o1 - vx2) - c4o9 * oMdrho * vx2;
m2 = mfcbb * c1o2 + mfbbb * (vvx + c1o2) + (mfabb + c4o9 * oMdrho) * (vx2 + vvx) * c1o2;
mfabb = m0;
mfbbb = m1;
mfcbb = m2;
///////////b////////////////////////////////////////////////////////////////////////
m0 = mfccb * c1o2 + mfbcb * (vvx - c1o2) + (mfacb + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfccb - 2. * mfbcb * vvx + mfacb * (1. - vx2) - c1o9 * oMdrho * vx2;
+ m1 = -mfccb - c2o1 * mfbcb * vvx + mfacb * (c1o1 - vx2) - c1o9 * oMdrho * vx2;
m2 = mfccb * c1o2 + mfbcb * (vvx + c1o2) + (mfacb + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
mfacb = m0;
mfbcb = m1;
@@ -808,21 +808,21 @@ void IncompressibleCumulantLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcac * c1o2 + mfbac * (vvx - c1o2) + (mfaac + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfcac - 2. * mfbac * vvx + mfaac * (1. - vx2) - c1o36 * oMdrho * vx2;
+ m1 = -mfcac - c2o1 * mfbac * vvx + mfaac * (c1o1 - vx2) - c1o36 * oMdrho * vx2;
m2 = mfcac * c1o2 + mfbac * (vvx + c1o2) + (mfaac + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
mfaac = m0;
mfbac = m1;
mfcac = m2;
///////////c////////////////////////////////////////////////////////////////////////
m0 = mfcbc * c1o2 + mfbbc * (vvx - c1o2) + (mfabc + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfcbc - 2. * mfbbc * vvx + mfabc * (1. - vx2) - c1o9 * oMdrho * vx2;
+ m1 = -mfcbc - c2o1 * mfbbc * vvx + mfabc * (c1o1 - vx2) - c1o9 * oMdrho * vx2;
m2 = mfcbc * c1o2 + mfbbc * (vvx + c1o2) + (mfabc + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
mfabc = m0;
mfbbc = m1;
mfcbc = m2;
///////////c////////////////////////////////////////////////////////////////////////
m0 = mfccc * c1o2 + mfbcc * (vvx - c1o2) + (mfacc + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
- m1 = -mfccc - 2. * mfbcc * vvx + mfacc * (1. - vx2) - c1o36 * oMdrho * vx2;
+ m1 = -mfccc - c2o1 * mfbcc * vvx + mfacc * (c1o1 - vx2) - c1o36 * oMdrho * vx2;
m2 = mfccc * c1o2 + mfbcc * (vvx + c1o2) + (mfacc + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
mfacc = m0;
mfbcc = m1;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
index 5abe9afc29caf6fe178d6b0e7c3b44e373c6defb..99e64ce0cac5a0a1e53a40f1eb4a4ab36cfa2f81 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantLBMKernel.h
@@ -4,7 +4,7 @@
#define IncompressibleCumulantLBMKernel_H
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "basics/utilities/UbTiming.h"
#include "basics/container/CbArray4D.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
index 7f2bf15a1d919a02cdad290265d741eee080f108..0ac578d90615b0ab0ba4989b6b70d680eb0e8c44 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleCumulantWithSpongeLayerLBMKernel.cpp
@@ -47,7 +47,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::initRelaxFactor(int vdir, r
real spongeFactor;
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -74,38 +74,38 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::initRelaxFactor(int vdir, r
case DIR_P00:
muX1 = (real)(x1 + ix1 * maxX1);
if (muX1 >= (sizeX - sizeSP) / deltaT)
- spongeFactor = (sizeX - (muX1 * deltaT + 1)) / sizeSP / 2.0 + 0.5;
- else spongeFactor = 1.0;
+ spongeFactor = (sizeX - (muX1 * deltaT + c1o1)) / sizeSP / c2o1 + c1o2;
+ else spongeFactor = c1o1;
break;
case DIR_M00:
muX1 = (real)(x1 + ix1 * maxX1);
if (muX1 <= sizeSP / deltaT)
- spongeFactor = (sizeSP - (muX1 * deltaT + 1)) / sizeSP / 2.0 + 0.5;
- else spongeFactor = 1.0;
+ spongeFactor = (sizeSP - (muX1 * deltaT + c1o1)) / sizeSP / c2o1 + c1o2;
+ else spongeFactor = c1o1;
break;
case DIR_0P0:
muX2 = (real)(x2 + ix2 * maxX2);
if (muX2 >= (sizeX - sizeSP) / deltaT)
- spongeFactor = (sizeX - (muX2 * deltaT + 1)) / sizeSP / 2.0 + 0.5;
- else spongeFactor = 1.0;
+ spongeFactor = (sizeX - (muX2 * deltaT + c1o1)) / sizeSP / c2o1 + c1o2;
+ else spongeFactor = c1o1;
break;
case DIR_0M0:
muX2 = (real)(x2 + ix2 * maxX2);
if (muX2 <= sizeSP / deltaT)
- spongeFactor = (sizeSP - (muX2 * deltaT + 1)) / sizeSP / 2.0 + 0.5;
- else spongeFactor = 1.0;
+ spongeFactor = (sizeSP - (muX2 * deltaT + c1o1)) / sizeSP / c2o1 + c1o2;
+ else spongeFactor = c1o1;
break;
case DIR_00P:
muX3 = (real)(x3 + ix3 * maxX3);
if (muX3 >= (sizeX - sizeSP) / deltaT)
- spongeFactor = (sizeX - (muX3 * deltaT + 1)) / sizeSP / 2.0 + 0.5;
- else spongeFactor = 1.0;
+ spongeFactor = (sizeX - (muX3 * deltaT + c1o1)) / sizeSP / c2o1 + c1o2;
+ else spongeFactor = c1o1;
break;
case DIR_00M:
muX3 = (real)(x3 + ix3 * maxX3);
if (muX3 <= sizeSP / deltaT)
- spongeFactor = (sizeSP - (muX3 * deltaT + 1)) / sizeSP / 2.0 + 0.5;
- else spongeFactor = 1.0;
+ spongeFactor = (sizeSP - (muX3 * deltaT + c1o1)) / sizeSP / c2o1 + c1o2;
+ else spongeFactor = c1o1;
break;
default: throw UbException(UB_EXARGS, "unknown dir");
}
@@ -122,7 +122,7 @@ SPtr<LBMKernel> IncompressibleCumulantWithSpongeLayerLBMKernel::clone()
kernel->setNX(nx);
dynamicPointerCast<IncompressibleCumulantWithSpongeLayerLBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -134,10 +134,10 @@ SPtr<LBMKernel> IncompressibleCumulantWithSpongeLayerLBMKernel::clone()
switch (parameter)
{
case NORMAL:
- dynamicPointerCast<IncompressibleCumulantWithSpongeLayerLBMKernel>(kernel)->OxyyMxzz = 1.0;
+ dynamicPointerCast<IncompressibleCumulantWithSpongeLayerLBMKernel>(kernel)->OxyyMxzz = c1o1;
break;
case MAGIC:
- dynamicPointerCast<IncompressibleCumulantWithSpongeLayerLBMKernel>(kernel)->OxyyMxzz = 2.0 +(-collFactor);
+ dynamicPointerCast<IncompressibleCumulantWithSpongeLayerLBMKernel>(kernel)->OxyyMxzz = c2o1 +(-collFactor);
break;
}
@@ -169,7 +169,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
// muForcingX2.DefineVar("dx",&muDeltaT);
// muForcingX3.DefineVar("dx",&muDeltaT);
- // muNu = (1.0/3.0)*(1.0/collFactor - 1.0/2.0);
+ // muNu = (1.0/3.0)*(1.0/collFactor - 1.0/c2o10);
// muForcingX1.DefineVar("nu",&muNu);
// muForcingX2.DefineVar("nu",&muNu);
@@ -193,7 +193,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
SPtr<RelaxationFactorArray3D> relaxationFactorPtr = dataSet->getRelaxationFactor();
const int bcArrayMaxX1 = (int)bcArray->getNX1();
@@ -352,7 +352,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
m2=mfbba+mfbbc;
m0+=m1+m2;
m0+=mfbbb; //hat gefehlt
- oMdrho = 1. - (oMdrho + m0);
+ oMdrho = c1o1 - (oMdrho + m0);
real vx2;
real vy2;
@@ -362,7 +362,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
vz2=vvz*vvz;
////////////////////////////////////////////////////////////////////////////////////
real wadjust;
- real qudricLimit = 0.01;
+ real qudricLimit = c1o100;
////////////////////////////////////////////////////////////////////////////////////
//Hin
////////////////////////////////////////////////////////////////////////////////////
@@ -375,7 +375,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfaaa = m0;
m0 += c1o36 * oMdrho;
mfaab = m1 - m0 * vvz;
- mfaac = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfaac = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaba + mfabc;
m1 = mfabc - mfaba;
@@ -383,7 +383,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfaba = m0;
m0 += c1o9 * oMdrho;
mfabb = m1 - m0 * vvz;
- mfabc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfabc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaca + mfacc;
m1 = mfacc - mfaca;
@@ -391,7 +391,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfaca = m0;
m0 += c1o36 * oMdrho;
mfacb = m1 - m0 * vvz;
- mfacc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfacc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbaa + mfbac;
@@ -400,7 +400,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfbaa = m0;
m0 += c1o9 * oMdrho;
mfbab = m1 - m0 * vvz;
- mfbac = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfbac = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbba + mfbbc;
m1 = mfbbc - mfbba;
@@ -408,7 +408,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfbba = m0;
m0 += c4o9 * oMdrho;
mfbbb = m1 - m0 * vvz;
- mfbbc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfbbc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbca + mfbcc;
m1 = mfbcc - mfbca;
@@ -416,7 +416,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfbca = m0;
m0 += c1o9 * oMdrho;
mfbcb = m1 - m0 * vvz;
- mfbcc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfbcc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcaa + mfcac;
@@ -425,7 +425,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfcaa = m0;
m0 += c1o36 * oMdrho;
mfcab = m1 - m0 * vvz;
- mfcac = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfcac = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcba + mfcbc;
m1 = mfcbc - mfcba;
@@ -433,7 +433,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfcba = m0;
m0 += c1o9 * oMdrho;
mfcbb = m1 - m0 * vvz;
- mfcbc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfcbc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcca + mfccc;
m1 = mfccc - mfcca;
@@ -441,7 +441,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfcca = m0;
m0 += c1o36 * oMdrho;
mfccb = m1 - m0 * vvz;
- mfccc = m2 - 2. * m1 * vvz + vz2 * m0;
+ mfccc = m2 - c2o1 * m1 * vvz + vz2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
// mit 1/6, 0, 1/18, 2/3, 0, 2/9, 1/6, 0, 1/18 Konditionieren
@@ -453,14 +453,14 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfaaa = m0;
m0 += c1o6 * oMdrho;
mfaba = m1 - m0 * vvy;
- mfaca = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfaca = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaab + mfacb;
m1 = mfacb - mfaab;
m0 = m2 + mfabb;
mfaab = m0;
mfabb = m1 - m0 * vvy;
- mfacb = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfacb = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaac + mfacc;
m1 = mfacc - mfaac;
@@ -468,7 +468,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfaac = m0;
m0 += c1o18 * oMdrho;
mfabc = m1 - m0 * vvy;
- mfacc = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfacc = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbaa + mfbca;
@@ -477,14 +477,14 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfbaa = m0;
m0 += c2o3 * oMdrho;
mfbba = m1 - m0 * vvy;
- mfbca = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfbca = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbab + mfbcb;
m1 = mfbcb - mfbab;
m0 = m2 + mfbbb;
mfbab = m0;
mfbbb = m1 - m0 * vvy;
- mfbcb = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfbcb = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfbac + mfbcc;
m1 = mfbcc - mfbac;
@@ -492,7 +492,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfbac = m0;
m0 += c2o9 * oMdrho;
mfbbc = m1 - m0 * vvy;
- mfbcc = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfbcc = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcaa + mfcca;
@@ -501,14 +501,14 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfcaa = m0;
m0 += c1o6 * oMdrho;
mfcba = m1 - m0 * vvy;
- mfcca = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfcca = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcab + mfccb;
m1 = mfccb - mfcab;
m0 = m2 + mfcbb;
mfcab = m0;
mfcbb = m1 - m0 * vvy;
- mfccb = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfccb = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfcac + mfccc;
m1 = mfccc - mfcac;
@@ -516,7 +516,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfcac = m0;
m0 += c1o18 * oMdrho;
mfcbc = m1 - m0 * vvy;
- mfccc = m2 - 2. * m1 * vvy + vy2 * m0;
+ mfccc = m2 - c2o1 * m1 * vvy + vy2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
// mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
@@ -526,16 +526,16 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
m1 = mfcaa - mfaaa;
m0 = m2 + mfbaa;
mfaaa = m0;
- m0 += 1. * oMdrho;
+ m0 += c1o1 * oMdrho;
mfbaa = m1 - m0 * vvx;
- mfcaa = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcaa = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaba + mfcba;
m1 = mfcba - mfaba;
m0 = m2 + mfbba;
mfaba = m0;
mfbba = m1 - m0 * vvx;
- mfcba = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcba = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaca + mfcca;
m1 = mfcca - mfaca;
@@ -543,7 +543,7 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfaca = m0;
m0 += c1o3 * oMdrho;
mfbca = m1 - m0 * vvx;
- mfcca = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcca = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaab + mfcab;
@@ -551,21 +551,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
m0 = m2 + mfbab;
mfaab = m0;
mfbab = m1 - m0 * vvx;
- mfcab = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcab = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfabb + mfcbb;
m1 = mfcbb - mfabb;
m0 = m2 + mfbbb;
mfabb = m0;
mfbbb = m1 - m0 * vvx;
- mfcbb = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcbb = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfacb + mfccb;
m1 = mfccb - mfacb;
m0 = m2 + mfbcb;
mfacb = m0;
mfbcb = m1 - m0 * vvx;
- mfccb = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfccb = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m2 = mfaac + mfcac;
@@ -574,14 +574,14 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfaac = m0;
m0 += c1o3 * oMdrho;
mfbac = m1 - m0 * vvx;
- mfcac = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcac = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfabc + mfcbc;
m1 = mfcbc - mfabc;
m0 = m2 + mfbbc;
mfabc = m0;
mfbbc = m1 - m0 * vvx;
- mfcbc = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfcbc = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
m2 = mfacc + mfccc;
m1 = mfccc - mfacc;
@@ -589,42 +589,42 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
mfacc = m0;
m0 += c1o9 * oMdrho;
mfbcc = m1 - m0 * vvx;
- mfccc = m2 - 2. * m1 * vvx + vx2 * m0;
+ mfccc = m2 - c2o1 * m1 * vvx + vx2 * m0;
////////////////////////////////////////////////////////////////////////////////////
// Cumulants
////////////////////////////////////////////////////////////////////////////////////
- real OxxPyyPzz = 1.;
- real OxyyPxzz = 1.;//-s9;//2+s9;//
- //real OxyyMxzz = 1.;//2+s9;//
- real O4 = 1.;
- real O5 = 1.;
- real O6 = 1.;
+ real OxxPyyPzz = c1o1;
+ real OxyyPxzz = c1o1;//-s9;//2+s9;//
+ //real OxyyMxzz = c1o1;//2+s9;//
+ real O4 = c1o1;
+ real O5 = c1o1;
+ real O6 = c1o1;
- //Cum 4.
- real CUMcbb = mfcbb - ((mfcaa + c1o3 * oMdrho) * mfabb + 2. * mfbba * mfbab);
- real CUMbcb = mfbcb - ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb);
- real CUMbbc = mfbbc - ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb);
+ //Cum c4o1
+ real CUMcbb = mfcbb - ((mfcaa + c1o3 * oMdrho) * mfabb + c2o1 * mfbba * mfbab);
+ real CUMbcb = mfbcb - ((mfaca + c1o3 * oMdrho) * mfbab + c2o1 * mfbba * mfabb);
+ real CUMbbc = mfbbc - ((mfaac + c1o3 * oMdrho) * mfbba + c2o1 * mfbab * mfabb);
- real CUMcca = mfcca - (mfcaa * mfaca + 2. * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
- real CUMcac = mfcac - (mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
- real CUMacc = mfacc - (mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ real CUMcca = mfcca - (mfcaa * mfaca + c2o1 * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ real CUMcac = mfcac - (mfcaa * mfaac + c2o1 * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ real CUMacc = mfacc - (mfaac * mfaca + c2o1 * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9*(oMdrho-1)*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;
+ real CUMbcc = mfbcc - (mfaac * mfbca + mfaca * mfbac + c4o1 * mfabb * mfbbb + c2o1 * (mfbab * mfacb + mfbba * mfabc)) - c1o3 * (mfbca + mfbac) * oMdrho;
+ real CUMcbc = mfcbc - (mfaac * mfcba + mfcaa * mfabc + c4o1 * mfbab * mfbbb + c2o1 * (mfabb * mfcab + mfbba * mfbac)) - c1o3 * (mfcba + mfabc) * oMdrho;
+ real CUMccb = mfccb - (mfcaa * mfacb + mfaca * mfcab + c4o1 * mfbba * mfbbb + c2o1 * (mfbab * mfbca + mfabb * mfcba)) - c1o3 * (mfacb + mfcab) * oMdrho;
//Cum 6.
- real CUMccc = mfccc +((-4. * mfbbb * mfbbb
+ real CUMccc = mfccc +((-c4o1 * 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)
+ - c4o1 * (mfabb * mfcbb + mfbab * mfbcb + mfbba * mfbbc)
+ - c2o1 * (mfbca * mfbac + mfcba * mfabc + mfcab * mfacb))
+ +( c4o1 * (mfbab * mfbab * mfaca + mfabb * mfabb * mfcaa + mfbba * mfbba * mfaac)
+ + c2o1 * (mfcaa * mfaca * mfaac)
+ + c16o1 * 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)
+ - c1o9* (mfcaa + mfaca + mfaac) * oMdrho*(c1o1-c2o1* oMdrho)- c1o27* oMdrho * oMdrho*(-c2o1* oMdrho)
+ +( c2o1 * (mfbab * mfbab + mfabb * mfabb + mfbba * mfbba)
+ (mfaac * mfaca + mfaac * mfcaa + mfaca * mfcaa)) * c2o3*oMdrho) +c1o27*oMdrho;
//2.
@@ -638,9 +638,9 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
real dzuz = dxux + collFactor * c3o2 * mxxMzz;
//relax
- mxxPyyPzz += OxxPyyPzz*(mfaaa - mxxPyyPzz)- 3. * (1. - c1o2 * OxxPyyPzz) * (vx2 * dxux + vy2 * dyuy + vz2 * dzuz);
- mxxMyy += collFactor * (-mxxMyy) - 3. * (1. - c1o2 * collFactor) * (vx2 * dxux - vy2 * dyuy);
- mxxMzz += collFactor * (-mxxMzz) - 3. * (1. - c1o2 * collFactor) * (vx2 * dxux - vz2 * dzuz);
+ mxxPyyPzz += OxxPyyPzz*(mfaaa - mxxPyyPzz)- c3o1 * (c1o1 - c1o2 * OxxPyyPzz) * (vx2 * dxux + vy2 * dyuy + vz2 * dzuz);
+ mxxMyy += collFactor * (-mxxMyy) - c3o1 * (c1o1 - c1o2 * collFactor) * (vx2 * dxux - vy2 * dyuy);
+ mxxMzz += collFactor * (-mxxMzz) - c3o1 * (c1o1 - c1o2 * collFactor) * (vx2 * dxux - vz2 * dzuz);
mfabb += collFactor * (-mfabb);
mfbab += collFactor * (-mfbab);
@@ -648,8 +648,8 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
// linear combinations back
mfcaa = c1o3 * ( mxxMyy + mxxMzz + mxxPyyPzz);
- mfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
- mfaac = c1o3 * ( mxxMyy - 2. * mxxMzz + mxxPyyPzz);
+ mfaca = c1o3 * (-c2o1 * mxxMyy + mxxMzz + mxxPyyPzz);
+ mfaac = c1o3 * ( mxxMyy - c2o1 * mxxMzz + mxxPyyPzz);
//3.
// linear combinations
@@ -663,19 +663,19 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
real mxyyMxzz = mfbca - mfbac;
//relax
- wadjust = OxyyMxzz+(1.-OxyyMxzz)*fabs(mfbbb)/(fabs(mfbbb)+qudricLimit);
+ wadjust = OxyyMxzz+(c1o1-OxyyMxzz)*fabs(mfbbb)/(fabs(mfbbb)+qudricLimit);
mfbbb += wadjust * (-mfbbb);
- wadjust = OxyyPxzz+(1.-OxyyPxzz)*fabs(mxxyPyzz)/(fabs(mxxyPyzz)+qudricLimit);
+ wadjust = OxyyPxzz+(c1o1-OxyyPxzz)*fabs(mxxyPyzz)/(fabs(mxxyPyzz)+qudricLimit);
mxxyPyzz += wadjust * (-mxxyPyzz);
- wadjust = OxyyMxzz+(1.-OxyyMxzz)*fabs(mxxyMyzz)/(fabs(mxxyMyzz)+qudricLimit);
+ wadjust = OxyyMxzz+(c1o1-OxyyMxzz)*fabs(mxxyMyzz)/(fabs(mxxyMyzz)+qudricLimit);
mxxyMyzz += wadjust * (-mxxyMyzz);
- wadjust = OxyyPxzz+(1.-OxyyPxzz)*fabs(mxxzPyyz)/(fabs(mxxzPyyz)+qudricLimit);
+ wadjust = OxyyPxzz+(c1o1-OxyyPxzz)*fabs(mxxzPyyz)/(fabs(mxxzPyyz)+qudricLimit);
mxxzPyyz += wadjust * (-mxxzPyyz);
- wadjust = OxyyMxzz+(1.-OxyyMxzz)*fabs(mxxzMyyz)/(fabs(mxxzMyyz)+qudricLimit);
+ wadjust = OxyyMxzz+(c1o1-OxyyMxzz)*fabs(mxxzMyyz)/(fabs(mxxzMyyz)+qudricLimit);
mxxzMyyz += wadjust * (-mxxzMyyz);
- wadjust = OxyyPxzz+(1.-OxyyPxzz)*fabs(mxyyPxzz)/(fabs(mxyyPxzz)+qudricLimit);
+ wadjust = OxyyPxzz+(c1o1-OxyyPxzz)*fabs(mxyyPxzz)/(fabs(mxyyPxzz)+qudricLimit);
mxyyPxzz += wadjust * (-mxyyPxzz);
- wadjust = OxyyMxzz+(1.-OxyyMxzz)*fabs(mxyyMxzz)/(fabs(mxyyMxzz)+qudricLimit);
+ wadjust = OxyyMxzz+(c1o1-OxyyMxzz)*fabs(mxyyMxzz)/(fabs(mxyyMxzz)+qudricLimit);
mxyyMxzz += wadjust * (-mxyyMxzz);
// linear combinations back
@@ -705,30 +705,30 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
//back cumulants to central moments
//4.
- mfcbb = CUMcbb + ((mfcaa + c1o3 * oMdrho) * mfabb + 2. * mfbba * mfbab);
- mfbcb = CUMbcb + ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb);
- mfbbc = CUMbbc + ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb);
+ mfcbb = CUMcbb + ((mfcaa + c1o3 * oMdrho) * mfabb + c2o1 * mfbba * mfbab);
+ mfbcb = CUMbcb + ((mfaca + c1o3 * oMdrho) * mfbab + c2o1 * mfbba * mfabb);
+ mfbbc = CUMbbc + ((mfaac + c1o3 * oMdrho) * mfbba + c2o1 * mfbab * mfabb);
- mfcca = CUMcca + (mfcaa * mfaca + 2. * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
- mfcac = CUMcac + (mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
- mfacc = CUMacc + (mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ mfcca = CUMcca + (mfcaa * mfaca + c2o1 * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ mfcac = CUMcac + (mfcaa * mfaac + c2o1 * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9*(oMdrho-1)*oMdrho;
+ mfacc = CUMacc + (mfaac * mfaca + c2o1 * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9*(oMdrho-1)*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;
+ mfbcc = CUMbcc + (mfaac * mfbca + mfaca * mfbac + c4o1 * mfabb * mfbbb + c2o1 * (mfbab * mfacb + mfbba * mfabc)) + c1o3 * (mfbca + mfbac) * oMdrho;
+ mfcbc = CUMcbc + (mfaac * mfcba + mfcaa * mfabc + c4o1 * mfbab * mfbbb + c2o1 * (mfabb * mfcab + mfbba * mfbac)) + c1o3 * (mfcba + mfabc) * oMdrho;
+ mfccb = CUMccb + (mfcaa * mfacb + mfaca * mfcab + c4o1 * mfbba * mfbbb + c2o1 * (mfbab * mfbca + mfabb * mfcba)) + c1o3 * (mfacb + mfcab) * oMdrho;
//6.
- mfccc = CUMccc -((-4. * mfbbb * mfbbb
+ mfccc = CUMccc -((-c4o1 * 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)
+ - c4o1 * (mfabb * mfcbb + mfbac * mfbca + mfbba * mfbbc)
+ - c2o1 * (mfbca * mfbac + mfcba * mfabc + mfcab * mfacb))
+ +( c4o1 * (mfbab * mfbab * mfaca + mfabb * mfabb * mfcaa + mfbba * mfbba * mfaac)
+ + c2o1 * (mfcaa * mfaca * mfaac)
+ + c16o1 * 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)
+ - c1o9* (mfcaa + mfaca + mfaac) * oMdrho*(c1o1-c2o1* oMdrho)- c1o27* oMdrho * oMdrho*(-c2o1* oMdrho)
+ +( c2o1 * (mfbab * mfbab + mfabb * mfabb + mfbba * mfbba)
+ (mfaac * mfaca + mfaac * mfcaa + mfaca * mfcaa)) * c2o3*oMdrho) -c1o27*oMdrho;
////////////////////////////////////////////////////////////////////////////////////
@@ -744,22 +744,22 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
//mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
////////////////////////////////////////////////////////////////////////////////////
// Z - Dir
- m0 = mfaac * c1o2 + mfaab * (vvz - c1o2) + (mfaaa + 1. * oMdrho) * ( vz2 - vvz) * c1o2;
- m1 = -mfaac - 2. * mfaab * vvz + mfaaa * (1. - vz2) - 1. * oMdrho * vz2;
- m2 = mfaac * c1o2 + mfaab * (vvz + c1o2) + (mfaaa + 1. * oMdrho) * ( vz2 + vvz) * c1o2;
+ m0 = mfaac * c1o2 + mfaab * (vvz - c1o2) + (mfaaa + c1o1 * oMdrho) * ( vz2 - vvz) * c1o2;
+ m1 = -mfaac - c2o1 * mfaab * vvz + mfaaa * (c1o1 - vz2) - c1o1 * oMdrho * vz2;
+ m2 = mfaac * c1o2 + mfaab * (vvz + c1o2) + (mfaaa + c1o1 * oMdrho) * ( vz2 + vvz) * c1o2;
mfaaa = m0;
mfaab = m1;
mfaac = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfabc * c1o2 + mfabb * (vvz - c1o2) + mfaba * ( vz2 - vvz) * c1o2;
- m1 = -mfabc - 2. * mfabb * vvz + mfaba * (1. - vz2);
+ m1 = -mfabc - c2o1 * mfabb * vvz + mfaba * (c1o1 - vz2);
m2 = mfabc * c1o2 + mfabb * (vvz + c1o2) + mfaba * ( vz2 + vvz) * c1o2;
mfaba = m0;
mfabb = m1;
mfabc = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfacc * c1o2 + mfacb * (vvz - c1o2) + (mfaca + c1o3 * oMdrho) * ( vz2 - vvz) * c1o2;
- m1 = -mfacc - 2. * mfacb * vvz + mfaca * (1. - vz2) - c1o3 * oMdrho * vz2;
+ m1 = -mfacc - c2o1 * mfacb * vvz + mfaca * (c1o1 - vz2) - c1o3 * oMdrho * vz2;
m2 = mfacc * c1o2 + mfacb * (vvz + c1o2) + (mfaca + c1o3 * oMdrho) * ( vz2 + vvz) * c1o2;
mfaca = m0;
mfacb = m1;
@@ -767,21 +767,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfbac * c1o2 + mfbab * (vvz - c1o2) + mfbaa * ( vz2 - vvz) * c1o2;
- m1 = -mfbac - 2. * mfbab * vvz + mfbaa * (1. - vz2);
+ m1 = -mfbac - c2o1 * mfbab * vvz + mfbaa * (c1o1 - vz2);
m2 = mfbac * c1o2 + mfbab * (vvz + c1o2) + mfbaa * ( vz2 + vvz) * c1o2;
mfbaa = m0;
mfbab = m1;
mfbac = m2;
/////////b//////////////////////////////////////////////////////////////////////////
m0 = mfbbc * c1o2 + mfbbb * (vvz - c1o2) + mfbba * ( vz2 - vvz) * c1o2;
- m1 = -mfbbc - 2. * mfbbb * vvz + mfbba * (1. - vz2);
+ m1 = -mfbbc - c2o1 * mfbbb * vvz + mfbba * (c1o1 - vz2);
m2 = mfbbc * c1o2 + mfbbb * (vvz + c1o2) + mfbba * ( vz2 + vvz) * c1o2;
mfbba = m0;
mfbbb = m1;
mfbbc = m2;
/////////b//////////////////////////////////////////////////////////////////////////
m0 = mfbcc * c1o2 + mfbcb * (vvz - c1o2) + mfbca * ( vz2 - vvz) * c1o2;
- m1 = -mfbcc - 2. * mfbcb * vvz + mfbca * (1. - vz2);
+ m1 = -mfbcc - c2o1 * mfbcb * vvz + mfbca * (c1o1 - vz2);
m2 = mfbcc * c1o2 + mfbcb * (vvz + c1o2) + mfbca * ( vz2 + vvz) * c1o2;
mfbca = m0;
mfbcb = m1;
@@ -789,21 +789,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcac * c1o2 + mfcab * (vvz - c1o2) + (mfcaa + c1o3 * oMdrho) * ( vz2 - vvz) * c1o2;
- m1 = -mfcac - 2. * mfcab * vvz + mfcaa * (1. - vz2) - c1o3 * oMdrho * vz2;
+ m1 = -mfcac - c2o1 * mfcab * vvz + mfcaa * (c1o1 - vz2) - c1o3 * oMdrho * vz2;
m2 = mfcac * c1o2 + mfcab * (vvz + c1o2) + (mfcaa + c1o3 * oMdrho) * ( vz2 + vvz) * c1o2;
mfcaa = m0;
mfcab = m1;
mfcac = m2;
/////////c//////////////////////////////////////////////////////////////////////////
m0 = mfcbc * c1o2 + mfcbb * (vvz - c1o2) + mfcba * ( vz2 - vvz) * c1o2;
- m1 = -mfcbc - 2. * mfcbb * vvz + mfcba * (1. - vz2);
+ m1 = -mfcbc - c2o1 * mfcbb * vvz + mfcba * (c1o1 - vz2);
m2 = mfcbc * c1o2 + mfcbb * (vvz + c1o2) + mfcba * ( vz2 + vvz) * c1o2;
mfcba = m0;
mfcbb = m1;
mfcbc = m2;
/////////c//////////////////////////////////////////////////////////////////////////
m0 = mfccc * c1o2 + mfccb * (vvz - c1o2) + (mfcca + c1o9 * oMdrho) * ( vz2 - vvz) * c1o2;
- m1 = -mfccc - 2. * mfccb * vvz + mfcca * (1. - vz2) - c1o9 * oMdrho * vz2;
+ m1 = -mfccc - c2o1 * mfccb * vvz + mfcca * (c1o1 - vz2) - c1o9 * oMdrho * vz2;
m2 = mfccc * c1o2 + mfccb * (vvz + c1o2) + (mfcca + c1o9 * oMdrho) * ( vz2 + vvz) * c1o2;
mfcca = m0;
mfccb = m1;
@@ -814,21 +814,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
// Y - Dir
m0 = mfaca * c1o2 + mfaba * (vvy - c1o2) + (mfaaa + c1o6 * oMdrho) * ( vy2 - vvy) * c1o2;
- m1 = -mfaca - 2. * mfaba * vvy + mfaaa * (1. - vy2) - c1o6 * oMdrho * vy2;
+ m1 = -mfaca - c2o1 * mfaba * vvy + mfaaa * (c1o1 - vy2) - c1o6 * oMdrho * vy2;
m2 = mfaca * c1o2 + mfaba * (vvy + c1o2) + (mfaaa + c1o6 * oMdrho) * ( vy2 + vvy) * c1o2;
mfaaa = m0;
mfaba = m1;
mfaca = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfacb * c1o2 + mfabb * (vvy - c1o2) + (mfaab + c2o3 * oMdrho) * ( vy2 - vvy) * c1o2;
- m1 = -mfacb - 2. * mfabb * vvy + mfaab * (1. - vy2) - c2o3 * oMdrho * vy2;
+ m1 = -mfacb - c2o1 * mfabb * vvy + mfaab * (c1o1 - vy2) - c2o3 * oMdrho * vy2;
m2 = mfacb * c1o2 + mfabb * (vvy + c1o2) + (mfaab + c2o3 * oMdrho) * ( vy2 + vvy) * c1o2;
mfaab = m0;
mfabb = m1;
mfacb = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfacc * c1o2 + mfabc * (vvy - c1o2) + (mfaac + c1o6 * oMdrho) * ( vy2 - vvy) * c1o2;
- m1 = -mfacc - 2. * mfabc * vvy + mfaac * (1. - vy2) - c1o6 * oMdrho * vy2;
+ m1 = -mfacc - c2o1 * mfabc * vvy + mfaac * (c1o1 - vy2) - c1o6 * oMdrho * vy2;
m2 = mfacc * c1o2 + mfabc * (vvy + c1o2) + (mfaac + c1o6 * oMdrho) * ( vy2 + vvy) * c1o2;
mfaac = m0;
mfabc = m1;
@@ -836,21 +836,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfbca * c1o2 + mfbba * (vvy - c1o2) + mfbaa * ( vy2 - vvy) * c1o2;
- m1 = -mfbca - 2. * mfbba * vvy + mfbaa * (1. - vy2);
+ m1 = -mfbca - c2o1 * mfbba * vvy + mfbaa * (c1o1 - vy2);
m2 = mfbca * c1o2 + mfbba * (vvy + c1o2) + mfbaa * ( vy2 + vvy) * c1o2;
mfbaa = m0;
mfbba = m1;
mfbca = m2;
/////////b//////////////////////////////////////////////////////////////////////////
m0 = mfbcb * c1o2 + mfbbb * (vvy - c1o2) + mfbab * ( vy2 - vvy) * c1o2;
- m1 = -mfbcb - 2. * mfbbb * vvy + mfbab * (1. - vy2);
+ m1 = -mfbcb - c2o1 * mfbbb * vvy + mfbab * (c1o1 - vy2);
m2 = mfbcb * c1o2 + mfbbb * (vvy + c1o2) + mfbab * ( vy2 + vvy) * c1o2;
mfbab = m0;
mfbbb = m1;
mfbcb = m2;
/////////b//////////////////////////////////////////////////////////////////////////
m0 = mfbcc * c1o2 + mfbbc * (vvy - c1o2) + mfbac * ( vy2 - vvy) * c1o2;
- m1 = -mfbcc - 2. * mfbbc * vvy + mfbac * (1. - vy2);
+ m1 = -mfbcc - c2o1 * mfbbc * vvy + mfbac * (c1o1 - vy2);
m2 = mfbcc * c1o2 + mfbbc * (vvy + c1o2) + mfbac * ( vy2 + vvy) * c1o2;
mfbac = m0;
mfbbc = m1;
@@ -858,21 +858,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcca * c1o2 + mfcba * (vvy - c1o2) + (mfcaa + c1o18 * oMdrho) * ( vy2 - vvy) * c1o2;
- m1 = -mfcca - 2. * mfcba * vvy + mfcaa * (1. - vy2) - c1o18 * oMdrho * vy2;
+ m1 = -mfcca - c2o1 * mfcba * vvy + mfcaa * (c1o1 - vy2) - c1o18 * oMdrho * vy2;
m2 = mfcca * c1o2 + mfcba * (vvy + c1o2) + (mfcaa + c1o18 * oMdrho) * ( vy2 + vvy) * c1o2;
mfcaa = m0;
mfcba = m1;
mfcca = m2;
/////////c//////////////////////////////////////////////////////////////////////////
m0 = mfccb * c1o2 + mfcbb * (vvy - c1o2) + (mfcab + c2o9 * oMdrho) * ( vy2 - vvy) * c1o2;
- m1 = -mfccb - 2. * mfcbb * vvy + mfcab * (1. - vy2) - c2o9 * oMdrho * vy2;
+ m1 = -mfccb - c2o1 * mfcbb * vvy + mfcab * (c1o1 - vy2) - c2o9 * oMdrho * vy2;
m2 = mfccb * c1o2 + mfcbb * (vvy + c1o2) + (mfcab + c2o9 * oMdrho) * ( vy2 + vvy) * c1o2;
mfcab = m0;
mfcbb = m1;
mfccb = m2;
/////////c//////////////////////////////////////////////////////////////////////////
m0 = mfccc * c1o2 + mfcbc * (vvy - c1o2) + (mfcac + c1o18 * oMdrho) * ( vy2 - vvy) * c1o2;
- m1 = -mfccc - 2. * mfcbc * vvy + mfcac * (1. - vy2) - c1o18 * oMdrho * vy2;
+ m1 = -mfccc - c2o1 * mfcbc * vvy + mfcac * (c1o1 - vy2) - c1o18 * oMdrho * vy2;
m2 = mfccc * c1o2 + mfcbc * (vvy + c1o2) + (mfcac + c1o18 * oMdrho) * ( vy2 + vvy) * c1o2;
mfcac = m0;
mfcbc = m1;
@@ -883,21 +883,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
// X - Dir
m0 = mfcaa * c1o2 + mfbaa * (vvx - c1o2) + (mfaaa + c1o36 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfcaa - 2. * mfbaa * vvx + mfaaa * (1. - vx2) - c1o36 * oMdrho * vx2;
+ m1 = -mfcaa - c2o1 * mfbaa * vvx + mfaaa * (c1o1 - vx2) - c1o36 * oMdrho * vx2;
m2 = mfcaa * c1o2 + mfbaa * (vvx + c1o2) + (mfaaa + c1o36 * oMdrho) * ( vx2 + vvx) * c1o2;
mfaaa = m0;
mfbaa = m1;
mfcaa = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcba * c1o2 + mfbba * (vvx - c1o2) + (mfaba + c1o9 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfcba - 2. * mfbba * vvx + mfaba * (1. - vx2) - c1o9 * oMdrho * vx2;
+ m1 = -mfcba - c2o1 * mfbba * vvx + mfaba * (c1o1 - vx2) - c1o9 * oMdrho * vx2;
m2 = mfcba * c1o2 + mfbba * (vvx + c1o2) + (mfaba + c1o9 * oMdrho) * ( vx2 + vvx) * c1o2;
mfaba = m0;
mfbba = m1;
mfcba = m2;
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcca * c1o2 + mfbca * (vvx - c1o2) + (mfaca + c1o36 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfcca - 2. * mfbca * vvx + mfaca * (1. - vx2) - c1o36 * oMdrho * vx2;
+ m1 = -mfcca - c2o1 * mfbca * vvx + mfaca * (c1o1 - vx2) - c1o36 * oMdrho * vx2;
m2 = mfcca * c1o2 + mfbca * (vvx + c1o2) + (mfaca + c1o36 * oMdrho) * ( vx2 + vvx) * c1o2;
mfaca = m0;
mfbca = m1;
@@ -905,21 +905,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcab * c1o2 + mfbab * (vvx - c1o2) + (mfaab + c1o9 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfcab - 2. * mfbab * vvx + mfaab * (1. - vx2) - c1o9 * oMdrho * vx2;
+ m1 = -mfcab - c2o1 * mfbab * vvx + mfaab * (c1o1 - vx2) - c1o9 * oMdrho * vx2;
m2 = mfcab * c1o2 + mfbab * (vvx + c1o2) + (mfaab + c1o9 * oMdrho) * ( vx2 + vvx) * c1o2;
mfaab = m0;
mfbab = m1;
mfcab = m2;
///////////b////////////////////////////////////////////////////////////////////////
m0 = mfcbb * c1o2 + mfbbb * (vvx - c1o2) + (mfabb + c4o9 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfcbb - 2. * mfbbb * vvx + mfabb * (1. - vx2) - c4o9 * oMdrho * vx2;
+ m1 = -mfcbb - c2o1 * mfbbb * vvx + mfabb * (c1o1 - vx2) - c4o9 * oMdrho * vx2;
m2 = mfcbb * c1o2 + mfbbb * (vvx + c1o2) + (mfabb + c4o9 * oMdrho) * ( vx2 + vvx) * c1o2;
mfabb = m0;
mfbbb = m1;
mfcbb = m2;
///////////b////////////////////////////////////////////////////////////////////////
m0 = mfccb * c1o2 + mfbcb * (vvx - c1o2) + (mfacb + c1o9 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfccb - 2. * mfbcb * vvx + mfacb * (1. - vx2) - c1o9 * oMdrho * vx2;
+ m1 = -mfccb - c2o1 * mfbcb * vvx + mfacb * (c1o1 - vx2) - c1o9 * oMdrho * vx2;
m2 = mfccb * c1o2 + mfbcb * (vvx + c1o2) + (mfacb + c1o9 * oMdrho) * ( vx2 + vvx) * c1o2;
mfacb = m0;
mfbcb = m1;
@@ -927,21 +927,21 @@ void IncompressibleCumulantWithSpongeLayerLBMKernel::calculate(int step)
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
m0 = mfcac * c1o2 + mfbac * (vvx - c1o2) + (mfaac + c1o36 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfcac - 2. * mfbac * vvx + mfaac * (1. - vx2) - c1o36 * oMdrho * vx2;
+ m1 = -mfcac - c2o1 * mfbac * vvx + mfaac * (c1o1 - vx2) - c1o36 * oMdrho * vx2;
m2 = mfcac * c1o2 + mfbac * (vvx + c1o2) + (mfaac + c1o36 * oMdrho) * ( vx2 + vvx) * c1o2;
mfaac = m0;
mfbac = m1;
mfcac = m2;
///////////c////////////////////////////////////////////////////////////////////////
m0 = mfcbc * c1o2 + mfbbc * (vvx - c1o2) + (mfabc + c1o9 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfcbc - 2. * mfbbc * vvx + mfabc * (1. - vx2) - c1o9 * oMdrho * vx2;
+ m1 = -mfcbc - c2o1 * mfbbc * vvx + mfabc * (c1o1 - vx2) - c1o9 * oMdrho * vx2;
m2 = mfcbc * c1o2 + mfbbc * (vvx + c1o2) + (mfabc + c1o9 * oMdrho) * ( vx2 + vvx) * c1o2;
mfabc = m0;
mfbbc = m1;
mfcbc = m2;
///////////c////////////////////////////////////////////////////////////////////////
m0 = mfccc * c1o2 + mfbcc * (vvx - c1o2) + (mfacc + c1o36 * oMdrho) * ( vx2 - vvx) * c1o2;
- m1 = -mfccc - 2. * mfbcc * vvx + mfacc * (1. - vx2) - c1o36 * oMdrho * vx2;
+ m1 = -mfccc - c2o1 * mfbcc * vvx + mfacc * (c1o1 - vx2) - c1o36 * oMdrho * vx2;
m2 = mfccc * c1o2 + mfbcc * (vvx + c1o2) + (mfacc + c1o36 * oMdrho) * ( vx2 + vvx) * c1o2;
mfacc = m0;
mfbcc = m1;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
index c4759d786367fc9c5030898839b57cbec7bd48ec..26635dbac5d4b2844e6f0205f30a063c5533d612 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
@@ -37,22 +37,24 @@ void IncompressibleOffsetInterpolationProcessor::setOffsets(real xoff, real yoff
//////////////////////////////////////////////////////////////////////////
void IncompressibleOffsetInterpolationProcessor::interpolateCoarseToFine(D3Q27ICell& icellC, D3Q27ICell& icellF, real xoff, real yoff, real zoff)
{
+ using namespace vf::basics::constant;
+
setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellC, omegaC, 0.5);
- calcInterpolatedNode(icellF.BSW, omegaF, -0.25, -0.25, -0.25, calcPressBSW(), -1, -1, -1);
- calcInterpolatedNode(icellF.BNE, omegaF, 0.25, 0.25, -0.25, calcPressBNE(), 1, 1, -1);
- calcInterpolatedNode(icellF.TNW, omegaF, -0.25, 0.25, 0.25, calcPressTNW(), -1, 1, 1);
- calcInterpolatedNode(icellF.TSE, omegaF, 0.25, -0.25, 0.25, calcPressTSE(), 1, -1, 1);
- calcInterpolatedNode(icellF.BNW, omegaF, -0.25, 0.25, -0.25, calcPressBNW(), -1, 1, -1);
- calcInterpolatedNode(icellF.BSE, omegaF, 0.25, -0.25, -0.25, calcPressBSE(), 1, -1, -1);
- calcInterpolatedNode(icellF.TSW, omegaF, -0.25, -0.25, 0.25, calcPressTSW(), -1, -1, 1);
- calcInterpolatedNode(icellF.TNE, omegaF, 0.25, 0.25, 0.25, calcPressTNE(), 1, 1, 1);
+ calcInterpolatedCoefficiets(icellC, omegaC, c1o2);
+ calcInterpolatedNode(icellF.BSW, omegaF, -c1o4, -c1o4, -c1o4, calcPressBSW(), -c1o1, -c1o1, -c1o1);
+ calcInterpolatedNode(icellF.BNE, omegaF, c1o4, c1o4, -c1o4, calcPressBNE(), c1o1, c1o1, -c1o1);
+ calcInterpolatedNode(icellF.TNW, omegaF, -c1o4, c1o4, c1o4, calcPressTNW(), -c1o1, c1o1, c1o1);
+ calcInterpolatedNode(icellF.TSE, omegaF, c1o4, -c1o4, c1o4, calcPressTSE(), c1o1, -c1o1, c1o1);
+ calcInterpolatedNode(icellF.BNW, omegaF, -c1o4, c1o4, -c1o4, calcPressBNW(), -c1o1, c1o1, -c1o1);
+ calcInterpolatedNode(icellF.BSE, omegaF, c1o4, -c1o4, -c1o4, calcPressBSE(), c1o1, -c1o1, -c1o1);
+ calcInterpolatedNode(icellF.TSW, omegaF, -c1o4, -c1o4, c1o4, calcPressTSW(), -c1o1, -c1o1, c1o1);
+ calcInterpolatedNode(icellF.TNE, omegaF, c1o4, c1o4, c1o4, calcPressTNE(), c1o1, c1o1, c1o1);
}
//////////////////////////////////////////////////////////////////////////
void IncompressibleOffsetInterpolationProcessor::interpolateFineToCoarse(D3Q27ICell& icellF, real* icellC, real xoff, real yoff, real zoff)
{
setOffsets(xoff, yoff, zoff);
- calcInterpolatedCoefficiets(icellF, omegaF, 2.0);
+ calcInterpolatedCoefficiets(icellF, omegaF, vf::basics::constant::c2o1);
calcInterpolatedNodeFC(icellC, omegaC);
}
//////////////////////////////////////////////////////////////////////////
@@ -61,11 +63,12 @@ void IncompressibleOffsetInterpolationProcessor::calcMoments(const real* const f
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
+ using namespace vf::basics::constant;
//UBLOG(logINFO,"D3Q27System::DIR_M0M = " << D3Q27System::DIR_M0M);
//UBLOG(logINFO,"BW = " << BW);;
- real rho = 0.0;
+ real rho = c0o1;
D3Q27System::calcIncompMacroscopicValues(f,rho,vx1,vx2,vx3);
//////////////////////////////////////////////////////////////////////////
@@ -83,12 +86,12 @@ void IncompressibleOffsetInterpolationProcessor::calcMoments(const real* const f
//press = D3Q27System::calcPress(f,rho,vx1,vx2,vx3);
press = rho; //interpolate rho!
- kxy = -3.*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]))-(vx1*vx2));// might not be optimal MG 25.2.13
- kyz = -3.*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]))-(vx2*vx3));
- kxz = -3.*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]))-(vx1*vx3));
- kxxMyy = -3./2.*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]))-(vx1*vx1-vx2*vx2));
- 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));
- //kxxMzz = -3./2.*omega*(((((f[NW]+f[SE])-(f[BS]+f[TN]))+((f[SW]+f[NE])-(f[17]+f[BN])))+((f[W]+f[DIR_P00])-(f[B]+f[T])))-(vx1*vx1-vx3*vx3));
+ 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]))-(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]))-(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]))-(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]))-(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]))-(vx1*vx1-vx3*vx3));
+ //kxxMzz = -c3o1/c2o1*omega*(((((f[NW]+f[SE])-(f[BS]+f[TN]))+((f[SW]+f[NE])-(f[17]+f[BN])))+((f[W]+f[DIR_P00])-(f[B]+f[T])))-(vx1*vx1-vx3*vx3));
//UBLOG(logINFO, "t1 = "<<(((f[NW]+f[SE])-(f[BS]+f[TN]))+((f[SW]+f[NE])-(f[17]+f[BN])))+((f[W]+f[DIR_P00])-(f[B]+f[T])));
//UBLOG(logINFO, "kxxMzz = "<<kxxMzz);
@@ -103,6 +106,8 @@ void IncompressibleOffsetInterpolationProcessor::calcMoments(const real* const f
//////////////////////////////////////////////////////////////////////////
void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const D3Q27ICell& icell, real omega, real eps_new)
{
+ using namespace vf::basics::constant;
+
real vx1_SWT,vx2_SWT,vx3_SWT;
real vx1_NWT,vx2_NWT,vx3_NWT;
real vx1_NET,vx2_NET,vx3_NET;
@@ -197,109 +202,109 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
kxxMyyFromfcNEQ_SEB - kxxMyyFromfcNEQ_SET + kxxMyyFromfcNEQ_SWB + kxxMyyFromfcNEQ_SWT -
kxxMzzFromfcNEQ_NEB - kxxMzzFromfcNEQ_NET + kxxMzzFromfcNEQ_NWB + kxxMzzFromfcNEQ_NWT -
kxxMzzFromfcNEQ_SEB - kxxMzzFromfcNEQ_SET + kxxMzzFromfcNEQ_SWB + kxxMzzFromfcNEQ_SWT -
- 2.*kxyFromfcNEQ_NEB - 2.*kxyFromfcNEQ_NET - 2.*kxyFromfcNEQ_NWB - 2.*kxyFromfcNEQ_NWT +
- 2.*kxyFromfcNEQ_SEB + 2.*kxyFromfcNEQ_SET + 2.*kxyFromfcNEQ_SWB + 2.*kxyFromfcNEQ_SWT +
- 2.*kxzFromfcNEQ_NEB - 2.*kxzFromfcNEQ_NET + 2.*kxzFromfcNEQ_NWB - 2.*kxzFromfcNEQ_NWT +
- 2.*kxzFromfcNEQ_SEB - 2.*kxzFromfcNEQ_SET + 2.*kxzFromfcNEQ_SWB - 2.*kxzFromfcNEQ_SWT +
- 8.*vx1_NEB + 8.*vx1_NET + 8.*vx1_NWB + 8.*vx1_NWT + 8.*vx1_SEB +
- 8.*vx1_SET + 8.*vx1_SWB + 8.*vx1_SWT + 2.*vx2_NEB + 2.*vx2_NET -
- 2.*vx2_NWB - 2.*vx2_NWT - 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB +
- 2.*vx2_SWT - 2.*vx3_NEB + 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/64.;
- b0 = (2.*kxxMyyFromfcNEQ_NEB + 2.*kxxMyyFromfcNEQ_NET + 2.*kxxMyyFromfcNEQ_NWB + 2.*kxxMyyFromfcNEQ_NWT -
- 2.*kxxMyyFromfcNEQ_SEB - 2.*kxxMyyFromfcNEQ_SET - 2.*kxxMyyFromfcNEQ_SWB - 2.*kxxMyyFromfcNEQ_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 -
- 2.*kxyFromfcNEQ_NEB - 2.*kxyFromfcNEQ_NET + 2.*kxyFromfcNEQ_NWB + 2.*kxyFromfcNEQ_NWT -
- 2.*kxyFromfcNEQ_SEB - 2.*kxyFromfcNEQ_SET + 2.*kxyFromfcNEQ_SWB + 2.*kxyFromfcNEQ_SWT +
- 2.*kyzFromfcNEQ_NEB - 2.*kyzFromfcNEQ_NET + 2.*kyzFromfcNEQ_NWB - 2.*kyzFromfcNEQ_NWT +
- 2.*kyzFromfcNEQ_SEB - 2.*kyzFromfcNEQ_SET + 2.*kyzFromfcNEQ_SWB - 2.*kyzFromfcNEQ_SWT +
- 2.*vx1_NEB + 2.*vx1_NET - 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB - 2.*vx1_SET + 2.*vx1_SWB + 2.*vx1_SWT +
- 8.*vx2_NEB + 8.*vx2_NET + 8.*vx2_NWB + 8.*vx2_NWT +
- 8.*vx2_SEB + 8.*vx2_SET + 8.*vx2_SWB + 8.*vx2_SWT -
- 2.*vx3_NEB + 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/64.;
+ 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 -
- 2.*kxxMzzFromfcNEQ_NEB + 2.*kxxMzzFromfcNEQ_NET - 2.*kxxMzzFromfcNEQ_NWB + 2.*kxxMzzFromfcNEQ_NWT -
- 2.*kxxMzzFromfcNEQ_SEB + 2.*kxxMzzFromfcNEQ_SET - 2.*kxxMzzFromfcNEQ_SWB + 2.*kxxMzzFromfcNEQ_SWT -
- 2.*kxzFromfcNEQ_NEB - 2.*kxzFromfcNEQ_NET + 2.*kxzFromfcNEQ_NWB + 2.*kxzFromfcNEQ_NWT -
- 2.*kxzFromfcNEQ_SEB - 2.*kxzFromfcNEQ_SET + 2.*kxzFromfcNEQ_SWB + 2.*kxzFromfcNEQ_SWT -
- 2.*kyzFromfcNEQ_NEB - 2.*kyzFromfcNEQ_NET - 2.*kyzFromfcNEQ_NWB - 2.*kyzFromfcNEQ_NWT +
- 2.*kyzFromfcNEQ_SEB + 2.*kyzFromfcNEQ_SET + 2.*kyzFromfcNEQ_SWB + 2.*kyzFromfcNEQ_SWT -
- 2.*vx1_NEB + 2.*vx1_NET + 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB + 2.*vx1_SET + 2.*vx1_SWB - 2.*vx1_SWT -
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB - 2.*vx2_SWT +
- 8.*vx3_NEB + 8.*vx3_NET + 8.*vx3_NWB + 8.*vx3_NWT +
- 8.*vx3_SEB + 8.*vx3_SET + 8.*vx3_SWB + 8.*vx3_SWT)/64.;
- ax = (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT + vx1_SEB + vx1_SET - vx1_SWB - vx1_SWT)/4.;
- bx = (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT + vx2_SEB + vx2_SET - vx2_SWB - vx2_SWT)/4.;
- cx = (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT + vx3_SEB + vx3_SET - vx3_SWB - vx3_SWT)/4.;
+ 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 +
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB - 2.*vx2_NWT -
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB + 2.*vx2_SWT -
- 2.*vx3_NEB + 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/16.;
+ 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 -
- 2.*vx1_NEB - 2.*vx1_NET + 2.*vx1_NWB + 2.*vx1_NWT +
- 2.*vx1_SEB + 2.*vx1_SET - 2.*vx1_SWB - 2.*vx1_SWT)/8.;
+ 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 +
- 2.*vx1_NEB - 2.*vx1_NET - 2.*vx1_NWB + 2.*vx1_NWT +
- 2.*vx1_SEB - 2.*vx1_SET - 2.*vx1_SWB + 2.*vx1_SWT)/8.;
- ay = (vx1_NEB + vx1_NET + vx1_NWB + vx1_NWT - vx1_SEB - vx1_SET - vx1_SWB - vx1_SWT)/4.;
- by = (vx2_NEB + vx2_NET + vx2_NWB + vx2_NWT - vx2_SEB - vx2_SET - vx2_SWB - vx2_SWT)/4.;
- cy = (vx3_NEB + vx3_NET + vx3_NWB + vx3_NWT - vx3_SEB - vx3_SET - vx3_SWB - vx3_SWT)/4.;
+ 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 -
- 2.*vx2_NEB - 2.*vx2_NET + 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB + 2.*vx2_SET - 2.*vx2_SWB - 2.*vx2_SWT)/8.;
- byy= (-2.*kxxMyyFromfcNEQ_NEB - 2.*kxxMyyFromfcNEQ_NET - 2.*kxxMyyFromfcNEQ_NWB - 2.*kxxMyyFromfcNEQ_NWT +
- 2.*kxxMyyFromfcNEQ_SEB + 2.*kxxMyyFromfcNEQ_SET + 2.*kxxMyyFromfcNEQ_SWB + 2.*kxxMyyFromfcNEQ_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 +
- 2.*vx1_NEB + 2.*vx1_NET - 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB - 2.*vx1_SET + 2.*vx1_SWB + 2.*vx1_SWT -
- 2.*vx3_NEB + 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET + 2.*vx3_SWB - 2.*vx3_SWT)/16.;
+ 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 +
- 2.*vx2_NEB - 2.*vx2_NET + 2.*vx2_NWB - 2.*vx2_NWT -
- 2.*vx2_SEB + 2.*vx2_SET - 2.*vx2_SWB + 2.*vx2_SWT)/8.;
- az = (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT - vx1_SEB + vx1_SET - vx1_SWB + vx1_SWT)/4.;
- bz = (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT - vx2_SEB + vx2_SET - vx2_SWB + vx2_SWT)/4.;
- cz = (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT - vx3_SEB + vx3_SET - vx3_SWB + vx3_SWT)/4.;
+ 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 +
- 2.*vx3_NEB - 2.*vx3_NET - 2.*vx3_NWB + 2.*vx3_NWT +
- 2.*vx3_SEB - 2.*vx3_SET - 2.*vx3_SWB + 2.*vx3_SWT)/8.;
+ 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 +
- 2.*vx3_NEB - 2.*vx3_NET + 2.*vx3_NWB - 2.*vx3_NWT -
- 2.*vx3_SEB + 2.*vx3_SET - 2.*vx3_SWB + 2.*vx3_SWT)/8.;
+ 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 +
- 2.*kxxMzzFromfcNEQ_NEB - 2.*kxxMzzFromfcNEQ_NET + 2.*kxxMzzFromfcNEQ_NWB - 2.*kxxMzzFromfcNEQ_NWT +
- 2.*kxxMzzFromfcNEQ_SEB - 2.*kxxMzzFromfcNEQ_SET + 2.*kxxMzzFromfcNEQ_SWB - 2.*kxxMzzFromfcNEQ_SWT -
- 2.*vx1_NEB + 2.*vx1_NET + 2.*vx1_NWB - 2.*vx1_NWT -
- 2.*vx1_SEB + 2.*vx1_SET + 2.*vx1_SWB - 2.*vx1_SWT -
- 2.*vx2_NEB + 2.*vx2_NET - 2.*vx2_NWB + 2.*vx2_NWT +
- 2.*vx2_SEB - 2.*vx2_SET + 2.*vx2_SWB - 2.*vx2_SWT)/16.;
- axy= (vx1_NEB + vx1_NET - vx1_NWB - vx1_NWT - vx1_SEB - vx1_SET + vx1_SWB + vx1_SWT)/2.;
- bxy= (vx2_NEB + vx2_NET - vx2_NWB - vx2_NWT - vx2_SEB - vx2_SET + vx2_SWB + vx2_SWT)/2.;
- cxy= (vx3_NEB + vx3_NET - vx3_NWB - vx3_NWT - vx3_SEB - vx3_SET + vx3_SWB + vx3_SWT)/2.;
- axz= (-vx1_NEB + vx1_NET + vx1_NWB - vx1_NWT - vx1_SEB + vx1_SET + vx1_SWB - vx1_SWT)/2.;
- bxz= (-vx2_NEB + vx2_NET + vx2_NWB - vx2_NWT - vx2_SEB + vx2_SET + vx2_SWB - vx2_SWT)/2.;
- cxz= (-vx3_NEB + vx3_NET + vx3_NWB - vx3_NWT - vx3_SEB + vx3_SET + vx3_SWB - vx3_SWT)/2.;
- ayz= (-vx1_NEB + vx1_NET - vx1_NWB + vx1_NWT + vx1_SEB - vx1_SET + vx1_SWB - vx1_SWT)/2.;
- byz= (-vx2_NEB + vx2_NET - vx2_NWB + vx2_NWT + vx2_SEB - vx2_SET + vx2_SWB - vx2_SWT)/2.;
- cyz= (-vx3_NEB + vx3_NET - vx3_NWB + vx3_NWT + vx3_SEB - vx3_SET + vx3_SWB - vx3_SWT)/2.;
+ 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;
@@ -351,7 +356,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
// kxxMzzFromfcNEQ_NWT+
// kxxMzzFromfcNEQ_NET+
// kxxMzzFromfcNEQ_NEB)*c1o8-(ax-cz);
- kxyAverage =0;//(kxyFromfcNEQ_SWB+
+ kxyAverage = c0o1;//(kxyFromfcNEQ_SWB+
//kxyFromfcNEQ_SWT+
//kxyFromfcNEQ_SET+
//kxyFromfcNEQ_SEB+
@@ -359,7 +364,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
//kxyFromfcNEQ_NWT+
//kxyFromfcNEQ_NET+
//kxyFromfcNEQ_NEB)*c1o8-(ay+bx);
- kyzAverage =0;//(kyzFromfcNEQ_SWB+
+ kyzAverage = c0o1;//(kyzFromfcNEQ_SWB+
//kyzFromfcNEQ_SWT+
//kyzFromfcNEQ_SET+
//kyzFromfcNEQ_SEB+
@@ -367,7 +372,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
//kyzFromfcNEQ_NWT+
//kyzFromfcNEQ_NET+
//kyzFromfcNEQ_NEB)*c1o8-(bz+cy);
- kxzAverage =0;//(kxzFromfcNEQ_SWB+
+ kxzAverage = c0o1;//(kxzFromfcNEQ_SWB+
//kxzFromfcNEQ_SWT+
//kxzFromfcNEQ_SET+
//kxzFromfcNEQ_SEB+
@@ -375,7 +380,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
//kxzFromfcNEQ_NWT+
//kxzFromfcNEQ_NET+
//kxzFromfcNEQ_NEB)*c1o8-(az+cx);
- kxxMyyAverage =0;//(kxxMyyFromfcNEQ_SWB+
+ kxxMyyAverage = c0o1;//(kxxMyyFromfcNEQ_SWB+
//kxxMyyFromfcNEQ_SWT+
//kxxMyyFromfcNEQ_SET+
//kxxMyyFromfcNEQ_SEB+
@@ -383,7 +388,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
//kxxMyyFromfcNEQ_NWT+
//kxxMyyFromfcNEQ_NET+
//kxxMyyFromfcNEQ_NEB)*c1o8-(ax-by);
- kxxMzzAverage =0;//(kxxMzzFromfcNEQ_SWB+
+ kxxMzzAverage = c0o1;//(kxxMzzFromfcNEQ_SWB+
//kxxMzzFromfcNEQ_SWT+
//kxxMzzFromfcNEQ_SET+
//kxxMzzFromfcNEQ_SEB+
@@ -397,17 +402,17 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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 + 2. * xoff * axx + yoff * axy + zoff * axz + yoff*zoff*axyz;
- ay = ay + 2. * yoff * ayy + xoff * axy + zoff * ayz + xoff*zoff*axyz;
- az = az + 2. * zoff * azz + xoff * axz + yoff * ayz + xoff*yoff*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 + 2. * xoff * bxx + yoff * bxy + zoff * bxz + yoff*zoff*bxyz;
- by = by + 2. * yoff * byy + xoff * bxy + zoff * byz + xoff*zoff*bxyz;
- bz = bz + 2. * zoff * bzz + xoff * bxz + yoff * byz + xoff*yoff*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 + 2. * xoff * cxx + yoff * cxy + zoff * cxz + yoff*zoff*cxyz;
- cy = cy + 2. * yoff * cyy + xoff * cxy + zoff * cyz + xoff*zoff*cxyz;
- cz = cz + 2. * zoff * czz + xoff * cxz + yoff * cyz + xoff*yoff*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;
@@ -421,121 +426,122 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
const real o = omega;
- f_E = eps_new*((2*(-2*ax + by + cz-kxxMzzAverage-kxxMyyAverage))/(27.*o));
- f_N = eps_new*((2*(ax - 2*by + cz+2*kxxMyyAverage-kxxMzzAverage))/(27.*o));
- f_T = eps_new*((2*(ax + by - 2*cz-kxxMyyAverage+2*kxxMzzAverage))/(27.*o));
- f_NE = eps_new*(-(ax + 3*ay + 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage+3*kxyAverage)/(54.*o));
- f_SE = eps_new*(-(ax - 3*ay - 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage-3*kxyAverage)/(54.*o));
- f_TE = eps_new*(-(ax + 3*az - 2*by + 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage+3*kxzAverage)/(54.*o));
- f_BE = eps_new*(-(ax - 3*az - 2*by - 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage-3*kxzAverage)/(54.*o));
- f_TN = eps_new*(-(-2*ax + by + 3*bz + 3*cy + cz-kxxMyyAverage-kxxMzzAverage+3*kyzAverage)/(54.*o));
- f_BN = eps_new*(-(-2*ax + by - 3*bz - 3*cy + cz-kxxMyyAverage-kxxMzzAverage-3*kyzAverage)/(54.*o));
+ 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)/(72.*o));
- f_TSW = eps_new*((-ay + az - bx + bz + cx + cy-kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSE = eps_new*((ay - az + bx + bz - cx + cy+kxyAverage-kxzAverage+kyzAverage)/(72.*o));
- f_TNW = eps_new*((ay + az + bx - bz + cx - cy+kxyAverage+kxzAverage-kyzAverage)/(72.*o));
-
- x_E = 0.25*eps_new*((2*(-4*axx + bxy + cxz))/(27.*o));
- x_N = 0.25*eps_new*((2*(2*axx - 2*bxy + cxz))/(27.*o));
- x_T = 0.25*eps_new*((2*(2*axx + bxy - 2*cxz))/(27.*o));
- x_NE = 0.25*eps_new*(-((2*axx + 3*axy + 6*bxx + bxy - 2*cxz))/(54.*o));
- x_SE = 0.25*eps_new*(-((2*axx - 3*axy - 6*bxx + bxy - 2*cxz))/(54.*o));
- x_TE = 0.25*eps_new*(-((2*axx + 3*axz - 2*bxy + 6*cxx + cxz))/(54.*o));
- x_BE = 0.25*eps_new*(-((2*axx - 3*axz - 2*bxy - 6*cxx + cxz))/(54.*o));
- x_TN = 0.25*eps_new*(-((-4*axx + bxy + 3*bxz + 3*cxy + cxz))/(54.*o));
- x_BN = 0.25*eps_new*(-((-4*axx + bxy - 3*bxz - 3*cxy + cxz))/(54.*o));
+ 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 = 0.25*eps_new*((c2o1*(-c4o1*axx + bxy + cxz))/(c27o1*o));
+ x_N = 0.25*eps_new*((c2o1*(c2o1*axx - c2o1*bxy + cxz))/(c27o1*o));
+ x_T = 0.25*eps_new*((c2o1*(c2o1*axx + bxy - c2o1*cxz))/(c27o1*o));
+ x_NE = 0.25*eps_new*(-((c2o1*axx + c3o1*axy + c6o1*bxx + bxy - c2o1*cxz))/(c54o1*o));
+ x_SE = 0.25*eps_new*(-((c2o1*axx - c3o1*axy - c6o1*bxx + bxy - c2o1*cxz))/(c54o1*o));
+ x_TE = 0.25*eps_new*(-((c2o1*axx + c3o1*axz - c2o1*bxy + c6o1*cxx + cxz))/(c54o1*o));
+ x_BE = 0.25*eps_new*(-((c2o1*axx - c3o1*axz - c2o1*bxy - c6o1*cxx + cxz))/(c54o1*o));
+ x_TN = 0.25*eps_new*(-((-c4o1*axx + bxy + c3o1*bxz + c3o1*cxy + cxz))/(c54o1*o));
+ x_BN = 0.25*eps_new*(-((-c4o1*axx + bxy - c3o1*bxz - c3o1*cxy + cxz))/(c54o1*o));
x_ZERO = 0.;
- x_TNE = 0.25*eps_new*(-((axy + axz + 2*bxx + bxz + 2*cxx + cxy))/(72.*o));
- x_TSW = 0.25*eps_new*(((-axy + axz - 2*bxx + bxz + 2*cxx + cxy))/(72.*o));
- x_TSE = 0.25*eps_new*(((axy - axz + 2*bxx + bxz - 2*cxx + cxy))/(72.*o));
- x_TNW = 0.25*eps_new*(((axy + axz + 2*bxx - bxz + 2*cxx - cxy))/(72.*o));
-
- y_E = 0.25*eps_new*(2*(-2*axy + 2*byy + cyz))/(27.*o);
- y_N = 0.25*eps_new*(2*(axy - 4*byy + cyz))/(27.*o);
- y_T = 0.25*eps_new*(2*(axy + 2*byy - 2*cyz))/(27.*o);
- y_NE = 0.25*eps_new*(-((axy + 6*ayy + 3*bxy + 2*byy - 2*cyz))/(54.*o));
- y_SE = 0.25*eps_new*(-((axy - 6*ayy - 3*bxy + 2*byy - 2*cyz))/(54.*o));
- y_TE = 0.25*eps_new*(-((axy + 3*ayz - 4*byy + 3*cxy + cyz))/(54.*o));
- y_BE = 0.25*eps_new*(-((axy - 3*ayz - 4*byy - 3*cxy + cyz))/(54.*o));
- y_TN = 0.25*eps_new*(-((-2*axy + 2*byy + 3*byz + 6*cyy + cyz))/(54.*o));
- y_BN = 0.25*eps_new*(-((-2*axy + 2*byy - 3*byz - 6*cyy + cyz))/(54.*o));
+ x_TNE = 0.25*eps_new*(-((axy + axz + c2o1*bxx + bxz + c2o1*cxx + cxy))/(c72o1*o));
+ x_TSW = 0.25*eps_new*(((-axy + axz - c2o1*bxx + bxz + c2o1*cxx + cxy))/(c72o1*o));
+ x_TSE = 0.25*eps_new*(((axy - axz + c2o1*bxx + bxz - c2o1*cxx + cxy))/(c72o1*o));
+ x_TNW = 0.25*eps_new*(((axy + axz + c2o1*bxx - bxz + c2o1*cxx - cxy))/(c72o1*o));
+
+ y_E = 0.25*eps_new*(c2o1*(-c2o1*axy + c2o1*byy + cyz))/(c27o1*o);
+ y_N = 0.25*eps_new*(c2o1*(axy - c4o1*byy + cyz))/(c27o1*o);
+ y_T = 0.25*eps_new*(c2o1*(axy + c2o1*byy - c2o1*cyz))/(c27o1*o);
+ y_NE = 0.25*eps_new*(-((axy + c6o1*ayy + c3o1*bxy + c2o1*byy - c2o1*cyz))/(c54o1*o));
+ y_SE = 0.25*eps_new*(-((axy - c6o1*ayy - c3o1*bxy + c2o1*byy - c2o1*cyz))/(c54o1*o));
+ y_TE = 0.25*eps_new*(-((axy + c3o1*ayz - c4o1*byy + c3o1*cxy + cyz))/(c54o1*o));
+ y_BE = 0.25*eps_new*(-((axy - c3o1*ayz - c4o1*byy - c3o1*cxy + cyz))/(c54o1*o));
+ y_TN = 0.25*eps_new*(-((-c2o1*axy + c2o1*byy + c3o1*byz + c6o1*cyy + cyz))/(c54o1*o));
+ y_BN = 0.25*eps_new*(-((-c2o1*axy + c2o1*byy - c3o1*byz - c6o1*cyy + cyz))/(c54o1*o));
y_ZERO = 0.;
- y_TNE = 0.25*eps_new*(-((2*ayy + ayz + bxy + byz + cxy + 2*cyy))/(72.*o));
- y_TSW = 0.25*eps_new*(((-2*ayy + ayz - bxy + byz + cxy + 2*cyy))/(72.*o));
- y_TSE = 0.25*eps_new*(((2*ayy - ayz + bxy + byz - cxy + 2*cyy))/(72.*o));
- y_TNW = 0.25*eps_new*(((2*ayy + ayz + bxy - byz + cxy - 2*cyy))/(72.*o));
-
- z_E = 0.25*eps_new*((2*(-2*axz + byz + 2*czz))/(27.*o));
- z_N = 0.25*eps_new*((2*(axz - 2*byz + 2*czz))/(27.*o));
- z_T = 0.25*eps_new*((2*(axz + byz - 4*czz))/(27.*o));
- z_NE = 0.25*eps_new*(-((axz + 3*ayz + 3*bxz + byz - 4*czz))/(54.*o));
- z_SE = 0.25*eps_new*(-((axz - 3*ayz - 3*bxz + byz - 4*czz))/(54.*o));
- z_TE = 0.25*eps_new*(-((axz + 6*azz - 2*byz + 3*cxz + 2*czz))/(54.*o));
- z_BE = 0.25*eps_new*(-((axz - 6*azz - 2*byz - 3*cxz + 2*czz))/(54.*o));
- z_TN = 0.25*eps_new*(-((-2*axz + byz + 6*bzz + 3*cyz + 2*czz))/(54.*o));
- z_BN = 0.25*eps_new*(-((-2*axz + byz - 6*bzz - 3*cyz + 2*czz))/(54.*o));
+ y_TNE = 0.25*eps_new*(-((c2o1*ayy + ayz + bxy + byz + cxy + c2o1*cyy))/(c72o1*o));
+ y_TSW = 0.25*eps_new*(((-c2o1*ayy + ayz - bxy + byz + cxy + c2o1*cyy))/(c72o1*o));
+ y_TSE = 0.25*eps_new*(((c2o1*ayy - ayz + bxy + byz - cxy + c2o1*cyy))/(c72o1*o));
+ y_TNW = 0.25*eps_new*(((c2o1*ayy + ayz + bxy - byz + cxy - c2o1*cyy))/(c72o1*o));
+
+ z_E = 0.25*eps_new*((c2o1*(-c2o1*axz + byz + c2o1*czz))/(c27o1*o));
+ z_N = 0.25*eps_new*((c2o1*(axz - c2o1*byz + c2o1*czz))/(c27o1*o));
+ z_T = 0.25*eps_new*((c2o1*(axz + byz - c4o1*czz))/(c27o1*o));
+ z_NE = 0.25*eps_new*(-((axz + c3o1*ayz + c3o1*bxz + byz - c4o1*czz))/(c54o1*o));
+ z_SE = 0.25*eps_new*(-((axz - c3o1*ayz - c3o1*bxz + byz - c4o1*czz))/(c54o1*o));
+ z_TE = 0.25*eps_new*(-((axz + c6o1*azz - c2o1*byz + c3o1*cxz + c2o1*czz))/(c54o1*o));
+ z_BE = 0.25*eps_new*(-((axz - c6o1*azz - c2o1*byz - c3o1*cxz + c2o1*czz))/(c54o1*o));
+ z_TN = 0.25*eps_new*(-((-c2o1*axz + byz + c6o1*bzz + c3o1*cyz + c2o1*czz))/(c54o1*o));
+ z_BN = 0.25*eps_new*(-((-c2o1*axz + byz - c6o1*bzz - c3o1*cyz + c2o1*czz))/(c54o1*o));
z_ZERO = 0.;
- z_TNE = 0.25*eps_new*(-((ayz + 2*azz + bxz + 2*bzz + cxz + cyz))/(72.*o));
- z_TSW = 0.25*eps_new*(((-ayz + 2*azz - bxz + 2*bzz + cxz + cyz))/(72.*o));
- z_TSE = 0.25*eps_new*(((ayz - 2*azz + bxz + 2*bzz - cxz + cyz))/(72.*o));
- z_TNW = 0.25*eps_new*(((ayz + 2*azz + bxz - 2*bzz + cxz - cyz))/(72.*o));
-
- xy_E = 0.0625*eps_new *(( 2.*cxyz)/(27.*o));
- xy_N = 0.0625*eps_new *(( 2.*cxyz)/(27.*o));
- xy_T = -(0.0625*eps_new *(( 4.*cxyz)/(27.*o)));
- xy_NE = 0.0625*eps_new *( cxyz /(27.*o));
- xy_SE = 0.0625*eps_new *( cxyz /(27.*o));
- xy_TE = -(0.0625*eps_new *(( 3.*axyz + cxyz)/(54.*o)));
- xy_BE = -(0.0625*eps_new *((-3.*axyz + cxyz)/(54.*o)));
- xy_TN = -(0.0625*eps_new *(( 3.*bxyz + cxyz)/(54.*o)));
- xy_BN = -(0.0625*eps_new *(( - 3.*bxyz + cxyz)/(54.*o)));
- //xy_ZERO= 0.0625*eps_new;
- xy_TNE = -(0.0625*eps_new *(( axyz + bxyz )/(72.*o)));
- xy_TSW = 0.0625*eps_new *(( axyz + bxyz )/(72.*o));
- xy_TSE = 0.0625*eps_new *((- axyz + bxyz )/(72.*o));
- xy_TNW = 0.0625*eps_new *(( axyz - bxyz )/(72.*o));
-
- xz_E = 0.0625*eps_new *(( 2.*bxyz )/(27.*o));
- xz_N = -(0.0625*eps_new *(( 4.*bxyz )/(27.*o)));
- xz_T = 0.0625*eps_new *(( 2.*bxyz )/(27.*o));
- xz_NE = -(0.0625*eps_new *(( 3.*axyz + bxyz )/(54.*o)));
- xz_SE = -(0.0625*eps_new *((-3.*axyz + bxyz )/(54.*o)));
- xz_TE = 0.0625*eps_new *(( bxyz )/(27.*o));
- xz_BE = 0.0625*eps_new *(( bxyz )/(27.*o));
- xz_TN = -(0.0625*eps_new *(( bxyz + 3.*cxyz)/(54.*o)));
- xz_BN = -(0.0625*eps_new *(( bxyz - 3.*cxyz)/(54.*o)));
- //xz_ZERO= 0.0625*eps_new;
- xz_TNE = -(0.0625*eps_new *(( axyz + cxyz)/(72.*o)));
- xz_TSW = 0.0625*eps_new *((- axyz + cxyz)/(72.*o));
- xz_TSE = 0.0625*eps_new *(( axyz + cxyz)/(72.*o));
- xz_TNW = 0.0625*eps_new *(( axyz - cxyz)/(72.*o));
-
- yz_E = -(0.0625*eps_new *(( 4.*axyz )/(27.*o)));
- yz_N = 0.0625*eps_new *(( 2.*axyz )/(27.*o));
- yz_T = 0.0625*eps_new *(( 2.*axyz )/(27.*o));
- yz_NE = -(0.0625*eps_new *(( axyz + 3.*bxyz )/(54.*o)));
- yz_SE = -(0.0625*eps_new *(( axyz - 3.*bxyz )/(54.*o)));
- yz_TE = -(0.0625*eps_new *(( axyz + 3.*cxyz)/(54.*o)));
- yz_BE = -(0.0625*eps_new *(( axyz - 3.*cxyz)/(54.*o)));
- yz_TN = 0.0625*eps_new *(( axyz )/(27.*o));
- yz_BN = 0.0625*eps_new *(( axyz )/(27.*o));
- //yz_ZERO= 0.0625*eps_new;
- yz_TNE = -(0.0625*eps_new *(( bxyz + cxyz)/(72.*o)));
- yz_TSW = 0.0625*eps_new *(( - bxyz + cxyz)/(72.*o));
- yz_TSE = 0.0625*eps_new *(( bxyz - cxyz)/(72.*o));
- yz_TNW = 0.0625*eps_new *(( bxyz + cxyz)/(72.*o));
+ z_TNE = 0.25*eps_new*(-((ayz + c2o1*azz + bxz + c2o1*bzz + cxz + cyz))/(c72o1*o));
+ z_TSW = 0.25*eps_new*(((-ayz + c2o1*azz - bxz + c2o1*bzz + cxz + cyz))/(c72o1*o));
+ z_TSE = 0.25*eps_new*(((ayz - c2o1*azz + bxz + c2o1*bzz - cxz + cyz))/(c72o1*o));
+ z_TNW = 0.25*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 IncompressibleOffsetInterpolationProcessor::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;
+ using namespace vf::basics::constant;
real rho = press ;//+ (2.*axx*x+axy*y+axz*z+axyz*y*z+ax + 2.*byy*y+bxy*x+byz*z+bxyz*x*z+by + 2.*czz*z+cxz*x+cyz*y+cxyz*x*y+cz)/3.;
- real vx1 = a0 + 0.25*( xs*ax + ys*ay + zs*az) + 0.0625*(axx + xs*ys*axy + xs*zs*axz + ayy + ys*zs*ayz + azz) + 0.015625*(xs*ys*zs*axyz);
- real vx2 = b0 + 0.25*( xs*bx + ys*by + zs*bz) + 0.0625*(bxx + xs*ys*bxy + xs*zs*bxz + byy + ys*zs*byz + bzz) + 0.015625*(xs*ys*zs*bxyz);
- real vx3 = c0 + 0.25*( xs*cx + ys*cy + zs*cz) + 0.0625*(cxx + xs*ys*cxy + xs*zs*cxz + cyy + ys*zs*cyz + czz) + 0.015625*(xs*ys*zs*cxyz);
+ 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);
//////////////////////////////////////////////////////////////////////////
//DRAFT
@@ -577,105 +583,121 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNode(real* f, r
//Position SWB -0.25, -0.25, -0.25
real IncompressibleOffsetInterpolationProcessor::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) +
- press_SET * (0.046875 - 0.1875 * xoff + 0.0625 * yoff - 0.1875 * zoff) +
- press_NET * (0.015625 - 0.0625 * xoff - 0.0625 * yoff - 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.1875 * xoff - 0.1875 * yoff + 0.0625 * zoff) +
- press_NWB * (0.140625 + 0.1875 * xoff - 0.5625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.5625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.421875 + 0.5625 * xoff + 0.5625 * yoff + 0.5625 * zoff);
+ using namespace vf::basics::constant;
+
+ 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 IncompressibleOffsetInterpolationProcessor::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) +
- press_SET * (0.140625 - 0.5625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_NET * (0.046875 - 0.1875 * xoff - 0.1875 * yoff - 0.0625 * zoff) +
- press_NEB * (0.015625 - 0.0625 * xoff - 0.0625 * yoff + 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.0625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.046875 - 0.1875 * xoff + 0.0625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.1875 * xoff + 0.1875 * yoff + 0.5625 * zoff);
+ using namespace vf::basics::constant;
+
+ 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 IncompressibleOffsetInterpolationProcessor::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) +
- press_SWT * (0.140625 + 0.5625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_NWT * (0.046875 + 0.1875 * xoff - 0.1875 * yoff - 0.0625 * zoff) +
- press_NWB * (0.015625 + 0.0625 * xoff - 0.0625 * yoff + 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.0625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.046875 + 0.1875 * xoff + 0.0625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.1875 * xoff + 0.1875 * yoff + 0.5625 * zoff);
+ using namespace vf::basics::constant;
+
+ 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 IncompressibleOffsetInterpolationProcessor::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) +
- press_SWT * (0.046875 + 0.1875 * xoff + 0.0625 * yoff - 0.1875 * zoff) +
- press_NWT * (0.015625 + 0.0625 * xoff - 0.0625 * yoff - 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.1875 * xoff - 0.1875 * yoff + 0.0625 * zoff) +
- press_NEB * (0.140625 - 0.1875 * xoff - 0.5625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.5625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.421875 - 0.5625 * xoff + 0.5625 * yoff + 0.5625 * zoff);
+ using namespace vf::basics::constant;
+
+ 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 IncompressibleOffsetInterpolationProcessor::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) +
- press_SWT * (0.046875 + 0.0625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_SET * (0.015625 - 0.0625 * xoff + 0.0625 * yoff - 0.0625 * zoff) +
- press_SEB * (0.046875 - 0.1875 * xoff + 0.1875 * yoff + 0.0625 * zoff) +
- press_NEB * (0.140625 - 0.5625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SWB * (0.140625 + 0.1875 * xoff + 0.5625 * yoff + 0.1875 * zoff) +
- press_NWB * (0.421875 + 0.5625 * xoff - 0.5625 * yoff + 0.5625 * zoff);
+ using namespace vf::basics::constant;
+
+ 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 IncompressibleOffsetInterpolationProcessor::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) +
- press_SWT * (0.140625 + 0.1875 * xoff + 0.5625 * yoff - 0.1875 * zoff) +
- press_SET * (0.046875 - 0.1875 * xoff + 0.1875 * yoff - 0.0625 * zoff) +
- press_SEB * (0.015625 - 0.0625 * xoff + 0.0625 * yoff + 0.0625 * zoff) +
- press_NEB * (0.046875 - 0.1875 * xoff - 0.0625 * yoff + 0.1875 * zoff) +
- press_SWB * (0.046875 + 0.0625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_NWB * (0.140625 + 0.1875 * xoff - 0.1875 * yoff + 0.5625 * zoff);
+ using namespace vf::basics::constant;
+
+ 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 IncompressibleOffsetInterpolationProcessor::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) +
- press_SET * (0.140625 - 0.1875 * xoff + 0.5625 * yoff - 0.1875 * zoff) +
- press_SWT * (0.046875 + 0.1875 * xoff + 0.1875 * yoff - 0.0625 * zoff) +
- press_SWB * (0.015625 + 0.0625 * xoff + 0.0625 * yoff + 0.0625 * zoff) +
- press_NWB * (0.046875 + 0.1875 * xoff - 0.0625 * yoff + 0.1875 * zoff) +
- press_SEB * (0.046875 - 0.0625 * xoff + 0.1875 * yoff + 0.1875 * zoff) +
- press_NEB * (0.140625 - 0.1875 * xoff - 0.1875 * yoff + 0.5625 * zoff);
+ using namespace vf::basics::constant;
+
+ 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 IncompressibleOffsetInterpolationProcessor::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) +
- press_SET * (0.046875 - 0.0625 * xoff + 0.1875 * yoff - 0.1875 * zoff) +
- press_SWT * (0.015625 + 0.0625 * xoff + 0.0625 * yoff - 0.0625 * zoff) +
- press_SWB * (0.046875 + 0.1875 * xoff + 0.1875 * yoff + 0.0625 * zoff) +
- press_NWB * (0.140625 + 0.5625 * xoff - 0.1875 * yoff + 0.1875 * zoff) +
- press_SEB * (0.140625 - 0.1875 * xoff + 0.5625 * yoff + 0.1875 * zoff) +
- press_NEB * (0.421875 - 0.5625 * xoff - 0.5625 * yoff + 0.5625 * zoff);
+ using namespace vf::basics::constant;
+
+ 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
@@ -683,15 +705,16 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f,
{
using namespace D3Q27System;
using namespace vf::lbm::dir;
-
- real press = press_NET * (0.125 - 0.25 * xoff - 0.25 * yoff - 0.25 * zoff) +
- press_NWT * (0.125 + 0.25 * xoff - 0.25 * yoff - 0.25 * zoff) +
- press_SET * (0.125 - 0.25 * xoff + 0.25 * yoff - 0.25 * zoff) +
- press_SWT * (0.125 + 0.25 * xoff + 0.25 * yoff - 0.25 * zoff) +
- press_NEB * (0.125 - 0.25 * xoff - 0.25 * yoff + 0.25 * zoff) +
- press_NWB * (0.125 + 0.25 * xoff - 0.25 * yoff + 0.25 * zoff) +
- press_SEB * (0.125 - 0.25 * xoff + 0.25 * yoff + 0.25 * zoff) +
- press_SWB * (0.125 + 0.25 * xoff + 0.25 * yoff + 0.25 * zoff);
+ using namespace vf::basics::constant;
+
+ 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;
@@ -706,7 +729,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f,
real feq[ENDF+1];
D3Q27System::calcIncompFeq(feq,rho,vx1,vx2,vx3);
- real eps_new = 2.;
+ real eps_new = c2o1;
real o = omega;
// LBMReal op = 1.;
@@ -725,20 +748,20 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNodeFC(real* f,
//f_TSE = - eps_new *((az + cx)/(36.*o)) - f_TNE;
//f_TNW = - eps_new *((bz + cy)/(36.*o)) - f_TNE;
- f_E = eps_new*((2*(-2*ax + by + cz-kxxMzzAverage-kxxMyyAverage))/(27.*o));
- f_N = eps_new*((2*(ax - 2*by + cz+2*kxxMyyAverage-kxxMzzAverage))/(27.*o));
- f_T = eps_new*((2*(ax + by - 2*cz-kxxMyyAverage+2*kxxMzzAverage))/(27.*o));
- f_NE = eps_new*(-(ax + 3*ay + 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage+3*kxyAverage)/(54.*o));
- f_SE = eps_new*(-(ax - 3*ay - 3*bx + by - 2*cz+2*kxxMyyAverage-kxxMyyAverage-3*kxyAverage)/(54.*o));
- f_TE = eps_new*(-(ax + 3*az - 2*by + 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage+3*kxzAverage)/(54.*o));
- f_BE = eps_new*(-(ax - 3*az - 2*by - 3*cx + cz+2*kxxMyyAverage-kxxMzzAverage-3*kxzAverage)/(54.*o));
- f_TN = eps_new*(-(-2*ax + by + 3*bz + 3*cy + cz-kxxMyyAverage-kxxMzzAverage+3*kyzAverage)/(54.*o));
- f_BN = eps_new*(-(-2*ax + by - 3*bz - 3*cy + cz-kxxMyyAverage-kxxMzzAverage-3*kyzAverage)/(54.*o));
- f_ZERO = 0.;
- f_TNE = eps_new*(-(ay + az + bx + bz + cx + cy+kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSW = eps_new*((-ay + az - bx + bz + cx + cy-kxyAverage+kxzAverage+kyzAverage)/(72.*o));
- f_TSE = eps_new*((ay - az + bx + bz - cx + cy+kxyAverage-kxzAverage+kyzAverage)/(72.*o));
- f_TNW = eps_new*((ay + az + bx - bz + cx - cy+kxyAverage+kxzAverage-kyzAverage)/(72.*o));
+ 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 = c0o1;
+ 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));
f[DIR_P00] = f_E + feq[DIR_P00];
f[DIR_M00] = f_E + feq[DIR_M00];
@@ -778,10 +801,12 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedVelocity(real x
//////////////////////////////////////////////////////////////////////////
void IncompressibleOffsetInterpolationProcessor::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;
- tauzz=cz+2*czz*z+cxz*x+cyz*y+cxyz*x*y;
- tauxy=0.5*((ay+2.0*ayy*y+axy*x+ayz*z+axyz*x*z)+(bx+2.0*bxx*x+bxy*y+bxz*z+bxyz*y*z));
- tauxz=0.5*((az+2.0*azz*z+axz*x+ayz*y+axyz*x*y)+(cx+2.0*cxx*x+cxy*y+cxz*z+cxyz*y*z));
- tauyz=0.5*((bz+2.0*bzz*z+bxz*x+byz*y+bxyz*x*y)+(cy+2.0*cyy*y+cxy*x+cyz*z+cxyz*x*z));
+ using namespace vf::basics::constant;
+
+ 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));
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
index 927dfeb158d0a89ca2081545420ac537ad7ae2e9..bf68b4d43930eb431b6cb23f0647266225298165 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
@@ -1,6 +1,6 @@
#include "InitDensityLBMKernel.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "DataSet3D.h"
#include "BCArray3D.h"
#include "basics/constants/NumericConstants.h"
@@ -30,7 +30,7 @@ SPtr<LBMKernel> InitDensityLBMKernel::clone()
kernel->setNX(nx);
dynamicPointerCast<InitDensityLBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -61,7 +61,7 @@ real InitDensityLBMKernel::getCalculationTime()
// nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
// zeroDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
//
-// BCArray3D<D3Q27BoundaryCondition>& bcArray = dynamicPointerCast<D3Q27ETBCProcessor>(this->getBCProcessor())->getBCArray();
+// BCArray3D<D3Q27BoundaryCondition>& bcArray = dynamicPointerCast<D3Q27ETBCSet>(this->getBCSet())->getBCArray();
//
// const int bcArrayMaxX1 = (int)bcArray->getNX1();
// const int bcArrayMaxX2 = (int)bcArray->getNX2();
@@ -864,7 +864,7 @@ void InitDensityLBMKernel::calculate(int /*step*/)
nonLocalDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributions = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
SPtr<BoundaryConditions> bcPtr;
real f[D3Q27System::ENDF+1];
real feq[D3Q27System::ENDF+1];
@@ -960,32 +960,32 @@ void InitDensityLBMKernel::calculate(int /*step*/)
real cu_sq = 1.5*(vx1*vx1+vx2*vx2+vx3*vx3);
feq[DIR_000] = c8o27*(drho-cu_sq);
- feq[DIR_P00] = c2o27*(drho+3.0*(vx1)+c9o2*(vx1)*(vx1)-cu_sq);
- feq[DIR_M00] = c2o27*(drho+3.0*(-vx1)+c9o2*(-vx1)*(-vx1)-cu_sq);
- feq[DIR_0P0] = c2o27*(drho+3.0*(vx2)+c9o2*(vx2)*(vx2)-cu_sq);
- feq[DIR_0M0] = c2o27*(drho+3.0*(-vx2)+c9o2*(-vx2)*(-vx2)-cu_sq);
- feq[DIR_00P] = c2o27*(drho+3.0*(vx3)+c9o2*(vx3)*(vx3)-cu_sq);
- feq[DIR_00M] = c2o27*(drho+3.0*(-vx3)+c9o2*(-vx3)*(-vx3)-cu_sq);
- feq[DIR_PP0] = c1o54*(drho+3.0*(vx1+vx2)+c9o2*(vx1+vx2)*(vx1+vx2)-cu_sq);
- feq[DIR_MM0] = c1o54*(drho+3.0*(-vx1-vx2)+c9o2*(-vx1-vx2)*(-vx1-vx2)-cu_sq);
- feq[DIR_PM0] = c1o54*(drho+3.0*(vx1-vx2)+c9o2*(vx1-vx2)*(vx1-vx2)-cu_sq);
- feq[DIR_MP0] = c1o54*(drho+3.0*(-vx1+vx2)+c9o2*(-vx1+vx2)*(-vx1+vx2)-cu_sq);
- feq[DIR_P0P] = c1o54*(drho+3.0*(vx1+vx3)+c9o2*(vx1+vx3)*(vx1+vx3)-cu_sq);
- feq[DIR_M0M] = c1o54*(drho+3.0*(-vx1-vx3)+c9o2*(-vx1-vx3)*(-vx1-vx3)-cu_sq);
- feq[DIR_P0M] = c1o54*(drho+3.0*(vx1-vx3)+c9o2*(vx1-vx3)*(vx1-vx3)-cu_sq);
- feq[DIR_M0P] = c1o54*(drho+3.0*(-vx1+vx3)+c9o2*(-vx1+vx3)*(-vx1+vx3)-cu_sq);
- feq[DIR_0PP] = c1o54*(drho+3.0*(vx2+vx3)+c9o2*(vx2+vx3)*(vx2+vx3)-cu_sq);
- feq[DIR_0MM] = c1o54*(drho+3.0*(-vx2-vx3)+c9o2*(-vx2-vx3)*(-vx2-vx3)-cu_sq);
- feq[DIR_0PM] = c1o54*(drho+3.0*(vx2-vx3)+c9o2*(vx2-vx3)*(vx2-vx3)-cu_sq);
- feq[DIR_0MP] = c1o54*(drho+3.0*(-vx2+vx3)+c9o2*(-vx2+vx3)*(-vx2+vx3)-cu_sq);
- feq[DIR_PPP] = c1o216*(drho+3.0*(vx1+vx2+vx3)+c9o2*(vx1+vx2+vx3)*(vx1+vx2+vx3)-cu_sq);
- feq[DIR_MMM] = c1o216*(drho+3.0*(-vx1-vx2-vx3)+c9o2*(-vx1-vx2-vx3)*(-vx1-vx2-vx3)-cu_sq);
- feq[DIR_PPM] = c1o216*(drho+3.0*(vx1+vx2-vx3)+c9o2*(vx1+vx2-vx3)*(vx1+vx2-vx3)-cu_sq);
- feq[DIR_MMP] = c1o216*(drho+3.0*(-vx1-vx2+vx3)+c9o2*(-vx1-vx2+vx3)*(-vx1-vx2+vx3)-cu_sq);
- feq[DIR_PMP] = c1o216*(drho+3.0*(vx1-vx2+vx3)+c9o2*(vx1-vx2+vx3)*(vx1-vx2+vx3)-cu_sq);
- feq[DIR_MPM] = c1o216*(drho+3.0*(-vx1+vx2-vx3)+c9o2*(-vx1+vx2-vx3)*(-vx1+vx2-vx3)-cu_sq);
- feq[DIR_PMM] = c1o216*(drho+3.0*(vx1-vx2-vx3)+c9o2*(vx1-vx2-vx3)*(vx1-vx2-vx3)-cu_sq);
- feq[DIR_MPP] = c1o216*(drho+3.0*(-vx1+vx2+vx3)+c9o2*(-vx1+vx2+vx3)*(-vx1+vx2+vx3)-cu_sq);
+ feq[DIR_P00] = c2o27*(drho+c3o1*(vx1)+c9o2*(vx1)*(vx1)-cu_sq);
+ feq[DIR_M00] = c2o27*(drho+c3o1*(-vx1)+c9o2*(-vx1)*(-vx1)-cu_sq);
+ feq[DIR_0P0] = c2o27*(drho+c3o1*(vx2)+c9o2*(vx2)*(vx2)-cu_sq);
+ feq[DIR_0M0] = c2o27*(drho+c3o1*(-vx2)+c9o2*(-vx2)*(-vx2)-cu_sq);
+ feq[DIR_00P] = c2o27*(drho+c3o1*(vx3)+c9o2*(vx3)*(vx3)-cu_sq);
+ feq[DIR_00M] = c2o27*(drho+c3o1*(-vx3)+c9o2*(-vx3)*(-vx3)-cu_sq);
+ feq[DIR_PP0] = c1o54*(drho+c3o1*(vx1+vx2)+c9o2*(vx1+vx2)*(vx1+vx2)-cu_sq);
+ feq[DIR_MM0] = c1o54*(drho+c3o1*(-vx1-vx2)+c9o2*(-vx1-vx2)*(-vx1-vx2)-cu_sq);
+ feq[DIR_PM0] = c1o54*(drho+c3o1*(vx1-vx2)+c9o2*(vx1-vx2)*(vx1-vx2)-cu_sq);
+ feq[DIR_MP0] = c1o54*(drho+c3o1*(-vx1+vx2)+c9o2*(-vx1+vx2)*(-vx1+vx2)-cu_sq);
+ feq[DIR_P0P] = c1o54*(drho+c3o1*(vx1+vx3)+c9o2*(vx1+vx3)*(vx1+vx3)-cu_sq);
+ feq[DIR_M0M] = c1o54*(drho+c3o1*(-vx1-vx3)+c9o2*(-vx1-vx3)*(-vx1-vx3)-cu_sq);
+ feq[DIR_P0M] = c1o54*(drho+c3o1*(vx1-vx3)+c9o2*(vx1-vx3)*(vx1-vx3)-cu_sq);
+ feq[DIR_M0P] = c1o54*(drho+c3o1*(-vx1+vx3)+c9o2*(-vx1+vx3)*(-vx1+vx3)-cu_sq);
+ feq[DIR_0PP] = c1o54*(drho+c3o1*(vx2+vx3)+c9o2*(vx2+vx3)*(vx2+vx3)-cu_sq);
+ feq[DIR_0MM] = c1o54*(drho+c3o1*(-vx2-vx3)+c9o2*(-vx2-vx3)*(-vx2-vx3)-cu_sq);
+ feq[DIR_0PM] = c1o54*(drho+c3o1*(vx2-vx3)+c9o2*(vx2-vx3)*(vx2-vx3)-cu_sq);
+ feq[DIR_0MP] = c1o54*(drho+c3o1*(-vx2+vx3)+c9o2*(-vx2+vx3)*(-vx2+vx3)-cu_sq);
+ feq[DIR_PPP] = c1o216*(drho+c3o1*(vx1+vx2+vx3)+c9o2*(vx1+vx2+vx3)*(vx1+vx2+vx3)-cu_sq);
+ feq[DIR_MMM] = c1o216*(drho+c3o1*(-vx1-vx2-vx3)+c9o2*(-vx1-vx2-vx3)*(-vx1-vx2-vx3)-cu_sq);
+ feq[DIR_PPM] = c1o216*(drho+c3o1*(vx1+vx2-vx3)+c9o2*(vx1+vx2-vx3)*(vx1+vx2-vx3)-cu_sq);
+ feq[DIR_MMP] = c1o216*(drho+c3o1*(-vx1-vx2+vx3)+c9o2*(-vx1-vx2+vx3)*(-vx1-vx2+vx3)-cu_sq);
+ feq[DIR_PMP] = c1o216*(drho+c3o1*(vx1-vx2+vx3)+c9o2*(vx1-vx2+vx3)*(vx1-vx2+vx3)-cu_sq);
+ feq[DIR_MPM] = c1o216*(drho+c3o1*(-vx1+vx2-vx3)+c9o2*(-vx1+vx2-vx3)*(-vx1+vx2-vx3)-cu_sq);
+ feq[DIR_PMM] = c1o216*(drho+c3o1*(vx1-vx2-vx3)+c9o2*(vx1-vx2-vx3)*(vx1-vx2-vx3)-cu_sq);
+ feq[DIR_MPP] = c1o216*(drho+c3o1*(-vx1+vx2+vx3)+c9o2*(-vx1+vx2+vx3)*(-vx1+vx2+vx3)-cu_sq);
//Relaxation
f[DIR_000] += (feq[DIR_000]-f[DIR_000])*collFactor;
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
index 33bf1e623ce943d4edf3b11c3f51ad585adf4262..f4b54988b4c3c20928f93359b22d74cf671c03e6 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
@@ -7,15 +7,15 @@ InterpolationHelper::~InterpolationHelper() = default;
void InterpolationHelper::interpolate8to1(D3Q27ICell &icellF, real *icellC, real /*x1*/, real /*x2*/,
real /*x3*/, real omega)
{
- iProcessor->calcInterpolatedCoefficiets(icellF, omega, 1.0);
+ 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(0.0, 0.0, 0.0);
- iProcessor->calcInterpolatedCoefficiets(icellF, omega, 0.0);
+ 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);
}
//////////////////////////////////////////////////////////////////////////
@@ -25,8 +25,8 @@ void InterpolationHelper::interpolate8to1WithVelocityWithShearStress(D3Q27ICell
real &tauyy, real &tauzz, real &tauxy,
real &tauxz, real &tauyz)
{
- iProcessor->setOffsets(0.0, 0.0, 0.0);
- iProcessor->calcInterpolatedCoefficiets(icellF, omega, 0.0);
+ 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/LBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
index 0f9a9a96586268c872562e4d2ddfab5ef8e6377c..7a86aaa19ea0f6ae170e4543c27c7cede7a859b4 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.cpp
@@ -33,7 +33,7 @@
#include "LBMKernel.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "DataSet3D.h"
@@ -49,9 +49,9 @@ LBMKernel::LBMKernel()
this->nx[2] = 0;
}
//////////////////////////////////////////////////////////////////////////
-void LBMKernel::setBCProcessor(SPtr<BCProcessor> bcp) { bcProcessor = bcp; }
+void LBMKernel::setBCSet(SPtr<BCSet> bcp) { bcSet = bcp; }
//////////////////////////////////////////////////////////////////////////
-SPtr<BCProcessor> LBMKernel::getBCProcessor() const { return bcProcessor; }
+SPtr<BCSet> LBMKernel::getBCSet() const { return bcSet; }
//////////////////////////////////////////////////////////////////////////
void LBMKernel::setCollisionFactor(real collFactor) { this->collFactor = collFactor; }
//////////////////////////////////////////////////////////////////////////
@@ -111,7 +111,9 @@ void LBMKernel::setForcingX3(const std::string &muParserString)
//////////////////////////////////////////////////////////////////////////
void LBMKernel::checkFunction(mu::Parser fct)
{
- real x1 = 1.0, x2 = 1.0, x3 = 1.0, dt = 1.0, nue = 1.0, rho = 1.0;
+ using namespace vf::basics::constant;
+
+ real x1 = c1o1, x2 = c1o1, x3 = c1o1, dt = c1o1, nue = c1o1, rho = c1o1;
fct.DefineVar("x1", &x1);
fct.DefineVar("x2", &x2);
fct.DefineVar("x3", &x3);
@@ -183,7 +185,7 @@ std::array<int, 3> LBMKernel::getNX() { return nx; }
//////////////////////////////////////////////////////////////////////////
bool LBMKernel::isInsideOfDomain(const int &x1, const int &x2, const int &x3) const
{
- const SPtr<BCArray3D> bcArray = this->bcProcessor->getBCArray();
+ const SPtr<BCArray3D> bcArray = this->bcSet->getBCArray();
return bcArray->isInsideOfDomain(x1, x2, x3, ghostLayerWidth);
}
//////////////////////////////////////////////////////////////////////////
@@ -234,3 +236,6 @@ void LBMKernel::setMobility(real mob) { this->mob = mob; }
//////////////////////////////////////////////////////////////////////////
void LBMKernel::setInterfaceWidth(real w) { this->interfaceWidth = w; }
//////////////////////////////////////////////////////////////////////////
+void LBMKernel::setSigma(real sigma){ this->sigma = sigma;}
+//////////////////////////////////////////////////////////////////////////
+real LBMKernel::getSigma() const { return sigma;}
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
index bc12a1ed93ffc241f4e121207376e44533908259..fe397429610c6c76e6502a9956584b1cdd05f1cd 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernel.h
@@ -41,7 +41,7 @@
#include <limits>
#include <muParser.h>
-class BCProcessor;
+class BCSet;
class DataSet3D;
class Block3D;
@@ -59,8 +59,8 @@ public:
void calculate(int step) override = 0;
real getCalculationTime() override = 0;
- void setBCProcessor(SPtr<BCProcessor> bcp) override;
- SPtr<BCProcessor> getBCProcessor() const override;
+ void setBCSet(SPtr<BCSet> bcp) override;
+ SPtr<BCSet> getBCSet() const override;
void setCollisionFactor(real collFactor) override;
real getCollisionFactor() const override;
@@ -129,10 +129,12 @@ public:
real getPhaseFieldRelaxation() const;
void setMobility(real mob);
void setInterfaceWidth(real w);
+ void setSigma(real sigma);
+ real getSigma() const;
protected:
SPtr<DataSet3D> dataSet;
- SPtr<BCProcessor> bcProcessor;
+ SPtr<BCSet> bcSet;
real collFactor;
int ghostLayerWidth{ 1 };
bool compressible{ false };
@@ -159,6 +161,7 @@ protected:
real densityRatio;
real beta;
real kappa;
+ real sigma;
real contactAngle;
real phiL;
real phiH;
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
index 1f7128541ebbff53ea2638998f2a1c576a65b33c..318b8cc037581a2239d0a1a487d70afdcd2d8685 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
@@ -3,7 +3,7 @@
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "D3Q27EsoTwist3DSoA.h"
#include "DataSet3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "BCArray3D.h"
#include "basics/constants/NumericConstants.h"
@@ -33,7 +33,7 @@ SPtr<LBMKernel> LBMKernelETD3Q27BGK::clone()
SPtr<LBMKernel> kernel(new LBMKernelETD3Q27BGK());
std::dynamic_pointer_cast<LBMKernelETD3Q27BGK>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -53,9 +53,9 @@ void LBMKernelETD3Q27BGK::calculate(int /*step*/)
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);
- forcingX1 = 0;
- forcingX2 = 0;
- forcingX3 = 0;
+ forcingX1 = c0o1;
+ forcingX2 = c0o1;
+ forcingX3 = c0o1;
}
/////////////////////////////////////
@@ -63,7 +63,7 @@ void LBMKernelETD3Q27BGK::calculate(int /*step*/)
nonLocalDistributions = std::dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
zeroDistributions = std::dynamic_pointer_cast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
- SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = this->getBCSet()->getBCArray();
real f[D3Q27System::ENDF+1];
real feq[D3Q27System::ENDF+1];
real drho,vx1,vx2,vx3;
@@ -140,35 +140,35 @@ void LBMKernelETD3Q27BGK::calculate(int /*step*/)
+ f[DIR_0MP] + f[DIR_PPP] + f[DIR_MMP] + f[DIR_PMP] + f[DIR_MPP] - f[DIR_PPM] - f[DIR_MMM] - f[DIR_PMM]
- f[DIR_MPM];
- real cu_sq=1.5*(vx1*vx1+vx2*vx2+vx3*vx3);
+ real cu_sq= c3o2*(vx1*vx1+vx2*vx2+vx3*vx3);
feq[DIR_000] = c8o27*(drho-cu_sq);
- feq[DIR_P00] = c2o27*(drho+3.0*( vx1 )+c9o2*( vx1 )*( vx1 )-cu_sq);
- feq[DIR_M00] = c2o27*(drho+3.0*(-vx1 )+c9o2*(-vx1 )*(-vx1 )-cu_sq);
- feq[DIR_0P0] = c2o27*(drho+3.0*( vx2)+c9o2*( vx2)*( vx2)-cu_sq);
- feq[DIR_0M0] = c2o27*(drho+3.0*( -vx2)+c9o2*( -vx2)*( -vx2)-cu_sq);
- feq[DIR_00P] = c2o27*(drho+3.0*( vx3 )+c9o2*( vx3)*( vx3)-cu_sq);
- feq[DIR_00M] = c2o27*(drho+3.0*( -vx3)+c9o2*( -vx3)*( -vx3)-cu_sq);
- feq[DIR_PP0] = c1o54*(drho+3.0*( vx1+vx2)+c9o2*( vx1+vx2)*( vx1+vx2)-cu_sq);
- feq[DIR_MM0] = c1o54*(drho+3.0*(-vx1-vx2)+c9o2*(-vx1-vx2)*(-vx1-vx2)-cu_sq);
- feq[DIR_PM0] = c1o54*(drho+3.0*( vx1-vx2)+c9o2*( vx1-vx2)*( vx1-vx2)-cu_sq);
- feq[DIR_MP0] = c1o54*(drho+3.0*(-vx1+vx2)+c9o2*(-vx1+vx2)*(-vx1+vx2)-cu_sq);
- feq[DIR_P0P] = c1o54*(drho+3.0*( vx1+vx3)+c9o2*( vx1+vx3)*( vx1+vx3)-cu_sq);
- feq[DIR_M0M] = c1o54*(drho+3.0*(-vx1-vx3)+c9o2*(-vx1-vx3)*(-vx1-vx3)-cu_sq);
- feq[DIR_P0M] = c1o54*(drho+3.0*( vx1-vx3)+c9o2*( vx1-vx3)*( vx1-vx3)-cu_sq);
- feq[DIR_M0P] = c1o54*(drho+3.0*(-vx1+vx3)+c9o2*(-vx1+vx3)*(-vx1+vx3)-cu_sq);
- feq[DIR_0PP] = c1o54*(drho+3.0*( vx2+vx3)+c9o2*( vx2+vx3)*( vx2+vx3)-cu_sq);
- feq[DIR_0MM] = c1o54*(drho+3.0*(-vx2-vx3)+c9o2*(-vx2-vx3)*(-vx2-vx3)-cu_sq);
- feq[DIR_0PM] = c1o54*(drho+3.0*( vx2-vx3)+c9o2*( vx2-vx3)*( vx2-vx3)-cu_sq);
- feq[DIR_0MP] = c1o54*(drho+3.0*(-vx2+vx3)+c9o2*(-vx2+vx3)*(-vx2+vx3)-cu_sq);
- feq[DIR_PPP]= c1o216*(drho+3.0*( vx1+vx2+vx3)+c9o2*( vx1+vx2+vx3)*( vx1+vx2+vx3)-cu_sq);
- feq[DIR_MMM]= c1o216*(drho+3.0*(-vx1-vx2-vx3)+c9o2*(-vx1-vx2-vx3)*(-vx1-vx2-vx3)-cu_sq);
- feq[DIR_PPM]= c1o216*(drho+3.0*( vx1+vx2-vx3)+c9o2*( vx1+vx2-vx3)*( vx1+vx2-vx3)-cu_sq);
- feq[DIR_MMP]= c1o216*(drho+3.0*(-vx1-vx2+vx3)+c9o2*(-vx1-vx2+vx3)*(-vx1-vx2+vx3)-cu_sq);
- feq[DIR_PMP]= c1o216*(drho+3.0*( vx1-vx2+vx3)+c9o2*( vx1-vx2+vx3)*( vx1-vx2+vx3)-cu_sq);
- feq[DIR_MPM]= c1o216*(drho+3.0*(-vx1+vx2-vx3)+c9o2*(-vx1+vx2-vx3)*(-vx1+vx2-vx3)-cu_sq);
- feq[DIR_PMM]= c1o216*(drho+3.0*( vx1-vx2-vx3)+c9o2*( vx1-vx2-vx3)*( vx1-vx2-vx3)-cu_sq);
- feq[DIR_MPP]= c1o216*(drho+3.0*(-vx1+vx2+vx3)+c9o2*(-vx1+vx2+vx3)*(-vx1+vx2+vx3)-cu_sq);
+ feq[DIR_P00] = c2o27*(drho+c3o1*( vx1 )+c9o2*( vx1 )*( vx1 )-cu_sq);
+ feq[DIR_M00] = c2o27*(drho+c3o1*(-vx1 )+c9o2*(-vx1 )*(-vx1 )-cu_sq);
+ feq[DIR_0P0] = c2o27*(drho+c3o1*( vx2)+c9o2*( vx2)*( vx2)-cu_sq);
+ feq[DIR_0M0] = c2o27*(drho+c3o1*( -vx2)+c9o2*( -vx2)*( -vx2)-cu_sq);
+ feq[DIR_00P] = c2o27*(drho+c3o1*( vx3 )+c9o2*( vx3)*( vx3)-cu_sq);
+ feq[DIR_00M] = c2o27*(drho+c3o1*( -vx3)+c9o2*( -vx3)*( -vx3)-cu_sq);
+ feq[DIR_PP0] = c1o54*(drho+c3o1*( vx1+vx2)+c9o2*( vx1+vx2)*( vx1+vx2)-cu_sq);
+ feq[DIR_MM0] = c1o54*(drho+c3o1*(-vx1-vx2)+c9o2*(-vx1-vx2)*(-vx1-vx2)-cu_sq);
+ feq[DIR_PM0] = c1o54*(drho+c3o1*( vx1-vx2)+c9o2*( vx1-vx2)*( vx1-vx2)-cu_sq);
+ feq[DIR_MP0] = c1o54*(drho+c3o1*(-vx1+vx2)+c9o2*(-vx1+vx2)*(-vx1+vx2)-cu_sq);
+ feq[DIR_P0P] = c1o54*(drho+c3o1*( vx1+vx3)+c9o2*( vx1+vx3)*( vx1+vx3)-cu_sq);
+ feq[DIR_M0M] = c1o54*(drho+c3o1*(-vx1-vx3)+c9o2*(-vx1-vx3)*(-vx1-vx3)-cu_sq);
+ feq[DIR_P0M] = c1o54*(drho+c3o1*( vx1-vx3)+c9o2*( vx1-vx3)*( vx1-vx3)-cu_sq);
+ feq[DIR_M0P] = c1o54*(drho+c3o1*(-vx1+vx3)+c9o2*(-vx1+vx3)*(-vx1+vx3)-cu_sq);
+ feq[DIR_0PP] = c1o54*(drho+c3o1*( vx2+vx3)+c9o2*( vx2+vx3)*( vx2+vx3)-cu_sq);
+ feq[DIR_0MM] = c1o54*(drho+c3o1*(-vx2-vx3)+c9o2*(-vx2-vx3)*(-vx2-vx3)-cu_sq);
+ feq[DIR_0PM] = c1o54*(drho+c3o1*( vx2-vx3)+c9o2*( vx2-vx3)*( vx2-vx3)-cu_sq);
+ feq[DIR_0MP] = c1o54*(drho+c3o1*(-vx2+vx3)+c9o2*(-vx2+vx3)*(-vx2+vx3)-cu_sq);
+ feq[DIR_PPP]= c1o216*(drho+c3o1*( vx1+vx2+vx3)+c9o2*( vx1+vx2+vx3)*( vx1+vx2+vx3)-cu_sq);
+ feq[DIR_MMM]= c1o216*(drho+c3o1*(-vx1-vx2-vx3)+c9o2*(-vx1-vx2-vx3)*(-vx1-vx2-vx3)-cu_sq);
+ feq[DIR_PPM]= c1o216*(drho+c3o1*( vx1+vx2-vx3)+c9o2*( vx1+vx2-vx3)*( vx1+vx2-vx3)-cu_sq);
+ feq[DIR_MMP]= c1o216*(drho+c3o1*(-vx1-vx2+vx3)+c9o2*(-vx1-vx2+vx3)*(-vx1-vx2+vx3)-cu_sq);
+ feq[DIR_PMP]= c1o216*(drho+c3o1*( vx1-vx2+vx3)+c9o2*( vx1-vx2+vx3)*( vx1-vx2+vx3)-cu_sq);
+ feq[DIR_MPM]= c1o216*(drho+c3o1*(-vx1+vx2-vx3)+c9o2*(-vx1+vx2-vx3)*(-vx1+vx2-vx3)-cu_sq);
+ feq[DIR_PMM]= c1o216*(drho+c3o1*( vx1-vx2-vx3)+c9o2*( vx1-vx2-vx3)*( vx1-vx2-vx3)-cu_sq);
+ feq[DIR_MPP]= c1o216*(drho+c3o1*(-vx1+vx2+vx3)+c9o2*(-vx1+vx2+vx3)*(-vx1+vx2+vx3)-cu_sq);
//Relaxation
f[DIR_000] += (feq[DIR_000]-f[DIR_000])*collFactor;
@@ -212,33 +212,33 @@ void LBMKernelETD3Q27BGK::calculate(int /*step*/)
forcingX2 = muForcingX2.Eval();
forcingX3 = muForcingX3.Eval();
- f[DIR_000] += 0.0 ;
- f[DIR_P00] += 3.0*c2o27 * (forcingX1) ;
- f[DIR_M00] += 3.0*c2o27 * (-forcingX1) ;
- f[DIR_0P0] += 3.0*c2o27 * (forcingX2) ;
- f[DIR_0M0] += 3.0*c2o27 * (-forcingX2) ;
- f[DIR_00P] += 3.0*c2o27 * (forcingX3) ;
- f[DIR_00M] += 3.0*c2o27 * (-forcingX3);
- f[DIR_PP0] += 3.0*c1o54 * ( forcingX1+forcingX2 ) ;
- f[DIR_MM0 ] += 3.0*c1o54 * (-forcingX1-forcingX2 ) ;
- f[DIR_PM0 ] += 3.0*c1o54 * ( forcingX1-forcingX2 ) ;
- f[DIR_MP0 ] += 3.0*c1o54 * (-forcingX1+forcingX2 ) ;
- f[DIR_P0P ] += 3.0*c1o54 * ( forcingX1 +forcingX3) ;
- f[DIR_M0M ] += 3.0*c1o54 * (-forcingX1 -forcingX3) ;
- f[DIR_P0M ] += 3.0*c1o54 * ( forcingX1 -forcingX3) ;
- f[DIR_M0P ] += 3.0*c1o54 * (-forcingX1 +forcingX3) ;
- f[DIR_0PP ] += 3.0*c1o54 * ( forcingX2+forcingX3) ;
- f[DIR_0MM ] += 3.0*c1o54 * ( -forcingX2-forcingX3) ;
- f[DIR_0PM ] += 3.0*c1o54 * ( forcingX2-forcingX3) ;
- f[DIR_0MP ] += 3.0*c1o54 * ( -forcingX2+forcingX3) ;
- f[DIR_PPP] += 3.0*c1o216* ( forcingX1+forcingX2+forcingX3) ;
- f[DIR_MMM] += 3.0*c1o216* (-forcingX1-forcingX2-forcingX3) ;
- f[DIR_PPM] += 3.0*c1o216* ( forcingX1+forcingX2-forcingX3) ;
- f[DIR_MMP] += 3.0*c1o216* (-forcingX1-forcingX2+forcingX3) ;
- f[DIR_PMP] += 3.0*c1o216* ( forcingX1-forcingX2+forcingX3) ;
- f[DIR_MPM] += 3.0*c1o216* (-forcingX1+forcingX2-forcingX3) ;
- f[DIR_PMM] += 3.0*c1o216* ( forcingX1-forcingX2-forcingX3) ;
- f[DIR_MPP] += 3.0*c1o216* (-forcingX1+forcingX2+forcingX3) ;
+ f[DIR_000] += c0o1;
+ f[DIR_P00] += c3o1*c2o27 * (forcingX1) ;
+ f[DIR_M00] += c3o1*c2o27 * (-forcingX1) ;
+ f[DIR_0P0] += c3o1*c2o27 * (forcingX2) ;
+ f[DIR_0M0] += c3o1*c2o27 * (-forcingX2) ;
+ f[DIR_00P] += c3o1*c2o27 * (forcingX3) ;
+ f[DIR_00M] += c3o1*c2o27 * (-forcingX3);
+ f[DIR_PP0] += c3o1*c1o54 * ( forcingX1+forcingX2 ) ;
+ f[DIR_MM0 ] += c3o1*c1o54 * (-forcingX1-forcingX2 ) ;
+ f[DIR_PM0 ] += c3o1*c1o54 * ( forcingX1-forcingX2 ) ;
+ f[DIR_MP0 ] += c3o1*c1o54 * (-forcingX1+forcingX2 ) ;
+ f[DIR_P0P ] += c3o1*c1o54 * ( forcingX1 +forcingX3) ;
+ f[DIR_M0M ] += c3o1*c1o54 * (-forcingX1 -forcingX3) ;
+ f[DIR_P0M ] += c3o1*c1o54 * ( forcingX1 -forcingX3) ;
+ f[DIR_M0P ] += c3o1*c1o54 * (-forcingX1 +forcingX3) ;
+ f[DIR_0PP ] += c3o1*c1o54 * ( forcingX2+forcingX3) ;
+ f[DIR_0MM ] += c3o1*c1o54 * ( -forcingX2-forcingX3) ;
+ f[DIR_0PM ] += c3o1*c1o54 * ( forcingX2-forcingX3) ;
+ f[DIR_0MP ] += c3o1*c1o54 * ( -forcingX2+forcingX3) ;
+ f[DIR_PPP] += c3o1*c1o216* ( forcingX1+forcingX2+forcingX3) ;
+ f[DIR_MMM] += c3o1*c1o216* (-forcingX1-forcingX2-forcingX3) ;
+ f[DIR_PPM] += c3o1*c1o216* ( forcingX1+forcingX2-forcingX3) ;
+ f[DIR_MMP] += c3o1*c1o216* (-forcingX1-forcingX2+forcingX3) ;
+ f[DIR_PMP] += c3o1*c1o216* ( forcingX1-forcingX2+forcingX3) ;
+ f[DIR_MPM] += c3o1*c1o216* (-forcingX1+forcingX2-forcingX3) ;
+ f[DIR_PMM] += c3o1*c1o216* ( forcingX1-forcingX2-forcingX3) ;
+ f[DIR_MPP] += c3o1*c1o216* (-forcingX1+forcingX2+forcingX3) ;
}
//////////////////////////////////////////////////////////////////////////
#ifdef PROOF_CORRECTNESS
@@ -299,5 +299,5 @@ void LBMKernelETD3Q27BGK::calculate(int /*step*/)
//////////////////////////////////////////////////////////////////////////
real LBMKernelETD3Q27BGK::getCalculationTime()
{
- return 0.0;
+ return c0o1;
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMSystem.h b/src/cpu/VirtualFluidsCore/LBM/LBMSystem.h
index 14b4d223b2e07e3dbca9947cefd89de045bfb3cf..5cea71cd2054cc6755266e1b0b9b314ea06cb476 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMSystem.h
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMSystem.h
@@ -37,7 +37,7 @@
#include <iostream>
#include <string>
-#include "basics/Core/DataTypes.h"
+#include "basics/DataTypes.h"
//! \brief namespace for global system-functions
diff --git a/src/cpu/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp.old b/src/cpu/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp.old
deleted file mode 100644
index 2ab0e9df73c83b4de2b8824667452414f42dfa1d..0000000000000000000000000000000000000000
--- a/src/cpu/VirtualFluidsCore/LBM/MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp.old
+++ /dev/null
@@ -1,3024 +0,0 @@
-////=======================================================================================
-//// ____ ____ __ ______ __________ __ __ __ __
-//// \ \ | | | | | _ \ |___ ___| | | | | / \ | |
-//// \ \ | | | | | |_) | | | | | | | / \ | |
-//// \ \ | | | | | _ / | | | | | | / /\ \ | |
-//// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____
-//// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______|
-//// \ \ | | ________________________________________________________________
-//// \ \ | | | ______________________________________________________________|
-//// \ \| | | | __ __ __ __ ______ _______
-//// \ | | |_____ | | | | | | | | | _ \ / _____)
-//// \ | | _____| | | | | | | | | | | \ \ \_______
-//// \ | | | | |_____ | \_/ | | | | |_/ / _____ |
-//// \ _____| |__| |________| \_______/ |__| |______/ (_______/
-////
-//// 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 MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.cpp
-////! \ingroup LBMKernel
-////! \author M. Geier, K. Kutscher, Hesameddin Safari
-////=======================================================================================
-//
-//#include "MultiphaseSimpleVelocityBaseExternalPressureLBMKernel.h"
-//#include "BCArray3D.h"
-//#include "Block3D.h"
-//#include "D3Q27EsoTwist3DSplittedVector.h"
-//#include "D3Q27System.h"
-//#include "DataSet3D.h"
-//#include "LBMKernel.h"
-//#include <cmath>
-//#include <iostream>
-//#include <string>
-//
-//#define PROOF_CORRECTNESS
-//
-////////////////////////////////////////////////////////////////////////////
-//MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::MultiphaseSimpleVelocityBaseExternalPressureLBMKernel() { this->compressible = false; }
-////////////////////////////////////////////////////////////////////////////
-//void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::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<LBMReal, IndexerX3X2X1>::CbArray3DPtr pressure(new CbArray3D<LBMReal, IndexerX3X2X1>( nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
-// pressureOld = CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<LBMReal, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
-// p1Old = CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<LBMReal, 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<LBMReal, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<LBMReal, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, -999.0));
-// phaseFieldOld = CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<LBMReal, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 999.0));
-//
-// divU = CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr(new CbArray3D<LBMReal, IndexerX3X2X1>(nx[0] + 4, nx[1] + 4, nx[2] + 4, 0.0));
-//}
-////////////////////////////////////////////////////////////////////////////
-//SPtr<LBMKernel> MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::clone()
-//{
-// SPtr<LBMKernel> kernel(new MultiphaseSimpleVelocityBaseExternalPressureLBMKernel());
-// kernel->setNX(nx);
-// dynamicPointerCast<MultiphaseSimpleVelocityBaseExternalPressureLBMKernel>(kernel)->initDataSet();
-// kernel->setCollisionFactorMultiphase(this->collFactorL, this->collFactorG);
-// kernel->setDensityRatio(this->densityRatio);
-// kernel->setMultiphaseModelParameters(this->beta, this->kappa);
-// 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->setBCProcessor(bcProcessor->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<MultiphaseSimpleVelocityBaseExternalPressureLBMKernel>(kernel)->initForcing();
-//
-// return kernel;
-//}
-////////////////////////////////////////////////////////////////////////////
-//void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::forwardInverseChimeraWithKincompressible(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2, LBMReal Kinverse, LBMReal K, LBMReal oneMinusRho) {
-// using namespace UbMath;
-// LBMReal m2 = mfa + mfc;
-// LBMReal m1 = mfc - mfa;
-// LBMReal m0 = m2 + mfb;
-// mfa = m0;
-// m0 *= Kinverse;
-// m0 += oneMinusRho;
-// mfb = (m1 * Kinverse - m0 * vv) * K;
-// mfc = ((m2 - c2 * m1 * vv) * Kinverse + v2 * m0) * K;
-//}
-//
-//////////////////////////////////////////////////////////////////////////////////
-//void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::backwardInverseChimeraWithKincompressible(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2, LBMReal Kinverse, LBMReal K, LBMReal oneMinusRho) {
-// using namespace UbMath;
-// LBMReal m0 = (((mfc - mfb) * c1o2 + mfb * vv) * Kinverse + (mfa * Kinverse + oneMinusRho) * (v2 - vv) * c1o2) * K;
-// LBMReal m1 = (((mfa - mfc) - c2 * 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 MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::forwardChimera(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2) {
-// using namespace UbMath;
-// LBMReal m1 = (mfa + mfc) + mfb;
-// LBMReal m2 = mfc - mfa;
-// mfc = (mfc + mfa) + (v2 * m1 - c2 * vv * m2);
-// mfb = m2 - vv * m1;
-// mfa = m1;
-//}
-//
-//
-//void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::backwardChimera(LBMReal& mfa, LBMReal& mfb, LBMReal& mfc, LBMReal vv, LBMReal v2) {
-// using namespace UbMath;
-// LBMReal ma = (mfc + mfa * (v2 - vv)) * c1o2 + mfb * (vv - c1o2);
-// LBMReal mb = ((mfa - mfc) - mfa * v2) - c2 * mfb * vv;
-// mfc = (mfc + mfa * (v2 + vv)) * c1o2 + mfb * (vv + c1o2);
-// mfb = mb;
-// mfa = ma;
-//}
-//
-//
-//void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::calculate(int step)
-//{
-// using namespace D3Q27System;
-// using namespace UbMath;
-//
-// forcingX1 = 0.0;
-// forcingX2 = 0.0;
-// forcingX3 = 0.0;
-//
-// LBMReal oneOverInterfaceScale = c4 / interfaceWidth; //1.0;//1.5;
-// /////////////////////////////////////
-//
-// localDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getLocalDistributions();
-// nonLocalDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getNonLocalDistributions();
-// zeroDistributionsF = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getFdistributions())->getZeroDistributions();
-//
-// localDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getLocalDistributions();
-// nonLocalDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getNonLocalDistributions();
-// zeroDistributionsH1 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getHdistributions())->getZeroDistributions();
-//
-// localDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getLocalDistributions();
-// nonLocalDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getNonLocalDistributions();
-// zeroDistributionsH2 = dynamicPointerCast<D3Q27EsoTwist3DSplittedVector>(dataSet->getH2distributions())->getZeroDistributions();
-//
-//
-// CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr pressure = dataSet->getPressureField();
-//
-// SPtr<BCArray3D> bcArray = this->getBCProcessor()->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;
-// LBMReal 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;
-//
-// LBMReal mfcbb = (*this->localDistributionsH1)(D3Q27System::ET_E, x1, x2, x3);
-// LBMReal mfbcb = (*this->localDistributionsH1)(D3Q27System::ET_N, x1, x2, x3);
-// LBMReal mfbbc = (*this->localDistributionsH1)(D3Q27System::ET_T, x1, x2, x3);
-// LBMReal mfccb = (*this->localDistributionsH1)(D3Q27System::ET_NE, x1, x2, x3);
-// LBMReal mfacb = (*this->localDistributionsH1)(D3Q27System::ET_NW, x1p, x2, x3);
-// LBMReal mfcbc = (*this->localDistributionsH1)(D3Q27System::ET_TE, x1, x2, x3);
-// LBMReal mfabc = (*this->localDistributionsH1)(D3Q27System::ET_TW, x1p, x2, x3);
-// LBMReal mfbcc = (*this->localDistributionsH1)(D3Q27System::ET_TN, x1, x2, x3);
-// LBMReal mfbac = (*this->localDistributionsH1)(D3Q27System::ET_TS, x1, x2p, x3);
-// LBMReal mfccc = (*this->localDistributionsH1)(D3Q27System::ET_TNE, x1, x2, x3);
-// LBMReal mfacc = (*this->localDistributionsH1)(D3Q27System::ET_TNW, x1p, x2, x3);
-// LBMReal mfcac = (*this->localDistributionsH1)(D3Q27System::ET_TSE, x1, x2p, x3);
-// LBMReal mfaac = (*this->localDistributionsH1)(D3Q27System::ET_TSW, x1p, x2p, x3);
-// LBMReal mfabb = (*this->nonLocalDistributionsH1)(D3Q27System::ET_W, x1p, x2, x3);
-// LBMReal mfbab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_S, x1, x2p, x3);
-// LBMReal mfbba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_B, x1, x2, x3p);
-// LBMReal mfaab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SW, x1p, x2p, x3);
-// LBMReal mfcab = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SE, x1, x2p, x3);
-// LBMReal mfaba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BW, x1p, x2, x3p);
-// LBMReal mfcba = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BE, x1, x2, x3p);
-// LBMReal mfbaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BS, x1, x2p, x3p);
-// LBMReal mfbca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BN, x1, x2, x3p);
-// LBMReal mfaaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSW, x1p, x2p, x3p);
-// LBMReal mfcaa = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSE, x1, x2p, x3p);
-// LBMReal mfaca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNW, x1p, x2, x3p);
-// LBMReal mfcca = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNE, x1, x2, x3p);
-//
-// LBMReal mfbbb = (*this->zeroDistributionsH1)(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) = c1;
-// }
-//
-// if ((*phaseField)(x1, x2, x3) < 0) {
-// (*phaseField)(x1, x2, x3) = 0;
-// }
-// ////// read F-distributions for velocity formalism
-//
-// mfcbb = (*this->localDistributionsF)(D3Q27System::ET_E, x1, x2, x3);
-// mfbcb = (*this->localDistributionsF)(D3Q27System::ET_N, x1, x2, x3);
-// mfbbc = (*this->localDistributionsF)(D3Q27System::ET_T, x1, x2, x3);
-// mfccb = (*this->localDistributionsF)(D3Q27System::ET_NE, x1, x2, x3);
-// mfacb = (*this->localDistributionsF)(D3Q27System::ET_NW, x1p, x2, x3);
-// mfcbc = (*this->localDistributionsF)(D3Q27System::ET_TE, x1, x2, x3);
-// mfabc = (*this->localDistributionsF)(D3Q27System::ET_TW, x1p, x2, x3);
-// mfbcc = (*this->localDistributionsF)(D3Q27System::ET_TN, x1, x2, x3);
-// mfbac = (*this->localDistributionsF)(D3Q27System::ET_TS, x1, x2p, x3);
-// mfccc = (*this->localDistributionsF)(D3Q27System::ET_TNE, x1, x2, x3);
-// mfacc = (*this->localDistributionsF)(D3Q27System::ET_TNW, x1p, x2, x3);
-// mfcac = (*this->localDistributionsF)(D3Q27System::ET_TSE, x1, x2p, x3);
-// mfaac = (*this->localDistributionsF)(D3Q27System::ET_TSW, x1p, x2p, x3);
-// mfabb = (*this->nonLocalDistributionsF)(D3Q27System::ET_W, x1p, x2, x3);
-// mfbab = (*this->nonLocalDistributionsF)(D3Q27System::ET_S, x1, x2p, x3);
-// mfbba = (*this->nonLocalDistributionsF)(D3Q27System::ET_B, x1, x2, x3p);
-// mfaab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SW, x1p, x2p, x3);
-// mfcab = (*this->nonLocalDistributionsF)(D3Q27System::ET_SE, x1, x2p, x3);
-// mfaba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BW, x1p, x2, x3p);
-// mfcba = (*this->nonLocalDistributionsF)(D3Q27System::ET_BE, x1, x2, x3p);
-// mfbaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BS, x1, x2p, x3p);
-// mfbca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BN, x1, x2, x3p);
-// mfaaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSW, x1p, x2p, x3p);
-// mfcaa = (*this->nonLocalDistributionsF)(D3Q27System::ET_BSE, x1, x2p, x3p);
-// mfaca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNW, x1p, x2, x3p);
-// mfcca = (*this->nonLocalDistributionsF)(D3Q27System::ET_BNE, x1, x2, x3p);
-//
-// mfbbb = (*this->zeroDistributionsF)(x1, x2, x3);
-//
-// //LBMReal rhoH = 1.0;
-// //LBMReal rhoL = 1.0 / densityRatio;
-//
-// LBMReal rhoH = 1.0*densityRatio;
-// LBMReal rhoL = 1.0;
-//
-// LBMReal rhoToPhi = (rhoH - rhoL) / (phiH - phiL);
-//
-// LBMReal drho = (((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)) )
-// + (((mfaab + mfccb) + (mfacb + mfcab) ) + ((mfaba + mfcbc) + (mfabc + mfcba) ) + ((mfbaa + mfbcc) + (mfbac + mfbca) )))
-// + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb;
-//
-// omegaDRho = 2.0;// 1.5;
-// drho *= omegaDRho;
-// LBMReal keepDrho = drho;
-// drho = ((*p1Old)(x1, x2, x3) + drho) * c1o2;
-// // drho = ((*p1Old)(x1, x2, x3)*c2o3 + drho*c1o3) ;
-// (*p1Old)(x1, x2, x3) = keepDrho;
-//
-// //LBMReal rho = rhoH + rhoToPhi * ((*phaseField)(x1, x2, x3) - phiH); //Incompressible
-/////Density correction
-// //LBMReal dX1_phi = gradX1_phi();
-// //LBMReal dX2_phi = gradX2_phi();
-// //LBMReal dX3_phi = gradX3_phi();
-// //LBMReal vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
-// // (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
-// // (mfcbb - mfabb)) ;
-// //LBMReal vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
-// // (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
-// // (mfbcb - mfbab)) ;
-// //LBMReal vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
-// // (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
-// // (mfbbc - mfbba)) ;
-// //LBMReal rho = rhoH + rhoToPhi * ((*phaseField)(x1, x2, x3) - phiH) + (one - (*phaseField)(x1, x2, x3)) * three * (*pressure)(x1, x2, x3); //explicit Compressible
-// //(*pressureOld)(x1, x2, x3) = (((*pressure)(x1, x2, x3) + rho * c1o3 * drho-(rhoH-rhoL)*(vvx*dX1_phi+vvy*dX2_phi+vvz*dX3_phi)*c1o3)) / (one - (one - (*phaseField)(x1, x2, x3)) * drho);
-//
-// //(*pressureOld)(x1, x2, x3) = ((*pressure)(x1, x2, x3) - c1o3 * drho * ((*phaseField)(x1, x2, x3) * (rhoH - rhoL) + rhoL)) / (c1 - ((*phaseField)(x1, x2, x3) - c1) * drho);
-// //LBMReal rho=rhoH + rhoToPhi * ((*phaseField)(x1, x2, x3) - phiH) + (one - (*phaseField)(x1, x2, x3)) * three * (*pressureOld)(x1, x2, x3);
-// //LBMReal tempDrho = drho;
-// //drho = (drho*0.9 + (*pressureOld)(x1, x2, x3)*0.1) ;
-// //(*pressureOld)(x1, x2, x3) = tempDrho;
-//
-// //Mathematica
-//
-// LBMReal rho = ((*pressure)(x1, x2, x3) - (*phaseField)(x1, x2, x3) * (*pressure)(x1, x2, x3) + c1o3 * (rhoH + ((*phaseField)(x1, x2, x3) - phiH) * rhoToPhi)) / (c1o3 + c1o3 * drho * (-1 + (*phaseField)(x1, x2, x3)));
-// (*pressureOld)(x1, x2, x3) = ((*pressure)(x1, x2, x3) + c1o3 * drho * (rhoH + ((*phaseField)(x1, x2, x3) - phiH) * rhoToPhi)) / (1 + drho * (-1 + (*phaseField)(x1, x2, x3)));
-///////Full Filter
-// //LBMReal rho = rhoH + rhoToPhi * ((*phaseField)(x1, x2, x3) - phiH)+(one- (*phaseField)(x1, x2, x3))*three* (*pressure)(x1, x2, x3); //explicit Compressible
-// //(*pressureOld)(x1, x2, x3) = (((*pressure)(x1, x2, x3) + rho * c1o3 * drho)) / (one - (one - (*phaseField)(x1, x2, x3)) * drho);
-////// reduced Filter
-// //LBMReal rho = rhoH + rhoToPhi * ((*phaseField)(x1, x2, x3) - phiH) + (one - (*phaseField)(x1, x2, x3)) * three * (*pressureOld)(x1, x2, x3); //explicit Compressible
-// //(*pressure)(x1, x2, x3) = (((*pressureOld)(x1, x2, x3) + rho * c1o3 * drho)) / (one - (one - (*phaseField)(x1, x2, x3)) * drho);
-//
-// //rho = (rho)/(one- (one - (*phaseField)(x1, x2, x3)) * drho); // now implicit Compressible
-//
-// //(*pressure)(x1, x2, x3) = (((*phaseField)(x1, x2, x3)) + ((*phaseField2)(x1, x2, x3)) - c1) * c1o3;
-// ////!!!!!! relplace by pointer swap!
-// //(*pressureOld)(x1, x2, x3) = (*pressure)(x1, x2, x3);
-// }
-// }
-// }
-// }
-//
-// LBMReal collFactorM;
-//
-// ////Periodic Filter
-// //for (int x3 = minX3-1; x3 <= maxX3; x3++) {
-// // for (int x2 = minX2-1; x2 <= maxX2; x2++) {
-// // for (int x1 = minX1-1; x1 <= maxX1; x1++) {
-// // if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) {
-//
-// // LBMReal sum = 0.;
-//
-// // ///Version for boundaries
-// // for (int xx = -1; xx <= 1; xx++) {
-// // //int xxx = (xx+x1 <= maxX1) ? ((xx + x1 > 0) ? xx + x1 : maxX1) : 0;
-// // int xxx = xx + x1;
-//
-// // for (int yy = -1; yy <= 1; yy++) {
-// // //int yyy = (yy+x2 <= maxX2) ?( (yy + x2 > 0) ? yy + x2 : maxX2) : 0;
-// // int yyy = yy + x2;
-//
-// // for (int zz = -1; zz <= 1; zz++) {
-// // //int zzz = (zz+x3 <= maxX3) ? zzz = ((zz + x3 > 0) ? zz + x3 : maxX3 ): 0;
-// // int zzz = zz + x3;
-//
-// // if (!bcArray->isSolid(xxx, yyy, zzz) && !bcArray->isUndefined(xxx, yyy, zzz)) {
-// // sum+= 64.0/(216.0*(c1+c3*abs(xx))* (c1 + c3 * abs(yy))* (c1 + c3 * abs(zz)))*(*pressureOld)(xxx, yyy, zzz);
-// // }
-// // else{ sum+= 64.0 / (216.0 * (c1 + c3 * abs(xx)) * (c1 + c3 * abs(yy)) * (c1 + c3 * abs(zz))) * (*pressureOld)(x1, x2, x3);
-// // }
-//
-//
-// // }
-// // }
-// // }
-// // (*pressure)(x1, x2, x3) = sum;
-// // }
-// // }
-// // }
-// //}
-//
-// ////!filter
-//
-// 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;
-//
-// //////////////////////////////////////////////////////////////////////////
-// // Read distributions and phase field
-// ////////////////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////////////
-//
-// // E N T
-// // c c c
-// //////////
-// // W S B
-// // a a a
-//
-// // Rest ist b
-//
-// // mfxyz
-// // a - negative
-// // b - null
-// // c - positive
-//
-// // a b c
-// //-1 0 1
-//
-// findNeighbors(phaseField, 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->zeroDistributionsF)(x1, x2, x3);
-//
-//
-// LBMReal mfhcbb = (*this->localDistributionsH2)(D3Q27System::ET_E, x1, x2, x3);
-// LBMReal mfhbcb = (*this->localDistributionsH2)(D3Q27System::ET_N, x1, x2, x3);
-// LBMReal mfhbbc = (*this->localDistributionsH2)(D3Q27System::ET_T, x1, x2, x3);
-// LBMReal mfhccb = (*this->localDistributionsH2)(D3Q27System::ET_NE, x1, x2, x3);
-// LBMReal mfhacb = (*this->localDistributionsH2)(D3Q27System::ET_NW, x1p, x2, x3);
-// LBMReal mfhcbc = (*this->localDistributionsH2)(D3Q27System::ET_TE, x1, x2, x3);
-// LBMReal mfhabc = (*this->localDistributionsH2)(D3Q27System::ET_TW, x1p, x2, x3);
-// LBMReal mfhbcc = (*this->localDistributionsH2)(D3Q27System::ET_TN, x1, x2, x3);
-// LBMReal mfhbac = (*this->localDistributionsH2)(D3Q27System::ET_TS, x1, x2p, x3);
-// LBMReal mfhccc = (*this->localDistributionsH2)(D3Q27System::ET_TNE, x1, x2, x3);
-// LBMReal mfhacc = (*this->localDistributionsH2)(D3Q27System::ET_TNW, x1p, x2, x3);
-// LBMReal mfhcac = (*this->localDistributionsH2)(D3Q27System::ET_TSE, x1, x2p, x3);
-// LBMReal mfhaac = (*this->localDistributionsH2)(D3Q27System::ET_TSW, x1p, x2p, x3);
-// LBMReal mfhabb = (*this->nonLocalDistributionsH2)(D3Q27System::ET_W, x1p, x2, x3);
-// LBMReal mfhbab = (*this->nonLocalDistributionsH2)(D3Q27System::ET_S, x1, x2p, x3);
-// LBMReal mfhbba = (*this->nonLocalDistributionsH2)(D3Q27System::ET_B, x1, x2, x3p);
-// LBMReal mfhaab = (*this->nonLocalDistributionsH2)(D3Q27System::ET_SW, x1p, x2p, x3);
-// LBMReal mfhcab = (*this->nonLocalDistributionsH2)(D3Q27System::ET_SE, x1, x2p, x3);
-// LBMReal mfhaba = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BW, x1p, x2, x3p);
-// LBMReal mfhcba = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BE, x1, x2, x3p);
-// LBMReal mfhbaa = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BS, x1, x2p, x3p);
-// LBMReal mfhbca = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BN, x1, x2, x3p);
-// LBMReal mfhaaa = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSW, x1p, x2p, x3p);
-// LBMReal mfhcaa = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSE, x1, x2p, x3p);
-// LBMReal mfhaca = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNW, x1p, x2, x3p);
-// LBMReal mfhcca = (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNE, x1, x2, x3p);
-//
-// LBMReal mfhbbb = (*this->zeroDistributionsH2)(x1, x2, x3);
-//
-// //LBMReal rhoH = 1.0;
-// //LBMReal rhoL = 1.0 / densityRatio;
-//
-// LBMReal rhoH = 1.0;
-// LBMReal rhoL = 1.0/ densityRatio;
-//
-// LBMReal rhoToPhi = (rhoH - rhoL) / (phiH - phiL);
-//
-// LBMReal dX1_phi = gradX1_phi();
-// LBMReal dX2_phi = gradX2_phi();
-// LBMReal dX3_phi = gradX3_phi();
-//
-// LBMReal denom = sqrt(dX1_phi * dX1_phi + dX2_phi * dX2_phi + dX3_phi * dX3_phi) + 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?
-// LBMReal normX1 = dX1_phi / denom;
-// LBMReal normX2 = dX2_phi / denom;
-// LBMReal normX3 = dX3_phi / denom;
-//
-//
-//
-// collFactorM = collFactorL + (collFactorL - collFactorG) * (phi[REST] - phiH) / (phiH - phiL);
-//
-//
-// LBMReal mu = 2 * beta * phi[REST] * (phi[REST] - 1) * (2 * phi[REST] - 1) - kappa * nabla2_phi();
-//
-// //----------- Calculating Macroscopic Values -------------
-// LBMReal rho = rhoH + rhoToPhi * (phi[REST] - phiH); //Incompressible
-//
-// ///scaled phase field
-// //LBMReal rho = rhoH + rhoToPhi * ((*phaseField)(x1, x2, x3) * (*phaseField)(x1, x2, x3) / ((*phaseField)(x1, x2, x3) * (*phaseField)(x1, x2, x3) + (c1 - (*phaseField)(x1, x2, x3)) * (c1 - (*phaseField)(x1, x2, x3))) - phiH);
-// ///!scaled phase field
-//
-// //LBMReal rho = rhoH + rhoToPhi * (phi[REST] - phiH)+(one-phi[REST])* (*pressure)(x1, x2, x3)*three; //compressible
-// //LBMReal rho = rhoL + (rhoH - rhoL) * phi[REST] + (one - phi[REST]) * (*pressure)(x1, x2, x3) * three; //compressible
-//
-// LBMReal m0, m1, m2;
-// LBMReal rhoRef=c1;
-//
-// LBMReal vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
-// (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
-// (mfcbb - mfabb))/rhoRef;
-// LBMReal vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
-// (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
-// (mfbcb - mfbab))/rhoRef;
-// LBMReal vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
-// (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
-// (mfbbc - mfbba))/rhoRef;
-// ////Filter&Gradient merged
-// LBMReal pressureHere = (*pressureOld)(x1, x2, x3);
-// //LBMReal pressureHere = (*pressure)(x1, x2, x3);
-//
-// LBMReal arrayP[3][3][3] = { {{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere}},
-// {{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere}},
-// { {pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere},{pressureHere,pressureHere,pressureHere}} };
-// //LBMReal LaplaceP = 0.0;
-// //LaplaceP += WEIGTH[TNE] * (((((*pressureOld)(x1+1,x2+1,x3+1) - pressureHere) + ((*pressureOld)(x1 - 1, x2 - 1, x3 - 1) - pressureHere)) + (((*pressureOld)(x1 + 1, x2 + 1, x3 - 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2 - 1, x3 + 1) - pressureHere)))
-// // + ((((*pressureOld)(x1 + 1, x2 - 1, x3 + 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2 + 1, x3 - 1) - pressureHere)) + (((*pressureOld)(x1 + 1, x2 - 1, x3 - 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2 + 1, x3 + 1) - pressureHere))));
-// //LaplaceP += WEIGTH[TN] * (
-// // ((((*pressureOld)(x1 + 1, x2 + 1, x3) - pressureHere) + ((*pressureOld)(x1 - 1, x2 - 1, x3) - pressureHere)) + (((*pressureOld)(x1 + 1, x2 - 1, x3) - pressureHere) + ((*pressureOld)(x1 - 1, x2 + 1, x3) - pressureHere)))
-// // + ((((*pressureOld)(x1 + 1, x2, x3 + 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2, x3 -1) - pressureHere)) + (((*pressureOld)(x1 + 1, x2, x3 - 1) - pressureHere) + ((*pressureOld)(x1 - 1, x2, x3 + 1) - pressureHere)))
-// // + ((((*pressureOld)(x1, x2 + 1, x3 + 1) - pressureHere) + ((*pressureOld)(x1, x2 - 1, x3 - 1) - pressureHere)) + (((*pressureOld)(x1, x2 + 1, x3 - 1) - pressureHere) + ((*pressureOld)(x1, x2 - 1, x3 + 1) - pressureHere)))
-// // );
-// //LaplaceP += WEIGTH[T] * (
-// // (((*pressureOld)(x1 + 1, x2, x3) - pressureHere) + ((*pressureOld)(x1, x2-1, x3) - pressureHere))
-// // + (((*pressureOld)(x1, x2 + 1, x3) - pressureHere) + ((*pressureOld)(x1, x2 - 1, x3) - pressureHere))
-// // + (((*pressureOld)(x1, x2, x3 + 1) - pressureHere) + ((*pressureOld)(x1, x2, x3 - 1) - pressureHere))
-// // );
-//
-// //LaplaceP= 6.0 * LaplaceP;
-//
-// //LBMReal sum = 0.0;
-//
-// for (int dir1 = -1; dir1 <= 1; dir1++) {
-// for (int dir2 = -1; dir2 <= 1; dir2++) {
-// for (int dir3 = -1; dir3 <= 1; dir3++){
-// int xxx = x1 + dir1;
-// int yyy = x2 + dir2;
-// int zzz = x3 + dir3;
-// if (!bcArray->isSolid(xxx, yyy, zzz) && !bcArray->isUndefined(xxx, yyy, zzz)) arrayP[dir1 + 1][dir2 + 1][dir3 + 1] = (*pressureOld)(xxx, yyy, zzz);
-// //if (!bcArray->isSolid(xxx, yyy, zzz) && !bcArray->isUndefined(xxx, yyy, zzz)) arrayP[dir1 + 1][dir2 + 1][dir3 + 1] = (*pressure)(xxx, yyy, zzz);
-// // sum += 64.0 / (216.0 * (c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)) * (c1 + c3 * abs(dir3))) * arrayP[dir1 + 1][dir2 + 1][dir3 + 1];
-// }
-// }
-// }
-//// (*pressure)(x1, x2, x3) = sum;// *0.1 + (1.0 - 0.1) * (*pressureOld)(x1, x2, x3);
-//
-//
-// (*pressure)(x1, x2, x3) = (((((arrayP[0][0][0] + arrayP[2][2][2]) + (arrayP[0][2][0] + arrayP[2][0][2])) + ((arrayP[2][0][0] + arrayP[0][2][2]) + (arrayP[2][2][0] + arrayP[0][0][2]))) * c1o216
-// + (((arrayP[0][0][1] + arrayP[2][2][1]) + (arrayP[0][1][0] + arrayP[2][1][2])) + ((arrayP[1][0][0] + arrayP[1][2][2]) + (arrayP[0][1][2] + arrayP[2][1][0])) + ((arrayP[1][0][2] + arrayP[1][2][0]) + (arrayP[0][2][1] + arrayP[2][0][1]))) * c1o54)
-// + ((arrayP[0][1][1] + arrayP[2][1][1]) + (arrayP[1][0][1] + arrayP[1][2][1]) + (arrayP[1][1][0] + arrayP[1][1][2])) * c2o27)
-// + arrayP[1][1][1] * c8o27;
-// //LBMReal gradPx = 0.0;
-// //LBMReal gradPy = 0.0;
-// //LBMReal gradPz = 0.0;
-// //for (int dir1 = -1; dir1 <= 1; dir1++) {
-// // for (int dir2 = -1; dir2 <= 1; dir2++) {
-// // gradPx -= arrayP[0][dir1+1][dir2+1] * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // gradPx += arrayP[2][dir1+1][dir2+1] * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-//
-//
-//
-// // gradPy -= arrayP[dir1+1][0][dir2+1] * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // gradPy += arrayP[dir1+1][2][dir2+1] * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// //
-//
-// // gradPz -= arrayP[dir1+1][dir2+1][0] * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // gradPz += arrayP[dir1+1][dir2+1][2] * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// //}
-//
-// LBMReal gradPx = ((((arrayP[2][0][0] - arrayP[0][2][2]) + (arrayP[2][2][0] - arrayP[0][0][2])) + ((arrayP[2][2][2] - arrayP[0][0][0]) + (arrayP[2][0][2] - arrayP[0][2][0]))) * c1o72
-// + (((arrayP[2][1][0] - arrayP[0][1][2]) + (arrayP[2][2][1] - arrayP[0][0][1])) + ((arrayP[2][0][1] - arrayP[0][2][1]) + (arrayP[2][1][2] - arrayP[0][1][0]))) * c1o18)
-// + (arrayP[2][1][1] - arrayP[0][1][1]) * c2o9;
-// LBMReal gradPy = ((((arrayP[0][2][0] - arrayP[2][0][2]) + (arrayP[2][2][0] - arrayP[0][0][2])) + ((arrayP[2][2][2] - arrayP[0][0][0]) + (arrayP[0][2][2] - arrayP[2][0][0]))) * c1o72
-// + (((arrayP[1][2][0] - arrayP[1][0][2]) + (arrayP[2][2][1] - arrayP[0][0][1])) + ((arrayP[0][2][1] - arrayP[2][0][1]) + (arrayP[1][2][2] - arrayP[1][0][0]))) * c1o18)
-// + (arrayP[1][2][1] - arrayP[1][0][1]) * c2o9;
-// LBMReal gradPz = ((((arrayP[0][0][2] - arrayP[2][2][0]) + (arrayP[0][2][2] - arrayP[2][0][0])) + ((arrayP[2][2][2] - arrayP[0][0][0]) + (arrayP[2][0][2] - arrayP[0][2][0]))) * c1o72
-// + (((arrayP[0][1][2] - arrayP[2][1][0]) + (arrayP[1][2][2] - arrayP[1][0][0])) + ((arrayP[1][0][2] - arrayP[1][2][0]) + (arrayP[2][1][2] - arrayP[0][1][0]))) * c1o18)
-// + (arrayP[1][1][2] - arrayP[1][1][0]) * c2o9;
-//
-// //gradPx *=c1 - (*pressure)(x1, x2, x3)+pressureHere;
-// //gradPy *=c1 - (*pressure)(x1, x2, x3) + pressureHere;
-// //gradPz *=c1 - (*pressure)(x1, x2, x3) + pressureHere;
-//
-// ////!Filter&Gradient merged
-// //LBMReal gradPx = 0.0;
-// //LBMReal gradPy = 0.0;
-// //LBMReal gradPz = 0.0;
-// //for (int dir1 = -1; dir1 <= 1; dir1++) {
-// // for (int dir2 = -1; dir2 <= 1; dir2++) {
-// // int yyy = x2 + dir1;
-// // int zzz = x3 + dir2;
-// // if (!bcArray->isSolid(x1-1, yyy, zzz) && !bcArray->isUndefined(x1-1, yyy, zzz)) {
-// // gradPx -= (*pressure)(x1 - 1, yyy, zzz) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // else {
-// // gradPx -= (*pressure)(x1, x2, x3) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // if (!bcArray->isSolid(x1 + 1, yyy, zzz) && !bcArray->isUndefined(x1 + 1, yyy, zzz)) {
-// // gradPx += (*pressure)(x1 + 1, yyy, zzz) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // else {
-// // gradPx += (*pressure)(x1, x2, x3) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-//
-// // int xxx = x1 + dir1;
-// // if (!bcArray->isSolid(xxx, x2-1, zzz) && !bcArray->isUndefined(xxx, x2-1, zzz)) {
-// // gradPy -= (*pressure)(xxx, x2-1, zzz) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // else {
-// // gradPy -= (*pressure)(x1, x2, x3) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // if (!bcArray->isSolid(xxx, x2+1, zzz) && !bcArray->isUndefined(xxx, x2+1, zzz)) {
-// // gradPy += (*pressure)(xxx, x2+1, zzz) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // else {
-// // gradPy += (*pressure)(x1, x2, x3) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-//
-// // yyy = x2 + dir2;
-// // if (!bcArray->isSolid(xxx, yyy, x3-1) && !bcArray->isUndefined(xxx, yyy, x3-1)) {
-// // gradPz -= (*pressure)(xxx, yyy, x3-1) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // else {
-// // gradPz -= (*pressure)(x1, x2, x3) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // if (!bcArray->isSolid(xxx, yyy, x3+1) && !bcArray->isUndefined(xxx, yyy, x3+1)) {
-// // gradPz += (*pressure)(xxx, yyy, x3+1) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-// // else {
-// // gradPz += (*pressure)(x1, x2, x3) * c2o9 / ((c1 + c3 * abs(dir1)) * (c1 + c3 * abs(dir2)));
-// // }
-//
-// // }
-// //}
-//
-// //Viscosity increase by phase field residuum
-// //LBMReal errPhi = (((1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale)- denom);
-// //LBMReal limVis = 0.01;// 0.0000001 * 10;//0.01;
-// // collFactorM =collFactorM/(c1+limVis*(errPhi*errPhi)*collFactorM);
-// // collFactorM = (collFactorM < 1.8) ? 1.8 : collFactorM;
-// //errPhi = errPhi * errPhi* errPhi * errPhi * errPhi * errPhi;
-// //collFactorM = collFactorM + (1.8 - collFactorM) * errPhi / (errPhi + limVis);
-//
-// //3.0 * ((WEIGTH[TNE] * (((phi2[TNE] - phi2[BSW]) - (phi2[BSE] - phi2[TNW])) + ((phi2[TSE] - phi2[BNW]) - (phi2[BNE] - phi2[TSW])))
-// //+WEIGTH[NE] * (((phi2[TE] - phi2[BW]) - (phi2[BE] - phi2[TW])) + ((phi2[TS] - phi2[BN]) + (phi2[TN] - phi2[BS])))) +
-// //+WEIGTH[N] * (phi2[T] - phi2[B]));
-//
-// muRho = rho;
-//
-// ////external pressure
-// //forcingX1 =/* muForcingX1.Eval()/rho */- gradPx/rho;
-// //forcingX2 =/* muForcingX2.Eval()/rho */- gradPy/rho;
-// //forcingX3 =/* muForcingX3.Eval()/rho */- gradPz/rho;
-//
-// ///////////////////////////////////////////////
-//
-// //LBMReal pBefore = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
-// // + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
-// // + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb) * c1o3;
-// //pBefore = -c1o3 * (-1.0e-10)/((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) );
-// ////if (vvx * vvx + vvy * vvy + vvz * vvz > 1.0e-100) {
-// // mfabb -= pBefore * c2o9 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[E] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbab -= pBefore * c2o9 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[N] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbba -= pBefore * c2o9 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[T] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfaab -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[NE] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfcab -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[NW] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfaba -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[TE] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfcba -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[TW] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbaa -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[TN] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbca -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[TS] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfaaa -= pBefore * c1o72 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[TNE] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfcaa -= pBefore * c1o72 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[TNW] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfaca -= pBefore * c1o72 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[TSE] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfcca -= pBefore * c1o72 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[TSW] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfcbb -= pBefore * c2o9 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[W] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbcb -= pBefore * c2o9 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[S] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbbc -= pBefore * c2o9 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[B] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfccb -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[SW] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfacb -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[SE] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfcbc -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[BW] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfabc -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[BE] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbcc -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[BS] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbac -= pBefore * c1o18 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[BN] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfccc -= pBefore * c1o72 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[BSW] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfacc -= pBefore * c1o72 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[BSE] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfcac -= pBefore * c1o72 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[BNW] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfaac -= pBefore * c1o72 * ((rhoL + phi[REST] * (rhoH - rhoL) / (phiH - phiL)) / (rhoL + phi[BNE] * (rhoH - rhoL) / (phiH - phiL)));
-// // mfbbb -= pBefore * 8.0 / 9.0;
-// //}
-//
-// ///////////////////////////////////////////////
-//
-// LBMReal pStarStart = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
-// + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
-// + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb) * c1o3;
-//
-// /////////////////////
-// //LBMReal vvxh = ((((mfhccc - mfhaaa) + (mfhcac - mfhaca)) + ((mfhcaa - mfhacc) + (mfhcca - mfhaac))) +
-// // (((mfhcba - mfhabc) + (mfhcbc - mfhaba)) + ((mfhcab - mfhacb) + (mfhccb - mfhaab))) +
-// // (mfhcbb - mfhabb)) / rhoRef;
-// //LBMReal vvyh = ((((mfhccc - mfhaaa) + (mfhaca - mfhcac)) + ((mfhacc - mfhcaa) + (mfhcca - mfhaac))) +
-// // (((mfhbca - mfhbac) + (mfhbcc - mfhbaa)) + ((mfhacb - mfhcab) + (mfhccb - mfhaab))) +
-// // (mfhbcb - mfhbab)) / rhoRef;
-// //LBMReal vvzh = ((((mfhccc - mfhaaa) + (mfhcac - mfhaca)) + ((mfhacc - mfhcaa) + (mfhaac - mfhcca))) +
-// // (((mfhbac - mfhbca) + (mfhbcc - mfhbaa)) + ((mfhabc - mfhcba) + (mfhcbc - mfhaba))) +
-// // (mfhbbc - mfhbba)) / rhoRef;
-//
-// //LBMReal deltaPP = 0*(vvxh * dX1_phi + vvyh * dX2_phi + vvzh * dX3_phi) * rhoToPhi / (rho);
-// //mfhbcb += c1o6* c2o9 * deltaPP;
-// //mfhbbc += c1o6* c2o9 * deltaPP;
-// //mfhcbb += c1o6* c2o9 * deltaPP;
-// //mfhccb += c1o6* c1o18 * deltaPP;
-// //mfhacb += c1o6* c1o18 * deltaPP;
-// //mfhcbc += c1o6* c1o18 * deltaPP;
-// //mfhabc += c1o6* c1o18 * deltaPP;
-// //mfhbcc += c1o6* c1o18 * deltaPP;
-// //mfhbac += c1o6* c1o18 * deltaPP;
-// //mfhccc += c1o6* c1o72 * deltaPP;
-// //mfhacc += c1o6* c1o72 * deltaPP;
-// //mfhcac += c1o6* c1o72 * deltaPP;
-// //mfhaac += c1o6* c1o72 * deltaPP;
-// //mfhabb += c1o6* c2o9 * deltaPP;
-// //mfhbab += c1o6* c2o9 * deltaPP;
-// //mfhbba += c1o6* c2o9 * deltaPP;
-// //mfhaab += c1o6* c1o18 * deltaPP;
-// //mfhcab += c1o6* c1o18 * deltaPP;
-// //mfhaba += c1o6* c1o18 * deltaPP;
-// //mfhcba += c1o6* c1o18 * deltaPP;
-// //mfhbaa += c1o6* c1o18 * deltaPP;
-// //mfhbca += c1o6* c1o18 * deltaPP;
-// //mfhaaa += c1o6* c1o72 * deltaPP;
-// //mfhcaa += c1o6* c1o72 * deltaPP;
-// //mfhaca += c1o6* c1o72 * deltaPP;
-// //mfhcca += c1o6* c1o72 * deltaPP;
-// //mfhbbb += c1o6* c4 * c2o9 * deltaPP;
-//
-// //////////////////////
-//
-// /////Recovering the origin distributions
-// //LBMReal mfStartcbb = mfcbb ;
-// //LBMReal mfStartbcb = mfbcb ;
-// //LBMReal mfStartbbc = mfbbc ;
-// //LBMReal mfStartccb = mfccb ;
-// //LBMReal mfStartacb = mfacb ;
-// //LBMReal mfStartcbc = mfcbc ;
-// //LBMReal mfStartabc = mfabc ;
-// //LBMReal mfStartbcc = mfbcc ;
-// //LBMReal mfStartbac = mfbac ;
-// //LBMReal mfStartccc = mfccc ;
-// //LBMReal mfStartacc = mfacc ;
-// //LBMReal mfStartcac = mfcac ;
-// //LBMReal mfStartaac = mfaac ;
-// //LBMReal mfStartabb = mfabb ;
-// //LBMReal mfStartbab = mfbab ;
-// //LBMReal mfStartbba = mfbba ;
-// //LBMReal mfStartaab = mfaab ;
-// //LBMReal mfStartcab = mfcab ;
-// //LBMReal mfStartaba = mfaba ;
-// //LBMReal mfStartcba = mfcba ;
-// //LBMReal mfStartbaa = mfbaa ;
-// //LBMReal mfStartbca = mfbca ;
-// //LBMReal mfStartaaa = mfaaa ;
-// //LBMReal mfStartcaa = mfcaa ;
-// //LBMReal mfStartaca = mfaca ;
-// //LBMReal mfStartcca = mfcca ;
-// //LBMReal mfStartbbb = mfbbb ;
-//
-//
-// mfcbb += mfhcbb /rho;
-// mfbcb += mfhbcb /rho;
-// mfbbc += mfhbbc /rho;
-// mfccb += mfhccb /rho;
-// mfacb += mfhacb /rho;
-// mfcbc += mfhcbc /rho;
-// mfabc += mfhabc /rho;
-// mfbcc += mfhbcc /rho;
-// mfbac += mfhbac /rho;
-// mfccc += mfhccc /rho;
-// mfacc += mfhacc /rho;
-// mfcac += mfhcac /rho;
-// mfaac += mfhaac /rho;
-// mfabb += mfhabb /rho;
-// mfbab += mfhbab /rho;
-// mfbba += mfhbba /rho;
-// mfaab += mfhaab /rho;
-// mfcab += mfhcab /rho;
-// mfaba += mfhaba /rho;
-// mfcba += mfhcba /rho;
-// mfbaa += mfhbaa /rho;
-// mfbca += mfhbca /rho;
-// mfaaa += mfhaaa /rho;
-// mfcaa += mfhcaa /rho;
-// mfaca += mfhaca /rho;
-// mfcca += mfhcca /rho;
-// mfbbb += mfhbbb /rho;
-//
-//
-//
-// //Abbas
-// LBMReal pStar = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
-// + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
-// + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb) * c1o3;
-// //22.09.22 not yet in balance, repaire here
-// LBMReal ppStar = ((((((mfhaaa + mfhccc) + (mfhaac + mfhcca)) + ((mfhcac + mfhaca) + (mfhcaa + mfhacc)))*c3
-// + (((mfhaab + mfhccb) + (mfhacb + mfhcab)) + ((mfhaba + mfhcbc) + (mfhabc + mfhcba)) + ((mfhbaa + mfhbcc) + (mfhbac + mfhbca))))*c2
-// + ((mfhabb + mfhcbb) + (mfhbab + mfhbcb) + (mfhbba + mfhbbc))) ) * c1o3/rho;
-//
-// ppStar = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc))) * c3
-// + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca)))) * c2
-// + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc)))) * c1o3 ;
-//
-// //(*phaseFieldOld)(x1, x2, x3) = ((*phaseFieldOld)(x1, x2, x3) > 99.0) ? phi[REST] : (*phaseFieldOld)(x1, x2, x3);
-// //LBMReal dtPhi = phi[REST] - (*phaseFieldOld)(x1, x2, x3);
-// //LBMReal deltaP = -pStar * (c1 - rho / (rho + c1o2 * rhoToPhi * dtPhi));// -pStar * pStar * pStar * 1.0e-4 * rho * rho * rho;
-// //LBMReal deltaP = pStar * (c1 - mfhbbb*rho) * c1o2;//Explicit
-// //LBMReal deltaP = pStar * (c1 - mfhbbb * rho) / (c1 + mfhbbb * rho);//Semi-Implicit
-// //(*phaseFieldOld)(x1, x2, x3) = phi[REST];
-//
-// //mfabb += c2o9 *deltaP;
-// //mfbab += c2o9 *deltaP;
-// //mfbba += c2o9 *deltaP;
-// //mfaab += c1o18*deltaP;
-// //mfcab += c1o18*deltaP;
-// //mfaba += c1o18*deltaP;
-// //mfcba += c1o18*deltaP;
-// //mfbaa += c1o18*deltaP;
-// //mfbca += c1o18*deltaP;
-// //mfaaa += c1o72*deltaP;
-// //mfcaa += c1o72*deltaP;
-// //mfaca += c1o72*deltaP;
-// //mfcca += c1o72*deltaP;
-// //mfcbb += c2o9 *deltaP;
-// //mfbcb += c2o9 *deltaP;
-// //mfbbc += c2o9 *deltaP;
-// //mfccb += c1o18*deltaP;
-// //mfacb += c1o18*deltaP;
-// //mfcbc += c1o18*deltaP;
-// //mfabc += c1o18*deltaP;
-// //mfbcc += c1o18*deltaP;
-// //mfbac += c1o18*deltaP;
-// //mfccc += c1o72*deltaP;
-// //mfacc += c1o72*deltaP;
-// //mfcac += c1o72*deltaP;
-// //mfaac += c1o72*deltaP;
-//
-// //pStar = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
-// // + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
-// // + ((mfabb + mfcbb) + (mfbab + mfbcb) + (mfbba + mfbbc))) + mfbbb) * c1o3;
-//
-//
-//
-//
-// //mfabb -= c1o2 * c2o9 *pStar*(phi[REST]-phi[E ])*rhoToPhi/rho;
-// //mfbab -= c1o2 * c2o9 *pStar*(phi[REST]-phi[N ])*rhoToPhi/rho;
-// //mfbba -= c1o2 * c2o9 *pStar*(phi[REST]-phi[T ])*rhoToPhi/rho;
-// //mfaab -= c1o2 * c1o18*pStar*(phi[REST]-phi[NE ])*rhoToPhi/rho;
-// //mfcab -= c1o2 * c1o18*pStar*(phi[REST]-phi[NW ])*rhoToPhi/rho;
-// //mfaba -= c1o2 * c1o18*pStar*(phi[REST]-phi[TE ])*rhoToPhi/rho;
-// //mfcba -= c1o2 * c1o18*pStar*(phi[REST]-phi[TW ])*rhoToPhi/rho;
-// //mfbaa -= c1o2 * c1o18*pStar*(phi[REST]-phi[TN ])*rhoToPhi/rho;
-// //mfbca -= c1o2 * c1o18*pStar*(phi[REST]-phi[TS ])*rhoToPhi/rho;
-// //mfaaa -= c1o2 * c1o72*pStar*(phi[REST]-phi[TNE])*rhoToPhi/rho;
-// //mfcaa -= c1o2 * c1o72*pStar*(phi[REST]-phi[TNW])*rhoToPhi/rho;
-// //mfaca -= c1o2 * c1o72*pStar*(phi[REST]-phi[TSE])*rhoToPhi/rho;
-// //mfcca -= c1o2 * c1o72*pStar*(phi[REST]-phi[TSW])*rhoToPhi/rho;
-// //mfcbb -= c1o2 * c2o9 *pStar*(phi[REST]-phi[W ])*rhoToPhi/rho;
-// //mfbcb -= c1o2 * c2o9 *pStar*(phi[REST]-phi[S ])*rhoToPhi/rho;
-// //mfbbc -= c1o2 * c2o9 *pStar*(phi[REST]-phi[B ])*rhoToPhi/rho;
-// //mfccb -= c1o2 * c1o18*pStar*(phi[REST]-phi[SW ])*rhoToPhi/rho;
-// //mfacb -= c1o2 * c1o18*pStar*(phi[REST]-phi[SE ])*rhoToPhi/rho;
-// //mfcbc -= c1o2 * c1o18*pStar*(phi[REST]-phi[BW ])*rhoToPhi/rho;
-// //mfabc -= c1o2 * c1o18*pStar*(phi[REST]-phi[BE ])*rhoToPhi/rho;
-// //mfbcc -= c1o2 * c1o18*pStar*(phi[REST]-phi[BS ])*rhoToPhi/rho;
-// //mfbac -= c1o2 * c1o18*pStar*(phi[REST]-phi[BN ])*rhoToPhi/rho;
-// //mfccc -= c1o2 * c1o72*pStar*(phi[REST]-phi[BSW])*rhoToPhi/rho;
-// //mfacc -= c1o2 * c1o72*pStar*(phi[REST]-phi[BSE])*rhoToPhi/rho;
-// //mfcac -= c1o2 * c1o72*pStar*(phi[REST]-phi[BNW])*rhoToPhi/rho;
-// //mfaac -= c1o2 * c1o72*pStar*(phi[REST]-phi[BNE])*rhoToPhi/rho;
-//
-//
-// //forcingX1 =/* muForcingX1.Eval() / rho*/ - pStar * dX1_phi * rhoToPhi / rho;
-// //forcingX2 =/* muForcingX2.Eval() / rho*/ - pStar * dX2_phi * rhoToPhi / rho;
-// //forcingX3 =/* muForcingX3.Eval() / rho*/ - pStar * dX3_phi * rhoToPhi / rho;
-//
-//
-// //mfabb += (-forcingX1) * c2o9;
-// //mfbab += (-forcingX2) * c2o9;
-// //mfbba += (-forcingX3) * c2o9;
-// //mfaab += (-forcingX1 - forcingX2) * c1o16;
-// //mfcab += (forcingX1 - forcingX2) * c1o16;
-// //mfaba += (-forcingX1 - forcingX3) * c1o16;
-// //mfcba += (forcingX1 - forcingX3) * c1o16;
-// //mfbaa += (-forcingX2 - forcingX3) * c1o16;
-// //mfbca += (forcingX2 - forcingX3) * c1o16;
-// //mfaaa += (-forcingX1 - forcingX2 - forcingX3) * c1o72;
-// //mfcaa += (forcingX1 - forcingX2 - forcingX3) * c1o72;
-// //mfaca += (-forcingX1 + forcingX2 - forcingX3) * c1o72;
-// //mfcca += (forcingX1 + forcingX2 - forcingX3) * c1o72;
-// //mfcbb += (forcingX1)*c2o9;
-// //mfbcb += (forcingX2)*c2o9;
-// //mfbbc += (forcingX3)*c2o9;
-// //mfccb += (forcingX1 + forcingX2) * c1o16;
-// //mfacb += (-forcingX1 + forcingX2) * c1o16;
-// //mfcbc += (forcingX1 + forcingX3) * c1o16;
-// //mfabc += (-forcingX1 + forcingX3) * c1o16;
-// //mfbcc += (forcingX2 + forcingX3) * c1o16;
-// //mfbac += (-forcingX2 + forcingX3) * c1o16;
-// //mfccc += (forcingX1 + forcingX2 + forcingX3) * c1o72;
-// //mfacc += (-forcingX1 + forcingX2 + forcingX3) * c1o72;
-// //mfcac += (forcingX1 - forcingX2 + forcingX3) * c1o72;
-// //mfaac += (-forcingX1 - forcingX2 + forcingX3) * c1o72;
-//
-// LBMReal saveForceX1 = forcingX1;
-// LBMReal saveForceX2 = forcingX2;
-// LBMReal saveForceX3 = forcingX3;
-//
-// vvx = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
-// (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
-// (mfcbb - mfabb)) / rhoRef;
-// vvy = ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
-// (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
-// (mfbcb - mfbab)) / rhoRef;
-// vvz = ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfacc - mfcaa) + (mfaac - mfcca))) +
-// (((mfbac - mfbca) + (mfbcc - mfbaa)) + ((mfabc - mfcba) + (mfcbc - mfaba))) +
-// (mfbbc - mfbba)) / rhoRef;
-//
-//
-// LBMReal dRhoInvX = -(((((mfhccc - mfhaaa) + (mfhcac - mfhaca)) + ((mfhcaa - mfhacc) + (mfhcca - mfhaac))) +
-// (((mfhcba - mfhabc) + (mfhcbc - mfhaba)) + ((mfhcab - mfhacb) + (mfhccb - mfhaab))) +
-// (mfhcbb - mfhabb)));
-// LBMReal dRhoInvY = -(((((mfhccc - mfhaaa) + (mfhaca - mfhcac)) + ((mfhacc - mfhcaa) + (mfhcca - mfhaac))) +
-// (((mfhbca - mfhbac) + (mfhbcc - mfhbaa)) + ((mfhacb - mfhcab) + (mfhccb - mfhaab))) +
-// (mfhbcb - mfhbab)));
-// LBMReal dRhoInvZ = -(((((mfhccc - mfhaaa) + (mfhcac - mfhaca)) + ((mfhacc - mfhcaa) + (mfhaac - mfhcca))) +
-// (((mfhbac - mfhbca) + (mfhbcc - mfhbaa)) + ((mfhabc - mfhcba) + (mfhcbc - mfhaba))) +
-// (mfhbbc - mfhbba)));
-//
-//
-// forcingX1 = 0.0;
-// forcingX2 = 0.0;
-// forcingX3 = 0.0;
-// //!Abbas
-// //LBMReal dX1_rhoInv = gradX1_rhoInv(rhoL, rhoH - rhoL);
-// //LBMReal dX2_rhoInv = gradX2_rhoInv(rhoL, rhoH - rhoL);
-// //LBMReal dX3_rhoInv = gradX3_rhoInv(rhoL, rhoH - rhoL);
-// //forcingX1 =/* muForcingX1.Eval() / rho*/ +pStar * dX1_rhoInv * rho;
-// //forcingX2 =/* muForcingX2.Eval() / rho*/ +pStar * dX2_rhoInv * rho;
-// //forcingX3 =/* muForcingX3.Eval() / rho*/ +pStar * dX3_rhoInv * rho;
-//
-// //forcingX1 = (-pStar * dX1_phi * rhoToPhi / rho + pStar * dX1_rhoInv * rho) *c1o2;
-// //forcingX2 = (-pStar * dX2_phi * rhoToPhi / rho + pStar * dX2_rhoInv * rho) *c1o2;
-// //forcingX3 = (-pStar * dX3_phi * rhoToPhi / rho + pStar * dX3_rhoInv * rho) *c1o2;
-// LBMReal FdX1_phi = normX1 * (1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale;
-// LBMReal FdX2_phi = normX2 * (1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale;
-// LBMReal FdX3_phi = normX3 * (1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale;
-//
-//
-// //forcingX1 = (-pStar * dX1_phi * rhoToPhi / rho ) ;
-// //forcingX2 = (-pStar * dX2_phi * rhoToPhi / rho ) ;
-// //forcingX3 = (-pStar * dX3_phi * rhoToPhi / rho ) ;
-//
-// //forcingX1 = (pStar * dRhoInvX* rho *c3) ;
-// //forcingX2 = (pStar * dRhoInvY* rho *c3) ;
-// //forcingX3 = (pStar * dRhoInvZ* rho *c3) ;
-// //if (phi[REST] > 0.1 && phi[REST] < 0.9) std::cout << phi[REST] << " " << dX1_phi * rhoToPhi / rho << " " << dRhoInvX * rho *3<< std::endl;
-// //LBMReal forcingX1ALTERNAT = ( pStar * dX1_rhoInv * rho) ;
-// //LBMReal forcingX2ALTERNAT = ( pStar * dX2_rhoInv * rho) ;
-// //LBMReal forcingX3ALTERNAT = ( pStar * dX3_rhoInv * rho) ;
-//
-// //forcingX1 = (fabs(vvx + c1o2 * forcingX1) < fabs(vvx + c1o2 * forcingX1ALTERNAT)) ? forcingX1 : forcingX1ALTERNAT;
-// //forcingX2 = (fabs(vvy + c1o2 * forcingX2) < fabs(vvy + c1o2 * forcingX2ALTERNAT)) ? forcingX2 : forcingX2ALTERNAT;
-// //forcingX3 = (fabs(vvz + c1o2 * forcingX3) < fabs(vvz + c1o2 * forcingX3ALTERNAT)) ? forcingX3 : forcingX3ALTERNAT;
-//
-// // forcingX1 = -pStar * rhoToPhi / rho * normX1 * (1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale;
-// // forcingX2 = -pStar * rhoToPhi / rho * normX2 * (1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale;
-// // forcingX3 = -pStar * rhoToPhi / rho * normX3 * (1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale;
-//
-// //forcingX1 = (-pStar * dX1_phi * rhoToPhi / rho *(c1- phi[REST]) + pStar * dX1_rhoInv * rho*(phi[REST]));
-// //forcingX2 = (-pStar * dX2_phi * rhoToPhi / rho *(c1- phi[REST]) + pStar * dX2_rhoInv * rho*(phi[REST]));
-// //forcingX3 = (-pStar * dX3_phi * rhoToPhi / rho *(c1- phi[REST]) + pStar * dX3_rhoInv * rho*(phi[REST]));
-// //if (phi[REST] > 0.3 && phi[REST] < 0.7)
-// //{
-// // int test = 1;
-// // std::cout << phi[REST] <<" "<< dX1_phi <<" "<< normX1 * (1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale<<" "<< normX1 * (1.0 - phi[REST]) * (phi[REST]) * oneOverInterfaceScale/ dX1_phi<< std::endl;
-// //}
-//
-//
-//
-// //LBMReal scaleGrad = c2 * phi[REST] * (1.0 - phi[REST]) / ((phi[REST] * phi[REST] + (1.0 - phi[REST]) * (1.0 - phi[REST])) * (phi[REST] * phi[REST] + (1.0 - phi[REST]) * (1.0 - phi[REST])));
-// //dX1_phi *= scaleGrad;
-// //dX2_phi *= scaleGrad;
-// //dX3_phi *= scaleGrad;
-//
-// ///Experimental interface sharpening force 20.06.2022
-//
-// LBMReal 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;
-// ///surface tension force
-// forcingX1 += mu * dX1_phi/rho;
-// forcingX2 += mu * dX2_phi/rho;
-// forcingX3 += mu * dX3_phi/rho;
-//
-// LBMReal forcingBIAS = 0.5;
-// forcingX1 += muForcingX1.Eval() / rho;//*phi[REST];
-// forcingX2 += muForcingX2.Eval() / rho;// * phi[REST];
-// forcingX3 += muForcingX3.Eval() / rho;// * phi[REST];
-//
-// // //19.08.2022
-// //vvx += vvxh / rho * c1o2;
-// //vvy += vvyh / rho * c1o2;
-// //vvz += vvzh / rho * c1o2;
-// // //
-//
-//
-// 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
-// //vvz += (forcingX3 + muForcingX3.Eval() / rho) * deltaT * c1o2; // Z
-//
-//
-//
-// // vvx += (forcingX1 + muForcingX1.Eval() / rho) * deltaT * forcingBIAS; // X
-// // vvy += (forcingX2 + muForcingX2.Eval() / rho) * deltaT * forcingBIAS; // Y
-// // vvz += (forcingX3 + muForcingX3.Eval() / rho) * deltaT * forcingBIAS; // Z
-//
-//
-//
-// //Abbas
-// LBMReal M200 = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
-// + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfaba + mfcbc) + (mfabc + mfcba)) ))
-// + ((mfabb + mfcbb))) );
-// LBMReal M020 = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
-// + (((mfaab + mfccb) + (mfacb + mfcab)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
-// + ( (mfbab + mfbcb) )) );
-// LBMReal M002 = ((((((mfaaa + mfccc) + (mfaac + mfcca)) + ((mfcac + mfaca) + (mfcaa + mfacc)))
-// + ( + ((mfaba + mfcbc) + (mfabc + mfcba)) + ((mfbaa + mfbcc) + (mfbac + mfbca))))
-// + ( (mfbba + mfbbc))));
-//
-// LBMReal M110 = ((((((mfaaa + mfccc) + (-mfcac - mfaca)) + ((mfaac + mfcca) + (-mfcaa -mfacc)))
-// + (((mfaab + mfccb) + (-mfacb - mfcab)) ))
-// ) );
-// LBMReal M101 = ((((((mfaaa + mfccc) - (mfaac + mfcca)) + ((mfcac + mfaca) - (mfcaa + mfacc)))
-// + (((mfaba + mfcbc) + (-mfabc - mfcba))))
-// ));
-// LBMReal M011 = ((((((mfaaa + mfccc) - (mfaac + mfcca)) + ( (mfcaa + mfacc)- (mfcac + mfaca)))
-// + (((mfbaa + mfbcc) + (-mfbac - mfbca))))
-// ));
-// LBMReal vvxI = vvx;
-// LBMReal vvyI = vvy;
-// LBMReal vvzI = vvz;
-//
-// LBMReal collFactorStore=collFactorM;
-// LBMReal stress;
-// //for(int iter=0;iter<5;iter++)
-// //{
-// // LBMReal OxxPyyPzz = 1.0;
-// // LBMReal mxxPyyPzz = (M200-vvxI*vvxI) + (M020-vvyI*vvyI) + (M002-vvzI*vvzI);
-// // //pStar = mxxPyyPzz * c1o3;
-// //mxxPyyPzz -= c3 *pStar;
-//
-// //LBMReal mxxMyy = (M200-vvxI*vvxI) - (M020-vvyI*vvyI);
-// //LBMReal mxxMzz = (M200-vvxI*vvxI) - (M002-vvzI*vvzI);
-// //LBMReal mxy = M110 - vvxI * vvyI;
-// //LBMReal mxz = M101 - vvxI * vvzI;
-// //LBMReal myz = M011 - vvyI * vvzI;
-//
-//
-// //mxxMyy *= c1 - collFactorM * c1o2;
-// //mxxMzz *= c1 - collFactorM * c1o2;
-// //mxy *= c1 - collFactorM * c1o2;
-// //mxz *= c1 - collFactorM * c1o2;
-// //myz *= c1 - collFactorM * c1o2;
-// //mxxPyyPzz *= c1 - OxxPyyPzz * c1o2;
-// ////mxxPyyPzz = mxxPyyPzz*fabs(mxxPyyPzz)/(1.0e-6+fabs(mxxPyyPzz));
-// ////mxxPyyPzz += c3 * pStar;
-// //LBMReal mxx = (mxxMyy + mxxMzz + mxxPyyPzz)*c1o3;
-// //LBMReal myy = (-c2*mxxMyy + mxxMzz + mxxPyyPzz)*c1o3;
-// //LBMReal mzz = (mxxMyy -c2* mxxMzz + mxxPyyPzz) * c1o3;
-// //vvxI = vvx - (mxx * dX1_phi + mxy * dX2_phi + mxz * dX3_phi) * rhoToPhi / (rho);
-// //vvyI = vvy - (mxy * dX1_phi + myy * dX2_phi + myz * dX3_phi) * rhoToPhi / (rho);
-// //vvzI = vvz - (mxz * dX1_phi + myz * dX2_phi + mzz * dX3_phi) * rhoToPhi / (rho);
-//
-//
-// //// vvzI = vvz + (mxz * dRhoInvX + myz * dRhoInvY + mzz * dRhoInvZ) * (rho)*c3;
-// //// vvxI = vvx + (mxx * dRhoInvX + mxy * dRhoInvY + mxz * dRhoInvZ) * (rho)*c3;
-// //// vvyI = vvy + (mxy * dRhoInvX + myy * dRhoInvY + myz * dRhoInvZ) * (rho)*c3;
-//
-//
-// // //LBMReal dxux = -c1o2 * collFactorM * (mxxMyy + mxxMzz) + c1o2 * OxxPyyPzz * (/*mfaaa*/ -mxxPyyPzz);
-// // //
-// // //LBMReal dyuy = dxux + collFactorM * c3o2 * mxxMyy;
-// // //LBMReal dzuz = dxux + collFactorM * c3o2 * mxxMzz;
-// // //LBMReal Dxy = -three * collFactorM * mxy;
-// // //LBMReal Dxz = -three * collFactorM * mxz;
-// // //LBMReal Dyz = -three * collFactorM * myz;
-// // ////LBMReal stress = sqrt(sqrt((dyuy+dxux+dzuz)* (dyuy + dxux + dzuz))) * sqrt(forcingX1 * forcingX1 + forcingX2 * forcingX2 + forcingX3 * forcingX3);
-// // // stress = sqrt(dyuy * dyuy + dxux * dxux + dzuz*dzuz + Dxy * Dxy + Dxz * Dxz + Dyz * Dyz)*sqrt(forcingX1*forcingX1+forcingX2*forcingX2+forcingX3*forcingX3);
-// // ////collFactorM = collFactorStore + (1.75 - collFactorStore) * stress / (stress + 1.0e-8);
-// // //
-// // //LBMReal dX2_rho = (rhoToPhi)*dX2_phi;
-// // //LBMReal dX1_rho = (rhoToPhi)*dX1_phi;
-// // //LBMReal dX3_rho = (rhoToPhi)*dX3_phi;
-// // ////vvxI= vvx+ c1o6 * (c1 / collFactorM - c1o2) * (2 * dxux * dX1_rho + Dxy * dX2_rho + Dxz * dX3_rho) / (rho);
-// // ////vvyI= vvy+ c1o6 * (c1 / collFactorM - c1o2) * (Dxy * dX1_rho + 2 * dyuy * dX2_rho + Dyz * dX3_rho) / (rho);
-// // ////vvzI= vvz+ c1o6 * (c1 / collFactorM - c1o2) * (Dxz * dX1_rho + Dyz * dX2_rho + 2 * dyuy * dX3_rho) / (rho);
-//
-// // //vvxI = vvx + c1o3*forcingBIAS * (c1 / collFactorM - c1o2) * (2 * dxux * dX1_rho + Dxy * dX2_rho + Dxz * dX3_rho) / (rho);
-// // //vvyI = vvy + c1o3*forcingBIAS * (c1 / collFactorM - c1o2) * (Dxy * dX1_rho + 2 * dyuy * dX2_rho + Dyz * dX3_rho) / (rho);
-// // //vvzI = vvz + c1o3*forcingBIAS * (c1 / collFactorM - c1o2) * (Dxz * dX1_rho + Dyz * dX2_rho + 2 * dyuy * dX3_rho) / (rho);
-//
-// // ////vvxI = vvx - c1o3 * forcingBIAS * (c1 / collFactorM - c1o2) * (2 * dxux * dX1_rhoInv + Dxy * dX2_rhoInv + Dxz * dX3_rhoInv);
-// // ////vvyI = vvy - c1o3 * forcingBIAS * (c1 / collFactorM - c1o2) * (Dxy * dX1_rhoInv + 2 * dyuy * dX2_rhoInv + Dyz * dX3_rhoInv);
-// // ////vvzI = vvz - c1o3 * forcingBIAS * (c1 / collFactorM - c1o2) * (Dxz * dX1_rhoInv + Dyz * dX2_rhoInv + 2 * dyuy * dX3_rhoInv);
-//
-//
-// //}
-// // //forcingX1+=(vvxI-vvx)/(deltaT* forcingBIAS) + muForcingX1.Eval() / rho;
-// // //forcingX2 += (vvyI - vvy) / (deltaT * forcingBIAS) + muForcingX2.Eval() / rho;
-// // //forcingX3 += (vvzI - vvz) / (deltaT * forcingBIAS) + muForcingX3.Eval() / rho;
-//
-//
-// //// forcingX1 += c2 * (vvxI - vvx);
-// //// forcingX2 += c2 * (vvyI - vvy);
-// //// forcingX3 += c2 * (vvzI - vvz);
-//
-//
-// //mfabb += c1o2*(-forcingX1) * c2o9;
-// //mfbab += c1o2*(-forcingX2) * c2o9;
-// //mfbba += c1o2*(-forcingX3) * c2o9;
-// //mfaab += c1o2*(-forcingX1 - forcingX2) * c1o18;
-// //mfcab += c1o2*( forcingX1 - forcingX2) * c1o18;
-// //mfaba += c1o2*(-forcingX1 - forcingX3) * c1o18;
-// //mfcba += c1o2*( forcingX1 - forcingX3) * c1o18;
-// //mfbaa += c1o2*(-forcingX2 - forcingX3) * c1o18;
-// //mfbca += c1o2*( forcingX2 - forcingX3) * c1o18;
-// //mfaaa += c1o2*(-forcingX1 - forcingX2 - forcingX3) * c1o72;
-// //mfcaa += c1o2*(forcingX1 - forcingX2 - forcingX3) * c1o72;
-// //mfaca += c1o2*(-forcingX1 + forcingX2 - forcingX3) * c1o72;
-// //mfcca += c1o2*(forcingX1 + forcingX2 - forcingX3) * c1o72;
-// //mfcbb += c1o2*(forcingX1)*c2o9;
-// //mfbcb += c1o2*(forcingX2)*c2o9;
-// //mfbbc += c1o2*(forcingX3)*c2o9;
-// //mfccb += c1o2*( forcingX1 + forcingX2) * c1o18;
-// //mfacb += c1o2*(-forcingX1 + forcingX2) * c1o18;
-// //mfcbc += c1o2*( forcingX1 + forcingX3) * c1o18;
-// //mfabc += c1o2*(-forcingX1 + forcingX3) * c1o18;
-// //mfbcc += c1o2*( forcingX2 + forcingX3) * c1o18;
-// //mfbac += c1o2*(-forcingX2 + forcingX3) * c1o18;
-// //mfccc += c1o2*(forcingX1 + forcingX2 + forcingX3) * c1o72;
-// //mfacc += c1o2*(-forcingX1 + forcingX2 + forcingX3) * c1o72;
-// //mfcac += c1o2*(forcingX1 - forcingX2 + forcingX3) * c1o72;
-// //mfaac += c1o2*(-forcingX1 - forcingX2 + forcingX3) * c1o72;
-//
-//
-// //forcingX1 = saveForceX1;
-// //forcingX2 = saveForceX2;
-// //forcingX3 = saveForceX3;
-// vvx = vvxI;
-// vvy = vvyI;
-// vvz = vvzI;
-//
-//
-//
-// //!Abbas
-//
-// LBMReal vx2;
-// LBMReal vy2;
-// LBMReal vz2;
-// vx2 = vvx * vvx;
-// vy2 = vvy * vvy;
-// vz2 = vvz * vvz;
-// //pStar =ppStar- (vx2 + vy2 + vz2)*pStar;
-// // pStar = (pStar + ppStar)*c1o2;
-// ///////////////////////////////////////////////////////////////////////////////////////////
-// LBMReal oMdrho;
-// ///////////////
-// //mfabb -= pStar * c2o9;
-// //mfbab -= pStar * c2o9;
-// //mfbba -= pStar * c2o9;
-// //mfaab -= pStar * c1o16;
-// //mfcab -= pStar * c1o16;
-// //mfaba -= pStar * c1o16;
-// //mfcba -= pStar * c1o16;
-// //mfbaa -= pStar * c1o16;
-// //mfbca -= pStar * c1o16;
-// //mfaaa -= pStar * c1o72;
-// //mfcaa -= pStar * c1o72;
-// //mfaca -= pStar * c1o72;
-// //mfcca -= pStar * c1o72;
-// //mfcbb -= pStar * c2o9;
-// //mfbcb -= pStar * c2o9;
-// //mfbbc -= pStar * c2o9;
-// //mfccb -= pStar * c1o16;
-// //mfacb -= pStar * c1o16;
-// //mfcbc -= pStar * c1o16;
-// //mfabc -= pStar * c1o16;
-// //mfbcc -= pStar * c1o16;
-// //mfbac -= pStar * c1o16;
-// //mfccc -= pStar * c1o72;
-// //mfacc -= pStar * c1o72;
-// //mfcac -= pStar * c1o72;
-// //mfaac -= pStar * c1o72;
-// //mfbbb -= pStar * 8.0/9.0;
-// ///////////////////
-//
-// 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!!!!
-//
-// ////////////////////////////////////////////////////////////////////////////////////
-// LBMReal wadjust;
-// LBMReal qudricLimit = 0.01 / (c1 + 1.0e4 * phi[REST] * (c1 - phi[REST])); //LBMReal qudricLimit = 0.01;
-// ////////////////////////////////////////////////////////////////////////////////////
-// //Hin
-// ////////////////////////////////////////////////////////////////////////////////////
-// // mit 1/36, 1/9, 1/36, 1/9, 4/9, 1/9, 1/36, 1/9, 1/36 Konditionieren
-// ////////////////////////////////////////////////////////////////////////////////////
-// // Z - Dir
-// m2 = mfaaa + mfaac;
-// m1 = mfaac - mfaaa;
-// m0 = m2 + mfaab;
-// mfaaa = m0;
-// m0 += c1o36 * oMdrho;
-// mfaab = m1 - m0 * vvz;
-// mfaac = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfaba + mfabc;
-// m1 = mfabc - mfaba;
-// m0 = m2 + mfabb;
-// mfaba = m0;
-// m0 += c1o9 * oMdrho;
-// mfabb = m1 - m0 * vvz;
-// mfabc = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfaca + mfacc;
-// m1 = mfacc - mfaca;
-// m0 = m2 + mfacb;
-// mfaca = m0;
-// m0 += c1o36 * oMdrho;
-// mfacb = m1 - m0 * vvz;
-// mfacc = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfbaa + mfbac;
-// m1 = mfbac - mfbaa;
-// m0 = m2 + mfbab;
-// mfbaa = m0;
-// m0 += c1o9 * oMdrho;
-// mfbab = m1 - m0 * vvz;
-// mfbac = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfbba + mfbbc;
-// m1 = mfbbc - mfbba;
-// m0 = m2 + mfbbb;
-// mfbba = m0;
-// m0 += c4o9 * oMdrho;
-// mfbbb = m1 - m0 * vvz;
-// mfbbc = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfbca + mfbcc;
-// m1 = mfbcc - mfbca;
-// m0 = m2 + mfbcb;
-// mfbca = m0;
-// m0 += c1o9 * oMdrho;
-// mfbcb = m1 - m0 * vvz;
-// mfbcc = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfcaa + mfcac;
-// m1 = mfcac - mfcaa;
-// m0 = m2 + mfcab;
-// mfcaa = m0;
-// m0 += c1o36 * oMdrho;
-// mfcab = m1 - m0 * vvz;
-// mfcac = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfcba + mfcbc;
-// m1 = mfcbc - mfcba;
-// m0 = m2 + mfcbb;
-// mfcba = m0;
-// m0 += c1o9 * oMdrho;
-// mfcbb = m1 - m0 * vvz;
-// mfcbc = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfcca + mfccc;
-// m1 = mfccc - mfcca;
-// m0 = m2 + mfccb;
-// mfcca = m0;
-// m0 += c1o36 * oMdrho;
-// mfccb = m1 - m0 * vvz;
-// mfccc = m2 - 2. * m1 * vvz + vz2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// // mit 1/6, 0, 1/18, 2/3, 0, 2/9, 1/6, 0, 1/18 Konditionieren
-// ////////////////////////////////////////////////////////////////////////////////////
-// // Y - Dir
-// m2 = mfaaa + mfaca;
-// m1 = mfaca - mfaaa;
-// m0 = m2 + mfaba;
-// mfaaa = m0;
-// m0 += c1o6 * oMdrho;
-// mfaba = m1 - m0 * vvy;
-// mfaca = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfaab + mfacb;
-// m1 = mfacb - mfaab;
-// m0 = m2 + mfabb;
-// mfaab = m0;
-// mfabb = m1 - m0 * vvy;
-// mfacb = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfaac + mfacc;
-// m1 = mfacc - mfaac;
-// m0 = m2 + mfabc;
-// mfaac = m0;
-// m0 += c1o18 * oMdrho;
-// mfabc = m1 - m0 * vvy;
-// mfacc = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfbaa + mfbca;
-// m1 = mfbca - mfbaa;
-// m0 = m2 + mfbba;
-// mfbaa = m0;
-// m0 += c2o3 * oMdrho;
-// mfbba = m1 - m0 * vvy;
-// mfbca = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfbab + mfbcb;
-// m1 = mfbcb - mfbab;
-// m0 = m2 + mfbbb;
-// mfbab = m0;
-// mfbbb = m1 - m0 * vvy;
-// mfbcb = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfbac + mfbcc;
-// m1 = mfbcc - mfbac;
-// m0 = m2 + mfbbc;
-// mfbac = m0;
-// m0 += c2o9 * oMdrho;
-// mfbbc = m1 - m0 * vvy;
-// mfbcc = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfcaa + mfcca;
-// m1 = mfcca - mfcaa;
-// m0 = m2 + mfcba;
-// mfcaa = m0;
-// m0 += c1o6 * oMdrho;
-// mfcba = m1 - m0 * vvy;
-// mfcca = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfcab + mfccb;
-// m1 = mfccb - mfcab;
-// m0 = m2 + mfcbb;
-// mfcab = m0;
-// mfcbb = m1 - m0 * vvy;
-// mfccb = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfcac + mfccc;
-// m1 = mfccc - mfcac;
-// m0 = m2 + mfcbc;
-// mfcac = m0;
-// m0 += c1o18 * oMdrho;
-// mfcbc = m1 - m0 * vvy;
-// mfccc = m2 - 2. * m1 * vvy + vy2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// // mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
-// ////////////////////////////////////////////////////////////////////////////////////
-// // X - Dir
-// m2 = mfaaa + mfcaa;
-// m1 = mfcaa - mfaaa;
-// m0 = m2 + mfbaa;
-// mfaaa = m0;
-// m0 += 1. * oMdrho;
-// mfbaa = m1 - m0 * vvx;
-// mfcaa = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfaba + mfcba;
-// m1 = mfcba - mfaba;
-// m0 = m2 + mfbba;
-// mfaba = m0;
-// mfbba = m1 - m0 * vvx;
-// mfcba = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfaca + mfcca;
-// m1 = mfcca - mfaca;
-// m0 = m2 + mfbca;
-// mfaca = m0;
-// m0 += c1o3 * oMdrho;
-// mfbca = m1 - m0 * vvx;
-// mfcca = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfaab + mfcab;
-// m1 = mfcab - mfaab;
-// m0 = m2 + mfbab;
-// mfaab = m0;
-// mfbab = m1 - m0 * vvx;
-// mfcab = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfabb + mfcbb;
-// m1 = mfcbb - mfabb;
-// m0 = m2 + mfbbb;
-// mfabb = m0;
-// mfbbb = m1 - m0 * vvx;
-// mfcbb = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfacb + mfccb;
-// m1 = mfccb - mfacb;
-// m0 = m2 + mfbcb;
-// mfacb = m0;
-// mfbcb = m1 - m0 * vvx;
-// mfccb = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfaac + mfcac;
-// m1 = mfcac - mfaac;
-// m0 = m2 + mfbac;
-// mfaac = m0;
-// m0 += c1o3 * oMdrho;
-// mfbac = m1 - m0 * vvx;
-// mfcac = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfabc + mfcbc;
-// m1 = mfcbc - mfabc;
-// m0 = m2 + mfbbc;
-// mfabc = m0;
-// mfbbc = m1 - m0 * vvx;
-// mfcbc = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m2 = mfacc + mfccc;
-// m1 = mfccc - mfacc;
-// m0 = m2 + mfbcc;
-// mfacc = m0;
-// m0 += c1o9 * oMdrho;
-// mfbcc = m1 - m0 * vvx;
-// mfccc = m2 - 2. * m1 * vvx + vx2 * m0;
-// ////////////////////////////////////////////////////////////////////////////////////
-// // Cumulants
-// ////////////////////////////////////////////////////////////////////////////////////
-//
-// // mfaaa = 0.0;
-// LBMReal OxxPyyPzz = 1.0; //omega2 or bulk viscosity
-// // LBMReal OxyyPxzz = 1.;//-s9;//2+s9;//
-// // LBMReal OxyyMxzz = 1.;//2+s9;//
-// LBMReal O4 = 1.;
-// LBMReal O5 = 1.;
-// LBMReal O6 = 1.;
-//
-// //collFactorM+= (1.7 - collFactorM) * fabs(mfaaa) / (fabs(mfaaa) + 0.001f);
-//
-//
-// /////fourth order parameters; here only for test. Move out of loop!
-//
-// LBMReal 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)));
-// LBMReal 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);
-// LBMReal 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));
-// LBMReal 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' )
-// LBMReal 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));
-// //LBMReal stress = 1.0;// stress / (stress + 1.0e-10);
-// stress = 1.0;
-// //OxyyPxzz += stress*(1.0-OxyyPxzz);
-// //OxyyPxzz = c3 * (collFactorM - c2) / (collFactorM - c3);
-// //OxyyMxzz += stress*(1.0-OxyyMxzz);
-// //Oxyz += stress*(1.0-Oxyz);
-// //A *= 1.0-stress;
-// //BB *= 1.0-stress;
-//
-// //Cum 4.
-// //LBMReal CUMcbb = mfcbb - ((mfcaa + c1o3 * oMdrho) * mfabb + 2. * mfbba * mfbab); // till 18.05.2015
-// //LBMReal CUMbcb = mfbcb - ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb); // till 18.05.2015
-// //LBMReal CUMbbc = mfbbc - ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb); // till 18.05.2015
-//
-// LBMReal CUMcbb = mfcbb - ((mfcaa + c1o3) * mfabb + 2. * mfbba * mfbab);
-// LBMReal CUMbcb = mfbcb - ((mfaca + c1o3) * mfbab + 2. * mfbba * mfabb);
-// LBMReal CUMbbc = mfbbc - ((mfaac + c1o3) * mfbba + 2. * mfbab * mfabb);
-//
-// LBMReal CUMcca = mfcca - ((mfcaa * mfaca + 2. * mfbba * mfbba) + c1o3 * (mfcaa + mfaca) * oMdrho + c1o9 * (oMdrho - c1) * oMdrho);
-// LBMReal CUMcac = mfcac - ((mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9 * (oMdrho - c1) * oMdrho);
-// LBMReal CUMacc = mfacc - ((mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9 * (oMdrho - c1) * oMdrho);
-//
-// //Cum 5.
-// LBMReal CUMbcc = mfbcc - (mfaac * mfbca + mfaca * mfbac + 4. * mfabb * mfbbb + 2. * (mfbab * mfacb + mfbba * mfabc)) - c1o3 * (mfbca + mfbac) * oMdrho;
-// LBMReal CUMcbc = mfcbc - (mfaac * mfcba + mfcaa * mfabc + 4. * mfbab * mfbbb + 2. * (mfabb * mfcab + mfbba * mfbac)) - c1o3 * (mfcba + mfabc) * oMdrho;
-// LBMReal CUMccb = mfccb - (mfcaa * mfacb + mfaca * mfcab + 4. * mfbba * mfbbb + 2. * (mfbab * mfbca + mfabb * mfcba)) - c1o3 * (mfacb + mfcab) * oMdrho;
-//
-// //Cum 6.
-// LBMReal 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
-// LBMReal mxxPyyPzz = mfcaa + mfaca + mfaac;
-// //pStar = (mxxPyyPzz+vx2+vy2+vz2) * c1o3;//does not work
-// //pStar = (mxxPyyPzz) * c1o3;
-// //pStar = pStar + 1.5 * (mxxPyyPzz * c1o3 - pStar);
-// //mfaaa = mxxPyyPzz;
-// // LBMReal mfaaaS = (mfaaa * (-4 - 3 * OxxPyyPzz * (-1 + rho)) + 6 * mxxPyyPzz * OxxPyyPzz * (-1 + rho)) / (-4 + 3 * OxxPyyPzz * (-1 + rho));
-// mxxPyyPzz -= mfaaa ;//12.03.21 shifted by mfaaa
-// //mxxPyyPzz-=(mfaaa+mfaaaS)*c1o2;//12.03.21 shifted by mfaaa
-// LBMReal mxxMyy = mfcaa - mfaca;
-// LBMReal mxxMzz = mfcaa - mfaac;
-//
-// ///
-// LBMReal mmfcaa = c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz);
-// LBMReal mmfaca = c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz);
-// LBMReal mmfaac = c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz);
-// LBMReal mmfabb = mfabb;
-// LBMReal mmfbab = mfbab;
-// LBMReal mmfbba = mfbba;
-// ///
-//
-// LBMReal dxux = -c1o2 * collFactorM * (mxxMyy + mxxMzz) + c1o2 * OxxPyyPzz * (/*mfaaa*/ -mxxPyyPzz)*0;
-// //LBMReal dxux = -c1o2 * (mxxMyy + mxxMzz) * collFactorM - mfaaa * c1o3* omegaDRho;
-// LBMReal dyuy = dxux + collFactorM * c3o2 * mxxMyy;
-// LBMReal dzuz = dxux + collFactorM * c3o2 * mxxMzz;
-// LBMReal Dxy = -three * collFactorM * mfbba;
-// LBMReal Dxz = -three * collFactorM * mfbab;
-// LBMReal Dyz = -three * collFactorM * mfabb;
-//// // attempt to improve implicit stress computation by fixed iteration
-//// LBMReal dX2_rho = (rhoToPhi)*dX2_phi;
-//// LBMReal dX1_rho = (rhoToPhi)*dX1_phi;
-//// LBMReal dX3_rho = (rhoToPhi)*dX3_phi;
-////
-//// LBMReal dfx= c1o3 * (c1 / collFactorM - c1o2) *(2 * dxux * dX1_rho + Dxy * dX2_rho + Dxz * dX3_rho) / (rho);
-//// LBMReal dfy = c1o3 * (c1 / collFactorM - c1o2) *(Dxy * dX1_rho + 2 * dyuy * dX2_rho + Dyz * dX3_rho) / (rho);
-//// LBMReal dfz = c1o3 * (c1 / collFactorM - c1o2) *(Dxz * dX1_rho + Dyz * dX2_rho + 2 * dyuy * dX3_rho) / (rho);
-////
-//// for (int iteration = 0; iteration < 5; iteration++) {
-//// mxxMyy = (mfcaa - dfx * dfx * c1o2) - (mfaca - dfy * dfy * c1o2);
-//// mxxMzz = (mfcaa - dfx * dfx * c1o2) - (mfaac - dfz * dfz * c1o2);
-//// }
-///////end fixed iteration
-////
-//
-//
-// //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);
-//
-// //if (fabsf(mfaaa + (dxux + dyuy + dzuz) > 1e-9)){
-// // std::cout << mfaaa <<" "<< (dxux + dyuy + dzuz)<< std::endl;
-// //}
-//
-//
-// ////updated pressure
-// //mfaaa += (dX1_phi * vvx + dX2_phi * vvy + dX3_phi * vvz) * correctionScaling;
-// //mfaaa *= (one-omegaDRho);// (mfaaa + (dxux + dyuy + dzuz)) * .5; // Pressure elimination as in standard velocity model
-// // mfaaa += (rho - c1) * (dxux + dyuy + 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
-// LBMReal mxxyPyzz = mfcba + mfabc;
-// LBMReal mxxyMyzz = mfcba - mfabc;
-//
-// LBMReal mxxzPyyz = mfcab + mfacb;
-// LBMReal mxxzMyyz = mfcab - mfacb;
-//
-// LBMReal mxyyPxzz = mfbca + mfbac;
-// LBMReal 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 * (one / collFactorM - c1o2) * (dyuy + dzuz) * c2o3 * A + (one - O4) * (CUMacc);
-// CUMcac = -O4 * (one / collFactorM - c1o2) * (dxux + dzuz) * c2o3 * A + (one - O4) * (CUMcac);
-// CUMcca = -O4 * (one / collFactorM - c1o2) * (dyuy + dxux) * c2o3 * A + (one - O4) * (CUMcca);
-// CUMbbc = -O4 * (one / collFactorM - c1o2) * Dxy * c1o3 * BB + (one - O4) * (CUMbbc);
-// CUMbcb = -O4 * (one / collFactorM - c1o2) * Dxz * c1o3 * BB + (one - O4) * (CUMbcb);
-// CUMcbb = -O4 * (one / collFactorM - c1o2) * Dyz * c1o3 * BB + (one - 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 * oMdrho) * mfabb + 2. * mfbba * mfbab); // till 18.05.2015
-// //mfbcb = CUMbcb + ((mfaca + c1o3 * oMdrho) * mfbab + 2. * mfbba * mfabb); // till 18.05.2015
-// //mfbbc = CUMbbc + ((mfaac + c1o3 * oMdrho) * mfbba + 2. * mfbab * mfabb); // till 18.05.2015
-//
-// 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 - c1) * oMdrho;
-// mfcac = CUMcac + (mfcaa * mfaac + 2. * mfbab * mfbab) + c1o3 * (mfcaa + mfaac) * oMdrho + c1o9 * (oMdrho - c1) * oMdrho;
-// mfacc = CUMacc + (mfaac * mfaca + 2. * mfabb * mfabb) + c1o3 * (mfaac + mfaca) * oMdrho + c1o9 * (oMdrho - c1) * 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;// *(c1 - forcingBIAS) / forcingBIAS;
-// mfaba = -mfaba;// *(c1 - forcingBIAS) / forcingBIAS;
-// mfaab = -mfaab;// *(c1 - forcingBIAS) / forcingBIAS;
-//
-// //mfbaa += c1o3 * (c1 / collFactorM - c1o2) * rhoToPhi * (2 * dxux * dX1_phi + Dxy * dX2_phi + Dxz * dX3_phi) / (rho);
-// //mfaba += c1o3 * (c1 / collFactorM - c1o2) * rhoToPhi * (Dxy * dX1_phi + 2 * dyuy * dX2_phi + Dyz * dX3_phi) / (rho);
-// //mfaab += c1o3 * (c1 / collFactorM - c1o2) * rhoToPhi * (Dxz * dX1_phi + Dyz * dX2_phi + 2 * dyuy * dX3_phi) / (rho);
-//
-// mfbaa -= c1o2 * rhoToPhi * (mmfcaa* dX1_phi + mmfbba * dX2_phi + mmfbab * dX3_phi) / (rho);
-// mfaba -= c1o2 * rhoToPhi * (mmfbba* dX1_phi + mmfaca * dX2_phi + mmfabb * dX3_phi) / (rho);
-// mfaab -= c1o2 * rhoToPhi * (mmfbab* dX1_phi + mmfabb * dX2_phi + mmfaac * dX3_phi) / (rho);
-//
-// vvx -= c1o4 * rhoToPhi * (mmfcaa * dX1_phi + mmfbba * dX2_phi + mmfbab * dX3_phi) / (rho);
-// vvy -= c1o4 * rhoToPhi * (mmfbba * dX1_phi + mmfaca * dX2_phi + mmfabb * dX3_phi) / (rho);
-// vvz -= c1o4 * rhoToPhi * (mmfbab * dX1_phi + mmfabb * dX2_phi + mmfaac * dX3_phi) / (rho);
-//
-// vx2 = vvx * vvx;
-// vy2 = vvy * vvy;
-// vz2 = vvz * vvz;
-//
-// //mmfcaa =0;// c1o3 * (mxxMyy + mxxMzz + mxxPyyPzz - mfaaa);
-// //mmfaca =0;// c1o3 * (-2. * mxxMyy + mxxMzz + mxxPyyPzz - mfaaa);
-// //mmfaac =0;// c1o3 * (mxxMyy - 2. * mxxMzz + mxxPyyPzz - mfaaa);
-// //mmfabb =0;// mfabb;
-// //mmfbab =0;// mfbab;
-// //mmfbba =0;// mfbba;
-//
-//
-// //////////////////////////////////////////////////////////////////////////////////////
-// //grad Rho
-// //LBMReal dX1_rho = (rhoToPhi - three * (*pressure)(x1, x2, x3)) * dX1_phi - phi[REST] * three * gradPx;
-// //LBMReal dX2_rho = (rhoToPhi - three * (*pressure)(x1, x2, x3)) * dX2_phi - phi[REST] * three * gradPy;
-// //LBMReal dX3_rho = (rhoToPhi - three * (*pressure)(x1, x2, x3)) * dX3_phi - phi[REST] * three * gradPz;
-//
-// //LBMReal dX2_rho = (rhoToPhi ) * dX2_phi ;
-// //LBMReal dX1_rho = (rhoToPhi ) * dX1_phi ;
-// //LBMReal dX3_rho = (rhoToPhi ) * dX3_phi ;
-// ///////////////////////////////////////////////////////////////////////////////////////
-// //mfbaa += c1o3 * (c1 / collFactorM - c1o2) *(2 * dxux * dX1_rho + Dxy * dX2_rho + Dxz * dX3_rho) / (rho);
-// //mfaba += c1o3 * (c1 / collFactorM - c1o2) *(Dxy * dX1_rho + 2 * dyuy * dX2_rho + Dyz * dX3_rho) / (rho);
-// //mfaab += c1o3 * (c1 / collFactorM - c1o2) *(Dxz * dX1_rho + Dyz * dX2_rho + 2 * dyuy * dX3_rho) / (rho);
-//
-// ///////Fakhari pressure correction
-// //mfbaa -= mfaaa / rho * dX1_rho*c1o3;
-// //mfaba -= mfaaa / rho * dX2_rho*c1o3;
-// //mfaab -= mfaaa / rho * dX3_rho*c1o3;
-// ////////////////////////////////////////////////////////////////////////////////////
-// //back
-// ////////////////////////////////////////////////////////////////////////////////////
-// //mit 1, 0, 1/3, 0, 0, 0, 1/3, 0, 1/9 Konditionieren
-// ////////////////////////////////////////////////////////////////////////////////////
-// // Z - Dir
-// m0 = mfaac * c1o2 + mfaab * (vvz - c1o2) + (mfaaa + 1. * oMdrho) * (vz2 - vvz) * c1o2;
-// m1 = -mfaac - 2. * mfaab * vvz + mfaaa * (1. - vz2) - 1. * oMdrho * vz2;
-// m2 = mfaac * c1o2 + mfaab * (vvz + c1o2) + (mfaaa + 1. * oMdrho) * (vz2 + vvz) * c1o2;
-// mfaaa = m0;
-// mfaab = m1;
-// mfaac = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfabc * c1o2 + mfabb * (vvz - c1o2) + mfaba * (vz2 - vvz) * c1o2;
-// m1 = -mfabc - 2. * mfabb * vvz + mfaba * (1. - vz2);
-// m2 = mfabc * c1o2 + mfabb * (vvz + c1o2) + mfaba * (vz2 + vvz) * c1o2;
-// mfaba = m0;
-// mfabb = m1;
-// mfabc = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfacc * c1o2 + mfacb * (vvz - c1o2) + (mfaca + c1o3 * oMdrho) * (vz2 - vvz) * c1o2;
-// m1 = -mfacc - 2. * mfacb * vvz + mfaca * (1. - vz2) - c1o3 * oMdrho * vz2;
-// m2 = mfacc * c1o2 + mfacb * (vvz + c1o2) + (mfaca + c1o3 * oMdrho) * (vz2 + vvz) * c1o2;
-// mfaca = m0;
-// mfacb = m1;
-// mfacc = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfbac * c1o2 + mfbab * (vvz - c1o2) + mfbaa * (vz2 - vvz) * c1o2;
-// m1 = -mfbac - 2. * mfbab * vvz + mfbaa * (1. - vz2);
-// m2 = mfbac * c1o2 + mfbab * (vvz + c1o2) + mfbaa * (vz2 + vvz) * c1o2;
-// mfbaa = m0;
-// mfbab = m1;
-// mfbac = m2;
-// /////////b//////////////////////////////////////////////////////////////////////////
-// m0 = mfbbc * c1o2 + mfbbb * (vvz - c1o2) + mfbba * (vz2 - vvz) * c1o2;
-// m1 = -mfbbc - 2. * mfbbb * vvz + mfbba * (1. - vz2);
-// m2 = mfbbc * c1o2 + mfbbb * (vvz + c1o2) + mfbba * (vz2 + vvz) * c1o2;
-// mfbba = m0;
-// mfbbb = m1;
-// mfbbc = m2;
-// /////////b//////////////////////////////////////////////////////////////////////////
-// m0 = mfbcc * c1o2 + mfbcb * (vvz - c1o2) + mfbca * (vz2 - vvz) * c1o2;
-// m1 = -mfbcc - 2. * mfbcb * vvz + mfbca * (1. - vz2);
-// m2 = mfbcc * c1o2 + mfbcb * (vvz + c1o2) + mfbca * (vz2 + vvz) * c1o2;
-// mfbca = m0;
-// mfbcb = m1;
-// mfbcc = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfcac * c1o2 + mfcab * (vvz - c1o2) + (mfcaa + c1o3 * oMdrho) * (vz2 - vvz) * c1o2;
-// m1 = -mfcac - 2. * mfcab * vvz + mfcaa * (1. - vz2) - c1o3 * oMdrho * vz2;
-// m2 = mfcac * c1o2 + mfcab * (vvz + c1o2) + (mfcaa + c1o3 * oMdrho) * (vz2 + vvz) * c1o2;
-// mfcaa = m0;
-// mfcab = m1;
-// mfcac = m2;
-// /////////c//////////////////////////////////////////////////////////////////////////
-// m0 = mfcbc * c1o2 + mfcbb * (vvz - c1o2) + mfcba * (vz2 - vvz) * c1o2;
-// m1 = -mfcbc - 2. * mfcbb * vvz + mfcba * (1. - vz2);
-// m2 = mfcbc * c1o2 + mfcbb * (vvz + c1o2) + mfcba * (vz2 + vvz) * c1o2;
-// mfcba = m0;
-// mfcbb = m1;
-// mfcbc = m2;
-// /////////c//////////////////////////////////////////////////////////////////////////
-// m0 = mfccc * c1o2 + mfccb * (vvz - c1o2) + (mfcca + c1o9 * oMdrho) * (vz2 - vvz) * c1o2;
-// m1 = -mfccc - 2. * mfccb * vvz + mfcca * (1. - vz2) - c1o9 * oMdrho * vz2;
-// m2 = mfccc * c1o2 + mfccb * (vvz + c1o2) + (mfcca + c1o9 * oMdrho) * (vz2 + vvz) * 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 * (vvy - c1o2) + (mfaaa + c1o6 * oMdrho) * (vy2 - vvy) * c1o2;
-// m1 = -mfaca - 2. * mfaba * vvy + mfaaa * (1. - vy2) - c1o6 * oMdrho * vy2;
-// m2 = mfaca * c1o2 + mfaba * (vvy + c1o2) + (mfaaa + c1o6 * oMdrho) * (vy2 + vvy) * c1o2;
-// mfaaa = m0;
-// mfaba = m1;
-// mfaca = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfacb * c1o2 + mfabb * (vvy - c1o2) + (mfaab + c2o3 * oMdrho) * (vy2 - vvy) * c1o2;
-// m1 = -mfacb - 2. * mfabb * vvy + mfaab * (1. - vy2) - c2o3 * oMdrho * vy2;
-// m2 = mfacb * c1o2 + mfabb * (vvy + c1o2) + (mfaab + c2o3 * oMdrho) * (vy2 + vvy) * c1o2;
-// mfaab = m0;
-// mfabb = m1;
-// mfacb = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfacc * c1o2 + mfabc * (vvy - c1o2) + (mfaac + c1o6 * oMdrho) * (vy2 - vvy) * c1o2;
-// m1 = -mfacc - 2. * mfabc * vvy + mfaac * (1. - vy2) - c1o6 * oMdrho * vy2;
-// m2 = mfacc * c1o2 + mfabc * (vvy + c1o2) + (mfaac + c1o6 * oMdrho) * (vy2 + vvy) * c1o2;
-// mfaac = m0;
-// mfabc = m1;
-// mfacc = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfbca * c1o2 + mfbba * (vvy - c1o2) + mfbaa * (vy2 - vvy) * c1o2;
-// m1 = -mfbca - 2. * mfbba * vvy + mfbaa * (1. - vy2);
-// m2 = mfbca * c1o2 + mfbba * (vvy + c1o2) + mfbaa * (vy2 + vvy) * c1o2;
-// mfbaa = m0;
-// mfbba = m1;
-// mfbca = m2;
-// /////////b//////////////////////////////////////////////////////////////////////////
-// m0 = mfbcb * c1o2 + mfbbb * (vvy - c1o2) + mfbab * (vy2 - vvy) * c1o2;
-// m1 = -mfbcb - 2. * mfbbb * vvy + mfbab * (1. - vy2);
-// m2 = mfbcb * c1o2 + mfbbb * (vvy + c1o2) + mfbab * (vy2 + vvy) * c1o2;
-// mfbab = m0;
-// mfbbb = m1;
-// mfbcb = m2;
-// /////////b//////////////////////////////////////////////////////////////////////////
-// m0 = mfbcc * c1o2 + mfbbc * (vvy - c1o2) + mfbac * (vy2 - vvy) * c1o2;
-// m1 = -mfbcc - 2. * mfbbc * vvy + mfbac * (1. - vy2);
-// m2 = mfbcc * c1o2 + mfbbc * (vvy + c1o2) + mfbac * (vy2 + vvy) * c1o2;
-// mfbac = m0;
-// mfbbc = m1;
-// mfbcc = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfcca * c1o2 + mfcba * (vvy - c1o2) + (mfcaa + c1o18 * oMdrho) * (vy2 - vvy) * c1o2;
-// m1 = -mfcca - 2. * mfcba * vvy + mfcaa * (1. - vy2) - c1o18 * oMdrho * vy2;
-// m2 = mfcca * c1o2 + mfcba * (vvy + c1o2) + (mfcaa + c1o18 * oMdrho) * (vy2 + vvy) * c1o2;
-// mfcaa = m0;
-// mfcba = m1;
-// mfcca = m2;
-// /////////c//////////////////////////////////////////////////////////////////////////
-// m0 = mfccb * c1o2 + mfcbb * (vvy - c1o2) + (mfcab + c2o9 * oMdrho) * (vy2 - vvy) * c1o2;
-// m1 = -mfccb - 2. * mfcbb * vvy + mfcab * (1. - vy2) - c2o9 * oMdrho * vy2;
-// m2 = mfccb * c1o2 + mfcbb * (vvy + c1o2) + (mfcab + c2o9 * oMdrho) * (vy2 + vvy) * c1o2;
-// mfcab = m0;
-// mfcbb = m1;
-// mfccb = m2;
-// /////////c//////////////////////////////////////////////////////////////////////////
-// m0 = mfccc * c1o2 + mfcbc * (vvy - c1o2) + (mfcac + c1o18 * oMdrho) * (vy2 - vvy) * c1o2;
-// m1 = -mfccc - 2. * mfcbc * vvy + mfcac * (1. - vy2) - c1o18 * oMdrho * vy2;
-// m2 = mfccc * c1o2 + mfcbc * (vvy + c1o2) + (mfcac + c1o18 * oMdrho) * (vy2 + vvy) * 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 * (vvx - c1o2) + (mfaaa + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfcaa - 2. * mfbaa * vvx + mfaaa * (1. - vx2) - c1o36 * oMdrho * vx2;
-// m2 = mfcaa * c1o2 + mfbaa * (vvx + c1o2) + (mfaaa + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfaaa = m0;
-// mfbaa = m1;
-// mfcaa = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfcba * c1o2 + mfbba * (vvx - c1o2) + (mfaba + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfcba - 2. * mfbba * vvx + mfaba * (1. - vx2) - c1o9 * oMdrho * vx2;
-// m2 = mfcba * c1o2 + mfbba * (vvx + c1o2) + (mfaba + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfaba = m0;
-// mfbba = m1;
-// mfcba = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfcca * c1o2 + mfbca * (vvx - c1o2) + (mfaca + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfcca - 2. * mfbca * vvx + mfaca * (1. - vx2) - c1o36 * oMdrho * vx2;
-// m2 = mfcca * c1o2 + mfbca * (vvx + c1o2) + (mfaca + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfaca = m0;
-// mfbca = m1;
-// mfcca = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfcab * c1o2 + mfbab * (vvx - c1o2) + (mfaab + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfcab - 2. * mfbab * vvx + mfaab * (1. - vx2) - c1o9 * oMdrho * vx2;
-// m2 = mfcab * c1o2 + mfbab * (vvx + c1o2) + (mfaab + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfaab = m0;
-// mfbab = m1;
-// mfcab = m2;
-// ///////////b////////////////////////////////////////////////////////////////////////
-// m0 = mfcbb * c1o2 + mfbbb * (vvx - c1o2) + (mfabb + c4o9 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfcbb - 2. * mfbbb * vvx + mfabb * (1. - vx2) - c4o9 * oMdrho * vx2;
-// m2 = mfcbb * c1o2 + mfbbb * (vvx + c1o2) + (mfabb + c4o9 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfabb = m0;
-// mfbbb = m1;
-// mfcbb = m2;
-// ///////////b////////////////////////////////////////////////////////////////////////
-// m0 = mfccb * c1o2 + mfbcb * (vvx - c1o2) + (mfacb + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfccb - 2. * mfbcb * vvx + mfacb * (1. - vx2) - c1o9 * oMdrho * vx2;
-// m2 = mfccb * c1o2 + mfbcb * (vvx + c1o2) + (mfacb + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfacb = m0;
-// mfbcb = m1;
-// mfccb = m2;
-// ////////////////////////////////////////////////////////////////////////////////////
-// ////////////////////////////////////////////////////////////////////////////////////
-// m0 = mfcac * c1o2 + mfbac * (vvx - c1o2) + (mfaac + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfcac - 2. * mfbac * vvx + mfaac * (1. - vx2) - c1o36 * oMdrho * vx2;
-// m2 = mfcac * c1o2 + mfbac * (vvx + c1o2) + (mfaac + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfaac = m0;
-// mfbac = m1;
-// mfcac = m2;
-// ///////////c////////////////////////////////////////////////////////////////////////
-// m0 = mfcbc * c1o2 + mfbbc * (vvx - c1o2) + (mfabc + c1o9 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfcbc - 2. * mfbbc * vvx + mfabc * (1. - vx2) - c1o9 * oMdrho * vx2;
-// m2 = mfcbc * c1o2 + mfbbc * (vvx + c1o2) + (mfabc + c1o9 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfabc = m0;
-// mfbbc = m1;
-// mfcbc = m2;
-// ///////////c////////////////////////////////////////////////////////////////////////
-// m0 = mfccc * c1o2 + mfbcc * (vvx - c1o2) + (mfacc + c1o36 * oMdrho) * (vx2 - vvx) * c1o2;
-// m1 = -mfccc - 2. * mfbcc * vvx + mfacc * (1. - vx2) - c1o36 * oMdrho * vx2;
-// m2 = mfccc * c1o2 + mfbcc * (vvx + c1o2) + (mfacc + c1o36 * oMdrho) * (vx2 + vvx) * c1o2;
-// mfacc = m0;
-// mfbcc = m1;
-// mfccc = m2;
-// /////SimpleForce
-//
-// //mfabb += c2o9 * deltaP;
-// //mfbab += c2o9 * deltaP;
-// //mfbba += c2o9 * deltaP;
-// //mfaab += c1o18 * deltaP;
-// //mfcab += c1o18 * deltaP;
-// //mfaba += c1o18 * deltaP;
-// //mfcba += c1o18 * deltaP;
-// //mfbaa += c1o18 * deltaP;
-// //mfbca += c1o18 * deltaP;
-// //mfaaa += c1o72 * deltaP;
-// //mfcaa += c1o72 * deltaP;
-// //mfaca += c1o72 * deltaP;
-// //mfcca += c1o72 * deltaP;
-// //mfcbb += c2o9 * deltaP;
-// //mfbcb += c2o9 * deltaP;
-// //mfbbc += c2o9 * deltaP;
-// //mfccb += c1o18 * deltaP;
-// //mfacb += c1o18 * deltaP;
-// //mfcbc += c1o18 * deltaP;
-// //mfabc += c1o18 * deltaP;
-// //mfbcc += c1o18 * deltaP;
-// //mfbac += c1o18 * deltaP;
-// //mfccc += c1o72 * deltaP;
-// //mfacc += c1o72 * deltaP;
-// //mfcac += c1o72 * deltaP;
-// //mfaac += c1o72 * deltaP;
-//
-// //mfabb += c1o2*(-forcingX1 ) * c2o9;
-// //mfbab += c1o2*( - forcingX2 ) * c2o9;
-// //mfbba += c1o2*( - forcingX3) * c2o9;
-// //mfaab += c1o2*(-forcingX1 - forcingX2 ) * c1o18;
-// //mfcab += c1o2*( forcingX1 - forcingX2 ) * c1o18;
-// //mfaba += c1o2*(-forcingX1 - forcingX3) * c1o18;
-// //mfcba += c1o2*( forcingX1 - forcingX3) * c1o18;
-// //mfbaa += c1o2*( - forcingX2 - forcingX3) * c1o18;
-// //mfbca += c1o2*( forcingX2 - forcingX3) * c1o18;
-// //mfaaa += c1o2*(-forcingX1 - forcingX2 - forcingX3) * c1o72;
-// //mfcaa += c1o2*( forcingX1 - forcingX2 - forcingX3) * c1o72;
-// //mfaca += c1o2*(-forcingX1 + forcingX2 - forcingX3) * c1o72;
-// //mfcca += c1o2*( forcingX1 + forcingX2 - forcingX3) * c1o72;
-// //mfcbb += c1o2*( forcingX1 ) * c2o9;
-// //mfbcb += c1o2*( forcingX2 ) * c2o9;
-// //mfbbc += c1o2*( forcingX3) * c2o9;
-// //mfccb += c1o2*( forcingX1 + forcingX2 ) * c1o18;
-// //mfacb += c1o2*(-forcingX1 + forcingX2 ) * c1o18;
-// //mfcbc += c1o2*( forcingX1 + forcingX3) * c1o18;
-// //mfabc += c1o2*(-forcingX1 + forcingX3) * c1o18;
-// //mfbcc += c1o2*( forcingX2 + forcingX3) * c1o18;
-// //mfbac += c1o2*( - forcingX2 + forcingX3) * c1o18;
-// //mfccc += c1o2*( forcingX1 + forcingX2 + forcingX3) * c1o72;
-// //mfacc += c1o2*(-forcingX1 + forcingX2 + forcingX3) * c1o72;
-// //mfcac += c1o2*( forcingX1 - forcingX2 + forcingX3) * c1o72;
-// //mfaac += c1o2*(-forcingX1 - forcingX2 + forcingX3) * c1o72;
-// //pStarStart -= (vx2 + vy2 + vz2) * c1o3;
-//
-// ///Take the diffusion part with out
-//
-// //mfStartcbb -= D3Q27System::getIncompFeqForDirection(D3Q27System::E , zeroReal, vvx, vvy, vvz);
-// //mfStartbcb -= D3Q27System::getIncompFeqForDirection(D3Q27System::N , zeroReal, vvx, vvy, vvz);
-// //mfStartbbc -= D3Q27System::getIncompFeqForDirection(D3Q27System::T , zeroReal, vvx, vvy, vvz);
-// //mfStartccb -= D3Q27System::getIncompFeqForDirection(D3Q27System::NE , zeroReal, vvx, vvy, vvz);
-// //mfStartacb -= D3Q27System::getIncompFeqForDirection(D3Q27System::NW , zeroReal, vvx, vvy, vvz);
-// //mfStartcbc -= D3Q27System::getIncompFeqForDirection(D3Q27System::TE , zeroReal, vvx, vvy, vvz);
-// //mfStartabc -= D3Q27System::getIncompFeqForDirection(D3Q27System::TW , zeroReal, vvx, vvy, vvz);
-// //mfStartbcc -= D3Q27System::getIncompFeqForDirection(D3Q27System::TN , zeroReal, vvx, vvy, vvz);
-// //mfStartbac -= D3Q27System::getIncompFeqForDirection(D3Q27System::TS , zeroReal, vvx, vvy, vvz);
-// //mfStartccc -= D3Q27System::getIncompFeqForDirection(D3Q27System::TNE, zeroReal, vvx, vvy, vvz);
-// //mfStartacc -= D3Q27System::getIncompFeqForDirection(D3Q27System::TNW, zeroReal, vvx, vvy, vvz);
-// //mfStartcac -= D3Q27System::getIncompFeqForDirection(D3Q27System::TSE, zeroReal, vvx, vvy, vvz);
-// //mfStartaac -= D3Q27System::getIncompFeqForDirection(D3Q27System::TSW, zeroReal, vvx, vvy, vvz);
-// //mfStartabb -= D3Q27System::getIncompFeqForDirection(D3Q27System::W , zeroReal, vvx, vvy, vvz);
-// //mfStartbab -= D3Q27System::getIncompFeqForDirection(D3Q27System::S , zeroReal, vvx, vvy, vvz);
-// //mfStartbba -= D3Q27System::getIncompFeqForDirection(D3Q27System::B , zeroReal, vvx, vvy, vvz);
-// //mfStartaab -= D3Q27System::getIncompFeqForDirection(D3Q27System::SW , zeroReal, vvx, vvy, vvz);
-// //mfStartcab -= D3Q27System::getIncompFeqForDirection(D3Q27System::SE , zeroReal, vvx, vvy, vvz);
-// //mfStartaba -= D3Q27System::getIncompFeqForDirection(D3Q27System::BW , zeroReal, vvx, vvy, vvz);
-// //mfStartcba -= D3Q27System::getIncompFeqForDirection(D3Q27System::BE , zeroReal, vvx, vvy, vvz);
-// //mfStartbaa -= D3Q27System::getIncompFeqForDirection(D3Q27System::BS , zeroReal, vvx, vvy, vvz);
-// //mfStartbca -= D3Q27System::getIncompFeqForDirection(D3Q27System::BN , zeroReal, vvx, vvy, vvz);
-// //mfStartaaa -= D3Q27System::getIncompFeqForDirection(D3Q27System::BSW, zeroReal, vvx, vvy, vvz);
-// //mfStartcaa -= D3Q27System::getIncompFeqForDirection(D3Q27System::BSE, zeroReal, vvx, vvy, vvz);
-// //mfStartaca -= D3Q27System::getIncompFeqForDirection(D3Q27System::BNW, zeroReal, vvx, vvy, vvz);
-// //mfStartcca -= D3Q27System::getIncompFeqForDirection(D3Q27System::BNE, zeroReal, vvx, vvy, vvz);
-// //mfStartbbb -= D3Q27System::getIncompFeqForDirection(D3Q27System::REST, zeroReal, vvx, vvy, vvz);
-// //
-// //pStar += pStarStart*(omegaDRho-c1);
-//
-// //mfStartcbb = c2o9 * pStar;
-// // mfStartbcb= c2o9 * pStar;
-// // mfStartbbc= c2o9 * pStar;
-// // mfStartccb= c1o18 * pStar;
-// // mfStartacb= c1o18 * pStar;
-// // mfStartcbc= c1o18 * pStar;
-// // mfStartabc= c1o18 * pStar;
-// // mfStartbcc= c1o18 * pStar;
-// // mfStartbac= c1o18 * pStar;
-// // mfStartccc= c1o72 * pStar;
-// // mfStartacc= c1o72 * pStar;
-// // mfStartcac= c1o72 * pStar;
-// // mfStartaac= c1o72 * pStar;
-// // mfStartabb= c2o9 * pStar;
-// // mfStartbab= c2o9 * pStar;
-// // mfStartbba= c2o9 * pStar;
-// // mfStartaab= c1o18 * pStar;
-// // mfStartcab= c1o18 * pStar;
-// // mfStartaba= c1o18 * pStar;
-// // mfStartcba= c1o18 * pStar;
-// // mfStartbaa= c1o18 * pStar;
-// // mfStartbca= c1o18 * pStar;
-// // mfStartaaa= c1o72 * pStar;
-// // mfStartcaa= c1o72 * pStar;
-// // mfStartaca= c1o72 * pStar;
-// // mfStartcca= c1o72 * pStar;
-// // mfStartbbb= c4 * c2o9 * pStar;
-//
-// //mfaaa -= c1o2 * (mfStartaaa + mfStartccc)+ c1o72 * (mmfaac + c3 * mmfabb + mmfaca + c3 * mmfbab + c3 * mmfbba + mmfcaa);
-// //mfaab -= c1o2 * (mfStartaab + mfStartccb)+c1o36 * (-mmfaac + c2 * (mmfaca + c3 * mmfbba + mmfcaa));
-// //mfaac -= c1o2 * (mfStartaac + mfStartcca)+c1o72 * (mmfaac - c3 * mmfabb + mmfaca - c3 * mmfbab + c3 * mmfbba + mmfcaa);
-// //mfaba -= c1o2 * (mfStartaba + mfStartcbc)+c1o36 * (c2 * mmfaac - mmfaca + c6 * mmfbab + c2 * mmfcaa);
-// //mfabb -= c1o2 * (mfStartabb + mfStartcbb)+c1o9 * (-mmfaac - mmfaca + c2 * mmfcaa);
-// //mfabc -= c1o2 * (mfStartabc + mfStartcba)+c1o36 * (c2 * mmfaac - mmfaca - 6 * mmfbab + c2 * mmfcaa);
-// //mfaca -= c1o2 * (mfStartaca + mfStartcac)+c1o72 * (mmfaac - c3 * mmfabb + mmfaca + c3 * mmfbab - c3 * mmfbba + mmfcaa);
-// //mfacb -= c1o2 * (mfStartacb + mfStartcab)+c1o36 * (-mmfaac + c2 * (mmfaca - c3 * mmfbba + mmfcaa));
-// //mfacc -= c1o2 * (mfStartacc + mfStartcaa)+c1o72 * (mmfaac + c3 * mmfabb + mmfaca - c3 * mmfbab - c3 * mmfbba + mmfcaa);
-// //mfbaa -= c1o2 * (mfStartbaa + mfStartbcc)+c1o36 * (c2 * mmfaac + c6 * mmfabb + c2 * mmfaca - mmfcaa);
-// //mfbab -= c1o2 * (mfStartbab + mfStartbcb)+c1o9 * (-mmfaac + c2 * mmfaca - mmfcaa);
-// //mfbac -= c1o2 * (mfStartbac + mfStartbca)+c1o36 * (c2 * mmfaac - 6 * mmfabb + c2 * mmfaca - mmfcaa);
-// //mfbba -= c1o2 * (mfStartbba + mfStartbbc)+c1o9 * (c2 * mmfaac - mmfaca - mmfcaa);
-// //mfbbb -= (mfStartbbb)-(c4o9 * (mmfaac + mmfaca + mmfcaa));
-// //mfbbc -= c1o2 * (mfStartbbc + mfStartbba)+c1o9 * (c2 * mmfaac - mmfaca - mmfcaa);
-// //mfbca -= c1o2 * (mfStartbca + mfStartbac)+c1o36 * (c2 * mmfaac - 6 * mmfabb + c2 * mmfaca - mmfcaa);
-// //mfbcb -= c1o2 * (mfStartbcb + mfStartbab)+c1o9 * (-mmfaac + c2 * mmfaca - mmfcaa);
-// //mfbcc -= c1o2 * (mfStartbcc + mfStartbaa)+c1o36 * (c2 * mmfaac + c6 * mmfabb + c2 * mmfaca - mmfcaa);
-// //mfcaa -= c1o2 * (mfStartcaa + mfStartacc)+c1o72 * (mmfaac + c3 * mmfabb + mmfaca - c3 * mmfbab - c3 * mmfbba + mmfcaa);
-// //mfcab -= c1o2 * (mfStartcab + mfStartacb)+c1o36 * (-mmfaac + c2 * (mmfaca - c3 * mmfbba + mmfcaa));
-// //mfcac -= c1o2 * (mfStartcac + mfStartaca)+c1o72 * (mmfaac - c3 * mmfabb + mmfaca + c3 * mmfbab - c3 * mmfbba + mmfcaa);
-// //mfcba -= c1o2 * (mfStartcba + mfStartabc)+c1o36 * (c2 * mmfaac - mmfaca - 6 * mmfbab + c2 * mmfcaa);
-// //mfcbb -= c1o2 * (mfStartcbb + mfStartabb)+c1o9 * (-mmfaac - mmfaca + c2 * mmfcaa);
-// //mfcbc -= c1o2 * (mfStartcbc + mfStartaba)+c1o36 * (c2 * mmfaac - mmfaca + c6 * mmfbab + c2 * mmfcaa);
-// //mfcca -= c1o2 * (mfStartcca + mfStartaac)+c1o72 * (mmfaac - c3 * mmfabb + mmfaca - c3 * mmfbab + c3 * mmfbba + mmfcaa);
-// //mfccb -= c1o2 * (mfStartccb + mfStartaab)+c1o36 * (-mmfaac + c2 * (mmfaca + c3 * mmfbba + mmfcaa));
-// //mfccc -= c1o2 * (mfStartccc + mfStartaaa)+c1o72 * (mmfaac + c3 * mmfabb + mmfaca + c3 * mmfbab + c3 * mmfbba + mmfcaa);
-//
-// //mfhaaa =rho*( c1o2 * (mfStartaaa + mfStartccc) + c1o72 * (mmfaac + c3 * mmfabb + mmfaca + c3 * mmfbab + c3 * mmfbba + mmfcaa));
-// //mfhaab =rho*( c1o2 * (mfStartaab + mfStartccb) + c1o36 * (-mmfaac + c2 * (mmfaca + c3 * mmfbba + mmfcaa)));
-// //mfhaac =rho*( c1o2 * (mfStartaac + mfStartcca) + c1o72 * (mmfaac - c3 * mmfabb + mmfaca - c3 * mmfbab + c3 * mmfbba + mmfcaa));
-// //mfhaba =rho*( c1o2 * (mfStartaba + mfStartcbc) + c1o36 * (c2 * mmfaac - mmfaca + c6 * mmfbab + c2 * mmfcaa));
-// //mfhabb =rho*( c1o2 * (mfStartabb + mfStartcbb) + c1o9 * (-mmfaac - mmfaca + c2 * mmfcaa));
-// //mfhabc =rho*( c1o2 * (mfStartabc + mfStartcba) + c1o36 * (c2 * mmfaac - mmfaca - 6 * mmfbab + c2 * mmfcaa));
-// //mfhaca =rho*( c1o2 * (mfStartaca + mfStartcac) + c1o72 * (mmfaac - c3 * mmfabb + mmfaca + c3 * mmfbab - c3 * mmfbba + mmfcaa));
-// //mfhacb =rho*( c1o2 * (mfStartacb + mfStartcab) + c1o36 * (-mmfaac + c2 * (mmfaca - c3 * mmfbba + mmfcaa)));
-// //mfhacc =rho*( c1o2 * (mfStartacc + mfStartcaa) + c1o72 * (mmfaac + c3 * mmfabb + mmfaca - c3 * mmfbab - c3 * mmfbba + mmfcaa));
-// //mfhbaa =rho*( c1o2 * (mfStartbaa + mfStartbcc) + c1o36 * (c2 * mmfaac + c6 * mmfabb + c2 * mmfaca - mmfcaa));
-// //mfhbab =rho*( c1o2 * (mfStartbab + mfStartbcb) + c1o9 * (-mmfaac + c2 * mmfaca - mmfcaa));
-// //mfhbac =rho*( c1o2 * (mfStartbac + mfStartbca) + c1o36 * (c2 * mmfaac - 6 * mmfabb + c2 * mmfaca - mmfcaa));
-// //mfhbba =rho*( c1o2 * (mfStartbba + mfStartbbc) + c1o9 * (c2 * mmfaac - mmfaca - mmfcaa));
-// //mfhbbb =rho*( (mfStartbbb)-(c4o9 * (mmfaac + mmfaca + mmfcaa)));
-// //mfhbbc =rho*( c1o2 * (mfStartbbc + mfStartbba) + c1o9 * (c2 * mmfaac - mmfaca - mmfcaa));
-// //mfhbca =rho*( c1o2 * (mfStartbca + mfStartbac) + c1o36 * (c2 * mmfaac - 6 * mmfabb + c2 * mmfaca - mmfcaa));
-// //mfhbcb =rho*( c1o2 * (mfStartbcb + mfStartbab) + c1o9 * (-mmfaac + c2 * mmfaca - mmfcaa));
-// //mfhbcc =rho*( c1o2 * (mfStartbcc + mfStartbaa) + c1o36 * (c2 * mmfaac + c6 * mmfabb + c2 * mmfaca - mmfcaa));
-// //mfhcaa =rho*( c1o2 * (mfStartcaa + mfStartacc) + c1o72 * (mmfaac + c3 * mmfabb + mmfaca - c3 * mmfbab - c3 * mmfbba + mmfcaa));
-// //mfhcab =rho*( c1o2 * (mfStartcab + mfStartacb) + c1o36 * (-mmfaac + c2 * (mmfaca - c3 * mmfbba + mmfcaa)));
-// //mfhcac =rho*( c1o2 * (mfStartcac + mfStartaca) + c1o72 * (mmfaac - c3 * mmfabb + mmfaca + c3 * mmfbab - c3 * mmfbba + mmfcaa));
-// //mfhcba =rho*( c1o2 * (mfStartcba + mfStartabc) + c1o36 * (c2 * mmfaac - mmfaca - 6 * mmfbab + c2 * mmfcaa));
-// //mfhcbb =rho*( c1o2 * (mfStartcbb + mfStartabb) + c1o9 * (-mmfaac - mmfaca + c2 * mmfcaa));
-// //mfhcbc =rho*( c1o2 * (mfStartcbc + mfStartaba) + c1o36 * (c2 * mmfaac - mmfaca + c6 * mmfbab + c2 * mmfcaa));
-// //mfhcca =rho*( c1o2 * (mfStartcca + mfStartaac) + c1o72 * (mmfaac - c3 * mmfabb + mmfaca - c3 * mmfbab + c3 * mmfbba + mmfcaa));
-// //mfhccb =rho*( c1o2 * (mfStartccb + mfStartaab) + c1o36 * (-mmfaac + c2 * (mmfaca + c3 * mmfbba + mmfcaa)));
-// //mfhccc =rho*( c1o2 * (mfStartccc + mfStartaaa) + c1o72 * (mmfaac + c3 * mmfabb + mmfaca + c3 * mmfbab + c3 * mmfbba + mmfcaa));
-//
-//
-//
-//
-// pStar += pStarStart*(omegaDRho-c1);
-//
-// mfcbb -= c2o9*pStar;
-// mfbcb -= c2o9*pStar;
-// mfbbc -= c2o9*pStar;
-// mfccb -= c1o18*pStar;
-// mfacb -= c1o18*pStar;
-// mfcbc -= c1o18*pStar;
-// mfabc -= c1o18*pStar;
-// mfbcc -= c1o18*pStar;
-// mfbac -= c1o18*pStar;
-// mfccc -= c1o72*pStar;
-// mfacc -= c1o72*pStar;
-// mfcac -= c1o72*pStar;
-// mfaac -= c1o72*pStar;
-// mfabb -= c2o9*pStar;
-// mfbab -= c2o9*pStar;
-// mfbba -= c2o9*pStar;
-// mfaab -= c1o18*pStar;
-// mfcab -= c1o18*pStar;
-// mfaba -= c1o18*pStar;
-// mfcba -= c1o18*pStar;
-// mfbaa -= c1o18*pStar;
-// mfbca -= c1o18*pStar;
-// mfaaa -= c1o72*pStar;
-// mfcaa -= c1o72*pStar;
-// mfaca -= c1o72*pStar;
-// mfcca -= c1o72*pStar;
-// mfbbb -= c4*c2o9*pStar;
-//
-// mfhbcb = rho*c2o9 * pStar;
-// mfhbbc = rho*c2o9 * pStar;
-// mfhcbb = rho*c2o9 * pStar;
-// mfhccb = rho*c1o18 * pStar;
-// mfhacb = rho*c1o18 * pStar;
-// mfhcbc = rho*c1o18 * pStar;
-// mfhabc = rho*c1o18 * pStar;
-// mfhbcc = rho*c1o18 * pStar;
-// mfhbac = rho*c1o18 * pStar;
-// mfhccc = rho*c1o72 * pStar;
-// mfhacc = rho*c1o72 * pStar;
-// mfhcac = rho*c1o72 * pStar;
-// mfhaac = rho*c1o72 * pStar;
-// mfhabb = rho*c2o9 * pStar;
-// mfhbab = rho*c2o9 * pStar;
-// mfhbba = rho*c2o9 * pStar;
-// mfhaab = rho*c1o18 * pStar;
-// mfhcab = rho*c1o18 * pStar;
-// mfhaba = rho*c1o18 * pStar;
-// mfhcba = rho*c1o18 * pStar;
-// mfhbaa = rho*c1o18 * pStar;
-// mfhbca = rho*c1o18 * pStar;
-// mfhaaa = rho*c1o72 * pStar;
-// mfhcaa = rho*c1o72 * pStar;
-// mfhaca = rho*c1o72 * pStar;
-// mfhcca = rho*c1o72 * pStar;
-// mfhbbb = rho*c4 * c2o9 * pStar;
-//
-// //mfStartbcb = c2o9 * pStarStart;
-// //mfStartbbc = c2o9 * pStarStart;
-// //mfStartcbb = c2o9 * pStarStart;
-// //mfStartccb = c1o18 * pStarStart;
-// //mfStartacb = c1o18 * pStarStart;
-// //mfStartcbc = c1o18 * pStarStart;
-// //mfStartabc = c1o18 * pStarStart;
-// //mfStartbcc = c1o18 * pStarStart;
-// //mfStartbac = c1o18 * pStarStart;
-// //mfStartccc = c1o72 * pStarStart;
-// //mfStartacc = c1o72 * pStarStart;
-// //mfStartcac = c1o72 * pStarStart;
-// //mfStartaac = c1o72 * pStarStart;
-// //mfStartabb = c2o9 * pStarStart;
-// //mfStartbab = c2o9 * pStarStart;
-// //mfStartbba = c2o9 * pStarStart;
-// //mfStartaab = c1o18 * pStarStart;
-// //mfStartcab = c1o18 * pStarStart;
-// //mfStartaba = c1o18 * pStarStart;
-// //mfStartcba = c1o18 * pStarStart;
-// //mfStartbaa = c1o18 * pStarStart;
-// //mfStartbca = c1o18 * pStarStart;
-// //mfStartaaa = c1o72 * pStarStart;
-// //mfStartcaa = c1o72 * pStarStart;
-// //mfStartaca = c1o72 * pStarStart;
-// //mfStartcca = c1o72 * pStarStart;
-// //mfStartbbb = c4 * c2o9 * pStarStart;
-//
-// //LBMReal scaleSplit = 0.5;
-// //mfStartbcb = mfStartbcb*scaleSplit+(c1-scaleSplit)* c2o9 * pStarStart;
-// //mfStartbbc = mfStartbbc*scaleSplit+(c1-scaleSplit)* c2o9 * pStarStart;
-// //mfStartcbb = mfStartcbb*scaleSplit+(c1-scaleSplit)* c2o9 * pStarStart;
-// //mfStartccb = mfStartccb*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartacb = mfStartacb*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartcbc = mfStartcbc*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartabc = mfStartabc*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartbcc = mfStartbcc*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartbac = mfStartbac*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartccc = mfStartccc*scaleSplit+(c1-scaleSplit)* c1o72 * pStarStart;
-// //mfStartacc = mfStartacc*scaleSplit+(c1-scaleSplit)* c1o72 * pStarStart;
-// //mfStartcac = mfStartcac*scaleSplit+(c1-scaleSplit)* c1o72 * pStarStart;
-// //mfStartaac = mfStartaac*scaleSplit+(c1-scaleSplit)* c1o72 * pStarStart;
-// //mfStartabb = mfStartabb*scaleSplit+(c1-scaleSplit)* c2o9 * pStarStart;
-// //mfStartbab = mfStartbab*scaleSplit+(c1-scaleSplit)* c2o9 * pStarStart;
-// //mfStartbba = mfStartbba*scaleSplit+(c1-scaleSplit)* c2o9 * pStarStart;
-// //mfStartaab = mfStartaab*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartcab = mfStartcab*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartaba = mfStartaba*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartcba = mfStartcba*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartbaa = mfStartbaa*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartbca = mfStartbca*scaleSplit+(c1-scaleSplit)* c1o18 * pStarStart;
-// //mfStartaaa = mfStartaaa*scaleSplit+(c1-scaleSplit)* c1o72 * pStarStart;
-// //mfStartcaa = mfStartcaa*scaleSplit+(c1-scaleSplit)* c1o72 * pStarStart;
-// //mfStartaca = mfStartaca*scaleSplit+(c1-scaleSplit)* c1o72 * pStarStart;
-// //mfStartcca = mfStartcca*scaleSplit+(c1-scaleSplit)* c1o72 * pStarStart;
-// //mfStartbbb = mfStartbbb*scaleSplit+(c1-scaleSplit)* c4 * c2o9 * pStarStart;
-//
-//
-// //mfaaa -= c1o2 * (mfStartaaa + mfStartccc);
-// // mfaab -= c1o2 * (mfStartaab + mfStartccb);
-// // mfaac -= c1o2 * (mfStartaac + mfStartcca);
-// // mfaba -= c1o2 * (mfStartaba + mfStartcbc);
-// // mfabb -= c1o2 * (mfStartabb + mfStartcbb);
-// // mfabc -= c1o2 * (mfStartabc + mfStartcba);
-// // mfaca -= c1o2 * (mfStartaca + mfStartcac);
-// // mfacb -= c1o2 * (mfStartacb + mfStartcab);
-// // mfacc -= c1o2 * (mfStartacc + mfStartcaa);
-// // mfbaa -= c1o2 * (mfStartbaa + mfStartbcc);
-// // mfbab -= c1o2 * (mfStartbab + mfStartbcb);
-// // mfbac -= c1o2 * (mfStartbac + mfStartbca);
-// // mfbba -= c1o2 * (mfStartbba + mfStartbbc);
-// //mfbbb -= (mfStartbbb);
-// // mfbbc -= c1o2 * (mfStartbbc + mfStartbba);
-// // mfbca -= c1o2 * (mfStartbca + mfStartbac);
-// // mfbcb -= c1o2 * (mfStartbcb + mfStartbab);
-// // mfbcc -= c1o2 * (mfStartbcc + mfStartbaa);
-// // mfcaa -= c1o2 * (mfStartcaa + mfStartacc);
-// // mfcab -= c1o2 * (mfStartcab + mfStartacb);
-// // mfcac -= c1o2 * (mfStartcac + mfStartaca);
-// // mfcba -= c1o2 * (mfStartcba + mfStartabc);
-// // mfcbb -= c1o2 * (mfStartcbb + mfStartabb);
-// // mfcbc -= c1o2 * (mfStartcbc + mfStartaba);
-// // mfcca -= c1o2 * (mfStartcca + mfStartaac);
-// // mfccb -= c1o2 * (mfStartccb + mfStartaab);
-// // mfccc -= c1o2 * (mfStartccc + mfStartaaa);
-// //
-// //mfhaaa += rho*c1o2 * (mfStartaaa + mfStartccc);
-// //mfhaab += rho*c1o2 * (mfStartaab + mfStartccb);
-// //mfhaac += rho*c1o2 * (mfStartaac + mfStartcca);
-// //mfhaba += rho*c1o2 * (mfStartaba + mfStartcbc);
-// //mfhabb += rho*c1o2 * (mfStartabb + mfStartcbb);
-// //mfhabc += rho*c1o2 * (mfStartabc + mfStartcba);
-// //mfhaca += rho*c1o2 * (mfStartaca + mfStartcac);
-// //mfhacb += rho*c1o2 * (mfStartacb + mfStartcab);
-// //mfhacc += rho*c1o2 * (mfStartacc + mfStartcaa);
-// //mfhbaa += rho*c1o2 * (mfStartbaa + mfStartbcc);
-// //mfhbab += rho*c1o2 * (mfStartbab + mfStartbcb);
-// //mfhbac += rho*c1o2 * (mfStartbac + mfStartbca);
-// //mfhbba += rho*c1o2 * (mfStartbba + mfStartbbc);
-// //mfhbbb += rho*(mfStartbbb);
-// //mfhbbc += rho*c1o2 * (mfStartbbc + mfStartbba);
-// //mfhbca += rho*c1o2 * (mfStartbca + mfStartbac);
-// //mfhbcb += rho*c1o2 * (mfStartbcb + mfStartbab);
-// //mfhbcc += rho*c1o2 * (mfStartbcc + mfStartbaa);
-// //mfhcaa += rho*c1o2 * (mfStartcaa + mfStartacc);
-// //mfhcab += rho*c1o2 * (mfStartcab + mfStartacb);
-// //mfhcac += rho*c1o2 * (mfStartcac + mfStartaca);
-// //mfhcba += rho*c1o2 * (mfStartcba + mfStartabc);
-// //mfhcbb += rho*c1o2 * (mfStartcbb + mfStartabb);
-// //mfhcbc += rho*c1o2 * (mfStartcbc + mfStartaba);
-// //mfhcca += rho*c1o2 * (mfStartcca + mfStartaac);
-// //mfhccb += rho*c1o2 * (mfStartccb + mfStartaab);
-// //mfhccc += rho*c1o2 * (mfStartccc + mfStartaaa);
-// //mfhbcb += c1o6 * c2o9 * deltaPP;
-// //mfhbbc += c1o6 * c2o9 * deltaPP;
-// //mfhcbb += c1o6 * c2o9 * deltaPP;
-// //mfhccb += c1o6 * c1o18 * deltaPP;
-// //mfhacb += c1o6 * c1o18 * deltaPP;
-// //mfhcbc += c1o6 * c1o18 * deltaPP;
-// //mfhabc += c1o6 * c1o18 * deltaPP;
-// //mfhbcc += c1o6 * c1o18 * deltaPP;
-// //mfhbac += c1o6 * c1o18 * deltaPP;
-// //mfhccc += c1o6 * c1o72 * deltaPP;
-// //mfhacc += c1o6 * c1o72 * deltaPP;
-// //mfhcac += c1o6 * c1o72 * deltaPP;
-// //mfhaac += c1o6 * c1o72 * deltaPP;
-// //mfhabb += c1o6 * c2o9 * deltaPP;
-// //mfhbab += c1o6 * c2o9 * deltaPP;
-// //mfhbba += c1o6 * c2o9 * deltaPP;
-// //mfhaab += c1o6 * c1o18 * deltaPP;
-// //mfhcab += c1o6 * c1o18 * deltaPP;
-// //mfhaba += c1o6 * c1o18 * deltaPP;
-// //mfhcba += c1o6 * c1o18 * deltaPP;
-// //mfhbaa += c1o6 * c1o18 * deltaPP;
-// //mfhbca += c1o6 * c1o18 * deltaPP;
-// //mfhaaa += c1o6 * c1o72 * deltaPP;
-// //mfhcaa += c1o6 * c1o72 * deltaPP;
-// //mfhaca += c1o6 * c1o72 * deltaPP;
-// //mfhcca += c1o6 * c1o72 * deltaPP;
-// //mfhbbb += c1o6 * c4 * c2o9 * deltaPP;
-//
-//
-// //mfhbcb = c1o3/rho * c2o9 ;
-// //mfhbbc = c1o3/rho * c2o9 ;
-// //mfhcbb = c1o3/rho * c2o9 ;
-// //mfhccb = c1o3/rho * c1o18 ;
-// //mfhacb = c1o3/rho * c1o18 ;
-// //mfhcbc = c1o3/rho * c1o18 ;
-// //mfhabc = c1o3/rho * c1o18 ;
-// //mfhbcc = c1o3/rho * c1o18 ;
-// //mfhbac = c1o3/rho * c1o18 ;
-// //mfhccc = c1o3/rho * c1o72 ;
-// //mfhacc = c1o3/rho * c1o72 ;
-// //mfhcac = c1o3/rho * c1o72 ;
-// //mfhaac = c1o3/rho * c1o72 ;
-// //mfhabb = c1o3/rho * c2o9 ;
-// //mfhbab = c1o3/rho * c2o9 ;
-// //mfhbba = c1o3/rho * c2o9 ;
-// //mfhaab = c1o3/rho * c1o18 ;
-// //mfhcab = c1o3/rho * c1o18 ;
-// //mfhaba = c1o3/rho * c1o18 ;
-// //mfhcba = c1o3/rho * c1o18 ;
-// //mfhbaa = c1o3/rho * c1o18 ;
-// //mfhbca = c1o3/rho * c1o18 ;
-// //mfhaaa = c1o3/rho * c1o72 ;
-// //mfhcaa = c1o3/rho * c1o72 ;
-// //mfhaca = c1o3/rho * c1o72 ;
-// //mfhcca = c1o3/rho * c1o72 ;
-// //mfhbbb = c1/rho;//c1o3/rho * c4 * c2o9 ;
-//
-//
-//
-// //mfabb += c1o2 * c2o9 * pStar * (phi[REST] - phi[W]) * rhoToPhi / rho;
-// //mfbab += c1o2 * c2o9 * pStar * (phi[REST] - phi[S]) * rhoToPhi / rho;
-// //mfbba += c1o2 * c2o9 * pStar * (phi[REST] - phi[B]) * rhoToPhi / rho;
-// //mfaab += c1o2 * c1o18 * pStar * (phi[REST] - phi[SW]) * rhoToPhi / rho;
-// //mfcab += c1o2 * c1o18 * pStar * (phi[REST] - phi[SE]) * rhoToPhi / rho;
-// //mfaba += c1o2 * c1o18 * pStar * (phi[REST] - phi[BW]) * rhoToPhi / rho;
-// //mfcba += c1o2 * c1o18 * pStar * (phi[REST] - phi[BE]) * rhoToPhi / rho;
-// //mfbaa += c1o2 * c1o18 * pStar * (phi[REST] - phi[BS]) * rhoToPhi / rho;
-// //mfbca += c1o2 * c1o18 * pStar * (phi[REST] - phi[BN]) * rhoToPhi / rho;
-// //mfaaa += c1o2 * c1o72 * pStar * (phi[REST] - phi[BSW]) * rhoToPhi / rho;
-// //mfcaa += c1o2 * c1o72 * pStar * (phi[REST] - phi[BSE]) * rhoToPhi / rho;
-// //mfaca += c1o2 * c1o72 * pStar * (phi[REST] - phi[BNW]) * rhoToPhi / rho;
-// //mfcca += c1o2 * c1o72 * pStar * (phi[REST] - phi[BNE]) * rhoToPhi / rho;
-// //mfcbb += c1o2 * c2o9 * pStar * (phi[REST] - phi[E]) * rhoToPhi / rho;
-// //mfbcb += c1o2 * c2o9 * pStar * (phi[REST] - phi[N]) * rhoToPhi / rho;
-// //mfbbc += c1o2 * c2o9 * pStar * (phi[REST] - phi[T]) * rhoToPhi / rho;
-// //mfccb += c1o2 * c1o18 * pStar * (phi[REST] - phi[NE]) * rhoToPhi / rho;
-// //mfacb += c1o2 * c1o18 * pStar * (phi[REST] - phi[NW]) * rhoToPhi / rho;
-// //mfcbc += c1o2 * c1o18 * pStar * (phi[REST] - phi[TE]) * rhoToPhi / rho;
-// //mfabc += c1o2 * c1o18 * pStar * (phi[REST] - phi[TW]) * rhoToPhi / rho;
-// //mfbcc += c1o2 * c1o18 * pStar * (phi[REST] - phi[TN]) * rhoToPhi / rho;
-// //mfbac += c1o2 * c1o18 * pStar * (phi[REST] - phi[TS]) * rhoToPhi / rho;
-// //mfccc += c1o2 * c1o72 * pStar * (phi[REST] - phi[TNE]) * rhoToPhi / rho;
-// //mfacc += c1o2 * c1o72 * pStar * (phi[REST] - phi[TNW]) * rhoToPhi / rho;
-// //mfcac += c1o2 * c1o72 * pStar * (phi[REST] - phi[TSE]) * rhoToPhi / rho;
-// //mfaac += c1o2 * c1o72 * pStar * (phi[REST] - phi[TSW]) * rhoToPhi / rho;
-//
-// ///////////////
-// //mfabb += (pBefore-pStar) * c2o9 ;
-// //mfbab += (pBefore-pStar) * c2o9 ;
-// //mfbba += (pBefore-pStar) * c2o9 ;
-// //mfaab += (pBefore-pStar) * c1o18 ;
-// //mfcab += (pBefore-pStar) * c1o18 ;
-// //mfaba += (pBefore-pStar) * c1o18 ;
-// //mfcba += (pBefore-pStar) * c1o18 ;
-// //mfbaa += (pBefore-pStar) * c1o18 ;
-// //mfbca += (pBefore-pStar) * c1o18 ;
-// //mfaaa += (pBefore-pStar) * c1o72 ;
-// //mfcaa += (pBefore-pStar) * c1o72 ;
-// //mfaca += (pBefore-pStar) * c1o72 ;
-// //mfcca += (pBefore-pStar) * c1o72 ;
-// //mfcbb += (pBefore-pStar) * c2o9 ;
-// //mfbcb += (pBefore-pStar) * c2o9 ;
-// //mfbbc += (pBefore-pStar) * c2o9 ;
-// //mfccb += (pBefore-pStar) * c1o18 ;
-// //mfacb += (pBefore-pStar) * c1o18 ;
-// //mfcbc += (pBefore-pStar) * c1o18 ;
-// //mfabc += (pBefore-pStar) * c1o18 ;
-// //mfbcc += (pBefore-pStar) * c1o18 ;
-// //mfbac += (pBefore-pStar) * c1o18 ;
-// //mfccc += (pBefore-pStar) * c1o72 ;
-// //mfacc += (pBefore-pStar) * c1o72 ;
-// //mfcac += (pBefore-pStar) * c1o72 ;
-// //mfaac += (pBefore-pStar) * c1o72 ;
-// //mfbbb += (pBefore-pStar) * 8.0 / 9.0;
-//
-// //mfabb = (pBefore ) * c2o9;
-// //mfbab = (pBefore ) * c2o9;
-// //mfbba = (pBefore ) * c2o9;
-// //mfaab = (pBefore ) * c1o16;
-// //mfcab = (pBefore ) * c1o16;
-// //mfaba = (pBefore ) * c1o16;
-// //mfcba = (pBefore ) * c1o16;
-// //mfbaa = (pBefore ) * c1o16;
-// //mfbca = (pBefore ) * c1o16;
-// //mfaaa = (pBefore ) * c1o72;
-// //mfcaa = (pBefore ) * c1o72;
-// //mfaca = (pBefore ) * c1o72;
-// //mfcca = (pBefore ) * c1o72;
-// //mfcbb = (pBefore ) * c2o9;
-// //mfbcb = (pBefore ) * c2o9;
-// //mfbbc = (pBefore ) * c2o9;
-// //mfccb = (pBefore ) * c1o16;
-// //mfacb = (pBefore ) * c1o16;
-// //mfcbc = (pBefore ) * c1o16;
-// //mfabc = (pBefore ) * c1o16;
-// //mfbcc = (pBefore ) * c1o16;
-// //mfbac = (pBefore ) * c1o16;
-// //mfccc = (pBefore ) * c1o72;
-// //mfacc = (pBefore ) * c1o72;
-// //mfcac = (pBefore ) * c1o72;
-// //mfaac = (pBefore ) * c1o72;
-// //mfbbb = (pBefore ) * 8.0 / 9.0;
-// ///////////////////
-//
-// //////////////////////////////////////////////////////////////////////////
-// //proof correctness
-// //////////////////////////////////////////////////////////////////////////
-// //#ifdef PROOF_CORRECTNESS
-// LBMReal 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;
-// // //LBMReal dif = fabs(drho - rho_post);
-// // LBMReal dif = drho + (dX1_phi * vvx + dX2_phi * vvy + dX3_phi * vvz) * correctionScaling - rho_post;
-// //#ifdef SINGLEPRECISION
-// // if (dif > 10.0E-7 || dif < -10.0E-7)
-// //#else
-// // if (dif > 10.0E-15 || dif < -10.0E-15)
-// //#endif
-// // {
-// // UB_THROW(UbException(UB_EXARGS, "drho=" + UbSystem::toString(drho) + ", rho_post=" + UbSystem::toString(rho_post)
-// // + " dif=" + UbSystem::toString(dif)
-// // + " drho is not correct for node " + UbSystem::toString(x1) + "," + UbSystem::toString(x2) + "," + UbSystem::toString(x3)));
-// // //UBLOG(logERROR,"LBMKernelETD3Q27CCLB::collideAll(): drho is not correct for node "+UbSystem::toString(x1)+","+UbSystem::toString(x2)+","+UbSystem::toString(x3));
-// // //exit(EXIT_FAILURE);
-// // }
-// //#endif
-//
-// 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
-// //////////////////////////////////////////////////////////////////////////
-// (*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->zeroDistributionsF)(x1, x2, x3) = mfbbb;// *rho* c1o3;
-//
-//
-// (*this->localDistributionsH2)(D3Q27System::ET_E, x1, x2, x3) = mfhabb;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_N, x1, x2, x3) = mfhbab;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_T, x1, x2, x3) = mfhbba;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_NE, x1, x2, x3) = mfhaab;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_NW, x1p, x2, x3) = mfhcab;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_TE, x1, x2, x3) = mfhaba;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_TW, x1p, x2, x3) = mfhcba;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_TN, x1, x2, x3) = mfhbaa;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_TS, x1, x2p, x3) = mfhbca;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_TNE, x1, x2, x3) = mfhaaa;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_TNW, x1p, x2, x3) = mfhcaa;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_TSE, x1, x2p, x3) = mfhaca;//* rho * c1o3;
-// (*this->localDistributionsH2)(D3Q27System::ET_TSW, x1p, x2p, x3) = mfhcca;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_W, x1p, x2, x3) = mfhcbb;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_S, x1, x2p, x3) = mfhbcb;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_B, x1, x2, x3p) = mfhbbc;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_SW, x1p, x2p, x3) = mfhccb;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_SE, x1, x2p, x3) = mfhacb;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_BW, x1p, x2, x3p) = mfhcbc;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_BE, x1, x2, x3p) = mfhabc;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_BS, x1, x2p, x3p) = mfhbcc;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_BN, x1, x2, x3p) = mfhbac;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSW, x1p, x2p, x3p) = mfhccc;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_BSE, x1, x2p, x3p) = mfhacc;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNW, x1p, x2, x3p) = mfhcac;//* rho * c1o3;
-// (*this->nonLocalDistributionsH2)(D3Q27System::ET_BNE, x1, x2, x3p) = mfhaac;//* rho * c1o3;
-//
-// (*this->zeroDistributionsH2)(x1, x2, x3) = mfhbbb;// *rho* c1o3;
-//
-// // !Old Kernel
-/////////////////////// P H A S E - F I E L D S O L V E R
-//////////////////////////////////////////////
-///////CUMULANT PHASE-FIELD
-// LBMReal 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->zeroDistributionsH1)(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
-// LBMReal 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;
-// ////////////////////////////////////////////////////////////////////////////////////
-// LBMReal oneMinusRho = c1- concentration;
-//
-// LBMReal cx =
-// ((((mfccc - mfaaa) + (mfcac - mfaca)) + ((mfcaa - mfacc) + (mfcca - mfaac))) +
-// (((mfcba - mfabc) + (mfcbc - mfaba)) + ((mfcab - mfacb) + (mfccb - mfaab))) +
-// (mfcbb - mfabb));
-// LBMReal cy =
-// ((((mfccc - mfaaa) + (mfaca - mfcac)) + ((mfacc - mfcaa) + (mfcca - mfaac))) +
-// (((mfbca - mfbac) + (mfbcc - mfbaa)) + ((mfacb - mfcab) + (mfccb - mfaab))) +
-// (mfbcb - mfbab));
-// LBMReal 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
-// LBMReal cx2 = cx * cx;
-// LBMReal cy2 = cy * cy;
-// LBMReal 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, c36, c1o36, oneMinusRho);
-// forwardInverseChimeraWithKincompressible(mfaba, mfabb, mfabc, cz, cz2, c9, c1o9, oneMinusRho);
-// forwardInverseChimeraWithKincompressible(mfaca, mfacb, mfacc, cz, cz2, c36, c1o36, oneMinusRho);
-// forwardInverseChimeraWithKincompressible(mfbaa, mfbab, mfbac, cz, cz2, c9, c1o9, oneMinusRho);
-// forwardInverseChimeraWithKincompressible(mfbba, mfbbb, mfbbc, cz, cz2, c9o4, c4o9, oneMinusRho);
-// forwardInverseChimeraWithKincompressible(mfbca, mfbcb, mfbcc, cz, cz2, c9, c1o9, oneMinusRho);
-// forwardInverseChimeraWithKincompressible(mfcaa, mfcab, mfcac, cz, cz2, c36, c1o36, oneMinusRho);
-// forwardInverseChimeraWithKincompressible(mfcba, mfcbb, mfcbc, cz, cz2, c9, c1o9, oneMinusRho);
-// forwardInverseChimeraWithKincompressible(mfcca, mfccb, mfccc, cz, cz2, c36, c1o36, oneMinusRho);
-//
-// ////////////////////////////////////////////////////////////////////////////////////
-// // Y - Dir
-// forwardInverseChimeraWithKincompressible(mfaaa, mfaba, mfaca, cy, cy2, c6, c1o6, oneMinusRho);
-// forwardChimera(mfaab, mfabb, mfacb, cy, cy2);
-// forwardInverseChimeraWithKincompressible(mfaac, mfabc, mfacc, cy, cy2, c18, 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, c6, c1o6, oneMinusRho);
-// forwardChimera(mfcab, mfcbb, mfccb, cy, cy2);
-// forwardInverseChimeraWithKincompressible(mfcac, mfcbc, mfccc, cy, cy2, c18, c1o18, oneMinusRho);
-//
-// ////////////////////////////////////////////////////////////////////////////////////
-// // X - Dir
-// forwardInverseChimeraWithKincompressible(mfaaa, mfbaa, mfcaa, cx, cx2, c1, c1, oneMinusRho);
-// forwardChimera(mfaba, mfbba, mfcba, cx, cx2);
-// forwardInverseChimeraWithKincompressible(mfaca, mfbca, mfcca, cx, cx2, c3, 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, c3, c1o3, oneMinusRho);
-// forwardChimera(mfabc, mfbbc, mfcbc, cx, cx2);
-// forwardInverseChimeraWithKincompressible(mfacc, mfbcc, mfccc, cx, cx2, c3, c1o9, oneMinusRho);
-//
-// ////////////////////////////////////////////////////////////////////////////////////
-// //! - experimental Cumulant ... to be published ... hopefully
-// //!
-//
-// // linearized orthogonalization of 3rd order central moments
-// LBMReal Mabc = mfabc - mfaba * c1o3;
-// LBMReal Mbca = mfbca - mfbaa * c1o3;
-// LBMReal Macb = mfacb - mfaab * c1o3;
-// LBMReal Mcba = mfcba - mfaba * c1o3;
-// LBMReal Mcab = mfcab - mfaab * c1o3;
-// LBMReal Mbac = mfbac - mfbaa * c1o3;
-// // linearized orthogonalization of 5th order central moments
-// LBMReal Mcbc = mfcbc - mfaba * c1o9;
-// LBMReal Mbcc = mfbcc - mfbaa * c1o9;
-// LBMReal Mccb = mfccb - mfaab * c1o9;
-//
-// //31.05.2022 addaptive mobility
-// //omegaD = c1 + (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 = c2 * (concentration * (concentration - c1)) / (-c6 * (sqrt((cx - vvx * concentration) * (cx - vvx * concentration) + (cy - vvy * concentration) * (cy - vvy * concentration) + (cz - vvz * concentration) * (cz - vvz * concentration))) + (concentration * (concentration - c1))+1.0e-200);
-// // collision of 1st order moments
-// cx = cx * (c1 - omegaD) + omegaD * vvx * concentration +
-// normX1 * (c1 - 0.5 * omegaD) * (1.0 - concentration) * (concentration) * c1o3 * oneOverInterfaceScale;
-// cy = cy * (c1 - omegaD) + omegaD * vvy * concentration +
-// normX2 * (c1 - 0.5 * omegaD) * (1.0 - concentration) * (concentration) * c1o3 * oneOverInterfaceScale;
-// cz = cz * (c1 - omegaD) + omegaD * vvz * concentration +
-// normX3 * (c1 - 0.5 * omegaD) * (1.0 - concentration) * (concentration) * c1o3 * oneOverInterfaceScale;
-//
-// cx2 = cx * cx;
-// cy2 = cy * cy;
-// cz2 = cz * cz;
-//
-// // equilibration of 2nd order moments
-// mfbba = zeroReal;
-// mfbab = zeroReal;
-// mfabb = zeroReal;
-//
-// mfcaa = c1o3 * concentration;
-// mfaca = c1o3 * concentration;
-// mfaac = c1o3 * concentration;
-//
-// // equilibration of 3rd order moments
-// Mabc = zeroReal;
-// Mbca = zeroReal;
-// Macb = zeroReal;
-// Mcba = zeroReal;
-// Mcab = zeroReal;
-// Mbac = zeroReal;
-// mfbbb = zeroReal;
-//
-// // 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 = zeroReal;
-// mfbcb = zeroReal;
-// mfbbc = zeroReal;
-//
-// // equilibration of 5th order moments
-// Mcbc = zeroReal;
-// Mbcc = zeroReal;
-// Mccb = zeroReal;
-//
-// // 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, c1, c1, oneMinusRho);
-// backwardChimera(mfaba, mfbba, mfcba, cx, cx2);
-// backwardInverseChimeraWithKincompressible(mfaca, mfbca, mfcca, cx, cx2, c3, 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, c3, c1o3, oneMinusRho);
-// backwardChimera(mfabc, mfbbc, mfcbc, cx, cx2);
-// backwardInverseChimeraWithKincompressible(mfacc, mfbcc, mfccc, cx, cx2, c9, c1o9, oneMinusRho);
-//
-// ////////////////////////////////////////////////////////////////////////////////////
-// // Y - Dir
-// backwardInverseChimeraWithKincompressible(mfaaa, mfaba, mfaca, cy, cy2, c6, c1o6, oneMinusRho);
-// backwardChimera(mfaab, mfabb, mfacb, cy, cy2);
-// backwardInverseChimeraWithKincompressible(mfaac, mfabc, mfacc, cy, cy2, c18, 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, c6, c1o6, oneMinusRho);
-// backwardChimera(mfcab, mfcbb, mfccb, cy, cy2);
-// backwardInverseChimeraWithKincompressible(mfcac, mfcbc, mfccc, cy, cy2, c18, c1o18, oneMinusRho);
-//
-// ////////////////////////////////////////////////////////////////////////////////////
-// // Z - Dir
-// backwardInverseChimeraWithKincompressible(mfaaa, mfaab, mfaac, cz, cz2, c36, c1o36, oneMinusRho);
-// backwardInverseChimeraWithKincompressible(mfaba, mfabb, mfabc, cz, cz2, c9, c1o9, oneMinusRho);
-// backwardInverseChimeraWithKincompressible(mfaca, mfacb, mfacc, cz, cz2, c36, c1o36, oneMinusRho);
-// backwardInverseChimeraWithKincompressible(mfbaa, mfbab, mfbac, cz, cz2, c9, c1o9, oneMinusRho);
-// backwardInverseChimeraWithKincompressible(mfbba, mfbbb, mfbbc, cz, cz2, c9o4, c4o9, oneMinusRho);
-// backwardInverseChimeraWithKincompressible(mfbca, mfbcb, mfbcc, cz, cz2, c9, c1o9, oneMinusRho);
-// backwardInverseChimeraWithKincompressible(mfcaa, mfcab, mfcac, cz, cz2, c36, c1o36, oneMinusRho);
-// backwardInverseChimeraWithKincompressible(mfcba, mfcbb, mfcbc, cz, cz2, c9, c1o9, oneMinusRho);
-// backwardInverseChimeraWithKincompressible(mfcca, mfccb, mfccc, cz, cz2, c36, 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->zeroDistributionsH1)(x1,x2,x3) = mfbbb;
-//
-//
-//
-//
-// }
-// }
-// }
-// }
-// }
-//}
-////////////////////////////////////////////////////////////////////////////
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX1_phi()
-//{
-// using namespace D3Q27System;
-// return 3.0* ((WEIGTH[TNE] * (((phi[TNE] - phi[BSW]) + (phi[BSE] - phi[TNW])) + ((phi[TSE] - phi[BNW]) + (phi[BNE] - phi[TSW])))
-// + WEIGTH[NE] * (((phi[TE] - phi[BW]) + (phi[BE] - phi[TW])) + ((phi[SE] - phi[NW]) + (phi[NE] - phi[SW])))) +
-// +WEIGTH[N] * (phi[E] - phi[W]));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX2_phi()
-//{
-// using namespace D3Q27System;
-// return 3.0 * ((WEIGTH[TNE] * (((phi[TNE] - phi[BSW]) - (phi[BSE] - phi[TNW])) + ((phi[BNE] - phi[TSW])- (phi[TSE] - phi[BNW])))
-// + WEIGTH[NE] * (((phi[TN] - phi[BS]) + (phi[BN] - phi[TS])) + ((phi[NE] - phi[SW])- (phi[SE] - phi[NW])))) +
-// +WEIGTH[N] * (phi[N] - phi[S]));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX3_phi()
-//{
-// using namespace D3Q27System;
-// return 3.0 * ((WEIGTH[TNE] * (((phi[TNE] - phi[BSW]) - (phi[BSE] - phi[TNW])) + ((phi[TSE] - phi[BNW]) - (phi[BNE] - phi[TSW])))
-// + WEIGTH[NE] * (((phi[TE] - phi[BW]) - (phi[BE] - phi[TW])) + ((phi[TS] - phi[BN]) + (phi[TN] - phi[BS])))) +
-// +WEIGTH[N] * (phi[T] - phi[B]));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX1_rhoInv(LBMReal rhoL,LBMReal rhoDIV)
-//{
-// using namespace D3Q27System;
-// return 3.0 * ((WEIGTH[TNE] * (((1.0/(rhoL+rhoDIV*phi[TNE]) - 1.0 / (rhoL + rhoDIV * phi[BSW])) + (1.0 / (rhoL + rhoDIV * phi[BSE]) - 1.0 / (rhoL + rhoDIV * phi[TNW]))) + ((1.0 / (rhoL + rhoDIV * phi[TSE]) - 1.0 / (rhoL + rhoDIV * phi[BNW])) + (1.0 / (rhoL + rhoDIV * phi[BNE]) - 1.0 / (rhoL + rhoDIV * phi[TSW]))))
-// + WEIGTH[NE] * (((1.0 / (rhoL + rhoDIV * phi[TE]) - 1.0 / (rhoL + rhoDIV * phi[BW])) + (1.0 / (rhoL + rhoDIV * phi[BE]) - 1.0 / (rhoL + rhoDIV * phi[TW]))) + ((1.0 / (rhoL + rhoDIV * phi[SE]) - 1.0 / (rhoL + rhoDIV * phi[NW])) + (1.0 / (rhoL + rhoDIV * phi[NE]) - 1.0 / (rhoL + rhoDIV * phi[SW]))))) +
-// +WEIGTH[N] * (1.0 / (rhoL + rhoDIV * phi[E]) - 1.0 / (rhoL + rhoDIV * phi[W])));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX2_rhoInv(LBMReal rhoL,LBMReal rhoDIV)
-//{
-// using namespace D3Q27System;
-// return 3.0 * ((WEIGTH[TNE] * (((1.0 / (rhoL + rhoDIV * phi[TNE]) - 1.0 / (rhoL + rhoDIV * phi[BSW])) - (1.0 / (rhoL + rhoDIV * phi[BSE]) - 1.0 / (rhoL + rhoDIV * phi[TNW]))) + ((1.0 / (rhoL + rhoDIV * phi[BNE]) - 1.0 / (rhoL + rhoDIV * phi[TSW])) - (1.0 / (rhoL + rhoDIV * phi[TSE]) - 1.0 / (rhoL + rhoDIV * phi[BNW]))))
-// + WEIGTH[NE] * (((1.0 / (rhoL + rhoDIV * phi[TN]) - 1.0 / (rhoL + rhoDIV * phi[BS])) + (1.0 / (rhoL + rhoDIV * phi[BN]) - 1.0 / (rhoL + rhoDIV * phi[TS]))) + ((1.0 / (rhoL + rhoDIV * phi[NE]) - 1.0 / (rhoL + rhoDIV * phi[SW])) - (1.0 / (rhoL + rhoDIV * phi[SE]) - 1.0 / (rhoL + rhoDIV * phi[NW]))))) +
-// +WEIGTH[N] * (1.0 / (rhoL + rhoDIV * phi[N]) - 1.0 / (rhoL + rhoDIV * phi[S])));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX3_rhoInv(LBMReal rhoL, LBMReal rhoDIV)
-//{
-// using namespace D3Q27System;
-// return 3.0 * ((WEIGTH[TNE] * (((1.0 / (rhoL + rhoDIV * phi[TNE]) - 1.0 / (rhoL + rhoDIV * phi[BSW])) - (1.0 / (rhoL + rhoDIV * phi[BSE]) - 1.0 / (rhoL + rhoDIV * phi[TNW]))) + ((1.0 / (rhoL + rhoDIV * phi[TSE]) - 1.0 / (rhoL + rhoDIV * phi[BNW])) - (1.0 / (rhoL + rhoDIV * phi[BNE]) - 1.0 / (rhoL + rhoDIV * phi[TSW]))))
-// + WEIGTH[NE] * (((1.0 / (rhoL + rhoDIV * phi[TE]) - 1.0 / (rhoL + rhoDIV * phi[BW])) - (1.0 / (rhoL + rhoDIV * phi[BE]) - 1.0 / (rhoL + rhoDIV * phi[TW]))) + ((1.0 / (rhoL + rhoDIV * phi[TS]) - 1.0 / (rhoL + rhoDIV * phi[BN])) + (1.0 / (rhoL + rhoDIV * phi[TN]) - 1.0 / (rhoL + rhoDIV * phi[BS]))))) +
-// +WEIGTH[N] * (1.0 / (rhoL + rhoDIV * phi[T]) - 1.0 / (rhoL + rhoDIV * phi[B])));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX1_phi2()
-//{
-// using namespace D3Q27System;
-// return 3.0 * ((WEIGTH[TNE] * (((phi2[TNE] - phi2[BSW]) + (phi2[BSE] - phi2[TNW])) + ((phi2[TSE] - phi2[BNW]) + (phi2[BNE] - phi2[TSW])))
-// + WEIGTH[NE] * (((phi2[TE] - phi2[BW]) + (phi2[BE] - phi2[TW])) + ((phi2[SE] - phi2[NW]) + (phi2[NE] - phi2[SW])))) +
-// +WEIGTH[N] * (phi2[E] - phi2[W]));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX2_phi2()
-//{
-// using namespace D3Q27System;
-// return 3.0 * ((WEIGTH[TNE] * (((phi2[TNE] - phi2[BSW]) - (phi2[BSE] - phi2[TNW])) + ((phi2[BNE] - phi2[TSW]) - (phi2[TSE] - phi2[BNW])))
-// + WEIGTH[NE] * (((phi2[TN] - phi2[BS]) + (phi2[BN] - phi2[TS])) + ((phi2[NE] - phi2[SW]) - (phi2[SE] - phi2[NW])))) +
-// +WEIGTH[N] * (phi2[N] - phi2[S]));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::gradX3_phi2()
-//{
-// using namespace D3Q27System;
-// return 3.0 * ((WEIGTH[TNE] * (((phi2[TNE] - phi2[BSW]) - (phi2[BSE] - phi2[TNW])) + ((phi2[TSE] - phi2[BNW]) - (phi2[BNE] - phi2[TSW])))
-// + WEIGTH[NE] * (((phi2[TE] - phi2[BW]) - (phi2[BE] - phi2[TW])) + ((phi2[TS] - phi2[BN]) + (phi2[TN] - phi2[BS])))) +
-// +WEIGTH[N] * (phi2[T] - phi2[B]));
-//}
-//
-//LBMReal MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::nabla2_phi()
-//{
-// using namespace D3Q27System;
-// LBMReal 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;
-//}
-//
-//void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::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[E] = (*this->localDistributionsH1)(D3Q27System::ET_E, x1, x2, x3);
-// h[N] = (*this->localDistributionsH1)(D3Q27System::ET_N, x1, x2, x3);
-// h[T] = (*this->localDistributionsH1)(D3Q27System::ET_T, x1, x2, x3);
-// h[NE] = (*this->localDistributionsH1)(D3Q27System::ET_NE, x1, x2, x3);
-// h[NW] = (*this->localDistributionsH1)(D3Q27System::ET_NW, x1p, x2, x3);
-// h[TE] = (*this->localDistributionsH1)(D3Q27System::ET_TE, x1, x2, x3);
-// h[TW] = (*this->localDistributionsH1)(D3Q27System::ET_TW, x1p, x2, x3);
-// h[TN] = (*this->localDistributionsH1)(D3Q27System::ET_TN, x1, x2, x3);
-// h[TS] = (*this->localDistributionsH1)(D3Q27System::ET_TS, x1, x2p, x3);
-// h[TNE] = (*this->localDistributionsH1)(D3Q27System::ET_TNE, x1, x2, x3);
-// h[TNW] = (*this->localDistributionsH1)(D3Q27System::ET_TNW, x1p, x2, x3);
-// h[TSE] = (*this->localDistributionsH1)(D3Q27System::ET_TSE, x1, x2p, x3);
-// h[TSW] = (*this->localDistributionsH1)(D3Q27System::ET_TSW, x1p, x2p, x3);
-//
-// h[W] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_W, x1p, x2, x3);
-// h[S] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_S, x1, x2p, x3);
-// h[B] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_B, x1, x2, x3p);
-// h[SW] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SW, x1p, x2p, x3);
-// h[SE] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_SE, x1, x2p, x3);
-// h[BW] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BW, x1p, x2, x3p);
-// h[BE] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BE, x1, x2, x3p);
-// h[BS] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BS, x1, x2p, x3p);
-// h[BN] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BN, x1, x2, x3p);
-// h[BSW] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSW, x1p, x2p, x3p);
-// h[BSE] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BSE, x1, x2p, x3p);
-// h[BNW] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNW, x1p, x2, x3p);
-// h[BNE] = (*this->nonLocalDistributionsH1)(D3Q27System::ET_BNE, x1, x2, x3p);
-//
-// h[REST] = (*this->zeroDistributionsH1)(x1, x2, x3);
-// }
-// }
-// }
-// }
-//}
-//
-//void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::findNeighbors(CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr ph, int x1, int x2,
-// int x3)
-//{
-// using namespace D3Q27System;
-//
-// SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
-//
-// phi[REST] = (*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 MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::findNeighbors2(CbArray3D<LBMReal, IndexerX3X2X1>::CbArray3DPtr ph, int x1, int x2,
-// int x3)
-//{
-// using namespace D3Q27System;
-//
-// SPtr<BCArray3D> bcArray = this->getBCProcessor()->getBCArray();
-//
-// phi2[REST] = (*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 MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::swapDistributions()
-//{
-// LBMKernel::swapDistributions();
-// dataSet->getHdistributions()->swap();
-// dataSet->getH2distributions()->swap();
-//}
-//
-//void MultiphaseSimpleVelocityBaseExternalPressureLBMKernel::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/VirtualFluidsCore/LBM/VoidLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
index 83d6a791e761190e3cdd34d101c4fd1d1588a191..7ab956494af3121eedfb56a22cb638a04c08efba 100644
--- a/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/VoidLBMKernel.cpp
@@ -1,7 +1,8 @@
#include "VoidLBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "DataSet3D.h"
#include "VoidData3D.h"
+#include "D3Q27System.h"
VoidLBMKernel::VoidLBMKernel() = default;
//////////////////////////////////////////////////////////////////////////
@@ -19,7 +20,7 @@ SPtr<LBMKernel> VoidLBMKernel::clone()
kernel->setNX(nx);
dynamicPointerCast<VoidLBMKernel>(kernel)->initDataSet();
kernel->setCollisionFactor(this->collFactor);
- kernel->setBCProcessor(bcProcessor->clone(kernel));
+ kernel->setBCSet(bcSet->clone(kernel));
kernel->setWithForcing(withForcing);
kernel->setForcingX1(muForcingX1);
kernel->setForcingX2(muForcingX2);
@@ -31,4 +32,4 @@ SPtr<LBMKernel> VoidLBMKernel::clone()
//////////////////////////////////////////////////////////////////////////
void VoidLBMKernel::calculate(int step) {}
//////////////////////////////////////////////////////////////////////////
-real VoidLBMKernel::getCalculationTime() { return 0.0; }
+real VoidLBMKernel::getCalculationTime() { return vf::basics::constant::c0o1; }
diff --git a/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
index bbc4face9f784d120c80dcfbbbd73d07951fe49b..e84d4b7cd7e205c5403e57b4f9a737e8007e2ee2 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
+++ b/src/cpu/VirtualFluidsCore/Parallel/MPIIODataStructures.h
@@ -56,7 +56,7 @@ struct dataSetParam {
};
//! \struct DataSetRestart
-//! \brief Structure describes parameters of the dataSet in MPIIORestartCoProcessor format
+//! \brief Structure describes parameters of the dataSet in MPIIORestartSimulationObserver format
//! \details The structure is used when reading from the file
struct DataSetRestart {
real collFactor;
@@ -74,7 +74,7 @@ struct DataSetRestart {
};
//! \struct DataSetMigration
-//! \brief Structure describes parameters of the dataSet in MPIIOMigrationCoProcessor format
+//! \brief Structure describes parameters of the dataSet in MPIIOMigrationSimulationObserver format
//! \details The structure is used to find the needed block in the grid when restoring a dataSet
struct DataSetMigration {
real collFactor;
@@ -89,7 +89,7 @@ struct DataSetMigration {
};
//! \struct DataSetSmallRead
-//! \brief Structure describes parameters of the DataSetSmall in MPIIORestartCoProcessor format
+//! \brief Structure describes parameters of the DataSetSmall in MPIIORestartSimulationObserver format
//! \details The structure is used when reading from the file
struct DataSetSmallRestart {
int x1;
@@ -98,7 +98,7 @@ struct DataSetSmallRestart {
int level;
};
//! \struct dataSetSmall
-//! \brief Structure containes information identifying the block in MPIIOMigrationCoProcessor format
+//! \brief Structure containes information identifying the block in MPIIOMigrationSimulationObserver format
//! \details The structure is used to find the needed block in the grid when restoring a dataSet arrays
struct DataSetSmallMigration {
int globalID;
@@ -138,7 +138,7 @@ struct boundCondParam {
};
//! \struct BCAddRead
-//! \brief Structure describes parameters of the BCAdd in MPIIORestartCoProcessor format
+//! \brief Structure describes parameters of the BCAdd in MPIIORestartSimulationObserver format
//! \details The structure is used when reading from the file
struct BCAddRestart {
int x1; // to find the right block
@@ -151,7 +151,7 @@ struct BCAddRestart {
//! \struct BCAdd
//! \brief Structure containes information identifying the block and some parameters of the arrays
-//! \of boundary conditions that are equal in all blocks in MPIIOMigrationCoProcessor format
+//! \of boundary conditions that are equal in all blocks in MPIIOMigrationSimulationObserver format
//! \details The structure is used to find the needed block in the grid when restoring a dataSet
//! and to set common parameters
struct BCAddMigration {
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/Parallel/ZoltanPartitioner.cpp b/src/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.cpp
index 220fe67c5d0c34ecb40e4066c68d84649ca0dfc1..820af332b19754ee2a4325f0328bdb01de3d784b 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.cpp
+++ b/src/cpu/VirtualFluidsCore/Parallel/ZoltanPartitioner.cpp
@@ -76,7 +76,7 @@ void ZoltanPartitioner::partition()
&exportToPart); /* Partition to which each vertex will belong */
if (rc != ZOLTAN_OK) {
- cout << "Partitioning failed on process " << rank << "\n" << endl;
+ cout << "Partitioning failed on update " << rank << "\n" << endl;
MPI_Finalize();
Zoltan_Destroy(&zz);
exit(0);
diff --git a/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp b/src/cpu/VirtualFluidsCore/Simulation/Block3D.cpp
similarity index 100%
rename from src/cpu/VirtualFluidsCore/Grid/Block3D.cpp
rename to src/cpu/VirtualFluidsCore/Simulation/Block3D.cpp
diff --git a/src/cpu/VirtualFluidsCore/Grid/Block3D.h b/src/cpu/VirtualFluidsCore/Simulation/Block3D.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/Grid/Block3D.h
rename to src/cpu/VirtualFluidsCore/Simulation/Block3D.h
index 686d8df0f9a4dda1b8d744b11b18a7bddf7e3f77..e909ae0723c6bc1c2bda778831a18e33851ec249 100644
--- a/src/cpu/VirtualFluidsCore/Grid/Block3D.h
+++ b/src/cpu/VirtualFluidsCore/Simulation/Block3D.h
@@ -27,7 +27,7 @@
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \file Block3D.h
-//! \ingroup Grid
+//! \ingroup Simulation
//! \author Konstantin Kutscher
//=======================================================================================
diff --git a/src/cpu/VirtualFluidsCore/Grid/Grid3D.cpp b/src/cpu/VirtualFluidsCore/Simulation/Grid3D.cpp
similarity index 100%
rename from src/cpu/VirtualFluidsCore/Grid/Grid3D.cpp
rename to src/cpu/VirtualFluidsCore/Simulation/Grid3D.cpp
diff --git a/src/cpu/VirtualFluidsCore/Grid/Grid3D.h b/src/cpu/VirtualFluidsCore/Simulation/Grid3D.h
similarity index 99%
rename from src/cpu/VirtualFluidsCore/Grid/Grid3D.h
rename to src/cpu/VirtualFluidsCore/Simulation/Grid3D.h
index 41a99d6cc7be5177cc0f3ff2e89591b28317fede..821adff473961fafa00be08ca2cf8e2339353b51 100644
--- a/src/cpu/VirtualFluidsCore/Grid/Grid3D.h
+++ b/src/cpu/VirtualFluidsCore/Simulation/Grid3D.h
@@ -27,7 +27,7 @@
// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \file Grid.h
-//! \ingroup Grid
+//! \ingroup Simulation
//! \author Konstantin Kutscher, Soeren Freudiger, Sebastian Geller
//=======================================================================================
diff --git a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp b/src/cpu/VirtualFluidsCore/Simulation/Simulation.cpp
similarity index 54%
rename from src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
rename to src/cpu/VirtualFluidsCore/Simulation/Simulation.cpp
index 92559f5f37d0b39a086b6bab0e63157b79c9f718..e3b0169847d43efd62bdf7dabf80fdc009027d46 100644
--- a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
+++ b/src/cpu/VirtualFluidsCore/Simulation/Simulation.cpp
@@ -26,16 +26,19 @@
// 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 BasicCalculator.cpp
+//! \file Simulation.cpp
//! \ingroup Grid
//! \author Konstantin Kutscher
//=======================================================================================
-#include "BasicCalculator.h"
+#include "Simulation.h"
-#include "BCProcessor.h"
#include "Block3D.h"
#include "Block3DConnector.h"
+#include "SimulationObserver.h"
+#include "Grid3D.h"
+#include "BCSet.h"
+#include "Block3DConnector.h"
#include "LBMKernel.h"
#include "UbLogger.h"
#include "UbScheduler.h"
@@ -45,22 +48,207 @@
#endif
#define OMP_SCHEDULE guided
-//#define TIMING
-//#include "UbTiming.h"
+// #define TIMING
+// #include "UbTiming.h"
+
+#include <basics/utilities/UbException.h>
+
+
+Simulation::Simulation(SPtr<Grid3D> grid, SPtr<UbScheduler> additionalGhostLayerUpdateScheduler, int numberOfTimeSteps)
+ : grid(grid), additionalGhostLayerUpdateScheduler(additionalGhostLayerUpdateScheduler),
+ numberOfTimeSteps(numberOfTimeSteps)
+{
+ this->grid = grid;
+ startTimeStep = int(grid->getTimeStep()) + 1;
+ minLevel = grid->getCoarsestInitializedLevel();
+ maxLevel = grid->getFinestInitializedLevel();
+ if (maxLevel > 0)
+ refinement = true;
+ else
+ refinement = false;
+ blocks.resize(maxLevel + 1);
+ localConns.resize(maxLevel + 1);
+ remoteConns.resize(maxLevel + 1);
+ localInterConns.resize(maxLevel);
+ remoteInterConns.resize(maxLevel);
+
+ int gridRank = grid->getRank();
+
+ for (int level = minLevel; level <= maxLevel; level++) {
+ std::vector<SPtr<Block3D>> blockVector;
+ grid->getBlocks(level, gridRank, true, blockVector);
+ for (const auto &block : blockVector)
+ if (block)
+ blocks[block->getLevel()].push_back(block);
+ }
+
+ initLocalConnectors();
+ initRemoteConnectors();
+}
+//////////////////////////////////////////////////////////////////////////
+Simulation::~Simulation() = default;
+//////////////////////////////////////////////////////////////////////////
+void Simulation::addSimulationObserver(SPtr<SimulationObserver> coProcessor) { simulationObserver.push_back(coProcessor); }
+//////////////////////////////////////////////////////////////////////////
+void Simulation::notifyObservers(real step)
+{
+ for (SPtr<SimulationObserver> cp : simulationObserver) {
+ cp->update(step);
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+void Simulation::initLocalConnectors()
+{
+ UBLOG(logDEBUG1, "Simulation::initLocalConnectors() - start");
+
+ for (int l = minLevel; l <= maxLevel; l++) {
+ for (SPtr<Block3D> block : blocks[l]) {
+ block->pushBackLocalSameLevelConnectors(localConns[l]);
+
+ if (l != maxLevel)
+ block->pushBackLocalInterpolationConnectorsCF(localInterConns[l]);
+ }
+ if (l != maxLevel) {
+ for (SPtr<Block3D> block : blocks[l + 1]) {
+ block->pushBackLocalInterpolationConnectorsFC(localInterConns[l]);
+ }
+ }
+ UBLOG(logDEBUG5, "Simulation::initConnectors()-initConnectors(localConns[" << l << "])");
+ initConnectors(localConns[l]);
+
+ if (l != maxLevel) {
+ UBLOG(logDEBUG5, "Simulation::initConnectors()-initConnectors(localInterConns[" << l << "])");
+ initConnectors(localInterConns[l]);
+ }
+ }
+
+ UBLOG(logDEBUG1, "Simulation::initLocalConnectors() - end");
+}
+//////////////////////////////////////////////////////////////////////////
+void Simulation::initRemoteConnectors()
+{
+ std::vector<std::vector<SPtr<Block3DConnector>>> remoteInterConnsCF;
+ std::vector<std::vector<SPtr<Block3DConnector>>> remoteInterConnsFC;
+ remoteInterConnsCF.resize(maxLevel + 1);
+ remoteInterConnsFC.resize(maxLevel + 1);
+
+ for (int l = minLevel; l <= maxLevel; l++) {
+ std::vector<SPtr<Block3D>> blockVector;
+ // grid->getBlocks(level, gridRank, true, blockVector);
+ grid->getBlocks(l, blockVector);
+ for (SPtr<Block3D> block : blockVector) {
+ int block_level = block->getLevel();
+ block->pushBackRemoteSameLevelConnectors(remoteConns[block_level]);
+
+ block->pushBackRemoteInterpolationConnectorsCF(remoteInterConnsCF[block_level]);
+ block->pushBackRemoteInterpolationConnectorsFC(remoteInterConnsFC[block_level]);
+ }
+ }
+
+ for (int l = minLevel; l <= maxLevel; l++) {
+ UBLOG(logDEBUG5, "Simulation::initRemoteConnectors()-initConnectors(remoteConns[" << l << "])");
+ initConnectors(remoteConns[l]);
+ if (l != maxLevel) {
+ for (size_t i = 0; i < remoteInterConnsCF[l].size(); i++)
+ remoteInterConns[l].push_back(remoteInterConnsCF[l][i]);
+ for (size_t i = 0; i < remoteInterConnsFC[l + 1].size(); i++)
+ remoteInterConns[l].push_back(remoteInterConnsFC[l + 1][i]);
+ }
+ }
+ //////////////////////////////////////////////////////////////////////////
+ // UBLOG(logDEBUG5, "Simulation::initConnectors() - connectoren initialisieren - start");
+ for (int l = minLevel; l <= maxLevel; l++) {
+ if (l != maxLevel) {
+ UBLOG(logDEBUG5, "Simulation::initRemoteConnectors()-initConnectors(remoteInterConns[" << l << "])");
+ for (SPtr<Block3DConnector> c : remoteInterConns[l])
+ c->init();
+ }
+ }
+ // UBLOG(logDEBUG5, "Simulation::initConnectors() - connectoren initialisieren - end");
+ //////////////////////////////////////////////////////////////////////////
+ // sendTransmitterDataSize
+ // UBLOG(logDEBUG5, "Simulation::initConnectors() - sendTransmitterDataSize - start");
+ for (int l = minLevel; l <= maxLevel; l++) {
+ if (l != maxLevel) {
+ UBLOG(logDEBUG5,
+ "Simulation::initRemoteConnectors()-sendTransmitterDataSize(remoteInterConns[" << l << "])");
+ for (SPtr<Block3DConnector> c : remoteInterConns[l])
+ c->sendTransmitterDataSize();
+ }
+ }
+ // UBLOG(logDEBUG5, "Simulation::initConnectors() - sendTransmitterDataSize - end");
+ //////////////////////////////////////////////////////////////////////////
+ // receiveTransmitterDataSize
+ // if it stops here during distributed calculations, then there is probably an inactive block on one side!!!
+ // UBLOG(logDEBUG5, "Simulation::initConnectors() - receiveTransmitterDataSize - start");
+ for (int l = minLevel; l <= maxLevel; l++) {
+ if (l != maxLevel) {
+ UBLOG(logDEBUG5,
+ "Simulation::initRemoteConnectors()-receiveTransmitterDataSize(remoteInterConns[" << l << "])");
+ for (SPtr<Block3DConnector> c : remoteInterConns[l])
+ c->receiveTransmitterDataSize();
+ }
+ }
+ // UBLOG(logDEBUG5, "Simulation::initConnectors() - receiveTransmitterDataSize - end");
+ //////////////////////////////////////////////////////////////////////////
+}
+//////////////////////////////////////////////////////////////////////////
+void Simulation::initConnectors(std::vector<SPtr<Block3DConnector>> &connectors)
+{
+ UBLOG(logDEBUG1, "Simulation::initConnectors() - start");
+
+ // initialization
+ //////////////////////////////////////////////////////////////////////////
+ // initialize connectors
+ UBLOG(logDEBUG5, "Simulation::initConnectors() - connectoren initialisieren - start");
+ for (SPtr<Block3DConnector> c : connectors)
+ c->init();
+ UBLOG(logDEBUG5, "Simulation::initConnectors() - connectoren initialisieren - end");
+ //////////////////////////////////////////////////////////////////////////
+ // sendTransmitterDataSize
+ UBLOG(logDEBUG5, "Simulation::initConnectors() - sendTransmitterDataSize - start");
+ for (SPtr<Block3DConnector> c : connectors)
+ c->sendTransmitterDataSize();
+ UBLOG(logDEBUG5, "Simulation::initConnectors() - sendTransmitterDataSize - end");
+ //////////////////////////////////////////////////////////////////////////
+ // receiveTransmitterDataSize
+ // if it stops here during distributed calculations, then there is probably an inactive block on one side!!!
+ UBLOG(logDEBUG5, "Simulation::initConnectors() - receiveTransmitterDataSize - start");
+ for (SPtr<Block3DConnector> c : connectors)
+ c->receiveTransmitterDataSize();
+ UBLOG(logDEBUG5, "Simulation::initConnectors() - receiveTransmitterDataSize - end");
-BasicCalculator::BasicCalculator(SPtr<Grid3D> grid, SPtr<UbScheduler> additionalGhostLayerUpdateScheduler,
- int numberOfTimeSteps)
- : Calculator(grid, additionalGhostLayerUpdateScheduler, numberOfTimeSteps)
+ UBLOG(logDEBUG1, "Simulation::initConnectors() - end");
+}
+//////////////////////////////////////////////////////////////////////////
+void Simulation::deleteBlocks()
{
+ for (std::vector<SPtr<Block3D>> &bs : blocks)
+ bs.resize(0);
+}
+//////////////////////////////////////////////////////////////////////////
+void Simulation::deleteConnectors()
+{
+ deleteConnectors(localConns);
+ deleteConnectors(remoteConns);
+
+ deleteConnectors(localInterConns);
+ deleteConnectors(remoteInterConns);
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::calculate()
+void Simulation::deleteConnectors(std::vector<std::vector<SPtr<Block3DConnector>>> &conns)
{
- UBLOG(logDEBUG1, "OMPCalculator::calculate() - started");
+ for (std::vector<SPtr<Block3DConnector>> &c : conns)
+ c.resize(0);
+}
+//////////////////////////////////////////////////////////////////////////
+void Simulation::run()
+{
+ UBLOG(logDEBUG1, "OMPSimulation::calculate() - started");
int calcStep = 0;
try {
- int minInitLevel = minLevel;
- int maxInitLevel = maxLevel - minLevel;
+ int minInitLevel = minLevel;
+ int maxInitLevel = maxLevel - minLevel;
int straightStartLevel = minInitLevel;
int internalIterations = 1 << (maxInitLevel - minInitLevel);
int threshold;
@@ -75,16 +263,15 @@ void BasicCalculator::calculate()
#ifdef TIMING
UBLOG(logINFO, "calcStep = " << calcStep);
#endif
- //////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////
- for (int staggeredStep = 1; staggeredStep <= internalIterations; staggeredStep++)
- {
- if (staggeredStep == internalIterations) straightStartLevel = minInitLevel;
- else
- {
- for (straightStartLevel = maxInitLevel, threshold = 1;
- (staggeredStep & threshold) != threshold; straightStartLevel--, threshold <<= 1);
- }
+ for (int staggeredStep = 1; staggeredStep <= internalIterations; staggeredStep++) {
+ if (staggeredStep == internalIterations)
+ straightStartLevel = minInitLevel;
+ else {
+ for (straightStartLevel = maxInitLevel, threshold = 1; (staggeredStep & threshold) != threshold; straightStartLevel--, threshold <<= 1)
+ ;
+ }
#ifdef TIMING
timer.resetAndStart();
#endif
@@ -124,8 +311,7 @@ void BasicCalculator::calculate()
#endif
//////////////////////////////////////////////////////////////////////////
if (refinement) {
- if (straightStartLevel < maxInitLevel)
- exchangeBlockData(straightStartLevel, maxInitLevel);
+ if (straightStartLevel < maxInitLevel) exchangeBlockData(straightStartLevel, maxInitLevel);
//////////////////////////////////////////////////////////////////////////
#ifdef TIMING
time[4] = timer.stop();
@@ -147,10 +333,10 @@ void BasicCalculator::calculate()
if (additionalGhostLayerUpdateScheduler->isDue(calcStep)) {
exchangeBlockData(straightStartLevel, maxInitLevel);
}
- coProcess((real)(calcStep));
+ notifyObservers((real)(calcStep));
// now ghost nodes have actual values
}
- UBLOG(logDEBUG1, "OMPCalculator::calculate() - stoped");
+ UBLOG(logDEBUG1, "OMPSimulation::calculate() - stoped");
} catch (std::exception &e) {
UBLOG(logERROR, e.what());
UBLOG(logERROR, " step = " << calcStep);
@@ -167,7 +353,7 @@ void BasicCalculator::calculate()
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::calculateBlocks(int startLevel, int maxInitLevel, int calcStep)
+void Simulation::calculateBlocks(int startLevel, int maxInitLevel, int calcStep)
{
#ifdef _OPENMP
#pragma omp parallel
@@ -199,7 +385,7 @@ void BasicCalculator::calculateBlocks(int startLevel, int maxInitLevel, int calc
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::exchangeBlockData(int startLevel, int maxInitLevel)
+void Simulation::exchangeBlockData(int startLevel, int maxInitLevel)
{
// startLevel bis maxInitLevel
for (int level = startLevel; level <= maxInitLevel; level++) {
@@ -213,7 +399,7 @@ void BasicCalculator::exchangeBlockData(int startLevel, int maxInitLevel)
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::swapDistributions(int startLevel, int maxInitLevel)
+void Simulation::swapDistributions(int startLevel, int maxInitLevel)
{
#ifdef _OPENMP
#pragma omp parallel
@@ -232,7 +418,7 @@ void BasicCalculator::swapDistributions(int startLevel, int maxInitLevel)
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::connectorsPrepareLocal(std::vector<SPtr<Block3DConnector>> &connectors)
+void Simulation::connectorsPrepareLocal(std::vector<SPtr<Block3DConnector>> &connectors)
{
int size = (int)connectors.size();
#ifdef _OPENMP
@@ -249,7 +435,7 @@ void BasicCalculator::connectorsPrepareLocal(std::vector<SPtr<Block3DConnector>>
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::connectorsSendLocal(std::vector<SPtr<Block3DConnector>> &connectors)
+void Simulation::connectorsSendLocal(std::vector<SPtr<Block3DConnector>> &connectors)
{
int size = (int)connectors.size();
#ifdef _OPENMP
@@ -266,7 +452,7 @@ void BasicCalculator::connectorsSendLocal(std::vector<SPtr<Block3DConnector>> &c
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::connectorsReceiveLocal(std::vector<SPtr<Block3DConnector>> &connectors)
+void Simulation::connectorsReceiveLocal(std::vector<SPtr<Block3DConnector>> &connectors)
{
int size = (int)connectors.size();
#ifdef _OPENMP
@@ -277,7 +463,7 @@ void BasicCalculator::connectorsReceiveLocal(std::vector<SPtr<Block3DConnector>>
connectors[i]->distributeReceiveVectors();
}
}
-void BasicCalculator::connectorsPrepareRemote(std::vector<SPtr<Block3DConnector>> &connectors)
+void Simulation::connectorsPrepareRemote(std::vector<SPtr<Block3DConnector>> &connectors)
{
int size = (int)connectors.size();
for (int i = 0; i < size; i++) {
@@ -286,7 +472,7 @@ void BasicCalculator::connectorsPrepareRemote(std::vector<SPtr<Block3DConnector>
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::connectorsSendRemote(std::vector<SPtr<Block3DConnector>> &connectors)
+void Simulation::connectorsSendRemote(std::vector<SPtr<Block3DConnector>> &connectors)
{
int size = (int)connectors.size();
for (int i = 0; i < size; i++) {
@@ -295,7 +481,7 @@ void BasicCalculator::connectorsSendRemote(std::vector<SPtr<Block3DConnector>> &
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::connectorsReceiveRemote(std::vector<SPtr<Block3DConnector>> &connectors)
+void Simulation::connectorsReceiveRemote(std::vector<SPtr<Block3DConnector>> &connectors)
{
int size = (int)connectors.size();
for (int i = 0; i < size; i++) {
@@ -304,7 +490,7 @@ void BasicCalculator::connectorsReceiveRemote(std::vector<SPtr<Block3DConnector>
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::interpolation(int startLevel, int maxInitLevel)
+void Simulation::interpolation(int startLevel, int maxInitLevel)
{
for (int level = startLevel; level < maxInitLevel; level++) {
connectorsPrepareLocal(localInterConns[level]);
@@ -322,7 +508,7 @@ void BasicCalculator::interpolation(int startLevel, int maxInitLevel)
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::applyPreCollisionBC(int startLevel, int maxInitLevel)
+void Simulation::applyPreCollisionBC(int startLevel, int maxInitLevel)
{
// from startLevel to maxInitLevel
for (int level = startLevel; level <= maxInitLevel; level++) {
@@ -332,7 +518,7 @@ void BasicCalculator::applyPreCollisionBC(int startLevel, int maxInitLevel)
#endif
for (int i = 0; i < size; i++) {
try {
- blocks[level][i]->getKernel()->getBCProcessor()->applyPreCollisionBC();
+ blocks[level][i]->getKernel()->getBCSet()->applyPreCollisionBC();
} catch (std::exception &e) {
UBLOG(logERROR, e.what());
exit(EXIT_FAILURE);
@@ -347,7 +533,7 @@ void BasicCalculator::applyPreCollisionBC(int startLevel, int maxInitLevel)
}
}
//////////////////////////////////////////////////////////////////////////
-void BasicCalculator::applyPostCollisionBC(int startLevel, int maxInitLevel)
+void Simulation::applyPostCollisionBC(int startLevel, int maxInitLevel)
{
// from startLevel to maxInitLevel
for (int level = startLevel; level <= maxInitLevel; level++) {
@@ -357,7 +543,7 @@ void BasicCalculator::applyPostCollisionBC(int startLevel, int maxInitLevel)
#endif
for (int i = 0; i < size; i++) {
try {
- blocks[level][i]->getKernel()->getBCProcessor()->applyPostCollisionBC();
+ blocks[level][i]->getKernel()->getBCSet()->applyPostCollisionBC();
} catch (std::exception &e) {
UBLOG(logERROR, e.what());
exit(EXIT_FAILURE);
@@ -370,4 +556,4 @@ void BasicCalculator::applyPostCollisionBC(int startLevel, int maxInitLevel)
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/Grid/Calculator.h b/src/cpu/VirtualFluidsCore/Simulation/Simulation.h
similarity index 71%
rename from src/cpu/VirtualFluidsCore/Grid/Calculator.h
rename to src/cpu/VirtualFluidsCore/Simulation/Simulation.h
index 759541dd5c1a85cac727c9a714407d1fa10a1cb7..ba66b385a3eb9da2e15af72eaa31c8e896780f30 100644
--- a/src/cpu/VirtualFluidsCore/Grid/Calculator.h
+++ b/src/cpu/VirtualFluidsCore/Simulation/Simulation.h
@@ -26,13 +26,13 @@
// 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 Calculator.h
-//! \ingroup Grid
+//! \file Simulation.h
+//! \ingroup Simulation
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef CALCULATOR_H
-#define CALCULATOR_H
+#ifndef Simulation_H
+#define Simulation_H
#include <PointerDefinitions.h>
#include <vector>
@@ -42,21 +42,21 @@ class Grid3D;
class UbScheduler;
class Block3D;
class Block3DConnector;
-class CoProcessor;
+class SimulationObserver;
-//! \class Calculator
-//! \brief A base class for main calculation loop
+//! \class Simulation
+//! \brief A base class for main simulation loop
-class Calculator
+class Simulation
{
public:
- Calculator(SPtr<Grid3D> grid, SPtr<UbScheduler> additionalGhostLayerUpdateScheduler, int numberOfTimeSteps);
- virtual ~Calculator();
+ Simulation(SPtr<Grid3D> grid, SPtr<UbScheduler> additionalGhostLayerUpdateScheduler, int numberOfTimeSteps);
+ virtual ~Simulation();
//! control of coProcessors
- void addCoProcessor(SPtr<CoProcessor> coProcessor);
- void coProcess(real step);
+ void addSimulationObserver(SPtr<SimulationObserver> coProcessor);
+ void notifyObservers(real step);
- virtual void calculate() = 0;
+ virtual void run();
protected:
virtual void initLocalConnectors();
@@ -66,6 +66,19 @@ protected:
void deleteConnectors();
void deleteConnectors(std::vector<std::vector<SPtr<Block3DConnector>>> &conns);
+ void calculateBlocks(int startLevel, int maxInitLevel, int calcStep);
+ void swapDistributions(int startLevel, int maxInitLevel);
+ void exchangeBlockData(int startLevel, int maxInitLevel);
+ void connectorsPrepareLocal(std::vector<SPtr<Block3DConnector>> &connectors);
+ void connectorsSendLocal(std::vector<SPtr<Block3DConnector>> &connectors);
+ void connectorsReceiveLocal(std::vector<SPtr<Block3DConnector>> &connectors);
+ void connectorsPrepareRemote(std::vector<SPtr<Block3DConnector>> &connectors);
+ void connectorsSendRemote(std::vector<SPtr<Block3DConnector>> &connectors);
+ void connectorsReceiveRemote(std::vector<SPtr<Block3DConnector>> &connectors);
+ void interpolation(int startLevel, int maxInitLevel);
+ void applyPreCollisionBC(int startLevel, int maxInitLevel);
+ void applyPostCollisionBC(int startLevel, int maxInitLevel);
+
int minLevel, maxLevel;
int startTimeStep;
int numberOfTimeSteps;
@@ -86,7 +99,7 @@ protected:
std::vector<std::vector<SPtr<Block3DConnector>>> localInterConns;
std::vector<std::vector<SPtr<Block3DConnector>>> remoteInterConns;
- std::vector<SPtr<CoProcessor>> coProcessors;
+ std::vector<SPtr<SimulationObserver>> simulationObserver;
};
#endif
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/AdjustForcingSimulationObserver.cpp
similarity index 90%
rename from src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/AdjustForcingSimulationObserver.cpp
index f3137e5f63dff257d1311eee8d75550f186b480e..2254b9b02ea383e18c654a7569f0e5b2e973c839 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/AdjustForcingSimulationObserver.cpp
@@ -1,8 +1,8 @@
/*
- * D3Q27AdjustForcingCoProcessor.cpp
+ * D3Q27AdjustForcingSimulationObserver.cpp
* Author: Konstantin Kutscher
*/
-#include "AdjustForcingCoProcessor.h"
+#include "AdjustForcingSimulationObserver.h"
#include <fstream>
@@ -12,11 +12,11 @@
#include "UbScheduler.h"
#include <SetForcingBlockVisitor.h>
-AdjustForcingCoProcessor::AdjustForcingCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+AdjustForcingSimulationObserver::AdjustForcingSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
SPtr<IntegrateValuesHelper> integrateValues, real vTarged,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), integrateValues(integrateValues), comm(comm), vx1Targed(vTarged)
+ : SimulationObserver(grid, s), path(path), integrateValues(integrateValues), comm(comm), vx1Targed(vTarged)
{
// cnodes = integrateValues->getCNodes();
root = comm->isRoot();
@@ -71,13 +71,13 @@ AdjustForcingCoProcessor::AdjustForcingCoProcessor(SPtr<Grid3D> grid, SPtr<UbSch
}
//////////////////////////////////////////////////////////////////////////
-void AdjustForcingCoProcessor::process(real step)
+void AdjustForcingSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
}
//////////////////////////////////////////////////////////////////////////
-void AdjustForcingCoProcessor::collectData(real step)
+void AdjustForcingSimulationObserver::collectData(real step)
{
//////////////////////////////////////////////////////////////////////////////////////////////////
// temporary solution
@@ -140,7 +140,7 @@ void AdjustForcingCoProcessor::collectData(real step)
//}
if (root) {
- // UBLOG(logINFO, "D3Q27AdjustForcingCoProcessor step: " << static_cast<int>(step));
+ // UBLOG(logINFO, "D3Q27AdjustForcingSimulationObserver step: " << static_cast<int>(step));
// UBLOG(logINFO, "new forcing is: " << forcing);
std::string fname = path + "/forcing/forcing.csv";
// std::string fname = path + "/forcing/forcing_"+UbSystem::toString(comm->getProcessID())+".csv";
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/AdjustForcingSimulationObserver.h
similarity index 79%
rename from src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/AdjustForcingSimulationObserver.h
index be8dbc69f957521cff88cfbcc2b7260db05d6cdc..9e570e34dc43fa025c47c3d3c29c0dad4a262b99 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/AdjustForcingCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/AdjustForcingSimulationObserver.h
@@ -1,10 +1,10 @@
-#ifndef D3Q27ADJUSTFORCINGCoProcessor_H
-#define D3Q27ADJUSTFORCINGCoProcessor_H
+#ifndef D3Q27ADJUSTFORCINGSimulationObserver_H
+#define D3Q27ADJUSTFORCINGSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "lbm/constants/D3Q27.h"
namespace vf::mpi {class Communicator;}
@@ -18,13 +18,13 @@ class IntegrateValuesHelper;
//! Integrate values helper, scheduler must be set in test case.
//! \author: Konstantin Kutscher
-class AdjustForcingCoProcessor : public CoProcessor
+class AdjustForcingSimulationObserver : public SimulationObserver
{
public:
- AdjustForcingCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ AdjustForcingSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
SPtr<IntegrateValuesHelper> integrateValues, real vTarged, std::shared_ptr<vf::mpi::Communicator> comm);
//!< calls collect PostprocessData
- void process(real step) override;
+ void update(real step) override;
protected:
//!< object that can compute spacial average values in 3D-subdomain.
@@ -55,4 +55,4 @@ private:
std::string path;
};
-#endif /* D3Q27RHODIFFERENCECoProcessor_H_ */
+#endif /* D3Q27RHODIFFERENCESimulationObserver_H_ */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/AverageValuesSimulationObserver.cpp
similarity index 94%
rename from src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/AverageValuesSimulationObserver.cpp
index 1a5276fcf44098254cee825af503a4752df60cd5..1adf3ad9944a49c8065756988e95ab837e9f6d15 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/AverageValuesSimulationObserver.cpp
@@ -1,6 +1,6 @@
-#include "AverageValuesCoProcessor.h"
+#include "AverageValuesSimulationObserver.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "LBMKernel.h"
#include "basics/writer/WbWriterVtkXmlASCII.h"
@@ -15,12 +15,12 @@
using namespace std;
-AverageValuesCoProcessor::AverageValuesCoProcessor() = default;
+AverageValuesSimulationObserver::AverageValuesSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-AverageValuesCoProcessor::AverageValuesCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
+AverageValuesSimulationObserver::AverageValuesSimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
SPtr<UbScheduler> s, SPtr<UbScheduler> Avs,
SPtr<UbScheduler> rsMeans, SPtr<UbScheduler> rsRMS, bool restart)
- : CoProcessor(grid, s), averageScheduler(Avs), resetSchedulerMeans(rsMeans), resetSchedulerRMS(rsRMS), path(path),
+ : SimulationObserver(grid, s), averageScheduler(Avs), resetSchedulerMeans(rsMeans), resetSchedulerRMS(rsRMS), path(path),
writer(writer)
{
resetStepMeans = (int)rsMeans->getMinBegin();
@@ -54,7 +54,7 @@ AverageValuesCoProcessor::AverageValuesCoProcessor(SPtr<Grid3D> grid, const std:
// restartStep = 0.0;
}
//////////////////////////////////////////////////////////////////////////
-void AverageValuesCoProcessor::process(real step)
+void AverageValuesSimulationObserver::update(real step)
{
// resetRMS(step);
if (resetSchedulerRMS->isDue(step))
@@ -73,10 +73,10 @@ void AverageValuesCoProcessor::process(real step)
collectData(step);
}
- UBLOG(logDEBUG3, "AverageValuesCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "AverageValuesSimulationObserver::update:" << step);
}
-void AverageValuesCoProcessor::resetDataRMS(real step)
+void AverageValuesSimulationObserver::resetDataRMS(real step)
{
resetStepRMS = (int)step;
@@ -84,7 +84,7 @@ void AverageValuesCoProcessor::resetDataRMS(real step)
for (SPtr<Block3D> block : blockVector[level]) {
if (block) {
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageValues();
@@ -120,7 +120,7 @@ void AverageValuesCoProcessor::resetDataRMS(real step)
}
}
//////////////////////////////////////////////////////////////////////////
-void AverageValuesCoProcessor::resetDataMeans(real step)
+void AverageValuesSimulationObserver::resetDataMeans(real step)
{
resetStepMeans = (int)step;
@@ -128,7 +128,7 @@ void AverageValuesCoProcessor::resetDataMeans(real step)
for (SPtr<Block3D> block : blockVector[level]) {
if (block) {
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageValues();
@@ -161,7 +161,7 @@ void AverageValuesCoProcessor::resetDataMeans(real step)
}
}
//////////////////////////////////////////////////////////////////////////
-void AverageValuesCoProcessor::collectData(real step)
+void AverageValuesSimulationObserver::collectData(real step)
{
int istep = int(step);
@@ -195,18 +195,18 @@ void AverageValuesCoProcessor::collectData(real step)
vector<string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin()) {
+ if (step == SimulationObserver::scheduler->getMinBegin()) {
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
} else {
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- UBLOG(logINFO, "AverageValuesCoProcessor step: " << istep);
+ UBLOG(logINFO, "AverageValuesSimulationObserver step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void AverageValuesCoProcessor::clearData()
+void AverageValuesSimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -214,7 +214,7 @@ void AverageValuesCoProcessor::clearData()
data.clear();
}
//////////////////////////////////////////////////////////////////////////
-void AverageValuesCoProcessor::addData(const SPtr<Block3D> block)
+void AverageValuesSimulationObserver::addData(const SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
// UbTupleDouble3 blockLengths = grid->getBlockLengths(block);
@@ -238,7 +238,7 @@ void AverageValuesCoProcessor::addData(const SPtr<Block3D> block)
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageValues();
// int ghostLayerWidth = kernel->getGhostLayerWidth();
@@ -330,7 +330,7 @@ void AverageValuesCoProcessor::addData(const SPtr<Block3D> block)
}
}
//////////////////////////////////////////////////////////////////////////
-void AverageValuesCoProcessor::calculateAverageValues(real timeStep)
+void AverageValuesSimulationObserver::calculateAverageValues(real timeStep)
{
using namespace D3Q27System;
@@ -348,7 +348,7 @@ void AverageValuesCoProcessor::calculateAverageValues(real timeStep)
for (SPtr<Block3D> block : blockVector[level]) {
if (block) {
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageValues();
@@ -446,7 +446,7 @@ void AverageValuesCoProcessor::calculateAverageValues(real timeStep)
}
}
////////////////////////////////////////////////////////////////////////////
-// void AverageValuesCoProcessor::initPlotData(double step)
+// void AverageValuesSimulationObserver::initPlotData(double step)
//{
// std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::Communicator::getInstance();
// if (comm->getProcessID() == comm->getRoot())
@@ -469,7 +469,7 @@ void AverageValuesCoProcessor::calculateAverageValues(real timeStep)
// }
//}
//////////////////////////////////////////////////////////////////////////////
-// void AverageValuesCoProcessor::collectPlotData(double step)
+// void AverageValuesSimulationObserver::collectPlotData(double step)
//{
//
// double hminX1 = 0.9;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/AverageValuesSimulationObserver.h
similarity index 88%
rename from src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/AverageValuesSimulationObserver.h
index b45118adb5b9a18de0eabcc061fa18e11c042bdf..b5ce823ba3cedffd145d0d513c5acf715a631430 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/AverageValuesSimulationObserver.h
@@ -1,11 +1,11 @@
-#ifndef AverageValuesCoProcessor_H
-#define AverageValuesCoProcessor_H
+#ifndef AverageValuesSimulationObserver_H
+#define AverageValuesSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
#include "UbTuple.h"
@@ -22,14 +22,14 @@ class Block3D;
//
//! \author Sonja Uphoff, Kostyantyn Kucher
// \f$ u_{mean}=\frac{1}{N}\sum\limits_{i=1}^n u_{i} \f$
-class AverageValuesCoProcessor : public CoProcessor
+class AverageValuesSimulationObserver : public SimulationObserver
{
public:
- AverageValuesCoProcessor();
- AverageValuesCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer, SPtr<UbScheduler> s,
+ AverageValuesSimulationObserver();
+ AverageValuesSimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer, SPtr<UbScheduler> s,
SPtr<UbScheduler> Avs, SPtr<UbScheduler> rsMeans, SPtr<UbScheduler> rsRMS, bool restart);
//! Make update
- void process(real step) override;
+ void update(real step) override;
//! Resets averaged velocity and RMS-values according to ResetSceduler
void reset(real step);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/CalculateForcesSimulationObserver.cpp
similarity index 87%
rename from src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/CalculateForcesSimulationObserver.cpp
index d50c58d5698a7faa0939fedd613075873d9e5363..8610c5df9e4b56496c3dc3ba1c25fabfd355f294 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/CalculateForcesSimulationObserver.cpp
@@ -1,5 +1,5 @@
-#include "CalculateForcesCoProcessor.h"
-#include "BCProcessor.h"
+#include "CalculateForcesSimulationObserver.h"
+#include "BCSet.h"
#include "BCArray3D.h"
#include "Block3D.h"
@@ -13,9 +13,9 @@
#include "LBMKernel.h"
#include "UbScheduler.h"
-CalculateForcesCoProcessor::CalculateForcesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+CalculateForcesSimulationObserver::CalculateForcesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
std::shared_ptr<vf::mpi::Communicator> comm, real v, real a)
- : CoProcessor(grid, s), path(path), comm(comm), v(v), a(a), forceX1global(0), forceX2global(0), forceX3global(0)
+ : SimulationObserver(grid, s), path(path), comm(comm), v(v), a(a), forceX1global(0), forceX2global(0), forceX3global(0)
{
if (comm->getProcessID() == comm->getRoot()) {
std::ofstream ostr;
@@ -55,17 +55,17 @@ CalculateForcesCoProcessor::CalculateForcesCoProcessor(SPtr<Grid3D> grid, SPtr<U
}
}
//////////////////////////////////////////////////////////////////////////
-CalculateForcesCoProcessor::~CalculateForcesCoProcessor() = default;
+CalculateForcesSimulationObserver::~CalculateForcesSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void CalculateForcesCoProcessor::process(real step)
+void CalculateForcesSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "D3Q27ForcesCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "D3Q27ForcesSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void CalculateForcesCoProcessor::collectData(real step)
+void CalculateForcesSimulationObserver::collectData(real step)
{
calculateForces();
@@ -101,7 +101,7 @@ void CalculateForcesCoProcessor::collectData(real step)
}
}
//////////////////////////////////////////////////////////////////////////
-void CalculateForcesCoProcessor::calculateForces()
+void CalculateForcesSimulationObserver::calculateForces()
{
forceX1global = 0.0;
forceX2global = 0.0;
@@ -117,7 +117,7 @@ void CalculateForcesCoProcessor::calculateForces()
std::set<std::vector<int>> &transNodeIndicesSet = t.second;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
distributions->swap();
@@ -184,7 +184,7 @@ void CalculateForcesCoProcessor::calculateForces()
}
}
//////////////////////////////////////////////////////////////////////////
-UbTupleDouble3 CalculateForcesCoProcessor::getForces(int x1, int x2, int x3, SPtr<DistributionArray3D> distributions,
+UbTupleDouble3 CalculateForcesSimulationObserver::getForces(int x1, int x2, int x3, SPtr<DistributionArray3D> distributions,
SPtr<BoundaryConditions> bc)
{
UbTupleDouble3 force(0.0, 0.0, 0.0);
@@ -215,7 +215,7 @@ UbTupleDouble3 CalculateForcesCoProcessor::getForces(int x1, int x2, int x3, SPt
return force;
}
//////////////////////////////////////////////////////////////////////////
-void CalculateForcesCoProcessor::calculateCoefficients()
+void CalculateForcesSimulationObserver::calculateCoefficients()
{
real F1 = forceX1global;
real F2 = forceX2global;
@@ -227,9 +227,9 @@ void CalculateForcesCoProcessor::calculateCoefficients()
C3 = 2.0 * F3 / (v * v * a);
}
//////////////////////////////////////////////////////////////////////////
-void CalculateForcesCoProcessor::addInteractor(SPtr<D3Q27Interactor> interactor) { interactors.push_back(interactor); }
+void CalculateForcesSimulationObserver::addInteractor(SPtr<D3Q27Interactor> interactor) { interactors.push_back(interactor); }
//////////////////////////////////////////////////////////////////////////
-void CalculateForcesCoProcessor::write(std::ofstream *fileObject, real value, char *separator)
+void CalculateForcesSimulationObserver::write(std::ofstream *fileObject, real value, char *separator)
{
(*fileObject).width(12);
//(*fileObject).precision(2);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/CalculateForcesSimulationObserver.h
similarity index 71%
rename from src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/CalculateForcesSimulationObserver.h
index d282ae8ed10ae177ae78e4f559018d7ff0959be7..02b76e77bc6bfb3ee375e79465f2d548226189cb 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CalculateForcesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/CalculateForcesSimulationObserver.h
@@ -1,18 +1,18 @@
/*
- * D3Q27ForcesCoProcessor.h
+ * D3Q27ForcesSimulationObserver.h
*
* Created on: 29.09.2012
* Author: K. Kucher
*/
-#ifndef D3Q27ForcesCoProcessor_H
-#define D3Q27ForcesCoProcessor_H
+#ifndef D3Q27ForcesSimulationObserver_H
+#define D3Q27ForcesSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "UbTuple.h"
#include "lbm/constants/D3Q27.h"
@@ -24,16 +24,16 @@ class D3Q27Interactor;
class DistributionArray3D;
class BoundaryConditions;
-class CalculateForcesCoProcessor : public CoProcessor
+class CalculateForcesSimulationObserver : public SimulationObserver
{
public:
//! Constructor
//! \param v - velocity of fluid in LB units
//! \param a - area of object in LB units
- CalculateForcesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm,
+ CalculateForcesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm,
real v, real a);
- ~CalculateForcesCoProcessor() override;
- void process(real step) override;
+ ~CalculateForcesSimulationObserver() override;
+ void update(real step) override;
void addInteractor(SPtr<D3Q27Interactor> interactor);
protected:
@@ -58,4 +58,4 @@ private:
real C3;
};
-#endif /* D3Q27ForcesCoProcessor_H */
+#endif /* D3Q27ForcesSimulationObserver_H */
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/CalculateTorqueSimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/CalculateTorqueSimulationObserver.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..768fbbb26241edfe5771bf056b6b83be21b02312
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/CalculateTorqueSimulationObserver.cpp
@@ -0,0 +1,294 @@
+#include "NonNewtonianFluids/SimulationObservers/CalculateTorqueSimulationObserver.h"
+#include "BCSet.h"
+
+#include <mpi/Communicator.h>
+#include "D3Q27Interactor.h"
+#include "UbScheduler.h"
+#include "Grid3D.h"
+#include "BoundaryConditions.h"
+#include "DataSet3D.h"
+#include "Block3D.h"
+#include "LBMKernel.h"
+#include "BCArray3D.h"
+#include "EsoTwist3D.h"
+#include "DistributionArray3D.h"
+#include "NonNewtonianFluids/LBM/Rheology.h"
+
+CalculateTorqueSimulationObserver::CalculateTorqueSimulationObserver( SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path_, std::shared_ptr<vf::mpi::Communicator> comm) : SimulationObserver(grid, s), path(path_), comm(comm), torqueX1global(0), torqueX2global(0), torqueX3global(0)
+{
+ if (comm->getProcessID() == comm->getRoot())
+ {
+ std::ofstream ostr;
+ std::string fname = path_;
+ ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app);
+ if(!ostr)
+ {
+ ostr.clear();
+ const std::string path = UbSystem::getPathFromString(fname);
+ if(path.size()>0){ UbSystem::makeDirectory(path); ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app);}
+ if(!ostr) throw UbException(UB_EXARGS,"couldn't open file "+fname);
+ }
+
+ ostr << "step;";
+ ostr << "Tx;";
+ ostr << "Ty;";
+ ostr << "Tz" << std::endl;
+ ostr.close();
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+CalculateTorqueSimulationObserver::~CalculateTorqueSimulationObserver()
+{
+
+}
+//////////////////////////////////////////////////////////////////////////
+void CalculateTorqueSimulationObserver::update( real step )
+{
+ if(scheduler->isDue(step) )
+ collectData(step);
+
+ UBLOG(logDEBUG3, "D3Q27ForcesSimulationObserver::update:" << step);
+}
+//////////////////////////////////////////////////////////////////////////
+void CalculateTorqueSimulationObserver::collectData( real step )
+{
+ calculateForces();
+
+ if (comm->getProcessID() == comm->getRoot())
+ {
+ int istep = static_cast<int>(step);
+ std::ofstream ostr;
+ std::string fname = path;
+ ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app);
+ if(!ostr)
+ {
+ ostr.clear();
+ std::string path = UbSystem::getPathFromString(fname);
+ if(path.size()>0){ UbSystem::makeDirectory(path); ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app);}
+ if(!ostr) throw UbException(UB_EXARGS,"couldn't open file "+fname);
+ }
+
+ ostr << istep << ";";
+ ostr << torqueX1global << ";";
+ ostr << torqueX2global << ";";
+ ostr << torqueX3global << ";";
+ ostr << Fx << ";";
+ ostr << Fy << ";";
+ ostr << Fz;
+ ostr << std::endl;
+ ostr.close();
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+void CalculateTorqueSimulationObserver::calculateForces()
+{
+ torqueX1global = 0.0;
+ torqueX2global = 0.0;
+ torqueX3global = 0.0;
+
+ for(SPtr<D3Q27Interactor> interactor : interactors)
+ {
+ real x1Centre = interactor->getGbObject3D()->getX1Centroid();
+ real x2Centre = interactor->getGbObject3D()->getX2Centroid();
+ real x3Centre = interactor->getGbObject3D()->getX3Centroid();
+
+ for(BcNodeIndicesMap::value_type t : interactor->getBcNodeIndicesMap())
+ {
+ real torqueX1 = 0.0;
+ real torqueX2 = 0.0;
+ real torqueX3 = 0.0;
+
+ SPtr<Block3D> block = t.first;
+ std::set< std::vector<int> >& transNodeIndicesSet = t.second;
+
+ real deltaX = grid->getDeltaX(block);
+
+ SPtr<ILBMKernel> kernel = block->getKernel();
+
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
+ SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
+
+ int ghostLayerWidth = kernel->getGhostLayerWidth();
+ int minX1 = ghostLayerWidth;
+ int maxX1 = (int)bcArray->getNX1() - 1 - ghostLayerWidth;
+ int minX2 = ghostLayerWidth;
+ int maxX2 = (int)bcArray->getNX2() - 1 - ghostLayerWidth;
+ int minX3 = ghostLayerWidth;
+ int maxX3 = (int)bcArray->getNX3() - 1 - ghostLayerWidth;
+
+ for(std::vector<int> node : transNodeIndicesSet)
+ {
+ int x1 = node[0];
+ int x2 = node[1];
+ int x3 = node[2];
+
+ //without ghost nodes
+ if (x1 < minX1 || x1 > maxX1 || x2 < minX2 || x2 > maxX2 ||x3 < minX3 || x3 > maxX3 ) continue;
+
+ if(bcArray->isFluid(x1,x2,x3)) //es kann sein, dass der node von einem anderen interactor z.B. als solid gemarkt wurde!!!
+ {
+ SPtr<BoundaryConditions> bc = bcArray->getBC(x1,x2,x3);
+
+ Vector3D worldCoordinates = grid->getNodeCoordinates(block, x1, x2, x3);
+ real rx = (worldCoordinates[0] - x1Centre) / deltaX;
+ real ry = (worldCoordinates[1] - x2Centre) / deltaX;
+ real rz = (worldCoordinates[2] - x3Centre) / deltaX;
+
+ // real nx = rx / sqrt(rx * rx + ry * ry + rz * rz);
+ // real ny = ry / sqrt(rx * rx + ry * ry + rz * rz);
+ // real nz = rz / sqrt(rx * rx + ry * ry + rz * rz);
+
+ UbTupleDouble3 forceVec = getForces(x1, x2, x3, distributions, bc);
+ //UbTupleDouble3 forceVec = getForcesFromMoments(x1, x2, x3, kernel, distributions, bc, nx, ny, nz);
+ //UbTupleDouble3 forceVec = getForcesFromStressTensor(x1, x2, x3, kernel, distributions, bc, nx, ny, nz);
+ /*real*/ Fx = val<1>(forceVec);
+ /*real*/ Fy = val<2>(forceVec);
+ /*real*/ Fz = val<3>(forceVec);
+
+
+
+ torqueX1 += ry * Fz - rz * Fy;
+ torqueX2 += rz * Fx - rx * Fz;
+ torqueX3 += rx * Fy - ry * Fx;
+ }
+ }
+
+ torqueX1global += torqueX1;
+ torqueX2global += torqueX2;
+ torqueX3global += torqueX3;
+ }
+ }
+ std::vector<real> values;
+ std::vector<real> rvalues;
+ values.push_back(torqueX1global);
+ values.push_back(torqueX2global);
+ values.push_back(torqueX3global);
+
+ rvalues = comm->gather(values);
+ if (comm->getProcessID() == comm->getRoot())
+ {
+ torqueX1global = 0.0;
+ torqueX2global = 0.0;
+ torqueX3global = 0.0;
+
+ for (int i = 0; i < (int)rvalues.size(); i+=3)
+ {
+ torqueX1global += rvalues[i];
+ torqueX2global += rvalues[i+1];
+ torqueX3global += rvalues[i+2];
+ }
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+UbTupleDouble3 CalculateTorqueSimulationObserver::getForces(int x1, int x2, int x3, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc)
+{
+ UbTupleDouble3 force(0.0,0.0,0.0);
+
+ if(bc)
+ {
+ //references to tuple "force"
+ real& forceX1 = val<1>(force);
+ real& forceX2 = val<2>(force);
+ real& forceX3 = val<3>(force);
+ real f, fnbr;
+
+ dynamicPointerCast<EsoTwist3D>(distributions)->swap();
+
+ for(int fdir=D3Q27System::FSTARTDIR; fdir<=D3Q27System::FENDDIR; fdir++)
+ {
+ if(bc->hasNoSlipBoundaryFlag(fdir) || bc->hasVelocityBoundaryFlag(fdir))
+ {
+ const int invDir = D3Q27System::INVDIR[fdir];
+ f = dynamicPointerCast<EsoTwist3D>(distributions)->getDistributionInvForDirection(x1, x2, x3, invDir);
+ fnbr = dynamicPointerCast<EsoTwist3D>(distributions)->getDistributionInvForDirection(x1+D3Q27System::DX1[invDir], x2+D3Q27System::DX2[invDir], x3+D3Q27System::DX3[invDir], fdir);
+
+ forceX1 += (f + fnbr) * D3Q27System::DX1[invDir];
+ forceX2 += (f + fnbr) * D3Q27System::DX2[invDir];
+ forceX3 += (f + fnbr) * D3Q27System::DX3[invDir];
+ }
+ }
+
+ dynamicPointerCast<EsoTwist3D>(distributions)->swap();
+ }
+
+ return force;
+}
+//////////////////////////////////////////////////////////////////////////
+UbTupleDouble3 CalculateTorqueSimulationObserver::getForcesFromMoments(int x1, int x2, int x3, SPtr<ILBMKernel> kernel, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc, real nx, real ny, real nz)
+{
+ using namespace vf::basics::constant;
+ UbTupleDouble3 force(0.0, 0.0, 0.0);
+
+
+ if (bc) {
+ real f[D3Q27System::ENDF + 1];
+ distributions->getDistribution(f, x1, x2, x3);
+ real collFactor = kernel->getCollisionFactor();
+ real shearRate = D3Q27System::getShearRate(f, collFactor);
+ real rho = D3Q27System::getDensity(f);
+ real omega = Rheology::getBinghamCollFactor(collFactor, shearRate, rho);
+ std::array<real, 6> moments = D3Q27System::getSecondMoments(f, omega);
+
+ // references to tuple "force"
+ real &forceX1 = val<1>(force);
+ real &forceX2 = val<2>(force);
+ real &forceX3 = val<3>(force);
+
+ real mxx = (moments[0] + moments[1] + moments[2])*c1o3;
+ real myy = (-c2o1 * moments[1] + moments[2] + moments[0]) * c1o3;
+ real mzz = (-c2o1 * moments[2] + moments[1] + moments[0]) * c1o3;
+ real mxy = moments[3];
+ real mxz = moments[4];
+ real myz = moments[5];
+
+ forceX1 = mxx *nx + mxy*ny + mxz*nz;
+ forceX2 = mxy *nx + myy*ny + myz*nz;
+ forceX3 = mxz *nx + myz*ny + mzz*nz;
+ }
+
+ return force;
+}
+//////////////////////////////////////////////////////////////////////////
+UbTupleDouble3 CalculateTorqueSimulationObserver::getForcesFromStressTensor(int x1, int x2, int x3, SPtr<ILBMKernel> kernel, SPtr<DistributionArray3D> distributions, SPtr<BoundaryConditions> bc, real nx, real ny, real nz)
+{
+ using namespace vf::basics::constant;
+ UbTupleDouble3 force(0.0, 0.0, 0.0);
+
+ if (bc) {
+ real f[D3Q27System::ENDF + 1];
+ distributions->getDistribution(f, x1, x2, x3);
+ real collFactor = kernel->getCollisionFactor();
+ real shearRate = D3Q27System::getShearRate(f, collFactor);
+ real rho = D3Q27System::getDensity(f);
+ real omega = Rheology::getBinghamCollFactor(collFactor, shearRate, rho);
+ std::array<real, 6> stress = D3Q27System::getStressTensor(f, omega);
+
+ // references to tuple "force"
+ real &forceX1 = val<1>(force);
+ real &forceX2 = val<2>(force);
+ real &forceX3 = val<3>(force);
+
+ real &tauXX = stress[0];
+ real &tauYY = stress[1];
+ real &tauZZ = stress[2];
+ real &tauXY = stress[3];
+ real &tauXZ = stress[4];
+ real &tauYZ = stress[5];
+
+ //https: // journals.aps.org/pre/pdf/10.1103/PhysRevE.88.013303
+
+ forceX1 = tauXX * nx + tauXY * ny + tauXZ * nz;
+ forceX2 = tauXY * nx + tauYY * ny + tauYZ * nz;
+ forceX3 = tauXZ * nx + tauYZ * ny + tauZZ * nz;
+ }
+
+ return force;
+}
+//////////////////////////////////////////////////////////////////////////
+void CalculateTorqueSimulationObserver::addInteractor( SPtr<D3Q27Interactor> interactor )
+{
+ interactors.push_back(interactor);
+}
+
+
+
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/DecreaseViscositySimulationObserver.cpp
similarity index 76%
rename from src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/DecreaseViscositySimulationObserver.cpp
index 0221bf38a599352728dbd42f37b78bc5fa6ff1ee..0754491767b55e2a6059c8eef160a94a1f087540 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/DecreaseViscositySimulationObserver.cpp
@@ -1,11 +1,11 @@
/*
- * DecreaseViscosityCoProcessor
+ * DecreaseViscositySimulationObserver
*
* Created on: 10.05.2013
* Author: uphoff
*/
-#include "DecreaseViscosityCoProcessor.h"
+#include "DecreaseViscositySimulationObserver.h"
#include <vector>
@@ -15,27 +15,27 @@
#include "LBMKernel.h"
#include "UbScheduler.h"
-DecreaseViscosityCoProcessor::DecreaseViscosityCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, mu::Parser *nueFunc,
+DecreaseViscositySimulationObserver::DecreaseViscositySimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, mu::Parser *nueFunc,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), nueFunc(nueFunc), comm(comm)
+ : SimulationObserver(grid, s), nueFunc(nueFunc), comm(comm)
{
if (comm->getProcessID() == comm->getRoot()) {
}
}
//////////////////////////////////////////////////////////////////////////
-DecreaseViscosityCoProcessor::~DecreaseViscosityCoProcessor() = default;
+DecreaseViscositySimulationObserver::~DecreaseViscositySimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void DecreaseViscosityCoProcessor::process(real step)
+void DecreaseViscositySimulationObserver::update(real step)
{
if (scheduler->isDue(step))
setViscosity(step);
}
//////////////////////////////////////////////////////////////////////////
-void DecreaseViscosityCoProcessor::setViscosity(real step)
+void DecreaseViscositySimulationObserver::setViscosity(real step)
{
- UBLOG(logDEBUG3, "DecreaseViscosityCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "DecreaseViscositySimulationObserver::update:" << step);
int gridRank = grid->getRank();
int minInitLevel = this->grid->getCoarsestInitializedLevel();
int maxInitLevel = this->grid->getFinestInitializedLevel();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/DecreaseViscositySimulationObserver.h
similarity index 61%
rename from src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/DecreaseViscositySimulationObserver.h
index aaa8a3c0b8db4d9adb9b28c19ef993444e7106c0..2e2c655d223619169e0f3edd3bfa554e924639e0 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/DecreaseViscosityCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/DecreaseViscositySimulationObserver.h
@@ -1,9 +1,9 @@
-#ifndef DecreaseViscosityCoProcessor_H
-#define DecreaseViscosityCoProcessor_H
+#ifndef DecreaseViscositySimulationObserver_H
+#define DecreaseViscositySimulationObserver_H
#include <PointerDefinitions.h>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "IntegrateValuesHelper.h"
#include "LBMUnitConverter.h"
@@ -20,18 +20,18 @@ namespace vf::mpi {class Communicator;}
//! decrViscFunc.SetExpr("nue0+c0/(t+1)/(t+1)"); //this function is time-dependent, the viscosity decreases a 1/t^2
//! decrViscFunc.DefineConst("nue0", nueLB);
//! decrViscFunc.DefineConst("c0", 0.1); //constants such as c0 controll how fast the viscosity decreasis
-//! SPtr<UbScheduler> DecrViscSch(new UbScheduler()); //the CoProcessor is called according to a Scheduler
+//! SPtr<UbScheduler> DecrViscSch(new UbScheduler()); //the SimulationObserver is called according to a Scheduler
//! DecrViscSch->addSchedule(10,10,1000); //in this case the viscosity is reset every 10 timesteps for the
-//! first 1000 timesteps DecreaseViscosityCoProcessor decrViscPPPtr(grid, DecrViscSch,&decrViscFunc, comm); \endcode
+//! first 1000 timesteps DecreaseViscositySimulationObserver decrViscPPPtr(grid, DecrViscSch,&decrViscFunc, comm); \endcode
//! \author Sonja Uphoff
-class DecreaseViscosityCoProcessor : public CoProcessor
+class DecreaseViscositySimulationObserver : public SimulationObserver
{
public:
- DecreaseViscosityCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, mu::Parser *nueFunc, std::shared_ptr<vf::mpi::Communicator> comm);
- ~DecreaseViscosityCoProcessor() override;
+ DecreaseViscositySimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, mu::Parser *nueFunc, std::shared_ptr<vf::mpi::Communicator> comm);
+ ~DecreaseViscositySimulationObserver() override;
//! calls collect PostprocessData.
- void process(real step) override;
+ void update(real step) override;
protected:
//! resets the collision factor depending on the current timestep.
@@ -43,4 +43,4 @@ private:
mu::Parser *nueFunc;
};
-#endif /* DecreaseViscosityCoProcessor_H_ */
+#endif /* DecreaseViscositySimulationObserver_H_ */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/EmergencyExitSimulationObserver.cpp
similarity index 59%
rename from src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/EmergencyExitSimulationObserver.cpp
index fc181e266e0453a12a149a4c69083497617c61ea..a6826a713b45f74239c603d9a23b946169ac60d5 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/EmergencyExitSimulationObserver.cpp
@@ -1,15 +1,15 @@
-#include "EmergencyExitCoProcessor.h"
+#include "EmergencyExitSimulationObserver.h"
#include <mpi/Communicator.h>
#include "Grid3D.h"
-#include "MPIIORestartCoProcessor.h"
+#include "MPIIORestartSimulationObserver.h"
#include "UbLogger.h"
#include "UbScheduler.h"
#include <basics/utilities/UbFileInputASCII.h>
#include <basics/utilities/UbFileOutputASCII.h>
-EmergencyExitCoProcessor::EmergencyExitCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
- SPtr<MPIIORestartCoProcessor> rp, std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), rp(rp), comm(comm)
+EmergencyExitSimulationObserver::EmergencyExitSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ SPtr<MPIIORestartSimulationObserver> rp, std::shared_ptr<vf::mpi::Communicator> comm)
+ : SimulationObserver(grid, s), path(path), rp(rp), comm(comm)
{
this->path = path + "/exit";
metafile = this->path + "/stop.txt";
@@ -20,40 +20,40 @@ EmergencyExitCoProcessor::EmergencyExitCoProcessor(SPtr<Grid3D> grid, SPtr<UbSch
comm->barrier();
}
//////////////////////////////////////////////////////////////////////////
-EmergencyExitCoProcessor::~EmergencyExitCoProcessor() = default;
+EmergencyExitSimulationObserver::~EmergencyExitSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void EmergencyExitCoProcessor::process(real step)
+void EmergencyExitSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "EmergencyExitCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "EmergencyExitSimulationObserver::update:" << step);
}
-void EmergencyExitCoProcessor::collectData(real step)
+void EmergencyExitSimulationObserver::collectData(real step)
{
if (readMetafile()) {
- rp->process((int)step);
+ rp->update((int)step);
if (comm->getProcessID() == comm->getRoot())
- UBLOG(logINFO, "EmergencyExitCoProcessor save step: " << step);
+ UBLOG(logINFO, "EmergencyExitSimulationObserver save step: " << step);
comm->barrier();
exit(EXIT_SUCCESS);
}
}
//////////////////////////////////////////////////////////////////////////
-void EmergencyExitCoProcessor::writeMetafile(int /*status*/)
+void EmergencyExitSimulationObserver::writeMetafile(int /*status*/)
{
UbFileOutputASCII out(metafile);
out.writeBool(false);
}
//////////////////////////////////////////////////////////////////////////
-bool EmergencyExitCoProcessor::readMetafile()
+bool EmergencyExitSimulationObserver::readMetafile()
{
UbFileInputASCII in(metafile);
return in.readBool();
}
//////////////////////////////////////////////////////////////////////////
-void EmergencyExitCoProcessor::checkMetafile()
+void EmergencyExitSimulationObserver::checkMetafile()
{
std::ifstream file(metafile.c_str());
if (!file.is_open()) {
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/EmergencyExitSimulationObserver.h b/src/cpu/VirtualFluidsCore/SimulationObservers/EmergencyExitSimulationObserver.h
new file mode 100644
index 0000000000000000000000000000000000000000..f4a8e79f6f8b89f1b4e37714f0c42d2be4be1810
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/EmergencyExitSimulationObserver.h
@@ -0,0 +1,43 @@
+/*
+ * EmergencyExitSimulationObserver.h
+ *
+ * Created on: 05.10.2012
+ * Author: K. Kucher
+ */
+
+#ifndef EmergencyExitSimulationObserver_H
+#define EmergencyExitSimulationObserver_H
+
+#include <PointerDefinitions.h>
+#include <string>
+
+#include "SimulationObserver.h"
+
+class MPIIORestartSimulationObserver;
+namespace vf::mpi {class Communicator;}
+class Grid3D;
+class UbScheduler;
+
+class EmergencyExitSimulationObserver : public SimulationObserver
+{
+public:
+ EmergencyExitSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ SPtr<MPIIORestartSimulationObserver> rp, std::shared_ptr<vf::mpi::Communicator> comm);
+ ~EmergencyExitSimulationObserver() override;
+
+ void update(real step) override;
+
+protected:
+ void collectData(real step);
+ void writeMetafile(int status);
+ bool readMetafile();
+ void checkMetafile();
+
+private:
+ std::string path;
+ std::shared_ptr<vf::mpi::Communicator> comm;
+ SPtr<MPIIORestartSimulationObserver> rp;
+ std::string metafile;
+};
+
+#endif /* EmergencyExitSimulationObserver_H */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/ForceCalculator.cpp
similarity index 98%
rename from src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/ForceCalculator.cpp
index 918e3afbe8d454ac97707b8c79f927bca324cb52..9a39ce11ed15e939e9fc32eaeb15d541675387aa 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/ForceCalculator.cpp
@@ -1,5 +1,5 @@
#include "ForceCalculator.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "BCArray3D.h"
#include "Block3D.h"
@@ -66,7 +66,7 @@ void ForceCalculator::calculateForces(std::vector<SPtr<D3Q27Interactor>> interac
SPtr<Block3D> block = t.first;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
distributions->swap();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.h b/src/cpu/VirtualFluidsCore/SimulationObservers/ForceCalculator.h
similarity index 100%
rename from src/cpu/VirtualFluidsCore/CoProcessors/ForceCalculator.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/ForceCalculator.h
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/InSituCatalystSimulationObserver.cpp
similarity index 93%
rename from src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/InSituCatalystSimulationObserver.cpp
index 741f1f340c4c02e9f5b08854e7205ab2aa5e507b..4e8fd6d5f39fbeb581ace18bf544fa5346719850 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/InSituCatalystSimulationObserver.cpp
@@ -1,7 +1,7 @@
#ifdef VF_CATALYST
-#include "InSituCatalystCoProcessor.h"
-#include <D3Q27ETBCProcessor.h>
+#include "InSituCatalystSimulationObserver.h"
+#include <D3Q27ETBCSet.h>
#include <LBMKernel.h>
#include <string>
#include <vector>
@@ -15,10 +15,10 @@
using namespace std;
-InSituCatalystCoProcessor::InSituCatalystCoProcessor() {}
+InSituCatalystSimulationObserver::InSituCatalystSimulationObserver() {}
//////////////////////////////////////////////////////////////////////////
-InSituCatalystCoProcessor::InSituCatalystCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::string script)
- : CoProcessor(grid, s)
+InSituCatalystSimulationObserver::InSituCatalystSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::string script)
+ : SimulationObserver(grid, s)
{
gridRank = vf::mpi::Communicator::getInstance()->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -40,17 +40,17 @@ InSituCatalystCoProcessor::InSituCatalystCoProcessor(SPtr<Grid3D> grid, SPtr<UbS
buildVTKGrid();
}
//////////////////////////////////////////////////////////////////////////
-InSituCatalystCoProcessor::~InSituCatalystCoProcessor() {}
+InSituCatalystSimulationObserver::~InSituCatalystSimulationObserver() {}
//////////////////////////////////////////////////////////////////////////
-void InSituCatalystCoProcessor::process(real step)
+void InSituCatalystSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "InSituCatalystCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "InSituCatalystSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void InSituCatalystCoProcessor::collectData(real step)
+void InSituCatalystSimulationObserver::collectData(real step)
{
unsigned int istep = static_cast<int>(step);
@@ -86,10 +86,10 @@ void InSituCatalystCoProcessor::collectData(real step)
Processor->CoProcess(dataDescription.GetPointer());
}
- UBLOG(logINFO, "InSituCatalystCoProcessor step: " << istep);
+ UBLOG(logINFO, "InSituCatalystSimulationObserver step: " << istep);
}
//////////////////////////////////////////////////////////////////////////
-void InSituCatalystCoProcessor::addData(SPtr<Block3D> block)
+void InSituCatalystSimulationObserver::addData(SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
UbTupleDouble3 blockLengths = grid->getBlockLengths(block);
@@ -97,7 +97,7 @@ void InSituCatalystCoProcessor::addData(SPtr<Block3D> block)
real dx = grid->getDeltaX(block);
SPtr<LBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
real f[D3Q27System::ENDF + 1];
real vx1, vx2, vx3, rho;
@@ -166,7 +166,7 @@ void InSituCatalystCoProcessor::addData(SPtr<Block3D> block)
}
}
//////////////////////////////////////////////////////////////////////////
-void InSituCatalystCoProcessor::buildVTKGrid()
+void InSituCatalystSimulationObserver::buildVTKGrid()
{
unstructuredGrid = vtkSmartPointer<vtkUnstructuredGrid>::New();
points = vtkPoints::New();
@@ -206,7 +206,7 @@ void InSituCatalystCoProcessor::buildVTKGrid()
vx3Array.resize(numOfPoints);
}
//////////////////////////////////////////////////////////////////////////
-void InSituCatalystCoProcessor::addVTKGridData(SPtr<Block3D> block)
+void InSituCatalystSimulationObserver::addVTKGridData(SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
UbTupleDouble3 blockLengths = grid->getBlockLengths(block);
@@ -214,7 +214,7 @@ void InSituCatalystCoProcessor::addVTKGridData(SPtr<Block3D> block)
real dx = grid->getDeltaX(block);
SPtr<LBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
real f[D3Q27System::ENDF + 1];
real vx1, vx2, vx3, rho;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/InSituCatalystSimulationObserver.h
similarity index 73%
rename from src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/InSituCatalystSimulationObserver.h
index e1c9fb95c7ff420362c3dcbe4b7444902beb6ba1..f81fe767a448a75f04d8cf965b33a14cdf36b2b4 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/InSituCatalystCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/InSituCatalystSimulationObserver.h
@@ -1,9 +1,9 @@
#ifdef VF_CATALYST
-#ifndef InSituCatalystCoProcessor_h__
-#define InSituCatalystCoProcessor_h__
+#ifndef InSituCatalystSimulationObserver_h__
+#define InSituCatalystSimulationObserver_h__
-#include <CoProcessor.h>
+#include <SimulationObserver.h>
#include <Grid3D.h>
#include <LBMUnitConverter.h>
#include "lbm/constants/D3Q27.h"
@@ -19,13 +19,13 @@
#include <vtkSmartPointer.h>
#include <vtkUnstructuredGrid.h>
-class InSituCatalystCoProcessor : public CoProcessor
+class InSituCatalystSimulationObserver : public SimulationObserver
{
public:
- InSituCatalystCoProcessor();
- InSituCatalystCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::string script);
- virtual ~InSituCatalystCoProcessor();
- void process(real step);
+ InSituCatalystSimulationObserver();
+ InSituCatalystSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, std::string script);
+ virtual ~InSituCatalystSimulationObserver();
+ void update(real step);
protected:
void collectData(real step);
@@ -52,6 +52,6 @@ private:
real & /*vx2*/, real & /*vx3*/);
CalcMacrosFct calcMacros;
};
-#endif // InSituCatalystCoProcessor_h__
+#endif // InSituCatalystSimulationObserver_h__
#endif
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/InSituVTKSimulationObserver.cpp
similarity index 92%
rename from src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/InSituVTKSimulationObserver.cpp
index 6b8026cedd8331c02b52a06c86c0e5d7821d0aa2..74c1b653bd4f8b5f2def3492f83fa38677170feb 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/InSituVTKSimulationObserver.cpp
@@ -1,8 +1,8 @@
#ifdef VF_VTK
-#include "InSituVTKCoProcessor.h"
+#include "InSituVTKSimulationObserver.h"
#include <BCArray3D.h>
-#include <BCProcessor.h>
+#include <BCSet.h>
#include <Block3D.h>
#include <BoundaryConditions.h>
#include <Communicator.h>
@@ -24,11 +24,11 @@
using namespace std;
-InSituVTKCoProcessor::InSituVTKCoProcessor() {}
+InSituVTKSimulationObserver::InSituVTKSimulationObserver() {}
//////////////////////////////////////////////////////////////////////////
-InSituVTKCoProcessor::InSituVTKCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &configFile,
+InSituVTKSimulationObserver::InSituVTKSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &configFile,
SPtr<LBMUnitConverter> conv)
- : CoProcessor(grid, s), conv(conv)
+ : SimulationObserver(grid, s), conv(conv)
{
gridRank = vf::mpi::Communicator::getInstance()->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -55,17 +55,17 @@ InSituVTKCoProcessor::InSituVTKCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler>
}
}
//////////////////////////////////////////////////////////////////////////
-InSituVTKCoProcessor::~InSituVTKCoProcessor() { comm->CloseConnection(); }
+InSituVTKSimulationObserver::~InSituVTKSimulationObserver() { comm->CloseConnection(); }
//////////////////////////////////////////////////////////////////////////
-void InSituVTKCoProcessor::process(real step)
+void InSituVTKSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "InSituVTKCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "InSituVTKSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void InSituVTKCoProcessor::collectData(real step)
+void InSituVTKSimulationObserver::collectData(real step)
{
int istep = static_cast<int>(step);
@@ -119,10 +119,10 @@ void InSituVTKCoProcessor::collectData(real step)
// writer->SetDataModeToAscii();
// writer->Update();
- UBLOG(logINFO, "InSituVTKCoProcessor step: " << istep);
+ UBLOG(logINFO, "InSituVTKSimulationObserver step: " << istep);
}
//////////////////////////////////////////////////////////////////////////
-void InSituVTKCoProcessor::addData(SPtr<Block3D> block)
+void InSituVTKSimulationObserver::addData(SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
UbTupleDouble3 blockLengths = grid->getBlockLengths(block);
@@ -130,7 +130,7 @@ void InSituVTKCoProcessor::addData(SPtr<Block3D> block)
real dx = grid->getDeltaX(block);
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
real f[D3Q27System::ENDF + 1];
real vx1, vx2, vx3, rho;
@@ -259,7 +259,7 @@ void InSituVTKCoProcessor::addData(SPtr<Block3D> block)
}
}
//////////////////////////////////////////////////////////////////////////
-void InSituVTKCoProcessor::readConfigFile(const std::string &configFile)
+void InSituVTKSimulationObserver::readConfigFile(const std::string &configFile)
{
ifstream ifs;
ifs.open(configFile, ifstream::in);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/InSituVTKSimulationObserver.h
similarity index 69%
rename from src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/InSituVTKSimulationObserver.h
index 9456bf298b4e6e4af1e07ae14a46c3e11259cbaa..1171c54252fa315d1e9e84caed34d2596b9520c2 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/InSituVTKCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/InSituVTKSimulationObserver.h
@@ -1,9 +1,9 @@
#ifdef VF_VTK
-#ifndef InSituVTKCoProcessor_h__
-#define InSituVTKCoProcessor_h__
+#ifndef InSituVTKSimulationObserver_h__
+#define InSituVTKSimulationObserver_h__
-#include <CoProcessor.h>
+#include <SimulationObserver.h>
#include <Grid3D.h>
#include <LBMUnitConverter.h>
@@ -16,14 +16,14 @@
#include <vtkSocketController.h>
#include <vtkUnstructuredGrid.h>
-class InSituVTKCoProcessor : public CoProcessor
+class InSituVTKSimulationObserver : public SimulationObserver
{
public:
- InSituVTKCoProcessor();
- InSituVTKCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &configFile,
+ InSituVTKSimulationObserver();
+ InSituVTKSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &configFile,
SPtr<LBMUnitConverter> conv);
- virtual ~InSituVTKCoProcessor();
- void process(real step);
+ virtual ~InSituVTKSimulationObserver();
+ void update(real step);
protected:
void collectData(real step);
@@ -48,6 +48,6 @@ private:
std::string wIP;
};
-#endif // InSituVTKCoProcessor_h__
+#endif // InSituVTKSimulationObserver_h__
#endif
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/IntegrateValuesHelper.cpp
similarity index 98%
rename from src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/IntegrateValuesHelper.cpp
index 0d8b7827b48fb2a5e6e16d13538f63209e03e244..7eabcd2849f2fca11cb057357492fa1062c46dce 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/IntegrateValuesHelper.cpp
@@ -5,7 +5,7 @@
#include <vector>
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "DataSet3D.h"
#include "LBMKernel.h"
@@ -65,7 +65,7 @@ void IntegrateValuesHelper::init(int level)
orgX3 = val<3>(org);
SPtr<LBMKernel> kernel = dynamicPointerCast<LBMKernel>(block->getKernel());
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
int ghostLayerWitdh = kernel->getGhostLayerWidth();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
real internX1, internX2, internX3;
@@ -193,7 +193,7 @@ void IntegrateValuesHelper::calculateMQ()
calcMacros = &D3Q27System::calcIncompMacroscopicValues;
}
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
for (UbTupleInt3 node : cn.nodes) {
distributions->getDistribution(f, val<1>(node), val<2>(node), val<3>(node));
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.h b/src/cpu/VirtualFluidsCore/SimulationObservers/IntegrateValuesHelper.h
similarity index 100%
rename from src/cpu/VirtualFluidsCore/CoProcessors/IntegrateValuesHelper.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/IntegrateValuesHelper.h
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/LineTimeSeriesSimulationObserver.cpp
similarity index 90%
rename from src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/LineTimeSeriesSimulationObserver.cpp
index 98d0188fc25def9ee613e85f98d9623b0dfdf702..75350fb6e0904c434519a241228d7662c84ecf22 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/LineTimeSeriesSimulationObserver.cpp
@@ -1,5 +1,5 @@
-#include "LineTimeSeriesCoProcessor.h"
-#include "BCProcessor.h"
+#include "LineTimeSeriesSimulationObserver.h"
+#include "BCSet.h"
#include "WbWriterVtkXmlASCII.h"
#include "Block3D.h"
@@ -12,9 +12,9 @@
#include "LBMKernel.h"
#include "UbScheduler.h"
-LineTimeSeriesCoProcessor::LineTimeSeriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+LineTimeSeriesSimulationObserver::LineTimeSeriesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
SPtr<GbLine3D> line, int level, std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), length(0), ix1(0), ix2(0), ix3(0), level(level), line(line)
+ : SimulationObserver(grid, s), path(path), length(0), ix1(0), ix2(0), ix3(0), level(level), line(line)
{
root = comm->isRoot();
fname = path;
@@ -23,7 +23,7 @@ LineTimeSeriesCoProcessor::LineTimeSeriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbS
numOfProc = comm->getNumberOfProcesses();
gridRank = comm->getProcessID();
- real dx = CoProcessor::grid->getDeltaX(level);
+ real dx = SimulationObserver::grid->getDeltaX(level);
SPtr<CoordinateTransformation3D> trafo = grid->getCoordinateTransformator();
real orgX1 = trafo->getX1CoordinateOffset();
@@ -61,16 +61,16 @@ LineTimeSeriesCoProcessor::LineTimeSeriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbS
ix3 = x3min % val<3>(blockNx) + 1;
}
//////////////////////////////////////////////////////////////////////////
-void LineTimeSeriesCoProcessor::process(real step)
+void LineTimeSeriesSimulationObserver::update(real step)
{
if (scheduler->isDue(step)) {
collectData();
}
- UBLOG(logDEBUG3, "MacroscopicQuantitiesCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "MacroscopicQuantitiesSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void LineTimeSeriesCoProcessor::writeLine(const std::string &path)
+void LineTimeSeriesSimulationObserver::writeLine(const std::string &path)
{
std::vector<UbTupleFloat3> nodes(2);
std::vector<UbTupleInt2> lines(1);
@@ -86,7 +86,7 @@ void LineTimeSeriesCoProcessor::writeLine(const std::string &path)
writer->writeLines(path, nodes, lines);
}
//////////////////////////////////////////////////////////////////////////
-void LineTimeSeriesCoProcessor::collectData()
+void LineTimeSeriesSimulationObserver::collectData()
{
real f[27];
real vx1, vx2, vx3, rho;
@@ -104,7 +104,7 @@ void LineTimeSeriesCoProcessor::collectData()
blockix3 = x / blocknx;
}
- SPtr<Block3D> block = CoProcessor::grid->getBlock(blockix1, blockix2, blockix3, level);
+ SPtr<Block3D> block = SimulationObserver::grid->getBlock(blockix1, blockix2, blockix3, level);
if (block) {
if (block->getRank() == gridRank) {
SPtr<ILBMKernel> kernel = block->getKernel();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/LineTimeSeriesSimulationObserver.h
similarity index 71%
rename from src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/LineTimeSeriesSimulationObserver.h
index c510a9b46b265344242ab8e3c75560d370a53921..0f8a9ab44ac60e16708be7453e65809ec0505155 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/LineTimeSeriesSimulationObserver.h
@@ -1,12 +1,12 @@
-#ifndef LineTimeSeriesCoProcessor_h__
-#define LineTimeSeriesCoProcessor_h__
+#ifndef LineTimeSeriesSimulationObserver_h__
+#define LineTimeSeriesSimulationObserver_h__
#include <PointerDefinitions.h>
#include <string>
#include <mpi.h>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
namespace vf::mpi {class Communicator;}
@@ -20,17 +20,17 @@ class GbLine3D;
//
//! \author Konstantin Kutscher
-class LineTimeSeriesCoProcessor : public CoProcessor
+class LineTimeSeriesSimulationObserver : public SimulationObserver
{
public:
enum Direction { X1, X2, X3 };
public:
- LineTimeSeriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, SPtr<GbLine3D> line,
+ LineTimeSeriesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, SPtr<GbLine3D> line,
int level, std::shared_ptr<vf::mpi::Communicator> comm);
- ~LineTimeSeriesCoProcessor() override = default;
+ ~LineTimeSeriesSimulationObserver() override = default;
- void process(real step) override;
+ void update(real step) override;
void writeLine(const std::string &path);
protected:
@@ -58,4 +58,4 @@ private:
int gridRank;
Direction dir;
};
-#endif // LineTimeSeriesCoProcessor_h__
+#endif // LineTimeSeriesSimulationObserver_h__
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp
similarity index 91%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp
index fd08df50a3f0cb9b85fd3255465170a4ef1681a9..5cdc87c6867c5ec2a8676e66a228ba5e768014fb 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.cpp
@@ -1,6 +1,6 @@
-#include "MPIIOMigrationBECoProcessor.h"
+#include "MPIIOMigrationBESimulationObserver.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "BoundaryConditions.h"
#include <mpi/Communicator.h>
@@ -25,8 +25,8 @@ using namespace MPIIODataStructures;
#define MESSAGE_TAG 80
#define SEND_BLOCK_SIZE 100000
-MPIIOMigrationBECoProcessor::MPIIOMigrationBECoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Grid3DVisitor> mV, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm)
- : MPIIOCoProcessor(grid, s, path, comm), nue(-999.999), nuL(-999.999), nuG(-999.999), densityRatio(-999.999)
+MPIIOMigrationBESimulationObserver::MPIIOMigrationBESimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Grid3DVisitor> mV, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm)
+ : MPIIOSimulationObserver(grid, s, path, comm), nue(-999.999), nuL(-999.999), nuG(-999.999), densityRatio(-999.999)
{
memset(&boundCondParamStr, 0, sizeof(boundCondParamStr));
metisVisitor = mV;
@@ -38,13 +38,13 @@ MPIIOMigrationBECoProcessor::MPIIOMigrationBECoProcessor(SPtr<Grid3D> grid, SPtr
}
//////////////////////////////////////////////////////////////////////////
-MPIIOMigrationBECoProcessor::~MPIIOMigrationBECoProcessor() { MPI_Type_free(&sendBlockIntType); }
+MPIIOMigrationBESimulationObserver::~MPIIOMigrationBESimulationObserver() { MPI_Type_free(&sendBlockIntType); }
-void MPIIOMigrationBECoProcessor::process(real step)
+void MPIIOMigrationBESimulationObserver::update(real step)
{
if (scheduler->isDue(step)) {
if (comm->isRoot())
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor save step: " << step);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver save step: " << step);
if (comm->isRoot())
UBLOG(logINFO, "Save check point - start");
clearAllFiles((int)step);
@@ -60,13 +60,13 @@ void MPIIOMigrationBECoProcessor::process(real step)
}
}
-void MPIIOMigrationBECoProcessor::clearAllFiles(int step)
+void MPIIOMigrationBESimulationObserver::clearAllFiles(int step)
{
MPI_File file_handler;
MPI_Info info = MPI_INFO_NULL;
MPI_Offset new_size = 0;
- MPIIOCoProcessor::clearAllFiles(step);
+ MPIIOSimulationObserver::clearAllFiles(step);
UbSystem::makeDirectory(path + "/mpi_io_cp/mpi_io_cp_" + UbSystem::toString(step));
@@ -87,16 +87,16 @@ void MPIIOMigrationBECoProcessor::clearAllFiles(int step)
MPI_File_close(&file_handler);
}
-void MPIIOMigrationBECoProcessor::writeBlocks(int step)
+void MPIIOMigrationBESimulationObserver::writeBlocks(int step)
{
grid->deleteBlockIDs();
RenumberGridVisitor renumber(comm);
grid->accept(renumber);
- MPIIOCoProcessor::writeBlocks(step);
+ MPIIOSimulationObserver::writeBlocks(step);
}
-void MPIIOMigrationBECoProcessor::writeDataSet(int step)
+void MPIIOMigrationBESimulationObserver::writeDataSet(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -121,7 +121,7 @@ void MPIIOMigrationBECoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::writeDataSet start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeDataSet start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -130,7 +130,6 @@ void MPIIOMigrationBECoProcessor::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 MPIIOMigrationBECoProcessor::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++;
}
}
@@ -290,7 +287,7 @@ void MPIIOMigrationBECoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::writeDataSet start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeDataSet start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -362,7 +359,7 @@ void MPIIOMigrationBECoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::writeDataSet time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeDataSet time: " << finish - start << " s");
}
MPI_File file_handler1;
@@ -409,7 +406,7 @@ void MPIIOMigrationBECoProcessor::writeDataSet(int step)
}
-void MPIIOMigrationBECoProcessor::write4DArray(int step, Arrays arrayType, std::string fname)
+void MPIIOMigrationBESimulationObserver::write4DArray(int step, Arrays arrayType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -431,12 +428,11 @@ void MPIIOMigrationBECoProcessor::write4DArray(int step, Arrays arrayType, std::
dataSetParam dataSetParamStr;
bool firstBlock = true;
int doubleCountInBlock = 0;
- int ic = 0;
SPtr<CbArray4D<real, IndexerX4X3X2X1>> ___Array;
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::write4DArray start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write4DArray start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -462,7 +458,7 @@ void MPIIOMigrationBECoProcessor::write4DArray(int step, Arrays arrayType, std::
___Array = block->getKernel()->getDataSet()->getShearStressValues();
break;
default:
- UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationBECoProcessor::write4DArray : 4D array type does not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationBESimulationObserver::write4DArray : 4D array type does not exist!"));
break;
}
@@ -482,14 +478,12 @@ void MPIIOMigrationBECoProcessor::write4DArray(int step, Arrays arrayType, std::
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++;
}
}
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::write4DArray start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write4DArray start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -524,11 +518,11 @@ void MPIIOMigrationBECoProcessor::write4DArray(int step, Arrays arrayType, std::
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::write4DArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write4DArray time: " << finish - start << " s");
}
}
-void MPIIOMigrationBECoProcessor::write3DArray(int step, Arrays arrayType, std::string fname)
+void MPIIOMigrationBESimulationObserver::write3DArray(int step, Arrays arrayType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -550,12 +544,11 @@ void MPIIOMigrationBECoProcessor::write3DArray(int step, Arrays arrayType, std::
dataSetParam dataSetParamStr;
bool firstBlock = true;
int doubleCountInBlock = 0;
- int ic = 0;
SPtr<CbArray3D<real, IndexerX3X2X1>> ___Array;
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::write3DArray start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write3DArray start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -579,7 +572,7 @@ void MPIIOMigrationBECoProcessor::write3DArray(int step, Arrays arrayType, std::
break;
default:
UB_THROW(UbException(UB_EXARGS,
- "MPIIOMigrationBECoProcessor::write3DArray : 3D array type does not exist!"));
+ "MPIIOMigrationBESimulationObserver::write3DArray : 3D array type does not exist!"));
break;
}
@@ -599,14 +592,12 @@ void MPIIOMigrationBECoProcessor::write3DArray(int step, Arrays arrayType, std::
if ((dataSetParamStr.nx[0] > 0) && (dataSetParamStr.nx[1] > 0) && (dataSetParamStr.nx[2] > 0))
doubleValuesArray.insert(doubleValuesArray.end(), ___Array->getDataVector().begin(), ___Array->getDataVector().end());
-
- ic++;
}
}
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::write3DArray start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write3DArray start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -641,11 +632,11 @@ void MPIIOMigrationBECoProcessor::write3DArray(int step, Arrays arrayType, std::
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::write3DArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::write3DArray time: " << finish - start << " s");
}
}
-void MPIIOMigrationBECoProcessor::writeBoundaryConds(int step)
+void MPIIOMigrationBESimulationObserver::writeBoundaryConds(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -653,14 +644,12 @@ void MPIIOMigrationBECoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::writeBoundaryConds start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeBoundaryConds start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
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();
@@ -685,7 +674,7 @@ void MPIIOMigrationBECoProcessor::writeBoundaryConds(int step)
{
for (SPtr<Block3D> block : blocksVector[level]) // all the blocks of the current level
{
- bcArr = block->getKernel()->getBCProcessor()->getBCArray();
+ bcArr = block->getKernel()->getBCSet()->getBCArray();
bcAddArray[ic].globalID = block->getGlobalID(); // id of the block needed to find it while regenerating the grid
bcAddArray[ic].boundCond_count = 0; // how many BoundaryConditions in this block
@@ -716,12 +705,11 @@ void MPIIOMigrationBECoProcessor::writeBoundaryConds(int step)
bouCond->nx3 = (real)bcArr->bcvector[bc]->nx3;
for (int iq = 0; iq < 26; iq++)
bouCond->q[iq] = (real)bcArr->bcvector[bc]->getQ(iq);
- bouCond->algorithmType = bcArr->bcvector[bc]->getBcAlgorithmType();
+ bouCond->algorithmType = bcArr->bcvector[bc]->getBCStrategyType();
}
bcVector[ic].push_back(*bouCond);
bcAddArray[ic].boundCond_count++;
- count_boundCond++;
bytesCount[ic] += sizeof(BoundaryCondition);
}
@@ -738,7 +726,6 @@ void MPIIOMigrationBECoProcessor::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];
@@ -752,7 +739,7 @@ void MPIIOMigrationBECoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::writeBoundaryConds start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeBoundaryConds start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -835,7 +822,7 @@ void MPIIOMigrationBECoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::writeBoundaryConds time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::writeBoundaryConds time: " << finish - start << " s");
}
delete[] bcAddArray;
@@ -845,10 +832,10 @@ void MPIIOMigrationBECoProcessor::writeBoundaryConds(int step)
}
//------------------------------------------- READ -----------------------------------------------
-void MPIIOMigrationBECoProcessor::restart(int step)
+void MPIIOMigrationBESimulationObserver::restart(int step)
{
if (comm->isRoot())
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor restart step: " << step);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver restart step: " << step);
if (comm->isRoot())
UBLOG(logINFO, "Load check point - start");
@@ -863,9 +850,9 @@ void MPIIOMigrationBECoProcessor::restart(int step)
UBLOG(logINFO, "Load check point - end");
}
-void MPIIOMigrationBECoProcessor::readBlocks(int step) { MPIIOCoProcessor::readBlocks(step); }
+void MPIIOMigrationBESimulationObserver::readBlocks(int step) { MPIIOSimulationObserver::readBlocks(step); }
-void MPIIOMigrationBECoProcessor::blocksExchange(int tagN, int ind1, int ind2, int doubleCountInBlock, std::vector<real> &pV, std::vector<real> *rawDataReceive)
+void MPIIOMigrationBESimulationObserver::blocksExchange(int tagN, int ind1, int ind2, int doubleCountInBlock, std::vector<real> &pV, std::vector<real> *rawDataReceive)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -893,7 +880,7 @@ void MPIIOMigrationBECoProcessor::blocksExchange(int tagN, int ind1, int ind2, i
{
tempBlock = grid->getBlock(indexB + int(ind));
if (!tempBlock)
- throw UbException(UB_EXARGS, "MPIIOMigrationBECoProcessor::blocksExchange -- null block pointer!!!");
+ throw UbException(UB_EXARGS, "MPIIOMigrationBESimulationObserver::blocksExchange -- null block pointer!!!");
tempRank = tempBlock->getRank();
@@ -998,7 +985,7 @@ void MPIIOMigrationBECoProcessor::blocksExchange(int tagN, int ind1, int ind2, i
delete[] requests;
}
-void MPIIOMigrationBECoProcessor::readDataSet(int step)
+void MPIIOMigrationBESimulationObserver::readDataSet(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -1006,8 +993,8 @@ void MPIIOMigrationBECoProcessor::readDataSet(int step)
if (!lbmKernel)
UB_THROW(UbException(UB_EXARGS, "lbmKernel does not exist!"));
- if (!bcProcessor)
- UB_THROW(UbException(UB_EXARGS, "bcProcessor does not exist!"));
+ if (!bcSet)
+ UB_THROW(UbException(UB_EXARGS, "BCSet does not exist!"));
if (nue == -999.999)
UB_THROW(UbException(UB_EXARGS, "nue is not initialised!"));
if (nuL == -999.999 )
@@ -1019,7 +1006,7 @@ void MPIIOMigrationBECoProcessor::readDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readDataSet start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1109,8 +1096,8 @@ void MPIIOMigrationBECoProcessor::readDataSet(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readDataSet time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readDataSet start of exchange of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet start of exchange of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1139,8 +1126,8 @@ void MPIIOMigrationBECoProcessor::readDataSet(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readDataSet time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readDataSet start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1252,7 +1239,7 @@ void MPIIOMigrationBECoProcessor::readDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readDataSet end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readDataSet end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1306,7 +1293,7 @@ void MPIIOMigrationBECoProcessor::readDataSet(int step)
delete[] rawDataReceiveH2;
}
-void MPIIOMigrationBECoProcessor::readArray(int step, Arrays arrType, std::string fname)
+void MPIIOMigrationBESimulationObserver::readArray(int step, Arrays arrType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -1314,7 +1301,7 @@ void MPIIOMigrationBECoProcessor::readArray(int step, Arrays arrType, std::strin
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readArray start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1362,8 +1349,8 @@ void MPIIOMigrationBECoProcessor::readArray(int step, Arrays arrType, std::strin
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readArray time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readArray start of exchange of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray start of exchange of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1376,9 +1363,9 @@ void MPIIOMigrationBECoProcessor::readArray(int step, Arrays arrType, std::strin
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readArray end of exchange of data, rank = " << rank);
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readArray time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readArray start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray end of exchange of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1452,7 +1439,7 @@ void MPIIOMigrationBECoProcessor::readArray(int step, Arrays arrType, std::strin
block->getKernel()->getDataSet()->setPressureField(___3DArray);
break;
default:
- UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationBECoProcessor::readArray : array type does not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationBESimulationObserver::readArray : array type does not exist!"));
break;
}
}
@@ -1462,12 +1449,12 @@ void MPIIOMigrationBECoProcessor::readArray(int step, Arrays arrType, std::strin
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readArray end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readArray end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
}
-void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
+void MPIIOMigrationBESimulationObserver::readBoundaryConds(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -1475,7 +1462,7 @@ void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readBoundaryConds start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1521,8 +1508,8 @@ void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readBoundaryConds time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readBoundaryConds start of exchange of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds start of exchange of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1601,9 +1588,9 @@ void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readBoundaryConds end of exchange of data, rank = " << rank);
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readBoundaryConds time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readBoundaryConds start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds end of exchange of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1681,7 +1668,7 @@ void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
bc->nx3 = bcArray[ibc].nx3;
for (int iq = 0; iq < 26; iq++)
bc->setQ(bcArray[ibc].q[iq], iq);
- bc->setBcAlgorithmType(bcArray[ibc].algorithmType);
+ bc->setBCStrategyType(bcArray[ibc].algorithmType);
}
bcVector.push_back(bc);
@@ -1690,14 +1677,14 @@ void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
CbArray3D<int, IndexerX3X2X1> bcim(bcindexmatrixV, boundCondParamStr.nx1, boundCondParamStr.nx2, boundCondParamStr.nx3);
SPtr<Block3D> block1 = grid->getBlock(blockID);
- SPtr<BCProcessor> bcProc = bcProcessor->clone(block1->getKernel());
+ SPtr<BCSet> bcProc = bcSet->clone(block1->getKernel());
SPtr<BCArray3D> bcArr(new BCArray3D());
bcArr->bcindexmatrix = bcim;
bcArr->bcvector = bcVector;
bcArr->indexContainer = indexContainerV;
bcProc->setBCArray(bcArr);
- block1->getKernel()->setBCProcessor(bcProc);
+ block1->getKernel()->setBCSet(bcProc);
}
}
@@ -1714,20 +1701,20 @@ void MPIIOMigrationBECoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readBoundaryConds end of restore of data, rank = " << rank);
- UBLOG(logINFO, "MPIIOMigrationBECoProcessor::readBoundaryConds time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationBESimulationObserver::readBoundaryConds time: " << finish - start << " s");
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
}
//////////////////////////////////////////////////////////////////////////
-void MPIIOMigrationBECoProcessor::setLBMKernel(SPtr<LBMKernel> kernel) { this->lbmKernel = kernel; }
+void MPIIOMigrationBESimulationObserver::setLBMKernel(SPtr<LBMKernel> kernel) { this->lbmKernel = kernel; }
//////////////////////////////////////////////////////////////////////////
-void MPIIOMigrationBECoProcessor::setBCProcessor(SPtr<BCProcessor> bcProcessor) { this->bcProcessor = bcProcessor; }
+void MPIIOMigrationBESimulationObserver::setBCSet(SPtr<BCSet> bcSet) { this->bcSet = bcSet; }
//////////////////////////////////////////////////////////////////////////
-void MPIIOMigrationBECoProcessor::setNu(real nu) { this->nue = nu; }
+void MPIIOMigrationBESimulationObserver::setNu(real nu) { this->nue = nu; }
-void MPIIOMigrationBECoProcessor::setNuLG(real cfL, real cfG) { this->nuL = cfL; this->nuG = cfG; }
+void MPIIOMigrationBESimulationObserver::setNuLG(real cfL, real cfG) { this->nuL = cfL; this->nuG = cfG; }
-void MPIIOMigrationBECoProcessor::setDensityRatio(real dr) { this->densityRatio = dr; }
+void MPIIOMigrationBESimulationObserver::setDensityRatio(real dr) { this->densityRatio = dr; }
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.h
similarity index 84%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.h
index d29ecca36d194cd0498b3347b9e59eefced8a475..fa55ea17a350ec9a1de215892258526142f6d19b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationBECoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationBESimulationObserver.h
@@ -1,23 +1,23 @@
-#ifndef _MPIIOMigrationBECoProcessor_H_
-#define _MPIIOMigrationBECoProcessor_H_
+#ifndef _MPIIOMigrationBESimulationObserver_H_
+#define _MPIIOMigrationBESimulationObserver_H_
#include <mpi.h>
#include <string>
#include <vector>
-#include "MPIIOCoProcessor.h"
+#include "MPIIOSimulationObserver.h"
#include "MPIIODataStructures.h"
class Grid3D;
class UbScheduler;
namespace vf::mpi {class Communicator;}
-class BCProcessor;
+class BCSet;
class LBMKernel;
class Grid3DVisitor;
-//! \class MPIWriteBlocksBECoProcessor
+//! \class MPIWriteBlocksBESimulationObserver
//! \brief Writes the grid each timestep into the files and reads the grip from the files before regenerating
-class MPIIOMigrationBECoProcessor : public MPIIOCoProcessor
+class MPIIOMigrationBESimulationObserver : public MPIIOSimulationObserver
{
enum Arrays {
AverageDensity = 1,
@@ -32,11 +32,11 @@ class MPIIOMigrationBECoProcessor : public MPIIOCoProcessor
};
public:
- MPIIOMigrationBECoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Grid3DVisitor> mV, const std::string &path,
+ MPIIOMigrationBESimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Grid3DVisitor> mV, const std::string &path,
std::shared_ptr<vf::mpi::Communicator> comm);
- ~MPIIOMigrationBECoProcessor() override;
+ ~MPIIOMigrationBESimulationObserver() override;
//! Each timestep writes the grid into the files
- void process(real step) override;
+ void update(real step) override;
//! Reads the grid from the files before grid reconstruction
void restart(int step);
//! Writes the blocks of the grid into the file cpBlocks.bin
@@ -69,8 +69,8 @@ public:
void readBoundaryConds(int step);
//! The function sets LBMKernel
void setLBMKernel(SPtr<LBMKernel> kernel);
- //! The function sets BCProcessor
- void setBCProcessor(SPtr<BCProcessor> bcProcessor);
+ //! The function sets BCSet
+ void setBCSet(SPtr<BCSet> BCSet);
//! The function truncates the data files
void clearAllFiles(int step);
void setNu(real nu);
@@ -90,7 +90,7 @@ private:
MPIIODataStructures::boundCondParam boundCondParamStr;
SPtr<LBMKernel> lbmKernel;
- SPtr<BCProcessor> bcProcessor;
+ SPtr<BCSet> bcSet;
SPtr<Grid3DVisitor> metisVisitor;
real nue;
real nuL;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.cpp
similarity index 93%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.cpp
index 4e3a84aa8a47051aee123181fc63741266dbacc0..860b3f02ab1db6c1554ca9f87069281520100bd6 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.cpp
@@ -1,6 +1,6 @@
-#include "MPIIOMigrationCoProcessor.h"
+#include "MPIIOMigrationSimulationObserver.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "BoundaryConditions.h"
#include <mpi/Communicator.h>
@@ -22,8 +22,8 @@
using namespace MPIIODataStructures;
-MPIIOMigrationCoProcessor::MPIIOMigrationCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Grid3DVisitor> mV, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm)
- : MPIIOCoProcessor(grid, s, path, comm)
+MPIIOMigrationSimulationObserver::MPIIOMigrationSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Grid3DVisitor> mV, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm)
+ : MPIIOSimulationObserver(grid, s, path, comm)
{
memset(&boundCondParamStr, 0, sizeof(boundCondParamStr));
metisVisitor = mV;
@@ -60,7 +60,7 @@ MPIIOMigrationCoProcessor::MPIIOMigrationCoProcessor(SPtr<Grid3D> grid, SPtr<UbS
MPI_Type_commit(&boundCondTypeAdd);
}
//////////////////////////////////////////////////////////////////////////
-MPIIOMigrationCoProcessor::~MPIIOMigrationCoProcessor()
+MPIIOMigrationSimulationObserver::~MPIIOMigrationSimulationObserver()
{
MPI_Type_free(&dataSetType);
MPI_Type_free(&dataSetSmallType);
@@ -69,12 +69,12 @@ MPIIOMigrationCoProcessor::~MPIIOMigrationCoProcessor()
}
//////////////////////////////////////////////////////////////////////////
-void MPIIOMigrationCoProcessor::process(real step)
+void MPIIOMigrationSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
{
if (comm->isRoot())
- UBLOG(logINFO, "MPIIOMigrationCoProcessor save step: " << step);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver save step: " << step);
if (comm->isRoot())
UBLOG(logINFO, "Save check point - start");
/*if (comm->isRoot())*/ clearAllFiles((int)step);
@@ -90,13 +90,13 @@ void MPIIOMigrationCoProcessor::process(real step)
}
}
-void MPIIOMigrationCoProcessor::clearAllFiles(int step)
+void MPIIOMigrationSimulationObserver::clearAllFiles(int step)
{
MPI_File file_handler;
MPI_Info info = MPI_INFO_NULL;
MPI_Offset new_size = 0;
- MPIIOCoProcessor::clearAllFiles(step);
+ MPIIOSimulationObserver::clearAllFiles(step);
UbSystem::makeDirectory(path + "/mpi_io_cp/mpi_io_cp_" + UbSystem::toString(step));
@@ -108,13 +108,13 @@ void MPIIOMigrationCoProcessor::clearAllFiles(int step)
MPI_File_close(&file_handler);
}
-void MPIIOMigrationCoProcessor::writeBlocks(int step)
+void MPIIOMigrationSimulationObserver::writeBlocks(int step)
{
grid->renumberBlockIDs();
- MPIIOCoProcessor::writeBlocks(step);
+ MPIIOSimulationObserver::writeBlocks(step);
}
-void MPIIOMigrationCoProcessor::writeDataSet(int step)
+void MPIIOMigrationSimulationObserver::writeDataSet(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -139,7 +139,7 @@ void MPIIOMigrationCoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::writeDataSet start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeDataSet start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -324,7 +324,7 @@ void MPIIOMigrationCoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::writeDataSet start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeDataSet start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -410,7 +410,7 @@ void MPIIOMigrationCoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::writeDataSet time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeDataSet time: " << finish - start << " s");
}
delete[] dataSetArray;
@@ -453,7 +453,7 @@ void MPIIOMigrationCoProcessor::writeDataSet(int step)
}
-void MPIIOMigrationCoProcessor::write4DArray(int step, Arrays arrayType, std::string fname)
+void MPIIOMigrationSimulationObserver::write4DArray(int step, Arrays arrayType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -476,7 +476,7 @@ void MPIIOMigrationCoProcessor::write4DArray(int step, Arrays arrayType, std::st
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::write4DArray start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write4DArray start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -509,7 +509,7 @@ void MPIIOMigrationCoProcessor::write4DArray(int step, Arrays arrayType, std::st
___Array = block->getKernel()->getDataSet()->getShearStressValues();
break;
default:
- UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationCoProcessor::write4DArray : 4D array type does not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationSimulationObserver::write4DArray : 4D array type does not exist!"));
break;
}
@@ -538,7 +538,7 @@ void MPIIOMigrationCoProcessor::write4DArray(int step, Arrays arrayType, std::st
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::write4DArray start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write4DArray start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -577,13 +577,13 @@ void MPIIOMigrationCoProcessor::write4DArray(int step, Arrays arrayType, std::st
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::write4DArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write4DArray time: " << finish - start << " s");
}
delete[] dataSetSmallArray;
}
-void MPIIOMigrationCoProcessor::write3DArray(int step, Arrays arrayType, std::string fname)
+void MPIIOMigrationSimulationObserver::write3DArray(int step, Arrays arrayType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -606,7 +606,7 @@ void MPIIOMigrationCoProcessor::write3DArray(int step, Arrays arrayType, std::st
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::write3DArray start collect data to file = " << fname);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write3DArray start collect data to file = " << fname);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -636,7 +636,7 @@ void MPIIOMigrationCoProcessor::write3DArray(int step, Arrays arrayType, std::st
___Array = block->getKernel()->getDataSet()->getPressureField();
break;
default:
- UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationCoProcessor::write3DArray : 3D array type does not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationSimulationObserver::write3DArray : 3D array type does not exist!"));
break;
}
@@ -665,7 +665,7 @@ void MPIIOMigrationCoProcessor::write3DArray(int step, Arrays arrayType, std::st
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::write3DArray start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write3DArray start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -710,13 +710,13 @@ void MPIIOMigrationCoProcessor::write3DArray(int step, Arrays arrayType, std::st
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::write3DArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::write3DArray time: " << finish - start << " s");
}
delete[] dataSetSmallArray;
}
-void MPIIOMigrationCoProcessor::writeBoundaryConds(int step)
+void MPIIOMigrationSimulationObserver::writeBoundaryConds(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -724,14 +724,12 @@ void MPIIOMigrationCoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::writeBoundaryConds start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeBoundaryConds start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
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();
@@ -756,7 +754,7 @@ void MPIIOMigrationCoProcessor::writeBoundaryConds(int step)
{
for (SPtr<Block3D> block : blocksVector[level]) // all the blocks of the current level
{
- bcArr = block->getKernel()->getBCProcessor()->getBCArray();
+ bcArr = block->getKernel()->getBCSet()->getBCArray();
bcAddArray[ic].globalID = block->getGlobalID(); // id of the block needed to find it while regenerating the grid
bcAddArray[ic].boundCond_count = 0; // how many BoundaryConditions in this block
@@ -788,12 +786,11 @@ void MPIIOMigrationCoProcessor::writeBoundaryConds(int step)
bouCond->nx3 = (real)bcArr->bcvector[bc]->nx3;
for (int iq = 0; iq < 26; iq++)
bouCond->q[iq] = (real)bcArr->bcvector[bc]->getQ(iq);
- bouCond->algorithmType = bcArr->bcvector[bc]->getBcAlgorithmType();
+ bouCond->algorithmType = bcArr->bcvector[bc]->getBCStrategyType();
}
bcVector[ic].push_back(*bouCond);
bcAddArray[ic].boundCond_count++;
- count_boundCond++;
bytesCount[ic] += sizeof(BoundaryCondition);
}
@@ -810,7 +807,6 @@ void MPIIOMigrationCoProcessor::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];
@@ -824,7 +820,7 @@ void MPIIOMigrationCoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::writeBoundaryConds start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeBoundaryConds start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: "<< Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -897,7 +893,7 @@ void MPIIOMigrationCoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::writeBoundaryConds time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::writeBoundaryConds time: " << finish - start << " s");
}
delete[] bcAddArray;
@@ -908,10 +904,10 @@ void MPIIOMigrationCoProcessor::writeBoundaryConds(int step)
}
//------------------------------------------- READ -----------------------------------------------
-void MPIIOMigrationCoProcessor::restart(int step)
+void MPIIOMigrationSimulationObserver::restart(int step)
{
if (comm->isRoot())
- UBLOG(logINFO, "MPIIOMigrationCoProcessor restart step: " << step);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver restart step: " << step);
if (comm->isRoot())
UBLOG(logINFO, "Load check point - start");
@@ -928,9 +924,9 @@ void MPIIOMigrationCoProcessor::restart(int step)
UBLOG(logINFO, "Load check point - end");
}
-void MPIIOMigrationCoProcessor::readBlocks(int step) { MPIIOCoProcessor::readBlocks(step); }
+void MPIIOMigrationSimulationObserver::readBlocks(int step) { MPIIOSimulationObserver::readBlocks(step); }
-void MPIIOMigrationCoProcessor::readDataSet(int step)
+void MPIIOMigrationSimulationObserver::readDataSet(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -938,7 +934,7 @@ void MPIIOMigrationCoProcessor::readDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readDataSet start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readDataSet start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1063,8 +1059,8 @@ void MPIIOMigrationCoProcessor::readDataSet(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readDataSet time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readDataSet start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readDataSet time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readDataSet start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1170,7 +1166,7 @@ void MPIIOMigrationCoProcessor::readDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readDataSet end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readDataSet end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1216,7 +1212,7 @@ void MPIIOMigrationCoProcessor::readDataSet(int step)
}
-void MPIIOMigrationCoProcessor::readArray(int step, Arrays arrType, std::string fname)
+void MPIIOMigrationSimulationObserver::readArray(int step, Arrays arrType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -1224,7 +1220,7 @@ void MPIIOMigrationCoProcessor::readArray(int step, Arrays arrType, std::string
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readArray start fname = " << fname);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readArray start fname = " << fname);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1285,8 +1281,8 @@ void MPIIOMigrationCoProcessor::readArray(int step, Arrays arrType, std::string
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readArray readArray: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readArray start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readArray readArray: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readArray start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1353,21 +1349,21 @@ void MPIIOMigrationCoProcessor::readArray(int step, Arrays arrType, std::string
block->getKernel()->getDataSet()->setPressureField(___3DArray);
break;
default:
- UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationCoProcessor::readArray : array type does not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "MPIIOMigrationSimulationObserver::readArray : array type does not exist!"));
break;
}
}
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readArray end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readArray end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
delete[] dataSetSmallArray;
}
-void MPIIOMigrationCoProcessor::readBoundaryConds(int step)
+void MPIIOMigrationSimulationObserver::readBoundaryConds(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -1375,7 +1371,7 @@ void MPIIOMigrationCoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readBoundaryConds start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readBoundaryConds start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1416,8 +1412,8 @@ void MPIIOMigrationCoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readBoundaryConds time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readBoundaryConds start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readBoundaryConds time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readBoundaryConds start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1481,7 +1477,7 @@ void MPIIOMigrationCoProcessor::readBoundaryConds(int step)
bc->nx3 = bcArray[ibc].nx3;
for (int iq = 0; iq < 26; iq++)
bc->setQ(bcArray[ibc].q[iq], iq);
- bc->setBcAlgorithmType(bcArray[ibc].algorithmType);
+ bc->setBCStrategyType(bcArray[ibc].algorithmType);
}
bcVector.push_back(bc);
@@ -1496,17 +1492,17 @@ void MPIIOMigrationCoProcessor::readBoundaryConds(int step)
CbArray3D<int, IndexerX3X2X1> bcim(bcindexmatrixV, boundCondParamStr.nx1, boundCondParamStr.nx2, boundCondParamStr.nx3);
SPtr<Block3D> block1 = grid->getBlock(bcAddArray[ic].globalID);
- SPtr<BCProcessor> bcProc = bcProcessor->clone(block1->getKernel());
+ SPtr<BCSet> bcProc = bcSet->clone(block1->getKernel());
SPtr<BCArray3D> bcArr(new BCArray3D());
bcArr->bcindexmatrix = bcim;
bcArr->bcvector = bcVector;
bcArr->indexContainer = indexContainerV;
bcProc->setBCArray(bcArr);
- block1->getKernel()->setBCProcessor(bcProc);
+ block1->getKernel()->setBCSet(bcProc);
- delete bcArray;
- delete intArray1;
+ delete[] bcArray;
+ delete[] intArray1;
ic++;
}
@@ -1519,12 +1515,12 @@ void MPIIOMigrationCoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIOMigrationCoProcessor::readBoundaryConds end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOMigrationSimulationObserver::readBoundaryConds end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
}
//////////////////////////////////////////////////////////////////////////
-void MPIIOMigrationCoProcessor::setLBMKernel(SPtr<LBMKernel> kernel) { this->lbmKernel = kernel; }
+void MPIIOMigrationSimulationObserver::setLBMKernel(SPtr<LBMKernel> kernel) { this->lbmKernel = kernel; }
//////////////////////////////////////////////////////////////////////////
-void MPIIOMigrationCoProcessor::setBCProcessor(SPtr<BCProcessor> bcProcessor) { this->bcProcessor = bcProcessor; }
+void MPIIOMigrationSimulationObserver::setBCSet(SPtr<BCSet> bcSet) { this->bcSet = bcSet; }
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.h
similarity index 81%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.h
index 4b8c6231176923618b1a394f125ff32b0e450d54..588366a6498c107600d377a65819e11100aa6702 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOMigrationCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOMigrationSimulationObserver.h
@@ -1,22 +1,22 @@
-#ifndef _MPIIOMigrationCoProcessor_H_
-#define _MPIIOMigrationCoProcessor_H_
+#ifndef _MPIIOMigrationSimulationObserver_H_
+#define _MPIIOMigrationSimulationObserver_H_
#include <mpi.h>
#include <string>
-#include "MPIIOCoProcessor.h"
+#include "MPIIOSimulationObserver.h"
#include "MPIIODataStructures.h"
class Grid3D;
class UbScheduler;
namespace vf::mpi {class Communicator;}
-class BCProcessor;
+class BCSet;
class LBMKernel;
class Grid3DVisitor;
-//! \class MPIWriteBlocksCoProcessor
+//! \class MPIWriteBlocksSimulationObserver
//! \brief Writes the grid each timestep into the files and reads the grip from the files before regenerating
-class MPIIOMigrationCoProcessor : public MPIIOCoProcessor
+class MPIIOMigrationSimulationObserver : public MPIIOSimulationObserver
{
public:
enum Arrays {
@@ -31,10 +31,10 @@ public:
PressureField = 9
};
- MPIIOMigrationCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Grid3DVisitor> mV, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
- ~MPIIOMigrationCoProcessor() override;
+ MPIIOMigrationSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<Grid3DVisitor> mV, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
+ ~MPIIOMigrationSimulationObserver() override;
//! Each timestep writes the grid into the files
- void process(real step) override;
+ void update(real step) override;
//! Reads the grid from the files before grid reconstruction
void restart(int step);
//! Writes the blocks of the grid into the file cpBlocks.bin
@@ -67,8 +67,8 @@ public:
void readBoundaryConds(int step);
//! The function sets LBMKernel
void setLBMKernel(SPtr<LBMKernel> kernel);
- //! The function sets BCProcessor
- void setBCProcessor(SPtr<BCProcessor> bcProcessor);
+ //! The function sets BCSet
+ void setBCSet(SPtr<BCSet> BCSet);
//! The function truncates the data files
void clearAllFiles(int step);
// void setNu(real nu);
@@ -80,7 +80,7 @@ private:
MPIIODataStructures::boundCondParam boundCondParamStr;
SPtr<LBMKernel> lbmKernel;
- SPtr<BCProcessor> bcProcessor;
+ SPtr<BCSet> bcSet;
SPtr<Grid3DVisitor> metisVisitor;
};
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
similarity index 93%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
index f55d2e08a847e0892810ea12da8d97454c1416f7..fdc3f4d4347f56d52c2b8a4952da3309ca90fe19 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.cpp
@@ -1,6 +1,6 @@
-#include "MPIIORestartCoProcessor.h"
+#include "MPIIORestartSimulationObserver.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "BoundaryConditions.h"
#include <mpi/Communicator.h>
@@ -25,8 +25,8 @@
using namespace MPIIODataStructures;
-MPIIORestartCoProcessor::MPIIORestartCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm)
- : MPIIOCoProcessor(grid, s, path, comm)
+MPIIORestartSimulationObserver::MPIIORestartSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm)
+ : MPIIOSimulationObserver(grid, s, path, comm)
{
memset(&boundCondParamStr, 0, sizeof(boundCondParamStr));
@@ -67,7 +67,7 @@ MPIIORestartCoProcessor::MPIIORestartCoProcessor(SPtr<Grid3D> grid, SPtr<UbSched
MPI_Type_commit(&boundCondTypeAdd);
}
//////////////////////////////////////////////////////////////////////////
-MPIIORestartCoProcessor::~MPIIORestartCoProcessor()
+MPIIORestartSimulationObserver::~MPIIORestartSimulationObserver()
{
MPI_Type_free(&dataSetType);
MPI_Type_free(&dataSetSmallType);
@@ -77,12 +77,12 @@ MPIIORestartCoProcessor::~MPIIORestartCoProcessor()
}
//////////////////////////////////////////////////////////////////////////
-void MPIIORestartCoProcessor::process(real step)
+void MPIIORestartSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
{
if (comm->isRoot())
- UBLOG(logINFO, "MPIIORestartCoProcessor save step: " << step);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver save step: " << step);
if (comm->isRoot())
UBLOG(logINFO, "Save check point - start");
/*if (comm->isRoot())*/ clearAllFiles((int)step);
@@ -98,7 +98,7 @@ void MPIIORestartCoProcessor::process(real step)
}
}
//////////////////////////////////////////////////////////////////////////
-void MPIIORestartCoProcessor::clearAllFiles(int step)
+void MPIIORestartSimulationObserver::clearAllFiles(int step)
{
MPI_File file_handler;
MPI_Info info = MPI_INFO_NULL;
@@ -106,7 +106,7 @@ void MPIIORestartCoProcessor::clearAllFiles(int step)
UbSystem::makeDirectory(path + "/mpi_io_cp/mpi_io_cp_" + UbSystem::toString(step));
- MPIIOCoProcessor::clearAllFiles(step);
+ MPIIOSimulationObserver::clearAllFiles(step);
std::string filename10 = path + "/mpi_io_cp/mpi_io_cp_" + UbSystem::toString(step) + "/cpBC.bin";
int rc10 =
@@ -117,9 +117,9 @@ void MPIIORestartCoProcessor::clearAllFiles(int step)
MPI_File_close(&file_handler);
}
//////////////////////////////////////////////////////////////////////////
-void MPIIORestartCoProcessor::writeBlocks(int step) { MPIIOCoProcessor::writeBlocks(step); }
+void MPIIORestartSimulationObserver::writeBlocks(int step) { MPIIOSimulationObserver::writeBlocks(step); }
-void MPIIORestartCoProcessor::writeDataSet(int step)
+void MPIIORestartSimulationObserver::writeDataSet(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -144,7 +144,7 @@ void MPIIORestartCoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::writeDataSet start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::writeDataSet start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -331,7 +331,7 @@ void MPIIORestartCoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::writeDataSet start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::writeDataSet start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -433,7 +433,7 @@ void MPIIORestartCoProcessor::writeDataSet(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIORestartCoProcessor::writeDataSet time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::writeDataSet time: " << finish - start << " s");
}
MPI_File file_handler1;
@@ -474,7 +474,7 @@ void MPIIORestartCoProcessor::writeDataSet(int step)
}
-void MPIIORestartCoProcessor::write4DArray(int step, Arrays arrayType, std::string fname)
+void MPIIORestartSimulationObserver::write4DArray(int step, Arrays arrayType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -497,7 +497,7 @@ void MPIIORestartCoProcessor::write4DArray(int step, Arrays arrayType, std::stri
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::writeAverageDensityArray start collect data to file = " << fname);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::writeAverageDensityArray start collect data to file = " << fname);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -533,7 +533,7 @@ void MPIIORestartCoProcessor::write4DArray(int step, Arrays arrayType, std::stri
___Array = block->getKernel()->getDataSet()->getShearStressValues();
break;
default:
- UB_THROW(UbException(UB_EXARGS, "MPIIORestartCoProcessor::write4DArray : 4D array type does not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "MPIIORestartSimulationObserver::write4DArray : 4D array type does not exist!"));
break;
}
@@ -562,7 +562,7 @@ void MPIIORestartCoProcessor::write4DArray(int step, Arrays arrayType, std::stri
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::write4DArray start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::write4DArray start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -625,13 +625,13 @@ void MPIIORestartCoProcessor::write4DArray(int step, Arrays arrayType, std::stri
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIORestartCoProcessor::write4DArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::write4DArray time: " << finish - start << " s");
}
delete[] dataSetSmallArray;
}
-void MPIIORestartCoProcessor::write3DArray(int step, Arrays arrayType, std::string fname)
+void MPIIORestartSimulationObserver::write3DArray(int step, Arrays arrayType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -654,7 +654,7 @@ void MPIIORestartCoProcessor::write3DArray(int step, Arrays arrayType, std::stri
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::write3DArray start collect data to file = " << fname);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::write3DArray start collect data to file = " << fname);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -687,7 +687,7 @@ void MPIIORestartCoProcessor::write3DArray(int step, Arrays arrayType, std::stri
___Array = block->getKernel()->getDataSet()->getPressureField();
break;
default:
- UB_THROW(UbException(UB_EXARGS, "MPIIORestartCoProcessor::write3DArray : 3D array type does not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "MPIIORestartSimulationObserver::write3DArray : 3D array type does not exist!"));
break;
}
@@ -716,7 +716,7 @@ void MPIIORestartCoProcessor::write3DArray(int step, Arrays arrayType, std::stri
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::write3DArray start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::write3DArray start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -782,13 +782,13 @@ void MPIIORestartCoProcessor::write3DArray(int step, Arrays arrayType, std::stri
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIORestartCoProcessor ::write3DArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIORestartSimulationObserver ::write3DArray time: " << finish - start << " s");
}
delete[] dataSetSmallArray;
}
-void MPIIORestartCoProcessor::writeBoundaryConds(int step)
+void MPIIORestartSimulationObserver::writeBoundaryConds(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -796,7 +796,7 @@ void MPIIORestartCoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::writeBoundaryConds start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::writeBoundaryConds start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -826,7 +826,7 @@ void MPIIORestartCoProcessor::writeBoundaryConds(int step)
{
for (SPtr<Block3D> block : blocksVector[level]) // all the blocks of the current level
{
- bcArr = block->getKernel()->getBCProcessor()->getBCArray();
+ bcArr = block->getKernel()->getBCSet()->getBCArray();
bcAddArray[ic].x1 = block->getX1(); // coordinates of the block needed to find it while regenerating the grid
bcAddArray[ic].x2 = block->getX2();
@@ -859,7 +859,7 @@ void MPIIORestartCoProcessor::writeBoundaryConds(int step)
bouCond->nx3 = (real)bcArr->bcvector[bc]->nx3;
for (int iq = 0; iq < 26; iq++)
bouCond->q[iq] = (real)bcArr->bcvector[bc]->getQ(iq);
- bouCond->algorithmType = bcArr->bcvector[bc]->getBcAlgorithmType();
+ bouCond->algorithmType = bcArr->bcvector[bc]->getBCStrategyType();
}
bcVector.push_back(*bouCond);
@@ -929,7 +929,7 @@ void MPIIORestartCoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::writeBoundaryConds start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::writeBoundaryConds start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -986,17 +986,17 @@ void MPIIORestartCoProcessor::writeBoundaryConds(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIORestartCoProcessor::writeBoundaryConds time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::writeBoundaryConds time: " << finish - start << " s");
}
delete[] bcAddArray;
}
//------------------------------------------- READ -----------------------------------------------
-void MPIIORestartCoProcessor::restart(int step)
+void MPIIORestartSimulationObserver::restart(int step)
{
if (comm->isRoot())
- UBLOG(logINFO, "MPIIORestartCoProcessor restart step: " << step);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver restart step: " << step);
if (comm->isRoot())
UBLOG(logINFO, "Load check point - start");
@@ -1010,9 +1010,9 @@ void MPIIORestartCoProcessor::restart(int step)
UBLOG(logINFO, "Load check point - end");
}
-void MPIIORestartCoProcessor::readBlocks(int step) { MPIIOCoProcessor::readBlocks(step); }
+void MPIIORestartSimulationObserver::readBlocks(int step) { MPIIOSimulationObserver::readBlocks(step); }
-void MPIIORestartCoProcessor::readDataSet(int step)
+void MPIIORestartSimulationObserver::readDataSet(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -1020,7 +1020,7 @@ void MPIIORestartCoProcessor::readDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::readDataSet start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readDataSet start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1120,8 +1120,8 @@ void MPIIORestartCoProcessor::readDataSet(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIORestartCoProcessor::readDataSet time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIORestartCoProcessor::readDataSet start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readDataSet time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readDataSet start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1224,7 +1224,7 @@ void MPIIORestartCoProcessor::readDataSet(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::readDataSet end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readDataSet end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1270,7 +1270,7 @@ void MPIIORestartCoProcessor::readDataSet(int step)
}
-void MPIIORestartCoProcessor::readArray(int step, Arrays arrType, std::string fname)
+void MPIIORestartSimulationObserver::readArray(int step, Arrays arrType, std::string fname)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -1278,7 +1278,7 @@ void MPIIORestartCoProcessor::readArray(int step, Arrays arrType, std::string fn
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::readArray start fname = " << fname);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readArray start fname = " << fname);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1341,8 +1341,8 @@ void MPIIORestartCoProcessor::readArray(int step, Arrays arrType, std::string fn
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIORestartCoProcessor::readArray time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIORestartCoProcessor::readArray start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readArray time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readArray start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1410,21 +1410,21 @@ void MPIIORestartCoProcessor::readArray(int step, Arrays arrType, std::string fn
block->getKernel()->getDataSet()->setPressureField(___3DArray);
break;
default:
- UB_THROW(UbException(UB_EXARGS, "MPIIORestartCoProcessor::readArray : array type does not exist!"));
+ UB_THROW(UbException(UB_EXARGS, "MPIIORestartSimulationObserver::readArray : array type does not exist!"));
break;
}
}
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::readArray end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readArray end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
delete[] dataSetSmallArray;
}
-void MPIIORestartCoProcessor::readBoundaryConds(int step)
+void MPIIORestartSimulationObserver::readBoundaryConds(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -1432,7 +1432,7 @@ void MPIIORestartCoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
- UBLOG(logINFO, "MPIIORestartCoProcessor::readBoundaryConds start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readBoundaryConds start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1506,8 +1506,8 @@ void MPIIORestartCoProcessor::readBoundaryConds(int step)
if (comm->isRoot())
{
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIORestartCoProcessor::readBoundaryConds time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIORestartCoProcessor::readBoundaryConds start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readBoundaryConds time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readBoundaryConds start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -1546,7 +1546,7 @@ void MPIIORestartCoProcessor::readBoundaryConds(int step)
bc->nx3 = bcArray[index].nx3;
for (int iq = 0; iq < 26; iq++)
bc->setQ(bcArray[index].q[iq], iq);
- bc->setBcAlgorithmType(bcArray[index].algorithmType);
+ bc->setBCStrategyType(bcArray[index].algorithmType);
}
bcVector.push_back(bc);
@@ -1562,14 +1562,14 @@ void MPIIORestartCoProcessor::readBoundaryConds(int step)
CbArray3D<int, IndexerX3X2X1> bcim(bcindexmatrixV, boundCondParamStr.nx1, boundCondParamStr.nx2, boundCondParamStr.nx3);
SPtr<Block3D> block = grid->getBlock(bcAddArray[n].x1, bcAddArray[n].x2, bcAddArray[n].x3, bcAddArray[n].level);
- SPtr<BCProcessor> bcProc = bcProcessor->clone(block->getKernel());
+ SPtr<BCSet> bcSetNew = bcSet->clone(block->getKernel());
SPtr<BCArray3D> bcArr(new BCArray3D());
bcArr->bcindexmatrix = bcim;
bcArr->bcvector = bcVector;
bcArr->indexContainer = indexContainerV;
- bcProc->setBCArray(bcArr);
+ bcSetNew->setBCArray(bcArr);
- block->getKernel()->setBCProcessor(bcProc);
+ block->getKernel()->setBCSet(bcSetNew);
}
delete nullBouCond;
@@ -1579,11 +1579,11 @@ void MPIIORestartCoProcessor::readBoundaryConds(int step)
delete[] intArray2;
if (comm->isRoot()) {
- UBLOG(logINFO, "MPIIORestartCoProcessor::readBoundaryConds end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIORestartSimulationObserver::readBoundaryConds end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: " << Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
}
//////////////////////////////////////////////////////////////////////////
-void MPIIORestartCoProcessor::setLBMKernel(SPtr<LBMKernel> kernel) { this->lbmKernel = kernel; }
+void MPIIORestartSimulationObserver::setLBMKernel(SPtr<LBMKernel> kernel) { this->lbmKernel = kernel; }
//////////////////////////////////////////////////////////////////////////
-void MPIIORestartCoProcessor::setBCProcessor(SPtr<BCProcessor> bcProcessor) { this->bcProcessor = bcProcessor; }
+void MPIIORestartSimulationObserver::setBCSet(SPtr<BCSet> bcSet) { this->bcSet = bcSet; }
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.h
similarity index 83%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.h
index a4c1b32efbafbdb467eee7facede5f8d834e1a93..5681d9886e3a6f9a4b8d1cf1b8d32e9970fb8855 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIORestartCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIORestartSimulationObserver.h
@@ -1,23 +1,23 @@
-#ifndef _MPIIORestartCoProcessor_H_
-#define _MPIIORestartCoProcessor_H_
+#ifndef _MPIIORestartSimulationObserver_H_
+#define _MPIIORestartSimulationObserver_H_
#include <mpi.h>
//#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "MPIIOCoProcessor.h"
+#include "MPIIOSimulationObserver.h"
#include "MPIIODataStructures.h"
class Grid3D;
class UbScheduler;
namespace vf::mpi {class Communicator;}
-class BCProcessor;
+class BCSet;
class LBMKernel;
-//! \class MPIIORestartCoProcessor
+//! \class MPIIORestartSimulationObserver
//! \brief Writes the grid each timestep into the files and reads the grip from the files before regenerating
-class MPIIORestartCoProcessor : public MPIIOCoProcessor
+class MPIIORestartSimulationObserver : public MPIIOSimulationObserver
{
public:
enum Arrays {
@@ -32,10 +32,10 @@ public:
PressureField = 9
};
- MPIIORestartCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
- ~MPIIORestartCoProcessor() override;
+ MPIIORestartSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
+ ~MPIIORestartSimulationObserver() override;
//! Each timestep writes the grid into the files
- void process(real step) override;
+ void update(real step) override;
//! Reads the grid from the files before grid reconstruction
void restart(int step);
//! Writes the blocks of the grid into the file cpBlocks.bin
@@ -74,8 +74,8 @@ public:
void readBoundaryConds(int step);
//! The function sets LBMKernel
void setLBMKernel(SPtr<LBMKernel> kernel);
- //! The function sets BCProcessor
- void setBCProcessor(SPtr<BCProcessor> bcProcessor);
+ //! The function sets BCSet
+ void setBCSet(SPtr<BCSet> BCSet);
//! The function truncates the data files
void clearAllFiles(int step);
@@ -86,7 +86,7 @@ private:
MPIIODataStructures::boundCondParam boundCondParamStr;
SPtr<LBMKernel> lbmKernel;
- SPtr<BCProcessor> bcProcessor;
+ SPtr<BCSet> bcSet;
//std::vector<double> doubleValuesArrayRW;
};
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOSimulationObserver.cpp
similarity index 95%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOSimulationObserver.cpp
index e238ec8b0f4f342fd24c39ed1e60ab2ad1d137fc..adb47a75a2fbd7fc0e8242ef9b013f6324ae066b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOSimulationObserver.cpp
@@ -1,4 +1,4 @@
-#include "MPIIOCoProcessor.h"
+#include "MPIIOSimulationObserver.h"
#include "Block3D.h"
#include <mpi/Communicator.h>
#include "CoordinateTransformation3D.h"
@@ -12,9 +12,9 @@
using namespace MPIIODataStructures;
-MPIIOCoProcessor::MPIIOCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+MPIIOSimulationObserver::MPIIOSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), comm(comm)
+ : SimulationObserver(grid, s), path(path), comm(comm)
{
UbSystem::makeDirectory(path + "/mpi_io_cp");
@@ -74,7 +74,7 @@ MPIIOCoProcessor::MPIIOCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const
MPI_Type_commit(&arrayPresenceType);
}
-MPIIOCoProcessor::~MPIIOCoProcessor()
+MPIIOSimulationObserver::~MPIIOSimulationObserver()
{
MPI_Type_free(&gridParamType);
MPI_Type_free(&block3dType);
@@ -83,7 +83,7 @@ MPIIOCoProcessor::~MPIIOCoProcessor()
MPI_Type_free(&arrayPresenceType);
}
-void MPIIOCoProcessor::writeBlocks(int step)
+void MPIIOSimulationObserver::writeBlocks(int step)
{
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
@@ -91,7 +91,7 @@ void MPIIOCoProcessor::writeBlocks(int step)
size = 1;
if (comm->isRoot()) {
- UBLOG(logINFO, "MPIIOCoProcessor::writeBlocksToFile start collect data rank = " << rank);
+ UBLOG(logINFO, "MPIIOSimulationObserver::writeBlocksToFile start collect data rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: "
<< Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -187,7 +187,7 @@ void MPIIOCoProcessor::writeBlocks(int step)
}
if (comm->isRoot()) {
- UBLOG(logINFO, "MPIIOCoProcessor::writeBlocksToFile start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOSimulationObserver::writeBlocksToFile start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: "
<< Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -223,21 +223,21 @@ void MPIIOCoProcessor::writeBlocks(int step)
if (comm->isRoot()) {
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOCoProcessor::writeBlocksToFile time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOSimulationObserver::writeBlocksToFile time: " << finish - start << " s");
}
delete[] block3dArray;
delete gridParameters;
}
-void MPIIOCoProcessor::readBlocks(int step)
+void MPIIOSimulationObserver::readBlocks(int step)
{
int rank;
// int size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
// size = 1;
if (comm->isRoot()) {
- UBLOG(logINFO, "MPIIOCoProcessor::readBlocks start MPI IO rank = " << rank);
+ UBLOG(logINFO, "MPIIOSimulationObserver::readBlocks start MPI IO rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: "
<< Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -276,8 +276,8 @@ void MPIIOCoProcessor::readBlocks(int step)
if (comm->isRoot()) {
finish = MPI_Wtime();
- UBLOG(logINFO, "MPIIOCoProcessor::readBlocks time: " << finish - start << " s");
- UBLOG(logINFO, "MPIIOCoProcessor::readBlocks start of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOSimulationObserver::readBlocks time: " << finish - start << " s");
+ UBLOG(logINFO, "MPIIOSimulationObserver::readBlocks start of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: "
<< Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
@@ -359,13 +359,13 @@ void MPIIOCoProcessor::readBlocks(int step)
delete[] block3dArray;
if (comm->isRoot()) {
- UBLOG(logINFO, "MPIIOCoProcessor::readBlocks end of restore of data, rank = " << rank);
+ UBLOG(logINFO, "MPIIOSimulationObserver::readBlocks end of restore of data, rank = " << rank);
UBLOG(logINFO, "Physical Memory currently used by current process: "
<< Utilities::getPhysMemUsedByMe() / 1073741824.0 << " GB");
}
}
-void MPIIOCoProcessor::clearAllFiles(int step)
+void MPIIOSimulationObserver::clearAllFiles(int step)
{
MPI_File file_handler;
MPI_Info info = MPI_INFO_NULL;
@@ -480,7 +480,7 @@ void MPIIOCoProcessor::clearAllFiles(int step)
}
-void MPIIOCoProcessor::writeCpTimeStep(int step)
+void MPIIOSimulationObserver::writeCpTimeStep(int step)
{
if (comm->isRoot()) {
UbFileOutputASCII f(path + "/mpi_io_cp/cp.txt");
@@ -488,7 +488,7 @@ void MPIIOCoProcessor::writeCpTimeStep(int step)
}
}
//////////////////////////////////////////////////////////////////////////
-int MPIIOCoProcessor::readCpTimeStep()
+int MPIIOSimulationObserver::readCpTimeStep()
{
UbFileInputASCII f(path + "/mpi_io_cp/cp.txt");
int step = f.readInteger();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOSimulationObserver.h
similarity index 65%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOSimulationObserver.h
index 68759639d10d0032114bfc30ca0ed5d650f35a3f..c04938a71e62db4753689ad35160a7f980c0c0cb 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MPIIOSimulationObserver.h
@@ -1,7 +1,7 @@
-#ifndef _MPIIOCoProcessor_H_
-#define _MPIIOCoProcessor_H_
+#ifndef _MPIIOSimulationObserver_H_
+#define _MPIIOSimulationObserver_H_
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include <PointerDefinitions.h>
#include <mpi.h>
#include <string>
@@ -10,16 +10,16 @@ class Grid3D;
class UbScheduler;
namespace vf::mpi {class Communicator;}
-//! \class MPIWriteBlocksBECoProcessor
+//! \class MPIWriteBlocksBESimulationObserver
//! \brief Writes the grid each timestep into the files and reads the grip from the files before regenerating
-class MPIIOCoProcessor : public CoProcessor
+class MPIIOSimulationObserver : public SimulationObserver
{
public:
- MPIIOCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
- ~MPIIOCoProcessor() override;
+ MPIIOSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
+ ~MPIIOSimulationObserver() override;
//! Each timestep writes the grid into the files
- void process(real step) override = 0;
+ void update(real step) override = 0;
//! Writes the blocks of the grid into the file cpBlocks.bin
void writeBlocks(int step);
@@ -40,5 +40,5 @@ protected:
std::shared_ptr<vf::mpi::Communicator> comm;
MPI_Datatype gridParamType, block3dType, dataSetParamType, boundCondType, arrayPresenceType;
};
-#endif // ! _MPIIOCoProcessor_H_
-#define _MPIIOCoProcessor_H_
+#endif // ! _MPIIOSimulationObserver_H_
+#define _MPIIOSimulationObserver_H_
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/MicrophoneArraySimulationObserver.cpp
similarity index 85%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MicrophoneArraySimulationObserver.cpp
index f1762b5fdcfa8a2d4b20ee95665a2a3329e85196..2979c841c9c07e44b5a22998897d5665c67b51dc 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MicrophoneArraySimulationObserver.cpp
@@ -1,6 +1,6 @@
-#include "MicrophoneArrayCoProcessor.h"
+#include "MicrophoneArraySimulationObserver.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include <mpi/Communicator.h>
#include "D3Q27System.h"
@@ -12,17 +12,17 @@
#include "Vector3D.h"
#include <sstream>
-MicrophoneArrayCoProcessor::MicrophoneArrayCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+MicrophoneArraySimulationObserver::MicrophoneArraySimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), comm(comm)
+ : SimulationObserver(grid, s), path(path), comm(comm)
{
count = 0;
micID = 0;
}
-MicrophoneArrayCoProcessor::~MicrophoneArrayCoProcessor() = default;
+MicrophoneArraySimulationObserver::~MicrophoneArraySimulationObserver() = default;
-void MicrophoneArrayCoProcessor::process(real step)
+void MicrophoneArraySimulationObserver::update(real step)
{
if (microphones.size() > 0) {
collectData(step);
@@ -31,10 +31,10 @@ void MicrophoneArrayCoProcessor::process(real step)
writeFile(step);
}
- UBLOG(logDEBUG3, "MicrophoneArrayCoProcessor::process:" << step);
+ UBLOG(logDEBUG3, "MicrophoneArraySimulationObserver::update:" << step);
}
-bool MicrophoneArrayCoProcessor::addMicrophone(Vector3D coords)
+bool MicrophoneArraySimulationObserver::addMicrophone(Vector3D coords)
{
micID++;
// UbTupleInt3 blockIndexes = grid->getBlockIndexes(coords[0], coords[1], coords[2]);
@@ -48,7 +48,7 @@ bool MicrophoneArrayCoProcessor::addMicrophone(Vector3D coords)
if (block) {
SPtr<ILBMKernel> kernel = block->getKernel();
if (kernel) {
- SPtr<BCArray3D> bcarray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcarray = kernel->getBCSet()->getBCArray();
UbTupleInt3 nodes = grid->getNodeIndexes(block, coords[0], coords[1], coords[2]);
if (!bcarray->isUndefined(val<1>(nodes), val<2>(nodes), val<3>(nodes))) {
@@ -89,7 +89,7 @@ bool MicrophoneArrayCoProcessor::addMicrophone(Vector3D coords)
return false;
}
-void MicrophoneArrayCoProcessor::collectData(real step)
+void MicrophoneArraySimulationObserver::collectData(real step)
{
for (std::size_t i = 0; i < microphones.size(); i++) {
real f[D3Q27System::ENDF + 1];
@@ -102,7 +102,7 @@ void MicrophoneArrayCoProcessor::collectData(real step)
}
}
-void MicrophoneArrayCoProcessor::writeFile(real /*step*/)
+void MicrophoneArraySimulationObserver::writeFile(real /*step*/)
{
for (std::size_t i = 0; i < microphones.size(); i++) {
std::string fname = path + "/mic/mic_" + UbSystem::toString(microphones[i]->id) + ".csv";
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/MicrophoneArraySimulationObserver.h
similarity index 72%
rename from src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/MicrophoneArraySimulationObserver.h
index 140ac5a48405adb96b64941144a13fa6790a9e8c..e87954fa2902df3c27833729869a70abac348508 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/MicrophoneArraySimulationObserver.h
@@ -1,7 +1,7 @@
-#ifndef MicrophoneArrayCoProcessor_h__
-#define MicrophoneArrayCoProcessor_h__
+#ifndef MicrophoneArraySimulationObserver_h__
+#define MicrophoneArraySimulationObserver_h__
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
#include "UbTuple.h"
#include <array>
@@ -19,15 +19,15 @@ class DistributionArray3D;
//! \author Konstantin Kutscher
//! \date February 2019
-class MicrophoneArrayCoProcessor : public CoProcessor
+class MicrophoneArraySimulationObserver : public SimulationObserver
{
public:
- MicrophoneArrayCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ MicrophoneArraySimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
std::shared_ptr<vf::mpi::Communicator> comm);
- ~MicrophoneArrayCoProcessor() override;
+ ~MicrophoneArraySimulationObserver() override;
//! calls collectData.
- void process(real step) override;
+ void update(real step) override;
//! add microphone
bool addMicrophone(Vector3D coords);
@@ -56,4 +56,4 @@ private:
CalcMacrosFct calcMacros;
};
-#endif // MicrophoneArrayCoProcessor_h__
+#endif // MicrophoneArraySimulationObserver_h__
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/NUPSCounterSimulationObserver.cpp
similarity index 86%
rename from src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/NUPSCounterSimulationObserver.cpp
index af8cf408369454127a1fd246cf19f2e9fecefc96..3bd0bd6f888e64da0db8f492c872c4b15a518b4a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/NUPSCounterSimulationObserver.cpp
@@ -26,20 +26,20 @@
// 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 NUPSCounterCoProcessor.cpp
-//! \ingroup CoProcessors
+//! \file NUPSCounterSimulationObserver.cpp
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#include "NUPSCounterCoProcessor.h"
+#include "NUPSCounterSimulationObserver.h"
#include <mpi/Communicator.h>
#include "Grid3D.h"
#include "UbScheduler.h"
-NUPSCounterCoProcessor::NUPSCounterCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, int numOfThreads,
+NUPSCounterSimulationObserver::NUPSCounterSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, int numOfThreads,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), numOfThreads(numOfThreads), nup(0), nup_t(0), nupsStep(0.0), comm(comm)
+ : SimulationObserver(grid, s), numOfThreads(numOfThreads), nup(0), nup_t(0), nupsStep(0.0), comm(comm)
{
if (comm->getProcessID() == comm->getRoot()) {
timer.resetAndStart();
@@ -59,15 +59,15 @@ NUPSCounterCoProcessor::NUPSCounterCoProcessor(SPtr<Grid3D> grid, SPtr<UbSchedul
}
}
//////////////////////////////////////////////////////////////////////////
-NUPSCounterCoProcessor::~NUPSCounterCoProcessor() = default;
+NUPSCounterSimulationObserver::~NUPSCounterSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void NUPSCounterCoProcessor::process(real step)
+void NUPSCounterSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
}
//////////////////////////////////////////////////////////////////////////
-void NUPSCounterCoProcessor::collectData(real step)
+void NUPSCounterSimulationObserver::collectData(real step)
{
if (comm->getProcessID() == comm->getRoot()) {
real time = timer.stop();
@@ -76,7 +76,7 @@ void NUPSCounterCoProcessor::collectData(real step)
real tnups = nups / (real)numOfThreads;
UBLOG(logINFO, "Calculation step = " << step);
UBLOG(logINFO, "Total performance = " << nups_t << " NUPS");
- UBLOG(logINFO, "Performance per process = " << nups << " NUPS");
+ UBLOG(logINFO, "Performance per update = " << nups << " NUPS");
UBLOG(logINFO, "Performance per thread = " << tnups << " NUPS");
UBLOG(logINFO, "Time for " << step - nupsStep << " steps = " << time << " s");
nupsStep = step;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/NUPSCounterSimulationObserver.h
similarity index 82%
rename from src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/NUPSCounterSimulationObserver.h
index b178c97fe25647c7bec60883811a3263abc046bc..fdce1c4d67519b6d0a109e3cbd13e23b69d0fb19 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/NUPSCounterCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/NUPSCounterSimulationObserver.h
@@ -26,38 +26,38 @@
// 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 NUPSCounterCoProcessor.h
-//! \ingroup CoProcessors
+//! \file NUPSCounterSimulationObserver.h
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef NUPSCOUNTERCoProcessor_H_
-#define NUPSCOUNTERCoProcessor_H_
+#ifndef NUPSCOUNTERSimulationObserver_H_
+#define NUPSCOUNTERSimulationObserver_H_
#include <PointerDefinitions.h>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "basics/utilities/UbTiming.h"
namespace vf::mpi {class Communicator;}
class Grid3D;
class UbScheduler;
-//! \class NUPSCounterCoProcessor
+//! \class NUPSCounterSimulationObserver
//! \brief A class calculates Nodal Updates Per Second (NUPS)
-class NUPSCounterCoProcessor : public CoProcessor
+class NUPSCounterSimulationObserver : public SimulationObserver
{
public:
- //! \brief Construct NUPSCounterCoProcessor object for grid object and scheduler object.
+ //! \brief Construct NUPSCounterSimulationObserver object for grid object and scheduler object.
//! \pre The Grid3D and UbScheduler objects must exist.
//! \param grid is observable Grid3D object
//! \param s is UbScheduler object for scheduling of observer
//! \param numOfThreads is number of threads
//! \param comm is Communicator object
- NUPSCounterCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, int numOfThreads, std::shared_ptr<vf::mpi::Communicator> comm);
- ~NUPSCounterCoProcessor() override;
+ NUPSCounterSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, int numOfThreads, std::shared_ptr<vf::mpi::Communicator> comm);
+ ~NUPSCounterSimulationObserver() override;
- void process(real step) override;
+ void update(real step) override;
protected:
//! Collect data for calculation of NUPS
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/PressureCoefficientSimulationObserver.cpp
similarity index 87%
rename from src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/PressureCoefficientSimulationObserver.cpp
index 4197c5cfe7e9d8f0f9da618ff58f4b421ae3d4fa..7c9cd4b85e1404339b2c180bef93eafedff38c23 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/PressureCoefficientSimulationObserver.cpp
@@ -1,8 +1,8 @@
-#include "PressureCoefficientCoProcessor.h"
+#include "PressureCoefficientSimulationObserver.h"
#include <WbWriterVtkXmlASCII.h>
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include <mpi/Communicator.h>
#include "D3Q27Interactor.h"
@@ -12,26 +12,26 @@
#include "LBMKernel.h"
#include "UbScheduler.h"
-PressureCoefficientCoProcessor::PressureCoefficientCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+PressureCoefficientSimulationObserver::PressureCoefficientSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
GbCuboid3DPtr plane, const std::string &path,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), plane(plane), path(path), comm(comm)
+ : SimulationObserver(grid, s), plane(plane), path(path), comm(comm)
{
maxStep = scheduler->getMaxEnd();
numberOfSteps = int(maxStep - scheduler->getMinBegin());
}
//////////////////////////////////////////////////////////////////////////
-PressureCoefficientCoProcessor::~PressureCoefficientCoProcessor() = default;
+PressureCoefficientSimulationObserver::~PressureCoefficientSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void PressureCoefficientCoProcessor::process(real step)
+void PressureCoefficientSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "D3Q27ForcesCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "D3Q27ForcesSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void PressureCoefficientCoProcessor::collectData(real step)
+void PressureCoefficientSimulationObserver::collectData(real step)
{
calculateRho();
@@ -40,7 +40,7 @@ void PressureCoefficientCoProcessor::collectData(real step)
}
}
//////////////////////////////////////////////////////////////////////////
-void PressureCoefficientCoProcessor::calculateRho()
+void PressureCoefficientSimulationObserver::calculateRho()
{
real f[D3Q27System::ENDF + 1];
real vx1, vx2, vx3, rho;
@@ -54,7 +54,7 @@ void PressureCoefficientCoProcessor::calculateRho()
std::set<std::vector<int>> &bcNodeIndicesSet = t.second;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
@@ -120,7 +120,7 @@ void PressureCoefficientCoProcessor::calculateRho()
}
}
//////////////////////////////////////////////////////////////////////////
-void PressureCoefficientCoProcessor::writeValues(int step)
+void PressureCoefficientSimulationObserver::writeValues(int step)
{
if (comm->getProcessID() == comm->getRoot()) {
datanames.resize(0);
@@ -176,10 +176,10 @@ void PressureCoefficientCoProcessor::writeValues(int step)
out.close();
- UBLOG(logINFO, "PressureCoefficientCoProcessor::writeValues() step: " << (int)step);
+ UBLOG(logINFO, "PressureCoefficientSimulationObserver::writeValues() step: " << (int)step);
}
}
-void PressureCoefficientCoProcessor::readValues(int step)
+void PressureCoefficientSimulationObserver::readValues(int step)
{
if (comm->isRoot()) {
std::string fname = path + UbSystem::toString(step) + ".bin";
@@ -199,11 +199,11 @@ void PressureCoefficientCoProcessor::readValues(int step)
in.close();
- UBLOG(logINFO, "PressureCoefficientCoProcessor::readValues() step: " << (int)step);
+ UBLOG(logINFO, "PressureCoefficientSimulationObserver::readValues() step: " << (int)step);
}
}
//////////////////////////////////////////////////////////////////////////
-void PressureCoefficientCoProcessor::addInteractor(SPtr<D3Q27Interactor> interactor)
+void PressureCoefficientSimulationObserver::addInteractor(SPtr<D3Q27Interactor> interactor)
{
interactors.push_back(interactor);
}
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/PressureCoefficientSimulationObserver.h
similarity index 69%
rename from src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/PressureCoefficientSimulationObserver.h
index 26b8117aea007671bc1d6b17104f015cd62ddda3..bfb56a65dd31fd6f434462471c6a236340b05db0 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/PressureCoefficientSimulationObserver.h
@@ -1,11 +1,11 @@
-#ifndef PressureCoefficientCoProcessor_h__
-#define PressureCoefficientCoProcessor_h__
+#ifndef PressureCoefficientSimulationObserver_h__
+#define PressureCoefficientSimulationObserver_h__
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
#include "UbTuple.h"
@@ -15,14 +15,14 @@ namespace vf::mpi {class Communicator;}
class Grid3D;
class UbScheduler;
-class PressureCoefficientCoProcessor : public CoProcessor
+class PressureCoefficientSimulationObserver : public SimulationObserver
{
public:
- PressureCoefficientCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<GbCuboid3D> plane,
+ PressureCoefficientSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<GbCuboid3D> plane,
const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
- ~PressureCoefficientCoProcessor() override;
+ ~PressureCoefficientSimulationObserver() override;
- void process(real step) override;
+ void update(real step) override;
void addInteractor(SPtr<D3Q27Interactor> interactor);
void readValues(int step);
@@ -50,4 +50,4 @@ private:
CalcMacrosFct calcMacros;
};
-#endif // PressureDistributionCoProcessor_h__
+#endif // PressureDistributionSimulationObserver_h__
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/PressureDifferenceSimulationObserver.cpp
similarity index 88%
rename from src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/PressureDifferenceSimulationObserver.cpp
index a486da249e5c2ce2eeaaf53fa4601d39bda689b0..9b3c63f407b9fac00de6177a369fec2cb3e74a82 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/PressureDifferenceSimulationObserver.cpp
@@ -1,11 +1,11 @@
/*
- * D3Q27RhoCoProcessor.cpp
+ * D3Q27RhoSimulationObserver.cpp
*
* Created on: 28.12.2010
* Author: kucher
*/
-#include "PressureDifferenceCoProcessor.h"
+#include "PressureDifferenceSimulationObserver.h"
#include <fstream>
@@ -15,12 +15,12 @@
#include "LBMUnitConverter.h"
#include "UbScheduler.h"
-PressureDifferenceCoProcessor::PressureDifferenceCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+PressureDifferenceSimulationObserver::PressureDifferenceSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
const std::string &path, SPtr<IntegrateValuesHelper> h1,
SPtr<IntegrateValuesHelper> h2, real rhoReal,
real uReal, real uLB, std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), h1(h1), h2(h2), comm(comm)
+ : SimulationObserver(grid, s), path(path), h1(h1), h2(h2), comm(comm)
{
if (comm->getProcessID() == comm->getRoot()) {
std::ofstream ostr;
@@ -69,15 +69,15 @@ PressureDifferenceCoProcessor::PressureDifferenceCoProcessor(SPtr<Grid3D> grid,
}
}
//////////////////////////////////////////////////////////////////////////
-PressureDifferenceCoProcessor::~PressureDifferenceCoProcessor() = default;
+PressureDifferenceSimulationObserver::~PressureDifferenceSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void PressureDifferenceCoProcessor::process(real step)
+void PressureDifferenceSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
}
//////////////////////////////////////////////////////////////////////////
-void PressureDifferenceCoProcessor::collectData(real step)
+void PressureDifferenceSimulationObserver::collectData(real step)
{
h1->calculateMQ();
h2->calculateMQ();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/PressureDifferenceSimulationObserver.h
similarity index 67%
rename from src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/PressureDifferenceSimulationObserver.h
index 09523552289297b78fb59b66e86e7ba84e1ed00b..35356d25f9fa941500188fc75850d1bb7c8f86fb 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureDifferenceCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/PressureDifferenceSimulationObserver.h
@@ -1,17 +1,17 @@
/*
- * D3Q27PressureDifferenceCoProcessor.h
+ * D3Q27PressureDifferenceSimulationObserver.h
*
* Created on: 28.12.2010
* Author: kucher
*/
-#ifndef D3Q27PRESSUREDIFFERENCECoProcessor_H
-#define D3Q27PRESSUREDIFFERENCECoProcessor_H
+#ifndef D3Q27PRESSUREDIFFERENCESimulationObserver_H
+#define D3Q27PRESSUREDIFFERENCESimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
namespace vf::mpi {class Communicator;}
@@ -20,16 +20,16 @@ class UbScheduler;
class LBMUnitConverter;
class IntegrateValuesHelper;
-class PressureDifferenceCoProcessor : public CoProcessor
+class PressureDifferenceSimulationObserver : public SimulationObserver
{
public:
- PressureDifferenceCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ PressureDifferenceSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
SPtr<IntegrateValuesHelper> h1, SPtr<IntegrateValuesHelper> h2, real rhoReal,
real uReal, real uLB,
/*const SPtr<LBMUnitConverter> conv,*/ std::shared_ptr<vf::mpi::Communicator> comm);
- ~PressureDifferenceCoProcessor() override;
+ ~PressureDifferenceSimulationObserver() override;
- void process(real step) override;
+ void update(real step) override;
protected:
SPtr<IntegrateValuesHelper> h1, h2;
@@ -43,4 +43,4 @@ protected:
//uReal in SI
};
-#endif /* D3Q27RHODIFFERENCECoProcessor_H_ */
+#endif /* D3Q27RHODIFFERENCESimulationObserver_H_ */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.cpp
similarity index 90%
rename from src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.cpp
index 4e62a1c6bbb4c9f9a74968170c5821cc0f46fd23..f94b1b4472e894eb8cb975f9013b6d2aabb5214a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.cpp
@@ -1,5 +1,5 @@
-#include "QCriterionCoProcessor.h"
-#include "BCProcessor.h"
+#include "QCriterionSimulationObserver.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "DataSet3D.h"
#include "Grid3D.h"
@@ -10,14 +10,14 @@
#include <mpi/Communicator.h>
#include "UbScheduler.h"
-QCriterionCoProcessor::QCriterionCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
+QCriterionSimulationObserver::QCriterionSimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
SPtr<UbScheduler> s, std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), comm(comm), writer(writer)
+ : SimulationObserver(grid, s), path(path), comm(comm), writer(writer)
{
init();
}
//////////////////////////////////////////////////////////////////////////
-void QCriterionCoProcessor::init()
+void QCriterionSimulationObserver::init()
{
gridRank = comm->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -28,19 +28,19 @@ void QCriterionCoProcessor::init()
for (int level = minInitLevel; level <= maxInitLevel; level++) {
grid->getBlocks(
level, gridRank, true,
- blockVector[level]); // grid: private variable in CoProcessor. Initialized by filling with blocks
+ blockVector[level]); // grid: private variable in SimulationObserver. Initialized by filling with blocks
}
}
//////////////////////////////////////////////////////////////////////////
-void QCriterionCoProcessor::process(real step)
+void QCriterionSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "QCriterionCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "QCriterionSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void QCriterionCoProcessor::collectData(real step)
+void QCriterionSimulationObserver::collectData(real step)
{
int istep = static_cast<int>(step);
@@ -59,7 +59,7 @@ void QCriterionCoProcessor::collectData(real step)
std::vector<std::string> cellDataNames;
- // distributed writing as in MacroscopicValuesCoProcessor.cpp
+ // distributed writing as in MacroscopicValuesSimulationObserver.cpp
std::vector<std::string> pieces = comm->gather(piece); // comm: MPI-Wrapper
if (comm->getProcessID() == comm->getRoot()) {
std::string pname = WbWriterVtkXmlASCII::getInstance()->writeParallelFile(
@@ -67,19 +67,19 @@ void QCriterionCoProcessor::collectData(real step)
std::vector<std::string> filenames;
filenames.push_back(pname);
- if (step == CoProcessor::scheduler->getMinBegin()) // first time in timeseries
+ if (step == SimulationObserver::scheduler->getMinBegin()) // first time in timeseries
{
WbWriterVtkXmlASCII::getInstance()->writeCollection(path + "_collection", filenames, istep, false);
} else {
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(path + "_collection", filenames, istep, false);
}
- UBLOG(logINFO, "QCriterionCoProcessor step: " << istep);
+ UBLOG(logINFO, "QCriterionSimulationObserver step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void QCriterionCoProcessor::clearData()
+void QCriterionSimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -87,7 +87,7 @@ void QCriterionCoProcessor::clearData()
data.clear();
}
//////////////////////////////////////////////////////////////////////////
-void QCriterionCoProcessor::addData(const SPtr<Block3D> block)
+void QCriterionSimulationObserver::addData(const SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
// UbTupleDouble3 blockLengths = grid->getBlockLengths(block);
@@ -101,7 +101,7 @@ void QCriterionCoProcessor::addData(const SPtr<Block3D> block)
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
int minX1 = 0;
@@ -200,11 +200,11 @@ void QCriterionCoProcessor::addData(const SPtr<Block3D> block)
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void QCriterionCoProcessor::getNeighborVelocities(int offx, int offy, int offz, int ix1, int ix2, int ix3,
+void QCriterionSimulationObserver::getNeighborVelocities(int offx, int offy, int offz, int ix1, int ix2, int ix3,
const SPtr<Block3D> block, real *vE, real *vW)
{
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
bool compressible = block->getKernel()->getCompressible();
@@ -214,13 +214,13 @@ void QCriterionCoProcessor::getNeighborVelocities(int offx, int offy, int offz,
// 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, "QCriterionCoProcessor: NX1 too small for FD stencils!");
+ 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;
@@ -280,7 +280,7 @@ void QCriterionCoProcessor::getNeighborVelocities(int offx, int offy, int offz,
if (!checkInterpolation || neighNodeIsBC) {
SPtr<ILBMKernel> kernelW = blockNeighW->getKernel();
- SPtr<BCArray3D> bcArrayW = kernelW->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArrayW = kernelW->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributionsW = kernelW->getDataSet()->getFdistributions();
real fW2[27];
real fW[27];
@@ -312,7 +312,7 @@ void QCriterionCoProcessor::getNeighborVelocities(int offx, int offy, int offz,
// throw UbException(UB_EXARGS,"Parallel or Non-Uniform Simulation -- not yet implemented");
} else {
SPtr<ILBMKernel> kernelW = blockNeighW->getKernel();
- SPtr<BCArray3D> bcArrayW = kernelW->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArrayW = kernelW->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributionsW = kernelW->getDataSet()->getFdistributions();
real fW[27];
@@ -343,7 +343,7 @@ void QCriterionCoProcessor::getNeighborVelocities(int offx, int offy, int offz,
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void QCriterionCoProcessor::computeVelocity(real *f, real *v, bool compressible)
+void QCriterionSimulationObserver::computeVelocity(real *f, real *v, bool compressible)
{
//////////////////////////////////////////////////////////////////////////
// compute x,y,z-velocity components from distribution
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.h
similarity index 84%
rename from src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.h
index 38cd47fb890ffc79bb3f43ecc17bbe42885fa114..1d5aec23f9d4af9d9e232dd215fbde060a7c6f7c 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/QCriterionSimulationObserver.h
@@ -1,15 +1,15 @@
-//! \file QCriterionCoProcessor.h
+//! \file QCriterionSimulationObserver.h
//! \brief Created on: 25.08.2013
//! \author: Sonja Uphoff
-#ifndef QCriterionCoProcessor_H
-#define QCriterionCoProcessor_H
+#ifndef QCriterionSimulationObserver_H
+#define QCriterionSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
#include "UbTuple.h"
@@ -25,13 +25,13 @@ class Block3D;
//! Q-Criterion: Visualize Vorteces as regions where Vorticity is larger than strain rate (Hunt, 1988)
//! \author Sonja Uphoff
-class QCriterionCoProcessor : public CoProcessor
+class QCriterionSimulationObserver : public SimulationObserver
{
public:
- QCriterionCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer, SPtr<UbScheduler> s,
+ QCriterionSimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer, SPtr<UbScheduler> s,
std::shared_ptr<vf::mpi::Communicator> comm);
//! Make update if timestep is write-timestep specified in SPtr<UbScheduler> s
- void process(real step) override;
+ void update(real step) override;
protected:
//! Prepare data and write in .vtk file
@@ -50,7 +50,7 @@ private:
void init();
std::vector<UbTupleFloat3> nodes;
std::vector<UbTupleUInt8> cells;
- std::vector<std::string> datanames; // only one entry for QKrit-CoProcessor: Q
+ std::vector<std::string> datanames; // only one entry for QKrit-SimulationObserver: Q
std::vector<std::vector<real>> data;
std::vector<std::vector<SPtr<Block3D>>> blockVector;
int minInitLevel; // go through all levels for block vector of current process from minInitLevel to maxInitLevel
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
similarity index 96%
rename from src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
index cd1f9c54cb50585b572a61cdc7d8c884386b864c..92c8f5f60344019cff472851104b86e5838302a8 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.cpp
@@ -1,5 +1,5 @@
-#include "ShearStressCoProcessor.h"
-#include "BCProcessor.h"
+#include "ShearStressSimulationObserver.h"
+#include "BCSet.h"
#include "WbWriterVtkXmlASCII.h"
#include "BCArray3D.h"
@@ -12,9 +12,9 @@
#include "LBMKernel.h"
#include "UbScheduler.h"
-ShearStressCoProcessor::ShearStressCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
+ShearStressSimulationObserver::ShearStressSimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
SPtr<UbScheduler> s, SPtr<UbScheduler> rs)
- : CoProcessor(grid, s), Resetscheduler(rs), path(path), writer(writer)
+ : SimulationObserver(grid, s), Resetscheduler(rs), path(path), writer(writer)
{
std::shared_ptr<vf::mpi::Communicator> comm = vf::mpi::Communicator::getInstance();
normals.push_back(0);
@@ -36,9 +36,9 @@ ShearStressCoProcessor::ShearStressCoProcessor(SPtr<Grid3D> grid, const std::str
}
}
//////////////////////////////////////////////////////////////////////////
-ShearStressCoProcessor::~ShearStressCoProcessor() = default;
+ShearStressSimulationObserver::~ShearStressSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::process(real step)
+void ShearStressSimulationObserver::update(real step)
{
if (step == 0) {
initDistance();
@@ -46,10 +46,10 @@ void ShearStressCoProcessor::process(real step)
calculateShearStress(step);
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "D3Q27ShearStressCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "D3Q27ShearStressSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::collectData(real step)
+void ShearStressSimulationObserver::collectData(real step)
{
using namespace std;
@@ -71,7 +71,7 @@ void ShearStressCoProcessor::collectData(real step)
// vector<string> filenames;
// filenames.push_back(pname);
- // if (step == CoProcessor::scheduler->getMinBegin())
+ // if (step == SimulationObserver::scheduler->getMinBegin())
// {
// WbWriterVtkXmlASCII::getInstance()->writeCollection(path+"__Shear_collection",filenames,istep,false);
// }
@@ -79,7 +79,7 @@ void ShearStressCoProcessor::collectData(real step)
// {
// WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(path+"__Shear_collection",filenames,istep,false);
// }
- // UBLOG(logINFO,"D3Q27ShearStressCoProcessor step: " << istep);
+ // UBLOG(logINFO,"D3Q27ShearStressSimulationObserver step: " << istep);
//}
string pfilePath, partPath, subfolder, cfilePath;
@@ -104,25 +104,25 @@ void ShearStressCoProcessor::collectData(real step)
vector<string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin()) {
+ if (step == SimulationObserver::scheduler->getMinBegin()) {
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
} else {
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- UBLOG(logINFO, "D3Q27ShearStressCoProcessor step: " << istep);
+ UBLOG(logINFO, "D3Q27ShearStressSimulationObserver step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::clearData()
+void ShearStressSimulationObserver::clearData()
{
nodes.clear();
datanames.clear();
data.clear();
}
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::calculateShearStress(real timeStep)
+void ShearStressSimulationObserver::calculateShearStress(real timeStep)
{
using namespace vf::lbm::dir;
using namespace D3Q27System;
@@ -137,7 +137,7 @@ void ShearStressCoProcessor::calculateShearStress(real timeStep)
std::set<std::vector<int>> &transNodeIndicesSet = t.second;
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<ShearStressValuesArray3D> ssv = kernel->getDataSet()->getShearStressValues();
@@ -231,7 +231,7 @@ void ShearStressCoProcessor::calculateShearStress(real timeStep)
}
}
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::addData()
+void ShearStressSimulationObserver::addData()
{
// Diese Daten werden geschrieben:
datanames.resize(0);
@@ -253,7 +253,7 @@ void ShearStressCoProcessor::addData()
real dx = grid->getDeltaX(block);
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<ShearStressValuesArray3D> ssv = kernel->getDataSet()->getShearStressValues();
@@ -345,15 +345,15 @@ void ShearStressCoProcessor::addData()
}
}
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::reset(real step)
+void ShearStressSimulationObserver::reset(real step)
{
if (Resetscheduler->isDue(step))
resetData(step);
- UBLOG(logDEBUG3, "resetCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "resetSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::resetData(real /*step*/)
+void ShearStressSimulationObserver::resetData(real /*step*/)
{
for (int level = minInitLevel; level <= maxInitLevel; level++) {
for (const auto &block : blockVector[level]) {
@@ -364,7 +364,7 @@ void ShearStressCoProcessor::resetData(real /*step*/)
// double dx = grid->getDeltaX(block);
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<ShearStressValuesArray3D> ssv = kernel->getDataSet()->getShearStressValues();
@@ -403,9 +403,9 @@ void ShearStressCoProcessor::resetData(real /*step*/)
}
}
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::addInteractor(SPtr<D3Q27Interactor> interactor) { interactors.push_back(interactor); }
+void ShearStressSimulationObserver::addInteractor(SPtr<D3Q27Interactor> interactor) { interactors.push_back(interactor); }
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::findPlane(int ix1, int ix2, int ix3, SPtr<Grid3D> grid, SPtr<Block3D> block, real &A,
+void ShearStressSimulationObserver::findPlane(int ix1, int ix2, int ix3, SPtr<Grid3D> grid, SPtr<Block3D> block, real &A,
real &B, real &C, real &D, real &ii)
{
using namespace vf::lbm::dir;
@@ -417,7 +417,7 @@ void ShearStressCoProcessor::findPlane(int ix1, int ix2, int ix3, SPtr<Grid3D> g
real dx = grid->getDeltaX(block);
SPtr<ILBMKernel> kernel = block->getKernel();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
bcPtr = bcArray->getBC(ix1, ix2, ix3);
int x, y, z;
@@ -823,7 +823,7 @@ void ShearStressCoProcessor::findPlane(int ix1, int ix2, int ix3, SPtr<Grid3D> g
}
////////////////////////////////////////////////////////////////////////////////////////////////////////
-bool ShearStressCoProcessor::checkUndefindedNodes(SPtr<BCArray3D> bcArray, int ix1, int ix2, int ix3)
+bool ShearStressSimulationObserver::checkUndefindedNodes(SPtr<BCArray3D> bcArray, int ix1, int ix2, int ix3)
{
for (int i = ix1; i <= ix1 + 1; i++) {
for (int j = ix2; j <= ix2 + 1; j++) {
@@ -836,7 +836,7 @@ bool ShearStressCoProcessor::checkUndefindedNodes(SPtr<BCArray3D> bcArray, int i
return false;
}
//////////////////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::initDistance()
+void ShearStressSimulationObserver::initDistance()
{
using namespace vf::lbm::dir;
@@ -852,7 +852,7 @@ void ShearStressCoProcessor::initDistance()
// double dx = grid->getDeltaX(block);
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<ShearStressValuesArray3D> ssv = kernel->getDataSet()->getShearStressValues();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.h
similarity index 82%
rename from src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.h
index 73fd42d6485321a26e11b2cf0b4b2a521a0881fd..66a76356d5a1fe8d7b096e3db0e1452dca8d613f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/ShearStressSimulationObserver.h
@@ -1,5 +1,5 @@
-#ifndef D3Q27ShearStressCoProcessor_H
-#define D3Q27ShearStressCoProcessor_H
+#ifndef D3Q27ShearStressSimulationObserver_H
+#define D3Q27ShearStressSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
@@ -7,7 +7,7 @@
#include <basics/utilities/UbTuple.h>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
class Block3D;
class Grid3D;
@@ -21,17 +21,17 @@ class WbWriter;
//! Take root to obtain during post processing (paraview).
//! \author K. Kucher, S. Uphoff, M. Geier, E. Goraki Fard
-class ShearStressCoProcessor : public CoProcessor
+class ShearStressSimulationObserver : public SimulationObserver
{
public:
//! Default constructor
- ShearStressCoProcessor() = default;
+ ShearStressSimulationObserver() = default;
//! Constructor
- ShearStressCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer, SPtr<UbScheduler> s,
+ ShearStressSimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer, SPtr<UbScheduler> s,
SPtr<UbScheduler> rs);
- ~ShearStressCoProcessor() override;
+ ~ShearStressSimulationObserver() override;
- void process(real step) override;
+ void update(real step) override;
void addInteractor(SPtr<D3Q27Interactor> interactor);
@@ -82,4 +82,4 @@ private:
};
};
-#endif /* D3Q27ShearStressCoProcessor_H */
+#endif /* D3Q27ShearStressSimulationObserver_H */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/SimulationObserver.cpp
similarity index 87%
rename from src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/SimulationObserver.cpp
index 6572ac8b5c6a21eb29c773f0da8bcd1d4fa2e286..cef156e5689ee19f99c756771341a81a46357323 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/SimulationObserver.cpp
@@ -26,18 +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 CoProcessor.cpp
-//! \ingroup CoProcessors
+//! \file SimulationObserver.cpp
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "Grid3D.h"
#include "UbScheduler.h"
-CoProcessor::CoProcessor() = default;
+SimulationObserver::SimulationObserver() = default;
-CoProcessor::CoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s) : grid(grid), scheduler(s) {}
+SimulationObserver::SimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s) : grid(grid), scheduler(s) {}
-CoProcessor::~CoProcessor() = default;
+SimulationObserver::~SimulationObserver() = default;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/SimulationObserver.h
similarity index 82%
rename from src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/SimulationObserver.h
index 7aae7505b02ed9248a31b2a009cdc75f09ecd73a..f0c8e0e2c6428c4093f5a94204851988af38a5cd 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/CoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/SimulationObserver.h
@@ -26,13 +26,13 @@
// 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 CoProcessor.h
-//! \ingroup CoProcessors
+//! \file SimulationObserver.h
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef CoProcessor_H
-#define CoProcessor_H
+#ifndef SimulationObserver_H
+#define SimulationObserver_H
#include <PointerDefinitions.h>
#include "lbm/constants/D3Q27.h"
@@ -40,26 +40,26 @@
class Grid3D;
class UbScheduler;
-//! \class CoProcessor
+//! \class SimulationObserver
//! \brief An abstract class implements observer design pettern
-class CoProcessor
+class SimulationObserver
{
public:
//! Class default constructor
- CoProcessor();
- //! \brief Construct CoProcessor object for grid object and scheduler object.
+ SimulationObserver();
+ //! \brief Construct SimulationObserver object for grid object and scheduler object.
//! \pre The Grid3D and UbScheduler objects must exist.
//! \param grid is observable Grid3D object
//! \param s is UbScheduler object for scheduling of observer
//! \details
- //! Class CoProcessor implements the observer design pettern. CoProcessor object is observer. Grid3D object is
+ //! Class SimulationObserver implements the observer design pettern. SimulationObserver object is observer. Grid3D object is
//! observable.
- CoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s);
+ SimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s);
//! Class destructor
- virtual ~CoProcessor();
+ virtual ~SimulationObserver();
//! \brief Updates observer
//! \param step is the actual time step
- virtual void process(real step) = 0;
+ virtual void update(real step) = 0;
protected:
SPtr<Grid3D> grid;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeAveragedValuesSimulationObserver.cpp
similarity index 95%
rename from src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/TimeAveragedValuesSimulationObserver.cpp
index 8fa95c121ee61f419d778a636cacbb129ecdfe9e..ebd65f625600a1c68f48d00c33a79976ea6d1a5a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeAveragedValuesSimulationObserver.cpp
@@ -1,6 +1,6 @@
-#include "TimeAveragedValuesCoProcessor.h"
+#include "TimeAveragedValuesSimulationObserver.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "LBMKernel.h"
#include "Block3D.h"
@@ -12,31 +12,31 @@
#include "BCArray3D.h"
-TimeAveragedValuesCoProcessor::TimeAveragedValuesCoProcessor() = default;
+TimeAveragedValuesSimulationObserver::TimeAveragedValuesSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-TimeAveragedValuesCoProcessor::TimeAveragedValuesCoProcessor(SPtr<Grid3D> grid, const std::string &path,
+TimeAveragedValuesSimulationObserver::TimeAveragedValuesSimulationObserver(SPtr<Grid3D> grid, const std::string &path,
WbWriter *const writer, SPtr<UbScheduler> s,
std::shared_ptr<vf::mpi::Communicator> comm, int options)
- : CoProcessor(grid, s), path(path), writer(writer), comm(comm), options(options)
+ : SimulationObserver(grid, s), path(path), writer(writer), comm(comm), options(options)
{
init();
planarAveraging = false;
timeAveraging = true;
}
//////////////////////////////////////////////////////////////////////////
-TimeAveragedValuesCoProcessor::TimeAveragedValuesCoProcessor(SPtr<Grid3D> grid, const std::string &path,
+TimeAveragedValuesSimulationObserver::TimeAveragedValuesSimulationObserver(SPtr<Grid3D> grid, const std::string &path,
WbWriter *const writer, SPtr<UbScheduler> s,
std::shared_ptr<vf::mpi::Communicator> comm, int options,
std::vector<int> levels, std::vector<real> &levelCoords,
std::vector<real> &bounds, bool timeAveraging)
- : CoProcessor(grid, s), path(path), writer(writer), comm(comm), options(options), levels(levels),
+ : SimulationObserver(grid, s), path(path), writer(writer), comm(comm), options(options), levels(levels),
levelCoords(levelCoords), bounds(bounds), timeAveraging(timeAveraging)
{
init();
planarAveraging = true;
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::init()
+void TimeAveragedValuesSimulationObserver::init()
{
root = comm->isRoot();
gridRank = grid->getRank();
@@ -75,7 +75,7 @@ void TimeAveragedValuesCoProcessor::init()
}
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::initData()
+void TimeAveragedValuesSimulationObserver::initData()
{
blockVector.clear();
blockVector.resize(maxInitLevel + 1);
@@ -116,7 +116,7 @@ void TimeAveragedValuesCoProcessor::initData()
}
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::process(real step)
+void TimeAveragedValuesSimulationObserver::update(real step)
{
if (step == minStep) {
initData();
@@ -146,10 +146,10 @@ void TimeAveragedValuesCoProcessor::process(real step)
}
}
- UBLOG(logDEBUG3, "AverageValuesCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "AverageValuesSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::collectData(real step)
+void TimeAveragedValuesSimulationObserver::collectData(real step)
{
int istep = int(step);
@@ -176,13 +176,13 @@ void TimeAveragedValuesCoProcessor::collectData(real step)
if (root) {
std::string pname =
WbWriterVtkXmlASCII::getInstance()->writeParallelFile(pfilePath, pieces, datanames, cellDataNames);
- UBLOG(logINFO, "TimeAveragedValuesCoProcessor::collectData() step: " << istep);
+ UBLOG(logINFO, "TimeAveragedValuesSimulationObserver::collectData() step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::clearData()
+void TimeAveragedValuesSimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -190,7 +190,7 @@ void TimeAveragedValuesCoProcessor::clearData()
data.clear();
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::addData(const SPtr<Block3D> block)
+void TimeAveragedValuesSimulationObserver::addData(const SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
// UbTupleDouble3 blockLengths = grid->getBlockLengths(block);
@@ -244,7 +244,7 @@ void TimeAveragedValuesCoProcessor::addData(const SPtr<Block3D> block)
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> ar = kernel->getDataSet()->getAverageDensity();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageVelocity();
@@ -352,7 +352,7 @@ void TimeAveragedValuesCoProcessor::addData(const SPtr<Block3D> block)
}
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::calculateAverageValues(real timeSteps)
+void TimeAveragedValuesSimulationObserver::calculateAverageValues(real timeSteps)
{
for (int level = minInitLevel; level <= maxInitLevel; level++) {
int i;
@@ -365,7 +365,7 @@ void TimeAveragedValuesCoProcessor::calculateAverageValues(real timeSteps)
SPtr<Block3D> block = blockVector[level][i];
if (block) {
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> ar = kernel->getDataSet()->getAverageDensity();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageVelocity();
@@ -463,7 +463,7 @@ void TimeAveragedValuesCoProcessor::calculateAverageValues(real timeSteps)
}
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::calculateSubtotal(real step)
+void TimeAveragedValuesSimulationObserver::calculateSubtotal(real step)
{
if (scheduler->isDue(step)) {
@@ -487,7 +487,7 @@ void TimeAveragedValuesCoProcessor::calculateSubtotal(real step)
SPtr<Block3D> block = blockVector[level][i];
if (block) {
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> ar = kernel->getDataSet()->getAverageDensity();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageVelocity();
@@ -574,7 +574,7 @@ void TimeAveragedValuesCoProcessor::calculateSubtotal(real step)
}
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::planarAverage(real step)
+void TimeAveragedValuesSimulationObserver::planarAverage(real step)
{
std::ofstream ostr;
@@ -692,11 +692,11 @@ void TimeAveragedValuesCoProcessor::planarAverage(real step)
if (root) {
ostr.close();
- UBLOG(logINFO, "TimeAveragedValuesCoProcessor::planarAverage() step: " << (int)step);
+ UBLOG(logINFO, "TimeAveragedValuesSimulationObserver::planarAverage() step: " << (int)step);
}
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::reset()
+void TimeAveragedValuesSimulationObserver::reset()
{
for (int level = minInitLevel; level <= maxInitLevel; level++) {
for (SPtr<Block3D> block : blockVector[level]) {
@@ -725,7 +725,7 @@ void TimeAveragedValuesCoProcessor::reset()
}
}
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::setWithGhostLayer(bool val)
+void TimeAveragedValuesSimulationObserver::setWithGhostLayer(bool val)
{
withGhostLayer = val;
@@ -736,9 +736,9 @@ void TimeAveragedValuesCoProcessor::setWithGhostLayer(bool val)
}
}
//////////////////////////////////////////////////////////////////////////
-bool TimeAveragedValuesCoProcessor::getWithGhostLayer() { return withGhostLayer; }
+bool TimeAveragedValuesSimulationObserver::getWithGhostLayer() { return withGhostLayer; }
//////////////////////////////////////////////////////////////////////////
-void TimeAveragedValuesCoProcessor::calculateAverageValuesForPlane(
+void TimeAveragedValuesSimulationObserver::calculateAverageValuesForPlane(
std::vector<IntegrateValuesHelper::CalcNodes> &cnodes)
{
saVx = 0;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeAveragedValuesSimulationObserver.h
similarity index 89%
rename from src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/TimeAveragedValuesSimulationObserver.h
index 72a0f6fe16ef3805ff496ccff924b8ecf541bfef..14a1f6354aa57ca588361299caf7a1d336001f9e 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeAveragedValuesSimulationObserver.h
@@ -1,11 +1,11 @@
-#ifndef TimeAveragedValuesCoProcessor_H
-#define TimeAveragedValuesCoProcessor_H
+#ifndef TimeAveragedValuesSimulationObserver_H
+#define TimeAveragedValuesSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "IntegrateValuesHelper.h"
#include "LBMSystem.h"
@@ -24,7 +24,7 @@ class Block3D;
//! \author Konstantin Kutscher
// \f$ u_{mean}=\frac{1}{N}\sum\limits_{i=1}^n u_{i} \f$
-class TimeAveragedValuesCoProcessor : public CoProcessor
+class TimeAveragedValuesSimulationObserver : public SimulationObserver
{
public:
enum Options {
@@ -39,15 +39,15 @@ public:
};
public:
- TimeAveragedValuesCoProcessor();
- TimeAveragedValuesCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
+ TimeAveragedValuesSimulationObserver();
+ TimeAveragedValuesSimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
SPtr<UbScheduler> s, std::shared_ptr<vf::mpi::Communicator> comm, int options);
- TimeAveragedValuesCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
+ TimeAveragedValuesSimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
SPtr<UbScheduler> s, std::shared_ptr<vf::mpi::Communicator> comm, int options, std::vector<int> levels,
std::vector<real> &levelCoords, std::vector<real> &bounds,
bool timeAveraging = true);
//! Make update
- void process(real step) override;
+ void update(real step) override;
//! Computes subtotal of velocity , fluctuations and triple correlations
void calculateSubtotal(real step);
void addLevelCoordinate(real c);
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/TimeDependentBCSimulationObserver.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeDependentBCSimulationObserver.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..cedf228b665fff58a777f01aee8832c0e8e1cec4
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeDependentBCSimulationObserver.cpp
@@ -0,0 +1,22 @@
+#include "TimeDependentBCSimulationObserver.h"
+
+#include "Grid3D.h"
+#include "Interactor3D.h"
+#include "UbScheduler.h"
+
+TimeDependentBCSimulationObserver::TimeDependentBCSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s) : SimulationObserver(grid, s) {}
+//////////////////////////////////////////////////////////////////////////
+TimeDependentBCSimulationObserver::~TimeDependentBCSimulationObserver() = default;
+//////////////////////////////////////////////////////////////////////////
+void TimeDependentBCSimulationObserver::update(real step)
+{
+ if (scheduler->isDue(step)) {
+ for (SPtr<Interactor3D> inter : interactors)
+ inter->updateInteractor(step);
+ UBLOG(logDEBUG3, "TimeDependentBCSimulationObserver::update:" << step);
+ }
+}
+//////////////////////////////////////////////////////////////////////////
+void TimeDependentBCSimulationObserver::addInteractor(SPtr<Interactor3D> interactor) { interactors.push_back(interactor); }
+
+//////////////////////////////////////////////////////////////////////////
diff --git a/src/cpu/VirtualFluidsCore/SimulationObservers/TimeDependentBCSimulationObserver.h b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeDependentBCSimulationObserver.h
new file mode 100644
index 0000000000000000000000000000000000000000..0c72054f2feadcaa6cf9792453d1e3389e7213bb
--- /dev/null
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeDependentBCSimulationObserver.h
@@ -0,0 +1,30 @@
+#ifndef TimeDependentBCSimulationObserver_H
+#define TimeDependentBCSimulationObserver_H
+
+#include <PointerDefinitions.h>
+#include <vector>
+
+#include "SimulationObserver.h"
+
+class Interactor3D;
+class Grid3D;
+
+//! \brief The class update interactors depend of time step.
+//! \details TimeDependentBCSimulationObserver update every time step information in BCs throw Interactors
+//! \author Sonja Uphoff, Kostyantyn Kucher
+class TimeDependentBCSimulationObserver : public SimulationObserver
+{
+public:
+ TimeDependentBCSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s);
+ ~TimeDependentBCSimulationObserver() override;
+
+ void update(real step) override;
+
+ //! add interactors to SimulationObserver
+ void addInteractor(SPtr<Interactor3D> interactor);
+
+private:
+ std::vector<SPtr<Interactor3D>> interactors;
+};
+
+#endif /* TimeDependentBCSimulationObserver_H */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeseriesSimulationObserver.cpp
similarity index 77%
rename from src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/TimeseriesSimulationObserver.cpp
index b897d4df17ceb61d88f242c17de3e2030d01e120..e0560e2767b70dcc51db08f807a29e467efa6a2d 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeseriesSimulationObserver.cpp
@@ -1,11 +1,11 @@
/*
- * TimeseriesWriterCoProcessor.h
+ * TimeseriesWriterSimulationObserver.h
*
* Created on: 08.05.2013
* Author: uphoff
*/
-#include "TimeseriesCoProcessor.h"
+#include "TimeseriesSimulationObserver.h"
#include <fstream>
@@ -15,15 +15,15 @@
#include "LBMUnitConverter.h"
#include "UbScheduler.h"
-TimeseriesCoProcessor::TimeseriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<IntegrateValuesHelper> h1,
+TimeseriesSimulationObserver::TimeseriesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<IntegrateValuesHelper> h1,
const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), h1(h1), path(path), comm(comm)
+ : SimulationObserver(grid, s), h1(h1), path(path), comm(comm)
{
if (comm->getProcessID() == comm->getRoot()) {
std::ofstream ostr;
// fname = path+"/timeseries/timeseries"+UbSystem::toString(grid->getTimeStep())+".csv";
fname = path + ".csv";
- UBLOG(logINFO, "TimeseriesWriterCoProcessor::fname:" << fname);
+ UBLOG(logINFO, "TimeseriesWriterSimulationObserver::fname:" << fname);
ostr.open(fname.c_str(), std::ios_base::out | std::ios_base::app);
if (!ostr) {
ostr.clear();
@@ -37,23 +37,23 @@ TimeseriesCoProcessor::TimeseriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler
}
ostr << "step;rho;vx;vy;vz;volume\n";
ostr.close();
- UBLOG(logINFO, "TimeseriesWriterCoProcessor::Constructor:end");
+ UBLOG(logINFO, "TimeseriesWriterSimulationObserver::Constructor:end");
}
}
//////////////////////////////////////////////////////////////////////////
-TimeseriesCoProcessor::~TimeseriesCoProcessor() = default;
+TimeseriesSimulationObserver::~TimeseriesSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void TimeseriesCoProcessor::process(real step)
+void TimeseriesSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
}
//////////////////////////////////////////////////////////////////////////
-void TimeseriesCoProcessor::collectData(real step)
+void TimeseriesSimulationObserver::collectData(real step)
{
h1->calculateMQ();
- UBLOG(logDEBUG3, "TimeseriesWriterCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "TimeseriesWriterSimulationObserver::update:" << step);
if (comm->getProcessID() == comm->getRoot()) {
int istep = static_cast<int>(step);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeseriesSimulationObserver.h
similarity index 66%
rename from src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/TimeseriesSimulationObserver.h
index 7cdc98fd02b2776e970e52ccacf9966a4411a309..db41bd2ecea38ac86e97740310ba9501f94caa4a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeseriesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/TimeseriesSimulationObserver.h
@@ -1,17 +1,17 @@
/*
- * TimeseriesCoProcessor.h
+ * TimeseriesSimulationObserver.h
*
* Created on: 08.05.2013
* Author: uphoff
*/
-#ifndef TimeseriesCoProcessor_H
-#define TimeseriesCoProcessor_H
+#ifndef TimeseriesSimulationObserver_H
+#define TimeseriesSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
namespace vf::mpi {class Communicator;}
class Grid3D;
@@ -23,15 +23,15 @@ class IntegrateValuesHelper;
//! \author Sonja Uphoff
//! \date May 2013
-class TimeseriesCoProcessor : public CoProcessor
+class TimeseriesSimulationObserver : public SimulationObserver
{
public:
- TimeseriesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<IntegrateValuesHelper> h1,
+ TimeseriesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<IntegrateValuesHelper> h1,
const std::string &path, std::shared_ptr<vf::mpi::Communicator> comm);
- ~TimeseriesCoProcessor() override;
+ ~TimeseriesSimulationObserver() override;
//! calls collectData.
- void process(real step) override;
+ void update(real step) override;
protected:
void collectData(real step);
@@ -45,4 +45,4 @@ private:
std::string fname;
};
-#endif /* TimeseriesCoProcessor_H */
+#endif /* TimeseriesSimulationObserver_H */
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/TurbulenceIntensitySimulationObserver.cpp
similarity index 92%
rename from src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/TurbulenceIntensitySimulationObserver.cpp
index 4714349a9c25ec2b5d427e3b64ad00be738915f6..47b865ed7b80fd1c420d59fa54144d5afa1471f5 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/TurbulenceIntensitySimulationObserver.cpp
@@ -1,7 +1,7 @@
-#include "TurbulenceIntensityCoProcessor.h"
+#include "TurbulenceIntensitySimulationObserver.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include <mpi/Communicator.h>
#include "DataSet3D.h"
@@ -12,15 +12,15 @@
#include "basics/utilities/UbMath.h"
#include "basics/writer/WbWriterVtkXmlASCII.h"
-TurbulenceIntensityCoProcessor::TurbulenceIntensityCoProcessor(SPtr<Grid3D> grid, const std::string &path,
+TurbulenceIntensitySimulationObserver::TurbulenceIntensitySimulationObserver(SPtr<Grid3D> grid, const std::string &path,
WbWriter *const writer, SPtr<UbScheduler> s,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), comm(comm), writer(writer)
+ : SimulationObserver(grid, s), path(path), comm(comm), writer(writer)
{
init();
}
//////////////////////////////////////////////////////////////////////////
-void TurbulenceIntensityCoProcessor::init()
+void TurbulenceIntensitySimulationObserver::init()
{
gridRank = grid->getRank();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -40,17 +40,17 @@ void TurbulenceIntensityCoProcessor::init()
}
}
//////////////////////////////////////////////////////////////////////////
-void TurbulenceIntensityCoProcessor::process(real step)
+void TurbulenceIntensitySimulationObserver::update(real step)
{
calculateAverageValues(int(step));
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "TurbulenceIntensityCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "TurbulenceIntensitySimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void TurbulenceIntensityCoProcessor::collectData(real step)
+void TurbulenceIntensitySimulationObserver::collectData(real step)
{
int istep = int(step);
@@ -76,18 +76,18 @@ void TurbulenceIntensityCoProcessor::collectData(real step)
std::vector<std::string> filenames;
filenames.push_back(pname);
- if (step == CoProcessor::scheduler->getMinBegin()) {
+ if (step == SimulationObserver::scheduler->getMinBegin()) {
WbWriterVtkXmlASCII::getInstance()->writeCollection(path + "_collection", filenames, istep, false);
} else {
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(path + "_collection", filenames, istep, false);
}
- UBLOG(logINFO, "TurbulenceIntensityCoProcessor step: " << istep);
+ UBLOG(logINFO, "TurbulenceIntensitySimulationObserver step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void TurbulenceIntensityCoProcessor::clearData()
+void TurbulenceIntensitySimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -95,7 +95,7 @@ void TurbulenceIntensityCoProcessor::clearData()
data.clear();
}
//////////////////////////////////////////////////////////////////////////
-void TurbulenceIntensityCoProcessor::addData(const SPtr<Block3D> block)
+void TurbulenceIntensitySimulationObserver::addData(const SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
// UbTupleDouble3 blockLengths = grid->getBlockLengths(block);
@@ -109,7 +109,7 @@ void TurbulenceIntensityCoProcessor::addData(const SPtr<Block3D> block)
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageValues();
// int ghostLayerWidth = kernel->getGhostLayerWidth();
@@ -179,7 +179,7 @@ void TurbulenceIntensityCoProcessor::addData(const SPtr<Block3D> block)
}
}
//////////////////////////////////////////////////////////////////////////
-void TurbulenceIntensityCoProcessor::calculateAverageValues(real timeStep)
+void TurbulenceIntensitySimulationObserver::calculateAverageValues(real timeStep)
{
using namespace vf::lbm::dir;
using namespace D3Q27System;
@@ -193,7 +193,7 @@ void TurbulenceIntensityCoProcessor::calculateAverageValues(real timeStep)
for (SPtr<Block3D> block : blockVector[level]) {
if (block) {
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
SPtr<AverageValuesArray3D> av = kernel->getDataSet()->getAverageValues();
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/TurbulenceIntensitySimulationObserver.h
similarity index 73%
rename from src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/TurbulenceIntensitySimulationObserver.h
index 8f11e94b446050d2069f89dd8971fb3acc8fb787..c615bbda5cb58a522e6853fcf3f8475bc3320b52 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TurbulenceIntensityCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/TurbulenceIntensitySimulationObserver.h
@@ -1,11 +1,11 @@
-#ifndef TurbulenceIntensityCoProcessor_H
-#define TurbulenceIntensityCoProcessor_H
+#ifndef TurbulenceIntensitySimulationObserver_H
+#define TurbulenceIntensitySimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "UbTuple.h"
namespace vf::mpi {class Communicator;}
@@ -14,12 +14,12 @@ class UbScheduler;
class WbWriter;
class Block3D;
-class TurbulenceIntensityCoProcessor : public CoProcessor
+class TurbulenceIntensitySimulationObserver : public SimulationObserver
{
public:
- TurbulenceIntensityCoProcessor(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
+ TurbulenceIntensitySimulationObserver(SPtr<Grid3D> grid, const std::string &path, WbWriter *const writer,
SPtr<UbScheduler> s, std::shared_ptr<vf::mpi::Communicator> comm);
- void process(real step) override;
+ void update(real step) override;
protected:
void collectData(real step);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteBlocksSimulationObserver.cpp
similarity index 92%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteBlocksSimulationObserver.cpp
index de781d96b582f83e38e74ca0643a0d0c23b170c0..fd983bd02bd0bf3a7ae0cd0af96b2f169180f31b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteBlocksSimulationObserver.cpp
@@ -26,12 +26,12 @@
// 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 WriteBlocksCoProcessor.cpp
-//! \ingroup CoProcessors
+//! \file WriteBlocksSimulationObserver.cpp
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#include "WriteBlocksCoProcessor.h"
+#include "WriteBlocksSimulationObserver.h"
#include "basics/writer/WbWriterVtkXmlASCII.h"
#include <logger/Logger.h>
@@ -41,21 +41,21 @@
#include "Grid3D.h"
#include "UbScheduler.h"
-WriteBlocksCoProcessor::WriteBlocksCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+WriteBlocksSimulationObserver::WriteBlocksSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
WbWriter *const writer, std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), writer(writer), comm(comm)
+ : SimulationObserver(grid, s), path(path), writer(writer), comm(comm)
{
}
//////////////////////////////////////////////////////////////////////////
-WriteBlocksCoProcessor::~WriteBlocksCoProcessor() = default;
+WriteBlocksSimulationObserver::~WriteBlocksSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void WriteBlocksCoProcessor::process(real step)
+void WriteBlocksSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
}
//////////////////////////////////////////////////////////////////////////
-void WriteBlocksCoProcessor::collectData(real step)
+void WriteBlocksSimulationObserver::collectData(real step)
{
if (comm->getProcessID() == comm->getRoot()) {
int istep = int(step);
@@ -173,7 +173,7 @@ void WriteBlocksCoProcessor::collectData(real step)
path + "/blocks/blocks_" + UbSystem::toString(grid->getRank()) + "_" + UbSystem::toString(istep), nodes,
cells, celldatanames, celldata));
- if (istep == CoProcessor::scheduler->getMinBegin()) {
+ if (istep == SimulationObserver::scheduler->getMinBegin()) {
WbWriterVtkXmlASCII::getInstance()->writeCollection(path + "/blocks/blocks_collection", filenames, istep,
false);
} else {
@@ -181,6 +181,6 @@ void WriteBlocksCoProcessor::collectData(real step)
istep, false);
}
- VF_LOG_INFO("WriteBlocksCoProcessor step: {}", istep);
+ VF_LOG_INFO("WriteBlocksSimulationObserver step: {}", istep);
}
}
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteBlocksSimulationObserver.h
similarity index 83%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteBlocksSimulationObserver.h
index c94cd1e64861cead5d01becbd80e5b3381e6e159..805605b64564272c6a327545a4b01bc89926da38 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBlocksCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteBlocksSimulationObserver.h
@@ -26,41 +26,41 @@
// 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 WriteBlocksCoProcessor.h
-//! \ingroup CoProcessors
+//! \file WriteBlocksSimulationObserver.h
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef WriteBlocksCoProcessor_H_
-#define WriteBlocksCoProcessor_H_
+#ifndef WriteBlocksSimulationObserver_H_
+#define WriteBlocksSimulationObserver_H_
#include <PointerDefinitions.h>
#include <string>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
namespace vf::mpi {class Communicator;}
class Grid3D;
class UbScheduler;
class WbWriter;
-//! \class WriteBlocksCoProcessor
+//! \class WriteBlocksSimulationObserver
//! \brief A class writes a block grid to a VTK-file
-class WriteBlocksCoProcessor : public CoProcessor
+class WriteBlocksSimulationObserver : public SimulationObserver
{
public:
- //! \brief Construct WriteBlocksCoProcessor object.
+ //! \brief Construct WriteBlocksSimulationObserver object.
//! \pre The Grid3D and UbScheduler objects must exist.
//! \param grid is observable Grid3D object
//! \param s is UbScheduler object for scheduling of observer
//! \param path is path of folder for output
//! \param writer is WbWriter object
//! \param comm is Communicator object
- WriteBlocksCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, WbWriter *const writer,
+ WriteBlocksSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, WbWriter *const writer,
std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteBlocksCoProcessor() override;
+ ~WriteBlocksSimulationObserver() override;
- void process(real step) override;
+ void update(real step) override;
protected:
//! Collect data for VTK-file
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteBoundaryConditionsSimulationObserver.cpp
similarity index 89%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteBoundaryConditionsSimulationObserver.cpp
index 4ed68397a7813314450ddd7dea33ca1824f54ac9..9d09db9e2c839f5db6bdd4c95e348e3ade094759 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteBoundaryConditionsSimulationObserver.cpp
@@ -26,13 +26,13 @@
// 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 WriteBoundaryConditionsCoProcessor.cpp
-//! \ingroup CoProcessors
+//! \file WriteBoundaryConditionsSimulationObserver.cpp
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#include "WriteBoundaryConditionsCoProcessor.h"
-#include "BCProcessor.h"
+#include "WriteBoundaryConditionsSimulationObserver.h"
+#include "BCSet.h"
#include "LBMKernel.h"
#include <string>
#include <vector>
@@ -51,12 +51,12 @@
using namespace std;
-WriteBoundaryConditionsCoProcessor::WriteBoundaryConditionsCoProcessor() = default;
+WriteBoundaryConditionsSimulationObserver::WriteBoundaryConditionsSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-WriteBoundaryConditionsCoProcessor::WriteBoundaryConditionsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+WriteBoundaryConditionsSimulationObserver::WriteBoundaryConditionsSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
const std::string &path, WbWriter *const writer,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), writer(writer), comm(comm)
+ : SimulationObserver(grid, s), path(path), writer(writer), comm(comm)
{
gridRank = comm->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -69,15 +69,15 @@ WriteBoundaryConditionsCoProcessor::WriteBoundaryConditionsCoProcessor(SPtr<Grid
}
}
//////////////////////////////////////////////////////////////////////////
-void WriteBoundaryConditionsCoProcessor::process(real step)
+void WriteBoundaryConditionsSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "WriteBoundaryConditionsCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "WriteBoundaryConditionsSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void WriteBoundaryConditionsCoProcessor::collectData(real step)
+void WriteBoundaryConditionsSimulationObserver::collectData(real step)
{
int istep = static_cast<int>(step);
@@ -111,18 +111,18 @@ void WriteBoundaryConditionsCoProcessor::collectData(real step)
vector<string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin()) {
+ if (step == SimulationObserver::scheduler->getMinBegin()) {
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
} else {
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- VF_LOG_INFO("WriteBoundaryConditionsCoProcessor step: {}", istep);
+ VF_LOG_INFO("WriteBoundaryConditionsSimulationObserver step: {}", istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void WriteBoundaryConditionsCoProcessor::clearData()
+void WriteBoundaryConditionsSimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -130,7 +130,7 @@ void WriteBoundaryConditionsCoProcessor::clearData()
data.clear();
}
//////////////////////////////////////////////////////////////////////////
-void WriteBoundaryConditionsCoProcessor::addDataGeo(SPtr<Block3D> block)
+void WriteBoundaryConditionsSimulationObserver::addDataGeo(SPtr<Block3D> block)
{
UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
UbTupleDouble3 nodeOffset = grid->getNodeOffset(block);
@@ -147,7 +147,7 @@ void WriteBoundaryConditionsCoProcessor::addDataGeo(SPtr<Block3D> block)
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
int minX1 = 0;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteBoundaryConditionsSimulationObserver.h
similarity index 84%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteBoundaryConditionsSimulationObserver.h
index 31f2a5c8e31820217d76745d371a8a812acb3b67..ad5b20df942748e065cebe926ba346581b9bf30b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteBoundaryConditionsCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteBoundaryConditionsSimulationObserver.h
@@ -26,19 +26,19 @@
// 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 WriteBoundaryConditionsCoProcessor.h
-//! \ingroup CoProcessors
+//! \file WriteBoundaryConditionsSimulationObserver.h
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef WriteBoundaryConditionsCoProcessor_H
-#define WriteBoundaryConditionsCoProcessor_H
+#ifndef WriteBoundaryConditionsSimulationObserver_H
+#define WriteBoundaryConditionsSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "UbTuple.h"
namespace vf::mpi {class Communicator;}
@@ -49,22 +49,22 @@ class Block3D;
class LBMUnitConverter;
//! \brief A class writes boundary conditions information to a VTK-file
-class WriteBoundaryConditionsCoProcessor : public CoProcessor
+class WriteBoundaryConditionsSimulationObserver : public SimulationObserver
{
public:
- WriteBoundaryConditionsCoProcessor();
- //! \brief Construct WriteBoundaryConditionsCoProcessor object
+ WriteBoundaryConditionsSimulationObserver();
+ //! \brief Construct WriteBoundaryConditionsSimulationObserver object
//! \pre The Grid3D and UbScheduler objects must exist
//! \param grid is observable Grid3D object
//! \param s is UbScheduler object for scheduling of observer
//! \param path is path of folder for output
//! \param writer is WbWriter object
//! \param comm is Communicator object
- WriteBoundaryConditionsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ WriteBoundaryConditionsSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
WbWriter *const writer, std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteBoundaryConditionsCoProcessor() override = default;
+ ~WriteBoundaryConditionsSimulationObserver() override = default;
- void process(real step) override;
+ void update(real step) override;
protected:
//! Collect data for VTK-file
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteGbObjectsSimulationObserver.cpp
similarity index 73%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteGbObjectsSimulationObserver.cpp
index b47f1056172c07855eda232bede05eef475c4718..62178444f92abffebe8ce5d2ad1bd8a1f54960f0 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteGbObjectsSimulationObserver.cpp
@@ -1,4 +1,4 @@
-#include "WriteGbObjectsCoProcessor.h"
+#include "WriteGbObjectsSimulationObserver.h"
#include <mpi/Communicator.h>
#include "GbObject3D.h"
#include "UbScheduler.h"
@@ -6,23 +6,23 @@
#include "WbWriterVtkXmlBinary.h"
#include <vector>
-WriteGbObjectsCoProcessor::WriteGbObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+WriteGbObjectsSimulationObserver::WriteGbObjectsSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
WbWriter *const writer, std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), writer(writer), comm(comm)
+ : SimulationObserver(grid, s), path(path), writer(writer), comm(comm)
{
}
//////////////////////////////////////////////////////////////////////////
-WriteGbObjectsCoProcessor::~WriteGbObjectsCoProcessor() = default;
+WriteGbObjectsSimulationObserver::~WriteGbObjectsSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-void WriteGbObjectsCoProcessor::process(real step)
+void WriteGbObjectsSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
}
//////////////////////////////////////////////////////////////////////////
-void WriteGbObjectsCoProcessor::addGbObject(SPtr<GbObject3D> object) { objects.push_back(object); }
+void WriteGbObjectsSimulationObserver::addGbObject(SPtr<GbObject3D> object) { objects.push_back(object); }
//////////////////////////////////////////////////////////////////////////
-void WriteGbObjectsCoProcessor::collectData(real step)
+void WriteGbObjectsSimulationObserver::collectData(real step)
{
std::vector<UbTupleFloat3> nodes;
std::vector<UbTupleInt3> triangles;
@@ -62,12 +62,12 @@ void WriteGbObjectsCoProcessor::collectData(real step)
std::vector<std::string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin()) {
+ if (step == SimulationObserver::scheduler->getMinBegin()) {
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
} else {
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- UBLOG(logINFO, "WriteGbObjectsCoProcessor number of objects: " << numObjcts);
- UBLOG(logINFO, "WriteGbObjectsCoProcessor step: " << istep);
+ UBLOG(logINFO, "WriteGbObjectsSimulationObserver number of objects: " << numObjcts);
+ UBLOG(logINFO, "WriteGbObjectsSimulationObserver step: " << istep);
}
}
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteGbObjectsSimulationObserver.h
similarity index 63%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteGbObjectsSimulationObserver.h
index 5b502044f0556d2519afc23b72ea2b50bd664832..50f88c65ddbf87bb9960f2be61e380e9ad2d570b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteGbObjectsCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteGbObjectsSimulationObserver.h
@@ -1,7 +1,7 @@
-#ifndef WriteGbObjectsCoProcessor_h__
-#define WriteGbObjectsCoProcessor_h__
+#ifndef WriteGbObjectsSimulationObserver_h__
+#define WriteGbObjectsSimulationObserver_h__
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "UbTuple.h"
#include <vector>
@@ -17,14 +17,14 @@ class WbWriter;
//! \author Konstantin Kutscher
//! \date December 2018
-class WriteGbObjectsCoProcessor : public CoProcessor
+class WriteGbObjectsSimulationObserver : public SimulationObserver
{
public:
- WriteGbObjectsCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, WbWriter *const writer,
+ WriteGbObjectsSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path, WbWriter *const writer,
std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteGbObjectsCoProcessor() override;
+ ~WriteGbObjectsSimulationObserver() override;
//! calls collectData.
- void process(real step) override;
+ void update(real step) override;
//! adds geometry object
void addGbObject(SPtr<GbObject3D> object);
@@ -38,4 +38,4 @@ private:
std::shared_ptr<vf::mpi::Communicator> comm;
};
-#endif // WriteGbObjectsCoProcessor_h__
\ No newline at end of file
+#endif // WriteGbObjectsSimulationObserver_h__
\ No newline at end of file
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMQFromSelectionSimulationObserver.cpp
similarity index 89%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteMQFromSelectionSimulationObserver.cpp
index 2b49861af9fd53cdec491527f40f96b4f8bc0484..caf1e8c1ed2d4c43a219e1fd7a09b3a96e0e2370 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMQFromSelectionSimulationObserver.cpp
@@ -1,5 +1,5 @@
-#include "WriteMQFromSelectionCoProcessor.h"
-#include "BCProcessor.h"
+#include "WriteMQFromSelectionSimulationObserver.h"
+#include "BCSet.h"
#include "LBMKernel.h"
#include <string>
#include <vector>
@@ -14,13 +14,13 @@
#include "UbScheduler.h"
#include "basics/writer/WbWriterVtkXmlASCII.h"
-WriteMQFromSelectionCoProcessor::WriteMQFromSelectionCoProcessor() = default;
+WriteMQFromSelectionSimulationObserver::WriteMQFromSelectionSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-WriteMQFromSelectionCoProcessor::WriteMQFromSelectionCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+WriteMQFromSelectionSimulationObserver::WriteMQFromSelectionSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
SPtr<GbObject3D> gbObject, const std::string &path,
WbWriter *const writer, SPtr<LBMUnitConverter> conv,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), gbObject(gbObject), path(path), writer(writer), conv(conv), comm(comm)
+ : SimulationObserver(grid, s), gbObject(gbObject), path(path), writer(writer), conv(conv), comm(comm)
{
gridRank = comm->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -33,17 +33,17 @@ WriteMQFromSelectionCoProcessor::WriteMQFromSelectionCoProcessor(SPtr<Grid3D> gr
}
}
//////////////////////////////////////////////////////////////////////////
-void WriteMQFromSelectionCoProcessor::init() {}
+void WriteMQFromSelectionSimulationObserver::init() {}
//////////////////////////////////////////////////////////////////////////
-void WriteMQFromSelectionCoProcessor::process(real step)
+void WriteMQFromSelectionSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "WriteMQFromSelectionCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "WriteMQFromSelectionSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void WriteMQFromSelectionCoProcessor::collectData(real step)
+void WriteMQFromSelectionSimulationObserver::collectData(real step)
{
int istep = static_cast<int>(step);
@@ -90,25 +90,25 @@ void WriteMQFromSelectionCoProcessor::collectData(real step)
std::vector<std::string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin()) {
+ if (step == SimulationObserver::scheduler->getMinBegin()) {
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
} else {
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- UBLOG(logINFO, "WriteMQFromSelectionCoProcessor step: " << istep);
+ UBLOG(logINFO, "WriteMQFromSelectionSimulationObserver step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void WriteMQFromSelectionCoProcessor::clearData()
+void WriteMQFromSelectionSimulationObserver::clearData()
{
nodes.clear();
datanames.clear();
data.clear();
}
//////////////////////////////////////////////////////////////////////////
-void WriteMQFromSelectionCoProcessor::addDataMQ(SPtr<Block3D> block)
+void WriteMQFromSelectionSimulationObserver::addDataMQ(SPtr<Block3D> block)
{
real level = (real)block->getLevel();
// double blockID = (double)block->getGlobalID();
@@ -126,7 +126,7 @@ void WriteMQFromSelectionCoProcessor::addDataMQ(SPtr<Block3D> block)
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
real f[D3Q27System::ENDF + 1];
real vx1, vx2, vx3, rho;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMQFromSelectionSimulationObserver.h
similarity index 71%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteMQFromSelectionSimulationObserver.h
index 64e7572797a613815d62eec91a61d68120ee1a2e..e91fc369e1ddb33af68629d6aab75cf5b3756290 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMQFromSelectionSimulationObserver.h
@@ -1,11 +1,11 @@
-#ifndef WriteMQFromSelectionCoProcessor_H
-#define WriteMQFromSelectionCoProcessor_H
+#ifndef WriteMQFromSelectionSimulationObserver_H
+#define WriteMQFromSelectionSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
#include "UbTuple.h"
@@ -18,16 +18,16 @@ class WbWriter;
class Block3D;
class GbObject3D;
-class WriteMQFromSelectionCoProcessor : public CoProcessor
+class WriteMQFromSelectionSimulationObserver : public SimulationObserver
{
public:
- WriteMQFromSelectionCoProcessor();
- WriteMQFromSelectionCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<GbObject3D> gbObject,
+ WriteMQFromSelectionSimulationObserver();
+ WriteMQFromSelectionSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, SPtr<GbObject3D> gbObject,
const std::string &path, WbWriter *const writer, SPtr<LBMUnitConverter> conv,
std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteMQFromSelectionCoProcessor() override = default;
+ ~WriteMQFromSelectionSimulationObserver() override = default;
- void process(real step) override;
+ void update(real step) override;
protected:
void collectData(real step);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesPlusMassCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesPlusMassSimulationObserver.cpp
similarity index 90%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesPlusMassCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesPlusMassSimulationObserver.cpp
index 5c4f80887349280856a2de3791d9d0fb9012f53b..142bcc52b053f0be71c8a1ca41eaf0dfeaf24f1b 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesPlusMassCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesPlusMassSimulationObserver.cpp
@@ -26,13 +26,13 @@
// 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 WriteMacroscopicQuantitiesPlusMassCoProcessor.cpp
-//! \ingroup CoProcessors
+//! \file WriteMacroscopicQuantitiesPlusMassSimulationObserver.cpp
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#include "WriteMacroscopicQuantitiesPlusMassCoProcessor.h"
-#include "BCProcessor.h"
+#include "WriteMacroscopicQuantitiesPlusMassSimulationObserver.h"
+#include "BCSet.h"
#include "LBMKernel.h"
#include <string>
#include <vector>
@@ -46,14 +46,14 @@
#include "UbScheduler.h"
#include "basics/writer/WbWriterVtkXmlASCII.h"
-WriteMacroscopicQuantitiesPlusMassCoProcessor::WriteMacroscopicQuantitiesPlusMassCoProcessor() = default;
+WriteMacroscopicQuantitiesPlusMassSimulationObserver::WriteMacroscopicQuantitiesPlusMassSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-WriteMacroscopicQuantitiesPlusMassCoProcessor::WriteMacroscopicQuantitiesPlusMassCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+WriteMacroscopicQuantitiesPlusMassSimulationObserver::WriteMacroscopicQuantitiesPlusMassSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
const std::string &path,
WbWriter *const writer,
SPtr<LBMUnitConverter> conv,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), writer(writer), conv(conv), comm(comm)
+ : SimulationObserver(grid, s), path(path), writer(writer), conv(conv), comm(comm)
{
gridRank = comm->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -68,20 +68,20 @@ WriteMacroscopicQuantitiesPlusMassCoProcessor::WriteMacroscopicQuantitiesPlusMas
}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesPlusMassCoProcessor::init()
+void WriteMacroscopicQuantitiesPlusMassSimulationObserver::init()
{}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesPlusMassCoProcessor::process(real step)
+void WriteMacroscopicQuantitiesPlusMassSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "WriteMacroscopicQuantitiesPlusMassCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "WriteMacroscopicQuantitiesPlusMassSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesPlusMassCoProcessor::collectData(real step)
+void WriteMacroscopicQuantitiesPlusMassSimulationObserver::collectData(real step)
{
int istep = static_cast<int>(step);
@@ -118,21 +118,21 @@ void WriteMacroscopicQuantitiesPlusMassCoProcessor::collectData(real step)
std::vector<std::string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin())
+ if (step == SimulationObserver::scheduler->getMinBegin())
{
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
} else
{
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- UBLOG(logINFO, "WriteMacroscopicQuantitiesPlusMassCoProcessor step: " << istep);
+ UBLOG(logINFO, "WriteMacroscopicQuantitiesPlusMassSimulationObserver step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesPlusMassCoProcessor::clearData()
+void WriteMacroscopicQuantitiesPlusMassSimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -141,7 +141,7 @@ void WriteMacroscopicQuantitiesPlusMassCoProcessor::clearData()
}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesPlusMassCoProcessor::addDataMQ(SPtr<Block3D> block)
+void WriteMacroscopicQuantitiesPlusMassSimulationObserver::addDataMQ(SPtr<Block3D> block)
{
real level = (real)block->getLevel();
@@ -160,7 +160,7 @@ void WriteMacroscopicQuantitiesPlusMassCoProcessor::addDataMQ(SPtr<Block3D> bloc
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
real f[D3Q27System::ENDF + 1];
real vx1, vx2, vx3, rho;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesPlusMassSimulationObserver.h
similarity index 83%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesPlusMassSimulationObserver.h
index 1815d480f392fa47cdbf64038791929dc32a2ff3..ce6946528269adec3374dff655991b4a8cb0aaf7 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesPlusMassSimulationObserver.h
@@ -26,19 +26,19 @@
// 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 WriteMacroscopicQuantitiesCoProcessor.h
-//! \ingroup CoProcessors
+//! \file WriteMacroscopicQuantitiesPlusMassSimulationObserver.h
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef WriteMacroscopicQuantitiesCoProcessor_H
-#define WriteMacroscopicQuantitiesCoProcessor_H
+#ifndef WriteMacroscopicQuantitiesPlusMassSimulationObserver_H
+#define WriteMacroscopicQuantitiesPlusMassSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
#include "UbTuple.h"
@@ -50,11 +50,11 @@ class WbWriter;
class Block3D;
//! \brief A class writes macroscopic quantities information to a VTK-file
-class WriteMacroscopicQuantitiesCoProcessor : public CoProcessor
+class WriteMacroscopicQuantitiesPlusMassSimulationObserver : public SimulationObserver
{
public:
- WriteMacroscopicQuantitiesCoProcessor();
- //! \brief Construct WriteMacroscopicQuantitiesCoProcessor object
+ WriteMacroscopicQuantitiesPlusMassSimulationObserver();
+ //! \brief Construct WriteMacroscopicQuantitiesPlusMassSimulationObserver object
//! \pre The Grid3D and UbScheduler objects must exist
//! \param grid is observable Grid3D object
//! \param s is UbScheduler object for scheduling of observer
@@ -62,11 +62,11 @@ public:
//! \param writer is WbWriter object
//! \param conv is LBMUnitConverter object
//! \param comm is Communicator object
- WriteMacroscopicQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ WriteMacroscopicQuantitiesPlusMassSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
WbWriter *const writer, SPtr<LBMUnitConverter> conv, std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteMacroscopicQuantitiesCoProcessor() override = default;
+ ~WriteMacroscopicQuantitiesPlusMassSimulationObserver() override = default;
- void process(real step) override;
+ void update(real step) override;
protected:
//! Collect data for VTK-file
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.cpp
similarity index 91%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.cpp
index 58ed15604f8937b0b33fca96dab69250a404242c..b87b5cfcfc5b10b3fc97d54b135a745c811f9e0e 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.cpp
@@ -26,13 +26,13 @@
// 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 WriteMacroscopicQuantitiesCoProcessor.cpp
-//! \ingroup CoProcessors
+//! \file WriteMacroscopicQuantitiesSimulationObserver.cpp
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#include "WriteMacroscopicQuantitiesCoProcessor.h"
-#include "BCProcessor.h"
+#include "WriteMacroscopicQuantitiesSimulationObserver.h"
+#include "BCSet.h"
#include "LBMKernel.h"
#include <string>
#include <vector>
@@ -46,14 +46,14 @@
#include "UbScheduler.h"
#include "basics/writer/WbWriterVtkXmlASCII.h"
-WriteMacroscopicQuantitiesCoProcessor::WriteMacroscopicQuantitiesCoProcessor() = default;
+WriteMacroscopicQuantitiesSimulationObserver::WriteMacroscopicQuantitiesSimulationObserver() = default;
//////////////////////////////////////////////////////////////////////////
-WriteMacroscopicQuantitiesCoProcessor::WriteMacroscopicQuantitiesCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
+WriteMacroscopicQuantitiesSimulationObserver::WriteMacroscopicQuantitiesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s,
const std::string &path,
WbWriter *const writer,
SPtr<LBMUnitConverter> conv,
std::shared_ptr<vf::mpi::Communicator> comm)
- : CoProcessor(grid, s), path(path), writer(writer), conv(conv), comm(comm)
+ : SimulationObserver(grid, s), path(path), writer(writer), conv(conv), comm(comm)
{
gridRank = comm->getProcessID();
minInitLevel = this->grid->getCoarsestInitializedLevel();
@@ -68,20 +68,20 @@ WriteMacroscopicQuantitiesCoProcessor::WriteMacroscopicQuantitiesCoProcessor(SPt
}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesCoProcessor::init()
+void WriteMacroscopicQuantitiesSimulationObserver::init()
{}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesCoProcessor::process(real step)
+void WriteMacroscopicQuantitiesSimulationObserver::update(real step)
{
if (scheduler->isDue(step))
collectData(step);
- UBLOG(logDEBUG3, "WriteMacroscopicQuantitiesCoProcessor::update:" << step);
+ UBLOG(logDEBUG3, "WriteMacroscopicQuantitiesSimulationObserver::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesCoProcessor::collectData(real step)
+void WriteMacroscopicQuantitiesSimulationObserver::collectData(real step)
{
int istep = static_cast<int>(step);
@@ -118,21 +118,21 @@ void WriteMacroscopicQuantitiesCoProcessor::collectData(real step)
std::vector<std::string> filenames;
filenames.push_back(piece);
- if (step == CoProcessor::scheduler->getMinBegin())
+ if (step == SimulationObserver::scheduler->getMinBegin())
{
WbWriterVtkXmlASCII::getInstance()->writeCollection(cfilePath, filenames, istep, false);
} else
{
WbWriterVtkXmlASCII::getInstance()->addFilesToCollection(cfilePath, filenames, istep, false);
}
- UBLOG(logINFO, "WriteMacroscopicQuantitiesCoProcessor step: " << istep);
+ UBLOG(logINFO, "WriteMacroscopicQuantitiesSimulationObserver step: " << istep);
}
clearData();
}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesCoProcessor::clearData()
+void WriteMacroscopicQuantitiesSimulationObserver::clearData()
{
nodes.clear();
cells.clear();
@@ -141,7 +141,7 @@ void WriteMacroscopicQuantitiesCoProcessor::clearData()
}
//////////////////////////////////////////////////////////////////////////
-void WriteMacroscopicQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
+void WriteMacroscopicQuantitiesSimulationObserver::addDataMQ(SPtr<Block3D> block)
{
real level = (real)block->getLevel();
@@ -160,7 +160,7 @@ void WriteMacroscopicQuantitiesCoProcessor::addDataMQ(SPtr<Block3D> block)
data.resize(datanames.size());
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
real f[D3Q27System::ENDF + 1];
real vx1, vx2, vx3, rho;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesPlusMassCoProcessor.h b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.h
similarity index 84%
rename from src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesPlusMassCoProcessor.h
rename to src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.h
index 9251bfc22549a7a366e57540ea8387e851d4756f..85de0336487a71774d63c86f4c6ba1b65b15fe2a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMacroscopicQuantitiesPlusMassCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/SimulationObservers/WriteMacroscopicQuantitiesSimulationObserver.h
@@ -26,19 +26,19 @@
// 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 WriteMacroscopicQuantitiesPlusMassCoProcessor.h
-//! \ingroup CoProcessors
+//! \file WriteMacroscopicQuantitiesSimulationObserver.h
+//! \ingroup SimulationObservers
//! \author Konstantin Kutscher
//=======================================================================================
-#ifndef WriteMacroscopicQuantitiesPlusMassCoProcessor_H
-#define WriteMacroscopicQuantitiesPlusMassCoProcessor_H
+#ifndef WriteMacroscopicQuantitiesSimulationObserver_H
+#define WriteMacroscopicQuantitiesSimulationObserver_H
#include <PointerDefinitions.h>
#include <string>
#include <vector>
-#include "CoProcessor.h"
+#include "SimulationObserver.h"
#include "LBMSystem.h"
#include "UbTuple.h"
@@ -50,11 +50,11 @@ class WbWriter;
class Block3D;
//! \brief A class writes macroscopic quantities information to a VTK-file
-class WriteMacroscopicQuantitiesPlusMassCoProcessor : public CoProcessor
+class WriteMacroscopicQuantitiesSimulationObserver : public SimulationObserver
{
public:
- WriteMacroscopicQuantitiesPlusMassCoProcessor();
- //! \brief Construct WriteMacroscopicQuantitiesPlusMassCoProcessor object
+ WriteMacroscopicQuantitiesSimulationObserver();
+ //! \brief Construct WriteMacroscopicQuantitiesSimulationObserver object
//! \pre The Grid3D and UbScheduler objects must exist
//! \param grid is observable Grid3D object
//! \param s is UbScheduler object for scheduling of observer
@@ -62,11 +62,11 @@ public:
//! \param writer is WbWriter object
//! \param conv is LBMUnitConverter object
//! \param comm is Communicator object
- WriteMacroscopicQuantitiesPlusMassCoProcessor(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
+ WriteMacroscopicQuantitiesSimulationObserver(SPtr<Grid3D> grid, SPtr<UbScheduler> s, const std::string &path,
WbWriter *const writer, SPtr<LBMUnitConverter> conv, std::shared_ptr<vf::mpi::Communicator> comm);
- ~WriteMacroscopicQuantitiesPlusMassCoProcessor() override = default;
+ ~WriteMacroscopicQuantitiesSimulationObserver() override = default;
- void process(real step) override;
+ void update(real step) override;
protected:
//! Collect data for VTK-file
diff --git a/src/cpu/VirtualFluidsCore/Utilities/ChangeRandomQs.hpp b/src/cpu/VirtualFluidsCore/Utilities/ChangeRandomQs.hpp
index 3fbd3643d71409fe21aa800473310399757f3a44..dbfb8907dacdad96849812a1cf5b01ccb52e1483 100644
--- a/src/cpu/VirtualFluidsCore/Utilities/ChangeRandomQs.hpp
+++ b/src/cpu/VirtualFluidsCore/Utilities/ChangeRandomQs.hpp
@@ -5,7 +5,7 @@
#include "IntegrateValuesHelper.h"
#include "BoundaryConditions.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
namespace Utilities
{
@@ -16,7 +16,7 @@ namespace Utilities
for(IntegrateValuesHelper::CalcNodes cn : cnodes)
{
SPtr<ILBMKernel> kernel = cn.block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
for(UbTupleInt3 node : cn.nodes)
{
SPtr<BoundaryConditions> bc = bcArray->getBC(val<1>(node), val<2>(node), val<3>(node));
diff --git a/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
index 53282294203213fe98b8867dfaf2fde523490bc5..358dabf437fb69325a905d968e8dc6547127fd8f 100644
--- a/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
+++ b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
@@ -162,7 +162,7 @@ void CheckpointConverter::convertBlocks(int step, int procCount)
// calculate the read offset
procCount =
- 1; // readBlocks and writeBlocks in both MPIIORestartCoProcessor and MPIIOMigrationCoProcessor have size == 1!
+ 1; // readBlocks and writeBlocks in both MPIIORestartSimulationObserver and MPIIOMigrationSimulationObserver have size == 1!
MPI_Offset read_offset = (MPI_Offset)(procCount * sizeof(int));
// read parameters of the grid and blocks
diff --git a/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.h b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.h
index 6fe24772d574a6db67428a820027971b4c7fd230..bab67ae662c10e31158b47e1725788dc38794560 100644
--- a/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.h
+++ b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.h
@@ -11,7 +11,7 @@ class Grid3D;
namespace vf::mpi {class Communicator;}
//! \class UtilConvertor
-//! \brief Converts timestep data from MPIIORestartCoProcessor format into MPIIOMigrationCoProcessor format
+//! \brief Converts timestep data from MPIIORestartSimulationObserver format into MPIIOMigrationSimulationObserver format
class CheckpointConverter
{
public:
diff --git a/src/cpu/VirtualFluidsCore/Utilities/VoxelMatrixUtil.hpp b/src/cpu/VirtualFluidsCore/Utilities/VoxelMatrixUtil.hpp
index 7ac3aa19578b0735ffab354a8f45ec714bacd314..1903cba9b2318f094142bdd1f2562a845d05f069 100644
--- a/src/cpu/VirtualFluidsCore/Utilities/VoxelMatrixUtil.hpp
+++ b/src/cpu/VirtualFluidsCore/Utilities/VoxelMatrixUtil.hpp
@@ -2,7 +2,7 @@
#define VoxelMatrixUtil_h__
#include "GbCuboid3D.h"
-#include "NoSlipBCAdapter.h"
+#include "NoSlipBC.h"
#include "D3Q27Interactor.h"
#include "SetBcBlocksBlockVisitor.h"
#include "Block3D.h"
@@ -13,7 +13,7 @@ namespace Utilities
{
void voxelMatrixDiscretisation(SPtr<GbVoxelMatrix3D> matrix, std::string& pathname, int myid, int fileCounter, SPtr<Grid3D> grid, int bounceBackOption, bool vmFile)
{
- SPtr<BCAdapter> noSlipPM(new NoSlipBCAdapter(bounceBackOption));
+ SPtr<BC> noSlipPM(new NoSlipBC(bounceBackOption));
SPtr<D3Q27Interactor> vmInt = SPtr<D3Q27Interactor>(new D3Q27Interactor(matrix, grid, noSlipPM, Interactor3D::SOLID));
if (vmFile)
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/BoundaryConditionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
index fbfbd1bcab135056fa6b62e31d50b63c898bb83a..db18f090ab566bad0f4bb39493216e8db7c7be2c 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.cpp
@@ -32,26 +32,19 @@
//=======================================================================================
#include "BoundaryConditionsBlockVisitor.h"
-#include "BCAdapter.h"
+#include "BC.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "DataSet3D.h"
#include "Grid3D.h"
#include "D3Q27System.h"
-#include "BCAdapter.h"
+#include "BC.h"
#include "Block3D.h"
#include "BCArray3D.h"
#include "ILBMKernel.h"
-#include "ThixotropyDensityBCAlgorithm.h"
-#include "ThixotropyVelocityBCAlgorithm.h"
-#include "ThixotropyNoSlipBCAlgorithm.h"
-#include "ThixotropyNonReflectingOutflowBCAlgorithm.h"
-#include "ThixotropyVelocityWithDensityBCAlgorithm.h"
-
-
BoundaryConditionsBlockVisitor::BoundaryConditionsBlockVisitor() : Block3DVisitor(0, D3Q27System::MAXLEVEL)
{
}
@@ -67,13 +60,13 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
throw UbException(UB_EXARGS, "LBMKernel in " + block->toString() + "is not exist!");
}
- SPtr<BCProcessor> bcProcessor = kernel->getBCProcessor();
+ SPtr<BCSet> bcSet = kernel->getBCSet();
- if (!bcProcessor) {
+ if (!bcSet) {
throw UbException(UB_EXARGS, "Boundary Conditions Processor is not exist!");
}
- SPtr<BCArray3D> bcArray = bcProcessor->getBCArray();
+ SPtr<BCArray3D> bcArray = bcSet->getBCArray();
bool compressible = kernel->getCompressible();
real collFactor = kernel->getCollisionFactor();
@@ -86,7 +79,7 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
int maxX3 = (int)bcArray->getNX3();
SPtr<BoundaryConditions> bcPtr;
- bcProcessor->clearBC();
+ bcSet->clearBC();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
@@ -95,8 +88,8 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
for (int x1 = minX1; x1 < maxX1; x1++) {
if (!bcArray->isSolid(x1, x2, x3) && !bcArray->isUndefined(x1, x2, x3)) {
if ((bcPtr = bcArray->getBC(x1, x2, x3)) != NULL) {
- char alg = bcPtr->getBcAlgorithmType();
- SPtr<BCAlgorithm> bca = bcMap[alg];
+ char alg = bcPtr->getBCStrategyType();
+ SPtr<BCStrategy> bca = bcMap[alg];
if (bca) {
bca = bca->clone();
@@ -104,27 +97,10 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
bca->setNodeIndex(x1, x2, x3);
bca->setBcPointer(bcPtr);
bca->addDistributions(distributions);
-
- if (alg == BCAlgorithm::ThixotropyVelocityBCAlgorithm)
- std::static_pointer_cast<ThixotropyVelocityBCAlgorithm>(bca)->addDistributionsH(
- kernel->getDataSet()->getHdistributions());
- if (alg == BCAlgorithm::ThixotropyDensityBCAlgorithm)
- std::static_pointer_cast<ThixotropyDensityBCAlgorithm>(bca)->addDistributionsH(
- kernel->getDataSet()->getHdistributions());
- if (alg == BCAlgorithm::ThixotropyNoSlipBCAlgorithm)
- std::static_pointer_cast<ThixotropyNoSlipBCAlgorithm>(bca)->addDistributionsH(
- kernel->getDataSet()->getHdistributions());
- if (alg == BCAlgorithm::ThixotropyNonReflectingOutflowBCAlgorithm)
- std::static_pointer_cast<ThixotropyNonReflectingOutflowBCAlgorithm>(bca)
- ->addDistributionsH(kernel->getDataSet()->getHdistributions());
- if (alg == BCAlgorithm::ThixotropyVelocityWithDensityBCAlgorithm)
- std::static_pointer_cast<ThixotropyVelocityWithDensityBCAlgorithm>(bca)
- ->addDistributionsH(kernel->getDataSet()->getHdistributions());
-
bca->setCollFactor(collFactor);
bca->setCompressible(compressible);
bca->setBcArray(bcArray);
- bcProcessor->addBC(bca);
+ bcSet->addBC(bca);
}
}
}
@@ -134,7 +110,7 @@ void BoundaryConditionsBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> bloc
}
}
//////////////////////////////////////////////////////////////////////////
-void BoundaryConditionsBlockVisitor::addBC(SPtr<BCAdapter> bc)
+void BoundaryConditionsBlockVisitor::addBC(SPtr<BC> bc)
{
- bcMap.insert(std::make_pair(bc->getBcAlgorithmType(), bc->getAlgorithm()));
+ bcMap.insert(std::make_pair(bc->getBCStrategyType(), bc->getAlgorithm()));
}
diff --git a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.h b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.h
index 42eefd93077c56f12c2eec3282cb3f7a1e67c208..8954bf73a6a459a795e916f24192f5db698b1426 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/BoundaryConditionsBlockVisitor.h
@@ -41,8 +41,8 @@
class Grid3D;
class Block3D;
-class BCAlgorithm;
-class BCAdapter;
+class BCStrategy;
+class BC;
//! \brief set boundary conditions
class BoundaryConditionsBlockVisitor : public Block3DVisitor
@@ -52,10 +52,10 @@ public:
~BoundaryConditionsBlockVisitor() override;
void visit(SPtr<Grid3D> grid, SPtr<Block3D> block) override;
- void addBC(SPtr<BCAdapter> bc);
+ void addBC(SPtr<BC> bc);
protected:
private:
- std::map<char, SPtr<BCAlgorithm>> bcMap;
+ std::map<char, SPtr<BCStrategy>> bcMap;
};
#endif // BoundaryConditionBlockVisitor_h__
diff --git a/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
index c541465183dd084135d60b7112182daae33e22ab..682f1d65b2475001d59d4fad57fb3b4f39eaa918 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/ChangeBoundaryDensityBlockVisitor.cpp
@@ -1,6 +1,6 @@
#include "ChangeBoundaryDensityBlockVisitor.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "BoundaryConditions.h"
#include "Grid3D.h"
@@ -19,7 +19,7 @@ void ChangeBoundaryDensityBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> b
{
if (block->getRank() == grid->getRank()) {
SPtr<ILBMKernel> kernel = block->getKernel();
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
int minX1 = 0;
int minX2 = 0;
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
index 1c4860070a5ca8aefc4850a9b16dd7273c65f231..2e24a2e26d1709b5c1af33d2210f269ca59f2e40 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
@@ -33,7 +33,7 @@
#include "InitDistributionsBlockVisitor.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "DataSet3D.h"
#include "EsoTwist3D.h"
@@ -157,7 +157,7 @@ void InitDistributionsBlockVisitor::visit(const SPtr<Grid3D> grid, SPtr<Block3D>
else
calcFeqsFct = &D3Q27System::calcIncompFeq;
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getFdistributions();
real o = kernel->getCollisionFactor();
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.cpp
index 2632f2c59db6d4982806c50dcc50f743cc5c2ad3..3a51f5532532e4ac116221a551a1d4ad9bb5e66c 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsFromFileBlockVisitor.cpp
@@ -1,6 +1,6 @@
#include "InitDistributionsFromFileBlockVisitor.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "DataSet3D.h"
#include "EsoTwist3D.h"
@@ -73,7 +73,7 @@ void InitDistributionsFromFileBlockVisitor::visit(const SPtr<Grid3D> grid, SPtr<
// UbTupleDouble3 org = grid->getBlockWorldCoordinates(block);
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<EsoTwist3D> distributions = dynamicPointerCast<EsoTwist3D>(kernel->getDataSet()->getFdistributions());
real f[D3Q27System::ENDF + 1];
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
index 6dd6976ca3cb250e720079031632b9b5e3902696..660363e22e7c315a40df596aa95137f5589fff72 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitDistributionsWithInterpolationGridVisitor.cpp
@@ -2,7 +2,7 @@
#include "mpi.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "D3Q27EsoTwist3DSplittedVector.h"
#include "DataSet3D.h"
@@ -178,7 +178,7 @@ void InitDistributionsWithInterpolationGridVisitor::interpolateLocalBlockCoarseT
SPtr<EsoTwist3D> oldDistributions = dynamicPointerCast<EsoTwist3D>(oldKernel->getDataSet()->getFdistributions());
- SPtr<BCArray3D> bcArrayOldBlock = oldBlock->getKernel()->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArrayOldBlock = oldBlock->getKernel()->getBCSet()->getBCArray();
SPtr<ILBMKernel> newKernel = newBlock->getKernel();
if (!newKernel)
@@ -279,7 +279,7 @@ void InitDistributionsWithInterpolationGridVisitor::interpolateRemoteBlockCoarse
MPI_Send(zeroDistributions->getStartAdressOfSortedArray(0, 0, 0),
(int)zeroDistributions->getDataVector().size(), MPI_DOUBLE, newBlockRank, 0, MPI_COMM_WORLD);
- SPtr<BCArray3D> bcArrayOldBlock = oldBlock->getKernel()->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArrayOldBlock = oldBlock->getKernel()->getBCSet()->getBCArray();
std::vector<int> &bcDataVector = bcArrayOldBlock->getBcindexmatrixDataVector();
MPI_Send(&bcDataVector[0], (int)bcDataVector.size(), MPI_INT, newBlockRank, 0, MPI_COMM_WORLD);
} else if (newBlockRank == newGridRank && newBlock->isActive()) {
@@ -408,7 +408,7 @@ void InitDistributionsWithInterpolationGridVisitor::interpolateLocalBlockFineToC
SPtr<EsoTwist3D> oldDistributions = dynamicPointerCast<EsoTwist3D>(oldKernel->getDataSet()->getFdistributions());
- SPtr<BCArray3D> bcArrayOldBlock = oldBlock->getKernel()->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArrayOldBlock = oldBlock->getKernel()->getBCSet()->getBCArray();
SPtr<ILBMKernel> newKernel = newBlock->getKernel();
if (!newKernel)
@@ -510,7 +510,7 @@ void InitDistributionsWithInterpolationGridVisitor::interpolateRemoteBlockFineTo
MPI_Send(zeroDistributions->getStartAdressOfSortedArray(0, 0, 0),
(int)zeroDistributions->getDataVector().size(), MPI_DOUBLE, newBlockRank, 0, MPI_COMM_WORLD);
- SPtr<BCArray3D> bcArrayOldBlock = oldBlock->getKernel()->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArrayOldBlock = oldBlock->getKernel()->getBCSet()->getBCArray();
std::vector<int> &bcDataVector = bcArrayOldBlock->getBcindexmatrixDataVector();
MPI_Send(&bcDataVector[0], (int)bcDataVector.size(), MPI_INT, newBlockRank, 0, MPI_COMM_WORLD);
} else if (newBlockRank == newGridRank && newBlock->isActive()) {
diff --git a/src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp
index 0c666958912c7f73f74d91b179e19cf6d3b06dd1..be0c694bc733ff3b9ebd808d533757f98eefe73c 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/InitThixotropyBlockVisitor.cpp
@@ -33,7 +33,7 @@
#include "InitThixotropyBlockVisitor.h"
#include "LBMKernel.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "D3Q27System.h"
#include "DataSet3D.h"
#include "EsoTwist3D.h"
@@ -250,7 +250,7 @@ void InitThixotropyBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
else
calcFeqsFct = &D3Q27System::calcIncompFeq;
- SPtr<BCArray3D> bcArray = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcArray = kernel->getBCSet()->getBCArray();
SPtr<DistributionArray3D> distributions = kernel->getDataSet()->getHdistributions();
real h[D3Q27System::ENDF+1];
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp
index 54271370c11700886f969eeef75a2389ef062828..fed80000c562b8aafdefd83ff2791781a8907f7a 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetKernelBlockVisitor.cpp
@@ -34,7 +34,7 @@
#include "SetKernelBlockVisitor.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "DataSet3D.h"
#include "Grid3D.h"
@@ -88,24 +88,24 @@ void SetKernelBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
newKernel->setDataSet(dataSet);
- SPtr<BCProcessor> bcProc = block->getKernel()->getBCProcessor();
+ SPtr<BCSet> bcProc = block->getKernel()->getBCSet();
if (!bcProc) {
UB_THROW(UbException(
UB_EXARGS,
- "It is not possible to change a BCProcessor in kernel! Old BCProcessor is not exist!"));
+ "It is not possible to change a BCSet in kernel! Old BCSet is not exist!"));
}
- newKernel->setBCProcessor(bcProc);
+ newKernel->setBCSet(bcProc);
block->setKernel(newKernel);
} break;
case SetKernelBlockVisitor::ChangeKernelWithData: {
- SPtr<BCProcessor> bcProc = block->getKernel()->getBCProcessor();
+ SPtr<BCSet> bcProc = block->getKernel()->getBCSet();
if (!bcProc) {
UB_THROW(UbException(
UB_EXARGS,
- "It is not possible to change a BCProcessor in kernel! Old BCProcessor is not exist!"));
+ "It is not possible to change a BCSet in kernel! Old BCSet is not exist!"));
}
- newKernel->setBCProcessor(bcProc);
+ newKernel->setBCSet(bcProc);
block->setKernel(newKernel);
} break;
}
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
index bb6cc5dc6fe06b1a63647d83897bc1fe83066a1a..04f758d396b726c67a5e9a5797a3d65d3d26a36b 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
@@ -1,6 +1,6 @@
#include "SetUndefinedNodesBlockVisitor.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "BoundaryConditions.h"
#include "D3Q27System.h"
@@ -29,7 +29,7 @@ void SetUndefinedNodesBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block
// int gl = kernel->getGhostLayerWidth();
int gl = 0;
- SPtr<BCArray3D> bcMatrix = kernel->getBCProcessor()->getBCArray();
+ SPtr<BCArray3D> bcMatrix = kernel->getBCSet()->getBCArray();
int minX1 = gl;
int minX2 = gl;
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/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
index 6183024279ce1753f2fd78bf20b72313b84662f1..4cdcfb80bb4aa3119f1e2ca4dfcd19c2abf381dd 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SpongeLayerBlockVisitor.cpp
@@ -3,7 +3,7 @@
#include "LBMSystem.h"
#include "BCArray3D.h"
-#include "BCProcessor.h"
+#include "BCSet.h"
#include "Block3D.h"
#include "D3Q27System.h"
#include "Grid3D.h"
@@ -58,12 +58,12 @@ void SpongeLayerBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
newKernel->setDataSet(dataSet);
- SPtr<BCProcessor> bcProc = block->getKernel()->getBCProcessor();
+ SPtr<BCSet> bcProc = block->getKernel()->getBCSet();
if (!bcProc) {
UB_THROW(UbException(
- UB_EXARGS, "It is not possible to change a BCProcessor in kernel! Old BCProcessor is not exist!"));
+ UB_EXARGS, "It is not possible to change a BCSet in kernel! Old BCSet is not exist!"));
}
- newKernel->setBCProcessor(bcProc);
+ newKernel->setBCSet(bcProc);
real oldCollFactor = newKernel->getCollisionFactor();
diff --git a/src/cpu/simulationconfig/include/simulationconfig/AbstractLBMSystem.h b/src/cpu/simulationconfig/AbstractLBMSystem.h
similarity index 79%
rename from src/cpu/simulationconfig/include/simulationconfig/AbstractLBMSystem.h
rename to src/cpu/simulationconfig/AbstractLBMSystem.h
index 156649c6fd3c060117e8247efab2765f56f7c77b..77ab8798da189b4eedc64eb736b2d92e2b4be1cc 100644
--- a/src/cpu/simulationconfig/include/simulationconfig/AbstractLBMSystem.h
+++ b/src/cpu/simulationconfig/AbstractLBMSystem.h
@@ -2,7 +2,7 @@
#define VIRTUALFLUIDSPYTHONBINDINGS_ABSTRACTLBMSYSTEM_H
#include <Interactors/Interactor3D.h>
-#include <BoundaryConditions/BCAdapter.h>
+#include <BoundaryConditions/BC.h>
#include <memory>
class AbstractLBMSystem {
@@ -19,11 +19,11 @@ public:
virtual std::shared_ptr<Interactor3D>
makeInteractor(std::shared_ptr<GbObject3D> object, std::shared_ptr<Grid3D> grid,
- std::shared_ptr<BCAdapter> bcAdapter, int type) = 0;
+ std::shared_ptr<BC> bcAdapter, int type) = 0;
virtual std::shared_ptr<Interactor3D>
makeInteractor(std::shared_ptr<GbObject3D> object, std::shared_ptr<Grid3D> grid,
- std::shared_ptr<BCAdapter> bcAdapter, int type, Interactor3D::Accuracy accuracy) = 0;
+ std::shared_ptr<BC> bcAdapter, int type, Interactor3D::Accuracy accuracy) = 0;
};
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 84%
rename from src/cpu/simulationconfig/src/D3Q27LBMSystem.cpp
rename to src/cpu/simulationconfig/D3Q27LBMSystem.cpp
index b1a01ca7b05fedcbc7a66a0de3cdcfa33f3b0722..1e34e91c7a79d755b8670ff6e241e6b764548917 100644
--- a/src/cpu/simulationconfig/src/D3Q27LBMSystem.cpp
+++ b/src/cpu/simulationconfig/D3Q27LBMSystem.cpp
@@ -20,14 +20,14 @@ D3Q27LBMSystem::makeInteractor(std::shared_ptr<GbObject3D> object, std::shared_p
std::shared_ptr<Interactor3D>
D3Q27LBMSystem::makeInteractor(std::shared_ptr<GbObject3D> object, std::shared_ptr<Grid3D> grid,
- std::shared_ptr<BCAdapter> bcAdapter, int type)
+ std::shared_ptr<BC> bcAdapter, int type)
{
return std::shared_ptr<Interactor3D>(new D3Q27Interactor(object, grid, bcAdapter, type));
}
std::shared_ptr<Interactor3D>
D3Q27LBMSystem::makeInteractor(std::shared_ptr<GbObject3D> object, std::shared_ptr<Grid3D> grid,
- std::shared_ptr<BCAdapter> bcAdapter, int type, Interactor3D::Accuracy accuracy)
+ std::shared_ptr<BC> bcAdapter, int type, Interactor3D::Accuracy accuracy)
{
return std::shared_ptr<Interactor3D>(new D3Q27Interactor(object, grid, bcAdapter, type, accuracy));
}
diff --git a/src/cpu/simulationconfig/include/simulationconfig/D3Q27LBMSystem.h b/src/cpu/simulationconfig/D3Q27LBMSystem.h
similarity index 89%
rename from src/cpu/simulationconfig/include/simulationconfig/D3Q27LBMSystem.h
rename to src/cpu/simulationconfig/D3Q27LBMSystem.h
index c9883a61a27aa3d44af61be11d5b809aaf7068ce..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;
@@ -16,10 +14,10 @@ public:
makeInteractor(std::shared_ptr<GbObject3D> object, std::shared_ptr<Grid3D> grid, int type) override;
std::shared_ptr<Interactor3D> makeInteractor(std::shared_ptr<GbObject3D> object, std::shared_ptr<Grid3D> grid,
- std::shared_ptr<BCAdapter> bcAdapter, int type) override;
+ std::shared_ptr<BC> bcAdapter, int type) override;
std::shared_ptr<Interactor3D> makeInteractor(std::shared_ptr<GbObject3D> object, std::shared_ptr<Grid3D> grid,
- std::shared_ptr<BCAdapter> bcAdapter, int type,
+ std::shared_ptr<BC> bcAdapter, int type,
Interactor3D::Accuracy accuracy) override;
};
diff --git a/src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h b/src/cpu/simulationconfig/KernelConfigStructs.h
similarity index 53%
rename from src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h
rename to src/cpu/simulationconfig/KernelConfigStructs.h
index f346ea6cdbc8dffe164ddda2bff5808886160092..c7e46854933e7a8e64abc7b8ab961fc0f6e5eeb3 100644
--- a/src/cpu/simulationconfig/include/simulationconfig/KernelConfigStructs.h
+++ b/src/cpu/simulationconfig/KernelConfigStructs.h
@@ -2,16 +2,18 @@
#define VIRTUALFLUIDSPYTHONBINDINGS_KERNELCONFIGSTRUCTS_H
#include <string>
-#include <basics/Core/DataTypes.h>
+#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 56%
rename from src/cpu/simulationconfig/src/Simulation.cpp
rename to src/cpu/simulationconfig/Simulation.cpp
index 098f913d61a87b0dd2692faad07de691ca7e04a1..ec8773515ce49bdb8c0680152924605203ba9405 100644
--- a/src/cpu/simulationconfig/src/Simulation.cpp
+++ b/src/cpu/simulationconfig/Simulation.cpp
@@ -1,24 +1,30 @@
+#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/BCProcessor.h>
-#include <CoProcessors/CoProcessor.h>
-#include <CoProcessors/NUPSCounterCoProcessor.h>
-#include <CoProcessors/WriteBlocksCoProcessor.h>
-#include <CoProcessors/WriteBoundaryConditionsCoProcessor.h>
-#include <CoProcessors/WriteMacroscopicQuantitiesCoProcessor.h>
-#include <Grid/BasicCalculator.h>
-#include <Grid/Calculator.h>
-#include <Grid/Grid3D.h>
+#include <BoundaryConditions/BCStrategy.h>
+#include <BoundaryConditions/BCSet.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/LBMKernel.h>
@@ -31,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<BCAdapter> &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);
@@ -72,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<BCAdapter> &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];
@@ -146,7 +142,7 @@ 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);
@@ -155,23 +151,22 @@ void Simulation::run()
auto nupsCoProcessor = makeNupsCoProcessor();
- auto calculator = std::make_shared<BasicCalculator>(grid, visualizationScheduler,
+ auto simulation = std::make_shared<Simulation>(grid, visualizationScheduler,
simulationParameters->numberOfTimeSteps);
- calculator->addCoProcessor(nupsCoProcessor);
- calculator->addCoProcessor(mqCoProcessor);
+ 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);
@@ -180,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);
- WriteBoundaryConditionsCoProcessor ppgeo(grid, geoSch, writerConfig.outputPath, writerConfig.getWriter(),
+ 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<WriteBlocksCoProcessor>(grid,
+ 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());
}
@@ -260,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<CoProcessor>
-Simulation::makeMacroscopicQuantitiesCoProcessor(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 mqCoProcessor = std::make_shared<WriteMacroscopicQuantitiesCoProcessor>(grid, visualizationScheduler,
- writerConfig.outputPath,
- writerConfig.getWriter(),
- converter,
- communicator);
- mqCoProcessor->process(0);
+ auto mqCoProcessor = std::make_shared<WriteMacroscopicQuantitiesSimulationObserver>(grid, visualizationScheduler, writerConfig.outputPath, writerConfig.getWriter(), converter, communicator);
+ mqCoProcessor->update(0);
return mqCoProcessor;
}
-std::shared_ptr<CoProcessor> Simulation::makeNupsCoProcessor() const
+std::shared_ptr<SimulationObserver> CPUSimulation::makeNupsCoProcessor() const
{
auto scheduler = std::make_shared<UbScheduler>(100, 100);
- return std::make_shared<NUPSCounterCoProcessor>(grid, scheduler,
+ 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 76%
rename from src/cpu/simulationconfig/include/simulationconfig/Simulation.h
rename to src/cpu/simulationconfig/Simulation.h
index 63298db81741864b40c4b320fbe4bd72f688715c..ee8fc911c684b55d0f624ab8db960d225e24790b 100644
--- a/src/cpu/simulationconfig/include/simulationconfig/Simulation.h
+++ b/src/cpu/simulationconfig/Simulation.h
@@ -9,9 +9,9 @@
#include <geometry3d/GbPoint3D.h>
#include <Interactors/Interactor3D.h>
-#include <BoundaryConditions/BCAdapter.h>
+#include <BoundaryConditions/BC.h>
#include <Visitors/BoundaryConditionsBlockVisitor.h>
-#include <CoProcessors/CoProcessor.h>
+#include <SimulationObservers/SimulationObserver.h>
#include <LBM/LBMUnitConverter.h>
#include "KernelFactory.h"
#include "AbstractLBMSystem.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<BCAdapter>> 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);
@@ -57,10 +36,10 @@ public:
void setKernelConfiguration(const std::shared_ptr<LBMKernelConfiguration> &kernel);
- void addObject(const std::shared_ptr<GbObject3D> &object, const std::shared_ptr<BCAdapter> &bcAdapter, int state,
+ void addObject(const std::shared_ptr<GbObject3D> &object, const std::shared_ptr<BC> &bcAdapter, int state,
const std::string &folderPath);
- void addBCAdapter(const std::shared_ptr<BCAdapter> &bcAdapter);
+ void addBCAdapter(const std::shared_ptr<BC> &bcAdapter);
void run();
@@ -73,7 +52,7 @@ private:
void writeBoundaryConditions() const;
- std::shared_ptr<CoProcessor> makeMacroscopicQuantitiesCoProcessor(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<CoProcessor> makeNupsCoProcessor() 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/gpu/GridGenerator/CMakeLists.txt b/src/gpu/GridGenerator/CMakeLists.txt
index 8102ad3a10b53dded2ba6fe489753f20d1d2ed4f..7cc0f0e20e2b43601f9f70e639d0ecd61cadb2ae 100644
--- a/src/gpu/GridGenerator/CMakeLists.txt
+++ b/src/gpu/GridGenerator/CMakeLists.txt
@@ -1,6 +1,6 @@
project(GridGenerator LANGUAGES CXX)
-vf_add_library(PRIVATE_LINK basics OpenMP::OpenMP_CXX)
+vf_add_library(PUBLIC_LINK basics logger OpenMP::OpenMP_CXX)
vf_add_tests()
if(NOT MSVC)
diff --git a/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h b/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h
index 5172210d1704c7f91d60a306a85a50c951402471..e0db8c2e67de51f0c9774303b5fc954e193f377e 100644
--- a/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h
+++ b/src/gpu/GridGenerator/TransientBCSetter/TransientBCSetter.h
@@ -1,8 +1,8 @@
#ifndef TRANSIENTBCSETTER_H_
#define TRANSIENTBCSETTER_H_
-#include "Core/DataTypes.h"
-#include <Core/StringUtilities/StringUtil.h>
+#include "DataTypes.h"
+#include <StringUtilities/StringUtil.h>
#include "PointerDefinitions.h"
#include <string>
diff --git a/src/gpu/GridGenerator/geometries/Conglomerate/Conglomerate.cpp b/src/gpu/GridGenerator/geometries/Conglomerate/Conglomerate.cpp
index 331b928c6f5542584cffdcc1b17df7207981b8f8..b41813e12da1727ba03b7f179c93b4c6b042b76f 100644
--- a/src/gpu/GridGenerator/geometries/Conglomerate/Conglomerate.cpp
+++ b/src/gpu/GridGenerator/geometries/Conglomerate/Conglomerate.cpp
@@ -32,30 +32,14 @@
//=======================================================================================
#include "Conglomerate.h"
-Conglomerate::Conglomerate()
-{
- addObjects = new Object*[MAX_NUMBER_OF_OBJECTS];
- subtractObjects = new Object*[MAX_NUMBER_OF_OBJECTS];
-}
-
-Conglomerate::~Conglomerate()
-{
- for (uint i = 0; i < numberOfAddObjects; i++)
- delete addObjects[i];
-
- for (uint i = 0; i < numberOfSubtractObjects; i++)
- delete subtractObjects[i];
-
- delete[] addObjects;
- delete[] subtractObjects;
-}
+#include <memory>
SPtr<Conglomerate> Conglomerate::makeShared()
{
- return SPtr<Conglomerate>(new Conglomerate());
+ return std::make_shared<Conglomerate>();
}
-void Conglomerate::add(Object* object)
+void Conglomerate::add(SPtr<Object> object)
{
if (numberOfAddObjects < MAX_NUMBER_OF_OBJECTS)
{
@@ -65,7 +49,7 @@ void Conglomerate::add(Object* object)
printf("[WARNING] max numbers of %d reached! Object was not added.\n", MAX_NUMBER_OF_OBJECTS);
}
-void Conglomerate::subtract(Object* object)
+void Conglomerate::subtract(SPtr<Object> object)
{
if (numberOfSubtractObjects < MAX_NUMBER_OF_OBJECTS)
{
@@ -76,9 +60,9 @@ void Conglomerate::subtract(Object* object)
printf("[WARNING] max numbers of %d reached! Object was not added.\n", MAX_NUMBER_OF_OBJECTS);
}
-Object* Conglomerate::clone() const
+SPtr<Object> Conglomerate::clone() const
{
- auto conglomerate = new Conglomerate();
+ auto conglomerate = std::make_shared<Conglomerate>();
for (uint i = 0; i < numberOfAddObjects; i++)
conglomerate->add(addObjects[i]->clone());
@@ -193,5 +177,5 @@ void Conglomerate::findInnerNodes(SPtr<GridImp> grid)
addObjects[i]->findInnerNodes(grid);
if( numberOfSubtractObjects > 0 )
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Warning: Conglomerate::substract() is currently nut fully implemented!\n";
+ VF_LOG_WARNING("Warning: Conglomerate::substract() is currently nut fully implemented!");
}
diff --git a/src/gpu/GridGenerator/geometries/Conglomerate/Conglomerate.h b/src/gpu/GridGenerator/geometries/Conglomerate/Conglomerate.h
index 8cb26137d6ab4e4c52bed34aa1d044121ac4bf3d..0b3f7ad7b67554b72ad78188d68d9570bf21e090 100644
--- a/src/gpu/GridGenerator/geometries/Conglomerate/Conglomerate.h
+++ b/src/gpu/GridGenerator/geometries/Conglomerate/Conglomerate.h
@@ -33,25 +33,25 @@
#ifndef CONGLOMERATE_H
#define CONGLOMERATE_H
+#include <array>
+
#include "global.h"
#include "geometries/Object.h"
+#include "basics/PointerDefinitions.h"
#define MAX_NUMBER_OF_OBJECTS 20
class GRIDGENERATOR_EXPORT Conglomerate : public Object
{
-public:
- Conglomerate();
- virtual ~Conglomerate();
-
+public:
static SPtr<Conglomerate> makeShared();
- void add(Object* object);
- void subtract(Object* objectStub);
+ void add(SPtr<Object> object);
+ void subtract(SPtr<Object> objectStub);
- Object* clone() const override;
+ SPtr<Object> clone() const override;
double getX1Centroid() override;
double getX1Minimum() override;
@@ -74,8 +74,8 @@ protected:
static double getMaximum(double val1, double val2);
- Object** addObjects;
- Object** subtractObjects;
+ std::array<SPtr<Object>, MAX_NUMBER_OF_OBJECTS> addObjects;
+ std::array<SPtr<Object>, MAX_NUMBER_OF_OBJECTS> subtractObjects;
uint numberOfAddObjects = 0;
uint numberOfSubtractObjects = 0;
};
diff --git a/src/gpu/GridGenerator/geometries/Cuboid/Cuboid.cpp b/src/gpu/GridGenerator/geometries/Cuboid/Cuboid.cpp
index 7b0dbcdbdcbd679f1eb47ed5db7d828da8c31767..2cf56a867954abecf14f7dc2a74f735ebb0660a7 100644
--- a/src/gpu/GridGenerator/geometries/Cuboid/Cuboid.cpp
+++ b/src/gpu/GridGenerator/geometries/Cuboid/Cuboid.cpp
@@ -32,6 +32,7 @@
//=======================================================================================
#include "Cuboid.h"
+#include "PointerDefinitions.h"
#include "utilities/math/Math.h"
Cuboid::Cuboid(const double& x1a,const double& x2a, const double& x3a, const double& x1b,const double& x2b, const double& x3b)
@@ -40,14 +41,9 @@ Cuboid::Cuboid(const double& x1a,const double& x2a, const double& x3a, const dou
}
-Cuboid::~Cuboid()
+SPtr<Object> Cuboid::clone() const
{
-
-}
-
-Object* Cuboid::clone() const
-{
- return new Cuboid(minX1, minX2, minX3, maxX1, maxX2, maxX3);
+ return std::make_shared<Cuboid>(minX1, minX2, minX3, maxX1, maxX2, maxX3);
}
double Cuboid::getX1Centroid()
diff --git a/src/gpu/GridGenerator/geometries/Cuboid/Cuboid.h b/src/gpu/GridGenerator/geometries/Cuboid/Cuboid.h
index 0351bd3ed847f9702e3c64bce4dcef514804e23a..7ff5c14c2f17b4ed80f4f1e0c03d26ea1a2eb196 100644
--- a/src/gpu/GridGenerator/geometries/Cuboid/Cuboid.h
+++ b/src/gpu/GridGenerator/geometries/Cuboid/Cuboid.h
@@ -41,9 +41,8 @@ class GRIDGENERATOR_EXPORT Cuboid : public Object
{
public:
Cuboid(const double& minX1, const double& minX2, const double& minX3, const double& maxX1,const double& maxX2, const double& maxX3);
- virtual ~Cuboid();
- Object* clone() const override;
+ SPtr<Object> clone() const override;
double getX1Centroid() override;
double getX1Minimum() override;
diff --git a/src/gpu/GridGenerator/geometries/Object.h b/src/gpu/GridGenerator/geometries/Object.h
index b92cca7992dcb06c1f230da8d8c9ce46bb7a3416..8bb0a35d5e38df1f7db390fdf5ee750295788395 100644
--- a/src/gpu/GridGenerator/geometries/Object.h
+++ b/src/gpu/GridGenerator/geometries/Object.h
@@ -43,8 +43,8 @@ struct Vertex;
class GRIDGENERATOR_EXPORT Object
{
public:
- virtual ~Object() {}
- virtual Object* clone() const = 0;
+ virtual ~Object() = default;
+ virtual SPtr<Object> clone() const = 0;
virtual double getX1Centroid() = 0;
virtual double getX1Minimum() = 0;
diff --git a/src/gpu/GridGenerator/geometries/Sphere/Sphere.cpp b/src/gpu/GridGenerator/geometries/Sphere/Sphere.cpp
index fa460bc021cdca1159f272e3bcb4d4dad50fc352..4669bbcfb9848a910bc86f9331a394daf6c55dd5 100644
--- a/src/gpu/GridGenerator/geometries/Sphere/Sphere.cpp
+++ b/src/gpu/GridGenerator/geometries/Sphere/Sphere.cpp
@@ -44,18 +44,14 @@ Sphere::Sphere(const double& centerX, const double& centerY, const double& cente
}
-Sphere::~Sphere()
-{
-}
-
SPtr<Sphere> Sphere::makeShared(double centerX, double centerY, double centerZ, double radius)
{
- return SPtr<Sphere>(new Sphere(centerX, centerY, centerZ, radius));
+ return std::make_shared<Sphere>(centerX, centerY, centerZ, radius);
}
-Object* Sphere::clone() const
+SPtr<Object> Sphere::clone() const
{
- return new Sphere(centerX, centerY, centerZ, radius);
+ return std::make_shared<Sphere>(centerX, centerY, centerZ, radius);
}
double Sphere::getX1Centroid()
diff --git a/src/gpu/GridGenerator/geometries/Sphere/Sphere.h b/src/gpu/GridGenerator/geometries/Sphere/Sphere.h
index 03b9ef9fd101f19dbaff7d4e4109000cce6e3c49..9ac8821a9c95fce8de16c22688ef3c585197804a 100644
--- a/src/gpu/GridGenerator/geometries/Sphere/Sphere.h
+++ b/src/gpu/GridGenerator/geometries/Sphere/Sphere.h
@@ -33,6 +33,7 @@
#ifndef SPHERE_H
#define SPHERE_H
+#include "PointerDefinitions.h"
#include "global.h"
#include "geometries/Object.h"
@@ -40,11 +41,10 @@ class GRIDGENERATOR_EXPORT Sphere : public Object
{
public:
Sphere(const double& centerX, const double& centerY, const double& centerZ, const double& radius);
- virtual ~Sphere();
static SPtr<Sphere> makeShared(double centerX, double centerY, double centerZ, double radius);
- Object* clone() const override;
+ SPtr<Object> clone() const override;
double getX1Centroid() override;
double getX1Minimum() override;
diff --git a/src/gpu/GridGenerator/geometries/Triangle/Triangle.cpp b/src/gpu/GridGenerator/geometries/Triangle/Triangle.cpp
index bf272b9e7f46c413ae6edce62c05d1be20d327de..8d459e75b5b27c5d5a1c9e645b08b5fc663e8be6 100644
--- a/src/gpu/GridGenerator/geometries/Triangle/Triangle.cpp
+++ b/src/gpu/GridGenerator/geometries/Triangle/Triangle.cpp
@@ -40,7 +40,6 @@ using namespace vf::gpu;
Triangle::Triangle(Vertex &v1, Vertex &v2, Vertex &v3, Vertex &normal) : v1(v1), v2(v2), v3(v3), normal(normal), patchIndex(INVALID_INDEX) {}
Triangle::Triangle(Vertex &v1, Vertex &v2, Vertex &v3) : v1(v1), v2(v2), v3(v3), patchIndex(INVALID_INDEX) { calcNormal(); }
-Triangle::Triangle(){}
void Triangle::set(const Vertex &v1, const Vertex &v2, const Vertex &v3)
{
diff --git a/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMesh.cpp b/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMesh.cpp
index 883ca0deaf34f45e4608c4e59908b4562932db77..91bb8f030e76fa6e083e7765feb18c7ccc517ee1 100644
--- a/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMesh.cpp
+++ b/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMesh.cpp
@@ -32,7 +32,7 @@
//=======================================================================================
#include "TriangularMesh.h"
-#include "Core/Timer/Timer.h"
+#include "Timer/Timer.h"
#include "basics/geometry3d/GbTriFaceMesh3D.h"
@@ -79,9 +79,9 @@ TriangularMesh::TriangularMesh()
this->minmax = BoundingBox::makeInvalidMinMaxBox(); // blame Lenz
}
-Object* TriangularMesh::clone() const
+SPtr<Object> TriangularMesh::clone() const
{
- auto mesh = new TriangularMesh();
+ auto mesh = std::make_shared<TriangularMesh>();
mesh->setTriangles(this->triangleVec);
return mesh;
}
@@ -95,7 +95,7 @@ uint TriangularMesh::getNumberOfTriangles() const
void TriangularMesh::findNeighbors()
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "start finding neighbors ...\n";
+ VF_LOG_INFO("start finding neighbors ...");
auto t = Timer::makeStart();
@@ -103,8 +103,7 @@ void TriangularMesh::findNeighbors()
finder.fillWithNeighborAngles(this);
t->end();
-
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "time finding neighbors: " << t->getTimeInSeconds() << "s\n";
+ VF_LOG_INFO("time finding neighbors = {}", t->getTimeInSeconds());
}
void TriangularMesh::setTriangles(std::vector<Triangle> triangles)
@@ -152,7 +151,7 @@ GRIDGENERATOR_EXPORT void TriangularMesh::generateGbTriFaceMesh3D()
{
if( this->VF_GbTriFaceMesh3D ) return;
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start generating GbTriFaceMesh3D:\n";
+ VF_LOG_INFO("Start generating GbTriFaceMesh3D");
std::vector<GbTriFaceMesh3D::Vertex> *gbVertices = new std::vector<GbTriFaceMesh3D::Vertex>(this->triangleVec.size() * 3);
std::vector<GbTriFaceMesh3D::TriFace> *gbTriangles = new std::vector<GbTriFaceMesh3D::TriFace>(this->triangleVec.size());
@@ -168,7 +167,7 @@ GRIDGENERATOR_EXPORT void TriangularMesh::generateGbTriFaceMesh3D()
this->VF_GbTriFaceMesh3D = std::make_shared<GbTriFaceMesh3D>( "stl", gbVertices, gbTriangles, GbTriFaceMesh3D::KDTREE_SAHPLIT, false );
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Done generating GbTriFaceMesh3D\n";
+ VF_LOG_INFO("Done generating GbTriFaceMesh3D");
}
@@ -238,9 +237,9 @@ void TriangularMesh::scale(double offset)
const int vertexTriangleID = (int)vertexID % 3;
Vertex intersection;
- Vertex p = this->triangleVec[triangleID].v1 + this->triangleVec[triangleID].normal * offset;
+ // Vertex p = this->triangleVec[triangleID].v1 + this->triangleVec[triangleID].normal * offset; // TODO: https://git.rz.tu-bs.de/irmb/VirtualFluids_dev/-/issues/85
Vertex lineOrigin = this->triangleVec[triangleID].get(vertexTriangleID);
- //bool b = intersectPlane(this->triangleVec[triangleID].normal, p, lineOrigin, averrageNormal, intersection);
+ // bool b = intersectPlane(this->triangleVec[triangleID].normal, p, lineOrigin, averrageNormal, intersection);
triangles[triangleID].set(vertexTriangleID, intersection);
triangles[triangleID].calcNormal();
diff --git a/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMesh.h b/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMesh.h
index 2e876e1d3c50b377ef6df9a8489fe8a189849594..7c050dd70b3908f3e4b021872887c74833594a26 100644
--- a/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMesh.h
+++ b/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMesh.h
@@ -87,7 +87,7 @@ private:
static void eliminateTriangleswithIdenticialNormal(std::vector<Triangle> &triangles);
public:
- Object* clone() const override;
+ SPtr<Object> clone() const override;
double getX1Centroid() override { throw "Not implemented in TriangularMesh"; }
double getX1Minimum() override { return minmax.minX; }
double getX1Maximum() override { return minmax.maxX; }
diff --git a/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMeshStrategy.cpp b/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMeshStrategy.cpp
index d9c1486e2ca9469d55174eca673f22f180a78294..6d12a19cc097c0b8e98c59a938380be97dc0b15c 100644
--- a/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMeshStrategy.cpp
+++ b/src/gpu/GridGenerator/geometries/TriangularMesh/TriangularMeshStrategy.cpp
@@ -32,7 +32,7 @@
//=======================================================================================
#include "TriangularMeshStrategy.h"
-#include "Core/Timer/Timer.h"
+#include "Timer/Timer.h"
#include "basics/geometry3d/GbTriFaceMesh3D.h"
@@ -56,7 +56,7 @@ void PointInObjectDiscretizationStrategy::doDiscretize(TriangularMesh* triangula
{
triangularMesh->generateGbTriFaceMesh3D();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start Point-In-Object Test:\n";
+ VF_LOG_INFO("Start Point-In-Object Test");
// trigger the GbTriFaceMesh3D to generate a kd-tree
triangularMesh->getGbTriFaceMesh3D()->isPointInGbObject3D(0.0, 0.0, 0.0);
@@ -79,12 +79,11 @@ void PointInObjectDiscretizationStrategy::doDiscretize(TriangularMesh* triangula
// grid->setNodeTo(i, OuterType);
if( timer->getCurrentRuntimeInSeconds() > outputTime ){
- *logging::out << logging::Logger::INFO_INTERMEDIATE << " " << index << "/" << grid->getSize() <<" nodes tested!\n";
+ VF_LOG_INFO(" {} / {} nodes tested", index, grid->getSize());
timer->start();
}
}
-
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Done Point-In-Object Test\n";
+ VF_LOG_INFO("Done Point-In-Object Test");
}
@@ -125,10 +124,6 @@ void RayCastingDiscretizationStrategy::doDiscretize(TriangularMesh* triangularMe
}
}
-
-
- int counter = 0;
-
// Test line intersection
for (z = minZ; z <= maxZ; z += grid->getDelta())
{
@@ -136,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);
@@ -153,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);
@@ -171,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);
@@ -189,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);
@@ -207,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);
@@ -225,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/geometries/Vertex/Vertex.h b/src/gpu/GridGenerator/geometries/Vertex/Vertex.h
index ec5fc0f1ced64f7757de26deaf3053504e29d7c6..48e4712d7d701e3710c6ff7c0876e3f762a464d9 100644
--- a/src/gpu/GridGenerator/geometries/Vertex/Vertex.h
+++ b/src/gpu/GridGenerator/geometries/Vertex/Vertex.h
@@ -46,7 +46,6 @@ public:
Vertex(real x, real y, real z);
Vertex();
- ~Vertex() {}
real getEuclideanDistanceTo(const Vertex &w) const;
Vertex operator-(const Vertex &v) const;
diff --git a/src/gpu/GridGenerator/geometries/VerticalCylinder/VerticalCylinder.cpp b/src/gpu/GridGenerator/geometries/VerticalCylinder/VerticalCylinder.cpp
index 89bcd50349fe1a7591c5a873b5924a0c8ce8c2f3..5019f2a7547c509df6b7afd034cae179356c74ec 100644
--- a/src/gpu/GridGenerator/geometries/VerticalCylinder/VerticalCylinder.cpp
+++ b/src/gpu/GridGenerator/geometries/VerticalCylinder/VerticalCylinder.cpp
@@ -38,18 +38,14 @@ VerticalCylinder::VerticalCylinder(const double& centerX, const double& centerY,
}
-VerticalCylinder::~VerticalCylinder()
-{
-}
-
SPtr<VerticalCylinder> VerticalCylinder::makeShared(double centerX, double centerY, double centerZ, double radius, double height)
{
- return SPtr<VerticalCylinder>(new VerticalCylinder(centerX, centerY, centerZ, radius, height));
+ return std::make_shared<VerticalCylinder>(centerX, centerY, centerZ, radius, height);
}
-Object* VerticalCylinder::clone() const
+SPtr<Object> VerticalCylinder::clone() const
{
- return new VerticalCylinder(centerX, centerY, centerZ, radius, height);
+ return std::make_shared<VerticalCylinder>(centerX, centerY, centerZ, radius, height);
}
double VerticalCylinder::getX1Centroid()
diff --git a/src/gpu/GridGenerator/geometries/VerticalCylinder/VerticalCylinder.h b/src/gpu/GridGenerator/geometries/VerticalCylinder/VerticalCylinder.h
index e995d2ba16eba17930401c99c260f81b9c6077b4..64cdecef5824388a31a4f545c85b1194d3f4c77b 100644
--- a/src/gpu/GridGenerator/geometries/VerticalCylinder/VerticalCylinder.h
+++ b/src/gpu/GridGenerator/geometries/VerticalCylinder/VerticalCylinder.h
@@ -40,11 +40,10 @@ class GRIDGENERATOR_EXPORT VerticalCylinder : public Object
{
public:
VerticalCylinder(const double& centerX, const double& centerY, const double& centerZ, const double& radius, const double& height);
- virtual ~VerticalCylinder();
static SPtr<VerticalCylinder> makeShared(double centerX, double centerY, double centerZ, double radius, double height);
- Object* clone() const override;
+ SPtr<Object> clone() const override;
double getX1Centroid() override;
double getX1Minimum() override;
diff --git a/src/gpu/GridGenerator/global.h b/src/gpu/GridGenerator/global.h
index 79f62bb354bed18075f6a8327a18f24d1d0fd1e2..296c6727f248933e259065e68cb81d8bf4e6c119 100644
--- a/src/gpu/GridGenerator/global.h
+++ b/src/gpu/GridGenerator/global.h
@@ -43,8 +43,8 @@
#include "GridGenerator_export.h"
#include "basics/PointerDefinitions.h"
-#include "basics/Core/DataTypes.h"
+#include "basics/DataTypes.h"
-#include "basics/Core/Logger/Logger.h"
+#include <logger/Logger.h>
#endif
diff --git a/src/gpu/GridGenerator/grid/Grid.h b/src/gpu/GridGenerator/grid/Grid.h
index 622682bc308dd730ec91d1bbd012c97f8b15f014..d0969cd8a5318a91c5a486ba1f8811940aa69bd0 100644
--- a/src/gpu/GridGenerator/grid/Grid.h
+++ b/src/gpu/GridGenerator/grid/Grid.h
@@ -52,7 +52,7 @@ class GRIDGENERATOR_EXPORT Grid
public:
virtual ~Grid() = default;
- virtual const Object* getObject() const = 0;
+ virtual SPtr<const Object> getObject() const = 0;
virtual real getDelta() const = 0;
virtual uint getSparseSize() const = 0;
@@ -99,7 +99,7 @@ public:
virtual uint *getFC_offset() const = 0;
virtual real *getDistribution() const = 0;
- virtual int* getDirection() const = 0;
+ virtual const std::vector<int> &getDirection() const = 0;
virtual int getStartDirection() const = 0;
virtual int getEndDirection() const = 0;
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp b/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp
index 003e6dcd223d2bf019c83f71349a9a7bec84efdc..87ec7bab021064de527d251b5fe2908af8b5055d 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp
+++ b/src/gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.cpp
@@ -94,7 +94,7 @@ void LevelGridBuilder::setSlipBoundaryCondition(SideType sideType, real normalX,
slipBoundaryCondition->fillSlipNormalLists();
boundaryConditions[level]->slipBoundaryConditions.push_back(slipBoundaryCondition);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Set Slip BC on level " << level << " with " << (int)slipBoundaryCondition->indices.size() << "\n";
+ VF_LOG_INFO("Set Slip BC on level {} with {}", level, slipBoundaryCondition->indices.size());
}
}
}
@@ -114,7 +114,7 @@ void LevelGridBuilder::setSlipGeometryBoundaryCondition(real normalX, real norma
boundaryConditions[level]->geometryBoundaryCondition->fillSlipNormalLists();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Set Geometry Slip BC on level " << level << " with " << (int)boundaryConditions[level]->geometryBoundaryCondition->indices.size() <<"\n";
+ VF_LOG_INFO("Set Geometry Slip BC on level {} with {}", level, boundaryConditions[level]->geometryBoundaryCondition->indices.size());
}
}
}
@@ -144,7 +144,7 @@ void LevelGridBuilder::setStressBoundaryCondition( SideType sideType,
boundaryConditions[level]->stressBoundaryConditions.push_back(stressBoundaryCondition);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Set Stress BC on level " << level << " with " << (int)stressBoundaryCondition->indices.size() << "\n";
+ VF_LOG_INFO("Set Stress BC on level {} with {}", level, stressBoundaryCondition->indices.size());
}
}
@@ -167,7 +167,7 @@ void LevelGridBuilder::setVelocityBoundaryCondition(SideType sideType, real vx,
boundaryConditions[level]->velocityBoundaryConditions.push_back(velocityBoundaryCondition);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Set Velocity BC on level " << level << " with " << (int)velocityBoundaryCondition->indices.size() <<"\n";
+ VF_LOG_INFO("Set Velocity BC on level {} with {}", level, velocityBoundaryCondition->indices.size());
}
}
}
@@ -187,7 +187,7 @@ void LevelGridBuilder::setVelocityGeometryBoundaryCondition(real vx, real vy, re
boundaryConditions[level]->geometryBoundaryCondition->fillVelocityLists();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Set Geometry Velocity BC on level " << level << " with " << (int)boundaryConditions[level]->geometryBoundaryCondition->indices.size() <<"\n";
+ VF_LOG_INFO("Set Geometry BC on level {} with {}", level, boundaryConditions[level]->geometryBoundaryCondition->indices.size());
}
}
}
@@ -204,7 +204,7 @@ void LevelGridBuilder::setPressureBoundaryCondition(SideType sideType, real rho)
boundaryConditions[level]->pressureBoundaryConditions.push_back(pressureBoundaryCondition);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Set Pressure BC on level " << level << " with " << (int)pressureBoundaryCondition->indices.size() <<"\n";
+ VF_LOG_INFO("Set Pressure BC on level {} with {}", level, pressureBoundaryCondition->indices.size());
}
}
@@ -245,7 +245,7 @@ void LevelGridBuilder::setNoSlipGeometryBoundaryCondition()
{
boundaryConditions[level]->geometryBoundaryCondition->side->addIndices(grids, level, boundaryConditions[level]->geometryBoundaryCondition);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Set Geometry No-Slip BC on level " << level << " with " << (int)boundaryConditions[level]->geometryBoundaryCondition->indices.size() <<"\n";
+ VF_LOG_INFO("Set Geometry No-Slip BC on level {} with {}", level, boundaryConditions[level]->geometryBoundaryCondition->indices.size());
}
}
}
@@ -255,7 +255,7 @@ void LevelGridBuilder::setPrecursorBoundaryCondition(SideType sideType, SPtr<Fil
{
if(fileLevelToGridLevelMap.empty())
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Mapping precursor file levels to the corresponding grid levels" << "\n";
+ VF_LOG_INFO("Mapping precursor file levels to the corresponding grid levels");
for (uint level = 0; level < getNumberOfGridLevels(); level++)
fileLevelToGridLevelMap.push_back(level);
@@ -264,7 +264,7 @@ void LevelGridBuilder::setPrecursorBoundaryCondition(SideType sideType, SPtr<Fil
{
if(fileLevelToGridLevelMap.size()!=getNumberOfGridLevels())
throw std::runtime_error("In setPrecursorBoundaryCondition: fileLevelToGridLevelMap does not match with the number of levels");
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Using user defined file to grid level mapping" << "\n";
+ VF_LOG_INFO("Using user defined file to grid level mapping");
}
for (uint level = 0; level < getNumberOfGridLevels(); level++)
@@ -279,7 +279,7 @@ void LevelGridBuilder::setPrecursorBoundaryCondition(SideType sideType, SPtr<Fil
boundaryConditions[level]->precursorBoundaryConditions.push_back(precursorBoundaryCondition);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Set Precursor BC on level " << level << " with " << (int)precursorBoundaryCondition->indices.size() << "\n";
+ VF_LOG_INFO("Set Precursor BC on level {} with {}", level, precursorBoundaryCondition->indices.size());
}
}
@@ -790,10 +790,10 @@ GRIDGENERATOR_EXPORT SPtr<GeometryBoundaryCondition> LevelGridBuilder::getGeomet
void LevelGridBuilder::findFluidNodes(bool splitDomain)
{
- *logging::out << logging::Logger::INFO_HIGH << "Start findFluidNodes()\n";
+ VF_LOG_TRACE("Start findFluidNodes()");
for (uint i = 0; i < grids.size(); i++)
grids[i]->findFluidNodeIndices(splitDomain);
- *logging::out << logging::Logger::INFO_HIGH << "Done with findFluidNodes()\n";
+ VF_LOG_TRACE("Done findFluidNodes()");
}
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
index 207c974f62530670989f1d655bf790258caf77e6..e45ad99d8a63c332aa3723eb682b61dbc267f4db 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
+++ b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.cpp
@@ -61,7 +61,7 @@ SPtr<MultipleGridBuilder> MultipleGridBuilder::makeShared(SPtr<GridFactory> grid
void MultipleGridBuilder::addCoarseGrid(real startX, real startY, real startZ, real endX, real endY, real endZ, real delta)
{
- boundaryConditions.push_back(SPtr<BoundaryConditions>(new BoundaryConditions));
+ boundaryConditions.push_back(std::make_shared<BoundaryConditions>());
startX -= 0.5 * delta;
startY -= 0.5 * delta;
@@ -70,11 +70,11 @@ void MultipleGridBuilder::addCoarseGrid(real startX, real startY, real startZ, r
endY += 0.5 * delta;
endZ += 0.5 * delta;
- const auto grid = this->makeGrid(new Cuboid(startX, startY, startZ, endX, endY, endZ), startX, startY, startZ, endX, endY, endZ, delta, 0);
+ const auto grid = this->makeGrid(std::make_shared<Cuboid>(startX, startY, startZ, endX, endY, endZ), startX, startY, startZ, endX, endY, endZ, delta, 0);
addGridToList(grid);
}
-void MultipleGridBuilder::addGeometry(Object* solidObject)
+void MultipleGridBuilder::addGeometry(SPtr<Object> solidObject)
{
this->solidObject = solidObject;
@@ -85,7 +85,7 @@ void MultipleGridBuilder::addGeometry(Object* solidObject)
}
}
-void MultipleGridBuilder::addGeometry(Object* solidObject, uint level)
+void MultipleGridBuilder::addGeometry(SPtr<Object> solidObject, uint level)
{
this->solidObject = solidObject;
auto gridShape = solidObject->clone();
@@ -94,7 +94,7 @@ void MultipleGridBuilder::addGeometry(Object* solidObject, uint level)
this->addGrid(gridShape, level);
}
-void MultipleGridBuilder::addGrid(Object* gridShape)
+void MultipleGridBuilder::addGrid(SPtr<Object> gridShape)
{
if (!coarseGridExists())
return emitNoCoarseGridExistsWarning();
@@ -104,7 +104,7 @@ void MultipleGridBuilder::addGrid(Object* gridShape)
addGridToListIfValid(grid);
}
-void MultipleGridBuilder::addGrid(Object* gridShape, uint levelFine)
+void MultipleGridBuilder::addGrid(SPtr<Object> gridShape, uint levelFine)
{
if (!coarseGridExists())
return emitNoCoarseGridExistsWarning();
@@ -140,13 +140,13 @@ void MultipleGridBuilder::addGrid(Object* gridShape, uint levelFine)
//eraseGridsFromListIfInvalid(oldGridSize);
}
-void MultipleGridBuilder::addFineGridToList(uint level, Object* gridShape)
+void MultipleGridBuilder::addFineGridToList(uint level, SPtr<Object> gridShape)
{
const auto grid = makeGrid(gridShape, level, 0);
grids.push_back(grid);
}
-void MultipleGridBuilder::addIntermediateGridsToList(uint levelDifference, uint levelFine, uint nodesBetweenGrids, Object* gridShape)
+void MultipleGridBuilder::addIntermediateGridsToList(uint levelDifference, uint levelFine, uint nodesBetweenGrids, SPtr<Object> gridShape)
{
if (levelDifference > 0)
{
@@ -156,7 +156,7 @@ void MultipleGridBuilder::addIntermediateGridsToList(uint levelDifference, uint
for (int i = levelDifference - 1; i >= 0; i--)
{
const real scalingFactor = nodesBetweenGrids * spacings[i] * calculateDelta(levelFine);
- Object* gridShapeClone = gridShape->clone();
+ SPtr<Object> gridShapeClone = gridShape->clone();
gridShapeClone->scale(scalingFactor);
const auto grid = makeGrid(gridShapeClone, level++, 0);
@@ -193,7 +193,7 @@ void MultipleGridBuilder::addGridToListIfValid(SPtr<Grid> grid)
addGridToList(grid);
}
-SPtr<Grid> MultipleGridBuilder::makeGrid(Object* gridShape, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, uint level) const
+SPtr<Grid> MultipleGridBuilder::makeGrid(SPtr<Object> gridShape, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, uint level) const
{
return gridFactory->makeGrid(gridShape, startX, startY, startZ, endX, endY, endZ, delta, level);
}
@@ -203,9 +203,9 @@ bool MultipleGridBuilder::coarseGridExists() const
return !grids.empty();
}
-SPtr<Grid> MultipleGridBuilder::makeGrid(Object* gridShape, uint level, uint levelFine)
+SPtr<Grid> MultipleGridBuilder::makeGrid(SPtr<Object> gridShape, uint level, uint levelFine)
{
- boundaryConditions.push_back(SPtr<BoundaryConditions>(new BoundaryConditions));
+ boundaryConditions.push_back(std::make_shared<BoundaryConditions>());
const real delta = calculateDelta(level);
@@ -213,11 +213,11 @@ SPtr<Grid> MultipleGridBuilder::makeGrid(Object* gridShape, uint level, uint lev
auto staggeredCoordinates = getStaggeredCoordinates(gridShape, level, levelFine, xOddStart, yOddStart, zOddStart);
- SPtr<Grid> newGrid = this->makeGrid(gridShape, staggeredCoordinates[0],
- staggeredCoordinates[1],
- staggeredCoordinates[2],
- staggeredCoordinates[3],
- staggeredCoordinates[4],
+ SPtr<Grid> newGrid = this->makeGrid(gridShape, staggeredCoordinates[0],
+ staggeredCoordinates[1],
+ staggeredCoordinates[2],
+ staggeredCoordinates[3],
+ staggeredCoordinates[4],
staggeredCoordinates[5], delta, level);
newGrid->setOddStart( xOddStart, yOddStart, zOddStart );
@@ -233,7 +233,7 @@ real MultipleGridBuilder::calculateDelta(uint level) const
return delta;
}
-std::array<real, 6> MultipleGridBuilder::getStaggeredCoordinates(Object* gridShape, uint level, uint levelFine, bool& xOddStart, bool& yOddStart, bool& zOddStart) const
+std::array<real, 6> MultipleGridBuilder::getStaggeredCoordinates(SPtr<Object> gridShape, uint level, uint levelFine, bool& xOddStart, bool& yOddStart, bool& zOddStart) const
{
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
@@ -490,7 +490,7 @@ void MultipleGridBuilder::buildGrids(bool enableThinWalls )
//
for( int level = (int)grids.size()-1; level >= 0; level-- ) {
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start initializing level " << level << "\n";
+ VF_LOG_INFO("Start initializing level {}", level);
// On the coarse grid every thing is Fluid (w.r.t. the refinement)
// On the finest grid the Fluid region is defined by the Object
@@ -502,7 +502,7 @@ void MultipleGridBuilder::buildGrids(bool enableThinWalls )
else
grids[level]->inital( grids[level+1], this->numberOfLayersBetweenLevels );
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Done initializing level " << level << "\n";
+ VF_LOG_INFO("Done initializing level {}", level);
}
//////////////////////////////////////////////////////////////////////////
@@ -516,8 +516,7 @@ void MultipleGridBuilder::buildGrids(bool enableThinWalls )
//
if (solidObject)
{
-
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start with Q Computation\n";
+ VF_LOG_TRACE("Start with Q Computation");
// Currently the solid object is only used on the finest grid,
// because refinement into solid objects is not yet implemented.
@@ -529,13 +528,13 @@ void MultipleGridBuilder::buildGrids(bool enableThinWalls )
//for( uint level = 0; level < grids.size(); level++ )
uint level = (uint)grids.size() - 1;
{
- // the Grid::mesh(...) method distinguishes inside and ouside regions
+ // the Grid::mesh(...) method distinguishes inside and outside regions
// of the solid domain.:
// => set inner nodes to INVALID_SOLID
// => close needle sells
// => set one layer of STOPPER_SOLID nodes in the solid domain
// => set one layer of BC_SOLID nodes in the fluid domain
- grids[level]->mesh(solidObject);
+ grids[level]->mesh(solidObject.get());
// if thin walls are enables additional BC_SOLID nodes are found by
// Grid::findOs(...). To prevent the actual Q computation,
@@ -544,17 +543,17 @@ void MultipleGridBuilder::buildGrids(bool enableThinWalls )
// additionally some needle cells are closed in this process.
if (enableThinWalls) {
grids[level]->enableFindSolidBoundaryNodes();
- grids[level]->findQs(solidObject);
+ grids[level]->findQs(solidObject.get());
grids[level]->closeNeedleCellsThinWall();
grids[level]->enableComputeQs();
}
// compute the sub grid distances
// this works for STL and Sphere objects, but not yet for other primitives!
- grids[level]->findQs(solidObject);
+ grids[level]->findQs(solidObject.get());
}
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Done with Q Computation\n";
+ VF_LOG_TRACE("Done with Q Computation");
}
//////////////////////////////////////////////////////////////////////////
@@ -603,24 +602,24 @@ GRIDGENERATOR_EXPORT void MultipleGridBuilder::setNumberOfLayers(uint numberOfLa
void MultipleGridBuilder::emitNoCoarseGridExistsWarning()
{
- *logging::out << logging::Logger::WARNING << "No Coarse grid was added before. Actual Grid is not added, please create coarse grid before.\n";
+ VF_LOG_WARNING("No Coarse grid was added before. Actual Grid is not added, please create coarse grid before.");
}
void MultipleGridBuilder::emitGridIsNotInCoarseGridWarning()
{
- *logging::out << logging::Logger::WARNING << "Grid lies not inside of coarse grid. Actual Grid is not added.\n";
+ VF_LOG_WARNING("Grid lies not inside of coarse grid. Actual Grid is not added.");
}
void MultipleGridBuilder::findCommunicationIndices(int direction)
{
- *logging::out << logging::Logger::INFO_HIGH << "Start findCommunicationIndices()\n";
+ VF_LOG_TRACE("Start findCommunicationIndices()");
if( this->subDomainBox )
for (size_t i = 0; i < grids.size(); i++)
grids[i]->findCommunicationIndices(direction, this->subDomainBox);
- *logging::out << logging::Logger::INFO_HIGH << "Done with findCommunicationIndices()\n";
+ VF_LOG_TRACE("Done findCommunicationIndices()");
}
void MultipleGridBuilder::writeGridsToVtk(const std::string& path) const
diff --git a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h
index e6a71580ebc229d7a1b671bd8a315a7685749340..8d94edd0f42b237ef4e45e5a4f4246d739a51b46 100644
--- a/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h
+++ b/src/gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h
@@ -54,11 +54,11 @@ public:
GRIDGENERATOR_EXPORT static SPtr<MultipleGridBuilder> makeShared(SPtr<GridFactory> gridFactory);
GRIDGENERATOR_EXPORT void addCoarseGrid(real startX, real startY, real startZ, real endX, real endY, real endZ, real delta);
- GRIDGENERATOR_EXPORT void addGrid(Object *gridShape);
- GRIDGENERATOR_EXPORT void addGrid(Object *gridShape, uint levelFine);
+ GRIDGENERATOR_EXPORT void addGrid(SPtr<Object> gridShape);
+ GRIDGENERATOR_EXPORT void addGrid(SPtr<Object> gridShape, uint levelFine);
- GRIDGENERATOR_EXPORT void addGeometry(Object *gridShape);
- GRIDGENERATOR_EXPORT void addGeometry(Object *solidObject, uint level);
+ GRIDGENERATOR_EXPORT void addGeometry(SPtr<Object> gridShape);
+ GRIDGENERATOR_EXPORT void addGeometry(SPtr<Object> solidObject, uint level);
GRIDGENERATOR_EXPORT uint getNumberOfLevels() const;
GRIDGENERATOR_EXPORT real getDelta(uint level) const;
@@ -86,24 +86,24 @@ private:
bool coarseGridExists() const;
bool isGridInCoarseGrid(SPtr<Grid> grid) const;
- void addFineGridToList(uint level, Object *gridShape);
- void addIntermediateGridsToList(uint levelDifference, uint levelFine, uint nodesBetweenGrids, Object *gridShape);
+ void addFineGridToList(uint level, SPtr<Object> gridShape);
+ void addIntermediateGridsToList(uint levelDifference, uint levelFine, uint nodesBetweenGrids, SPtr<Object>gridShape);
void eraseGridsFromListIfInvalid(uint oldSize);
void addGridToListIfValid(SPtr<Grid> grid);
- std::array<real, 6> getStaggeredCoordinates(Object *gridShape, uint level, uint levelFine, bool &xOddStart, bool &yOddStart, bool &zOddStart) const;
+ std::array<real, 6> getStaggeredCoordinates(SPtr<Object> gridShape, uint level, uint levelFine, bool &xOddStart, bool &yOddStart, bool &zOddStart) const;
std::array<real, 6> getStaggeredCoordinates(real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, uint level) const;
std::array<real, 3> getOffset(real delta) const;
std::vector<uint> getSpacingFactors(uint levelDifference) const;
- SPtr<Grid> makeGrid(Object *gridShape, uint level, uint levelFine);
- SPtr<Grid> makeGrid(Object *gridShape, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, uint level) const;
+ SPtr<Grid> makeGrid(SPtr<Object> gridShape, uint level, uint levelFine);
+ SPtr<Grid> makeGrid(SPtr<Object> gridShape, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, uint level) const;
static void emitNoCoarseGridExistsWarning();
static void emitGridIsNotInCoarseGridWarning();
SPtr<GridFactory> gridFactory;
- Object *solidObject = nullptr;
+ SPtr<Object> solidObject = nullptr;
uint numberOfLayersFine;
uint numberOfLayersBetweenLevels;
diff --git a/src/gpu/GridGenerator/grid/GridFactory.h b/src/gpu/GridGenerator/grid/GridFactory.h
index 53d358d5325390394f1d38694de605e5cc0d2f56..a78dfe6d848a5f180bea9073056522d0e2196433 100644
--- a/src/gpu/GridGenerator/grid/GridFactory.h
+++ b/src/gpu/GridGenerator/grid/GridFactory.h
@@ -50,16 +50,16 @@ class GRIDGENERATOR_EXPORT GridFactory
public:
static SPtr<GridFactory> make()
{
- return SPtr<GridFactory>(new GridFactory());
+ return std::make_shared<GridFactory>();
}
- SPtr<Grid> makeGrid(Object* gridShape, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, uint level, const std::string& d3Qxx = "D3Q27")
+ SPtr<Grid> makeGrid(SPtr<Object> gridShape, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, uint level, const std::string& d3Qxx = "D3Q27")
{
SPtr<GridImp> grid;
grid = GridImp::makeShared(gridShape, startX, startY, startZ, endX, endY, endZ, delta, d3Qxx, level);
- grid->setTriangularMeshDiscretizationStrategy(new PointInObjectDiscretizationStrategy());
+ grid->setTriangularMeshDiscretizationStrategy(std::make_shared<PointInObjectDiscretizationStrategy>()); // Probably a bug, as this->triangularMeshDiscretizationStrategy is never used. Until ad5efd332a1d6808fccdf8e54fa547630eff401b this line was ``grid->setTriangularMeshDiscretizationStrategy(this->triangularMeshDiscretizationStrategy);``
return grid;
}
@@ -69,19 +69,19 @@ public:
switch (triangularMeshDiscretizationMethod)
{
case TriangularMeshDiscretizationMethod::POINT_UNDER_TRIANGLE:
- triangularMeshDiscretizationStrategy = new PointUnderTriangleStrategy();
+ triangularMeshDiscretizationStrategy = std::make_shared<PointUnderTriangleStrategy>();
break;
case TriangularMeshDiscretizationMethod::RAYCASTING:
- triangularMeshDiscretizationStrategy = new RayCastingDiscretizationStrategy();
+ triangularMeshDiscretizationStrategy = std::make_shared<RayCastingDiscretizationStrategy>();
break;
case TriangularMeshDiscretizationMethod::POINT_IN_OBJECT:
- triangularMeshDiscretizationStrategy = new PointInObjectDiscretizationStrategy();
+ triangularMeshDiscretizationStrategy = std::make_shared<PointInObjectDiscretizationStrategy>();
break;
}
}
private:
- TriangularMeshDiscretizationStrategy* triangularMeshDiscretizationStrategy;
+ SPtr<TriangularMeshDiscretizationStrategy> triangularMeshDiscretizationStrategy;
};
diff --git a/src/gpu/GridGenerator/grid/GridImp.cpp b/src/gpu/GridGenerator/grid/GridImp.cpp
index b68b4bfb2532a23c2ca9c36fd8b2ba89f98614c3..8ece061168883544d9857f109d505614ca005a43 100644
--- a/src/gpu/GridGenerator/grid/GridImp.cpp
+++ b/src/gpu/GridGenerator/grid/GridImp.cpp
@@ -36,6 +36,7 @@
#include <sstream>
# include <algorithm>
#include <cmath>
+#include <vector>
#include "global.h"
@@ -60,7 +61,7 @@ int DIRECTIONS[DIR_END_MAX][DIMENSION];
using namespace vf::gpu;
-GridImp::GridImp(Object* object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, Distribution distribution, uint level)
+GridImp::GridImp(SPtr<Object> object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, Distribution distribution, uint level)
: object(object),
startX(startX),
startY(startY),
@@ -91,7 +92,7 @@ GridImp::GridImp(Object* object, real startX, real startY, real startZ, real end
initalNumberOfNodesAndSize();
}
-SPtr<GridImp> GridImp::makeShared(Object* object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, std::string d3Qxx, uint level)
+SPtr<GridImp> GridImp::makeShared(SPtr<Object> object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, std::string d3Qxx, uint level)
{
Distribution distribution = DistributionHelper::getDistribution(d3Qxx);
SPtr<GridImp> grid(new GridImp(object, startX, startY, startZ, endX, endY, endZ, delta, distribution, level));
@@ -130,31 +131,31 @@ void GridImp::inital(const SPtr<Grid> fineGrid, uint numberOfLayers)
for (uint i = 0; i < this->size; i++)
this->qIndices[i] = INVALID_INDEX;
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start initalNodesToOutOfGrid()\n";
+ VF_LOG_TRACE("Start initalNodesToOutOfGrid()");
+
#pragma omp parallel for
for (int index = 0; index < (int)this->size; index++)
this->initalNodeToOutOfGrid(index);
if( this->innerRegionFromFinerGrid ){
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start setInnerBasedOnFinerGrid()\n";
+ VF_LOG_TRACE("Start setInnerBasedOnFinerGrid()");
this->setInnerBasedOnFinerGrid(fineGrid);
}
else{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start findInnerNodes()\n";
+ VF_LOG_TRACE("Start findInnerNodes()");
this->object->findInnerNodes( shared_from_this() );
}
-
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start addOverlap()\n";
+ VF_LOG_TRACE("Start addOverlap()");
this->addOverlap();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start fixOddCells()\n";
+ VF_LOG_TRACE("Start fixOddCells()");
#pragma omp parallel for
for (int index = 0; index < (int)this->size; index++)
this->fixOddCell(index);
if( enableFixRefinementIntoTheWall )
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start fixRefinementIntoWall()\n";
+ VF_LOG_TRACE("Start fixRefinementIntoWall()");
#pragma omp parallel for
for (int xIdx = 0; xIdx < (int)this->nx; xIdx++) {
for (uint yIdx = 0; yIdx < this->ny; yIdx++) {
@@ -179,15 +180,13 @@ void GridImp::inital(const SPtr<Grid> fineGrid, uint numberOfLayers)
}
}
}
-
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start findEndOfGridStopperNodes()\n";
+ VF_LOG_TRACE("Start findEndOfGridStopperNodes()");
#pragma omp parallel for
for (int index = 0; index < (int)this->size; index++)
this->findEndOfGridStopperNode(index);
- *logging::out << logging::Logger::INFO_INTERMEDIATE
- << "Grid created: " << "from (" << this->startX << ", " << this->startY << ", " << this->startZ << ") to (" << this->endX << ", " << this->endY << ", " << this->endZ << ")\n"
- << "nodes: " << this->nx << " x " << this->ny << " x " << this->nz << " = " << this->size << "\n";
+ VF_LOG_INFO("Grid created: from ({}, {}, {}) to ({}, {}, {})", this->startX, this->startY, this->startZ, this->endX, this->endY, this->endZ);
+ VF_LOG_INFO("nodes: {} x {} x {} = {}", this->nx, this->ny, this->nz, this->size);
}
void GridImp::setOddStart(bool xOddStart, bool yOddStart, bool zOddStart)
@@ -515,7 +514,7 @@ bool GridImp::cellContainsOnly(Cell &cell, char typeA, char typeB) const
return true;
}
-const Object * GridImp::getObject() const
+SPtr<const Object> GridImp::getObject() const
{
return this->object;
}
@@ -812,12 +811,12 @@ uint GridImp::getLevel() const
return this->level;
}
-void GridImp::setTriangularMeshDiscretizationStrategy(TriangularMeshDiscretizationStrategy* triangularMeshDiscretizationStrategy)
+void GridImp::setTriangularMeshDiscretizationStrategy(SPtr<TriangularMeshDiscretizationStrategy> triangularMeshDiscretizationStrategy)
{
this->triangularMeshDiscretizationStrategy = triangularMeshDiscretizationStrategy;
}
-TriangularMeshDiscretizationStrategy * GridImp::getTriangularMeshDiscretizationStrategy()
+SPtr<TriangularMeshDiscretizationStrategy> GridImp::getTriangularMeshDiscretizationStrategy()
{
return this->triangularMeshDiscretizationStrategy;
}
@@ -861,7 +860,7 @@ void GridImp::setNumberOfLayers(uint numberOfLayers)
void GridImp::findSparseIndices(SPtr<Grid> finerGrid)
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Find sparse indices...";
+ VF_LOG_TRACE("Find sparse indices...");
auto fineGrid = std::static_pointer_cast<GridImp>(finerGrid);
this->updateSparseIndices();
@@ -876,8 +875,7 @@ void GridImp::findSparseIndices(SPtr<Grid> finerGrid)
}
const uint newGridSize = this->getSparseSize();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "... done. new size: " << newGridSize
- << ", delete nodes:" << this->getSize() - newGridSize << "\n";
+ VF_LOG_TRACE("... done. new size: {}, delete nodes: {}", newGridSize, this->getSize() - newGridSize);
}
void GridImp::findForGridInterfaceNewIndices(SPtr<GridImp> fineGrid)
@@ -1111,8 +1109,7 @@ void GridImp::findGridInterface(SPtr<Grid> finerGrid)
const auto coarseLevel = this->getLevel();
const auto fineLevel = fineGrid->getLevel();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "find interface level " << coarseLevel << " -> "
- << fineLevel;
+ VF_LOG_TRACE("find interface level {} -> {}", coarseLevel, fineLevel);
this->gridInterface = new GridInterface();
// TODO: this is stupid! concave refinements can easily have many more interface cells
@@ -1133,7 +1130,7 @@ void GridImp::findGridInterface(SPtr<Grid> finerGrid)
for (uint index = 0; index < this->getSize(); index++)
this->findOverlapStopper(index, *fineGrid);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << " ... done. \n";
+ VF_LOG_TRACE(" ... done.");
}
void GridImp::repairGridInterfaceOnMultiGPU(SPtr<Grid> fineGrid)
@@ -1235,7 +1232,7 @@ void GridImp::mesh(TriangularMesh &triangularMesh)
const clock_t end = clock();
const real time = (real)(real(end - begin) / CLOCKS_PER_SEC);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "time grid generation: " << time << "s\n";
+ VF_LOG_INFO("time grid generation: {}s", time);
}
void GridImp::mesh(Triangle &triangle)
@@ -1266,7 +1263,7 @@ void GridImp::mesh(Triangle &triangle)
void GridImp::closeNeedleCells()
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start closeNeedleCells()\n";
+ VF_LOG_TRACE("Start closeNeedleCells()");
uint numberOfClosedNeedleCells = 0;
@@ -1278,7 +1275,7 @@ void GridImp::closeNeedleCells()
numberOfClosedNeedleCells++;
}
- *logging::out << logging::Logger::INFO_INTERMEDIATE << numberOfClosedNeedleCells << " cells closed!\n";
+ VF_LOG_TRACE("{} cells closed!", numberOfClosedNeedleCells);
}
while( numberOfClosedNeedleCells > 0 );
}
@@ -1307,7 +1304,7 @@ bool GridImp::closeCellIfNeedle(uint index)
void GridImp::closeNeedleCellsThinWall()
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start closeNeedleCellsThinWall()\n";
+ VF_LOG_TRACE("Start closeNeedleCellsThinWall()");
uint numberOfClosedNeedleCells = 0;
@@ -1318,8 +1315,7 @@ void GridImp::closeNeedleCellsThinWall()
if (this->closeCellIfNeedleThinWall(index))
numberOfClosedNeedleCells++;
}
-
- *logging::out << logging::Logger::INFO_INTERMEDIATE << numberOfClosedNeedleCells << " cells closed!\n";
+ VF_LOG_TRACE("{} cells closed!", numberOfClosedNeedleCells);
}
while( numberOfClosedNeedleCells > 0 );
}
@@ -1379,7 +1375,7 @@ void GridImp::findQs(TriangularMesh &triangularMesh)
const clock_t end = clock();
const real time = (real)(real(end - begin) / CLOCKS_PER_SEC);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "time finding qs: " << time << "s\n";
+ VF_LOG_TRACE("time finding qs: {}s", time);
}
void GridImp::findQs(Triangle &triangle)
@@ -1726,12 +1722,8 @@ void GridImp::repairCommunicationIndices(int direction)
this->communicationIndices[direction].receiveIndices = this->communicationIndices[direction+1].receiveIndices;
-
-
-
-
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size send " << (int)this->communicationIndices[direction].sendIndices.size() << "\n";
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "recv send " << (int)this->communicationIndices[direction].receiveIndices.size() << "\n";
+ VF_LOG_INFO("size send {}", (int)this->communicationIndices[direction].sendIndices.size());
+ VF_LOG_INFO("recv send {}",(int)this->communicationIndices[direction].receiveIndices.size());
}
@@ -1748,7 +1740,7 @@ real* GridImp::getDistribution() const
return this->distribution.f;
}
-int* GridImp::getDirection() const
+const std::vector<int>& GridImp::getDirection() const
{
return this->distribution.dirs;
}
diff --git a/src/gpu/GridGenerator/grid/GridImp.h b/src/gpu/GridGenerator/grid/GridImp.h
index 74f48e19ffb59bac56264b96bd767b996c12ca46..9377bbd407475add75a25af3fa38cb1fa74c833c 100644
--- a/src/gpu/GridGenerator/grid/GridImp.h
+++ b/src/gpu/GridGenerator/grid/GridImp.h
@@ -72,10 +72,10 @@ class GRIDGENERATOR_EXPORT GridImp : public enableSharedFromThis<GridImp>, publi
{
protected:
GridImp() = default;
- GridImp(Object* object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, Distribution d, uint level);
+ GridImp(SPtr<Object> object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, Distribution d, uint level);
public:
- static SPtr<GridImp> makeShared(Object* object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, std::string d3Qxx, uint level);
+ static SPtr<GridImp> makeShared(SPtr<Object> object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta, std::string d3Qxx, uint level);
~GridImp() override = default;
private:
@@ -111,7 +111,7 @@ private:
uint sparseSize;
bool periodicityX = false, periodicityY = false, periodicityZ = false;
- Object* object;
+ SPtr<Object> object;
GridInterface *gridInterface;
int *sparseIndices;
@@ -130,7 +130,7 @@ private:
uint numberOfLayers;
- TriangularMeshDiscretizationStrategy *triangularMeshDiscretizationStrategy;
+ SPtr<TriangularMeshDiscretizationStrategy> triangularMeshDiscretizationStrategy;
uint numberOfSolidBoundaryNodes = 0;
@@ -175,8 +175,8 @@ public:
uint getLevel(real levelNull) const;
uint getLevel() const;
- void setTriangularMeshDiscretizationStrategy(TriangularMeshDiscretizationStrategy *triangularMeshDiscretizationStrategy);
- TriangularMeshDiscretizationStrategy *getTriangularMeshDiscretizationStrategy();
+ void setTriangularMeshDiscretizationStrategy(SPtr<TriangularMeshDiscretizationStrategy> triangularMeshDiscretizationStrategy);
+ SPtr<TriangularMeshDiscretizationStrategy> getTriangularMeshDiscretizationStrategy();
uint getNumberOfSolidBoundaryNodes() const override;
void setNumberOfSolidBoundaryNodes(uint numberOfSolidBoundaryNodes) override;
@@ -229,7 +229,7 @@ public:
bool cellContainsOnly(Cell &cell, char type) const;
bool cellContainsOnly(Cell &cell, char typeA, char typeB) const;
- const Object* getObject() const override;
+ SPtr<const Object> getObject() const override;
Field getField() const;
char getFieldEntry(uint index) const override;
@@ -241,7 +241,7 @@ public:
uint getSparseSize() const override;
int getSparseIndex(uint matrixIndex) const override;
real* getDistribution() const override;
- int* getDirection() const override;
+ const std::vector<int>& getDirection() const override;
int getStartDirection() const override;
int getEndDirection() const override;
diff --git a/src/gpu/GridGenerator/grid/GridImpTest.cpp b/src/gpu/GridGenerator/grid/GridImpTest.cpp
index 257dd3490596886c4c4b9e81adff1eee141585ef..07b2a03f429ad8baf0badd0c966dd88235644c0a 100644
--- a/src/gpu/GridGenerator/grid/GridImpTest.cpp
+++ b/src/gpu/GridGenerator/grid/GridImpTest.cpp
@@ -169,17 +169,12 @@ class findNeighborsIntegrationTest : public ::testing::Test
{
protected:
SPtr<MultipleGridBuilder> gridBuilder;
+
void SetUp() override
{
auto gridFactory = GridFactory::make();
gridFactory->setTriangularMeshDiscretizationMethod(TriangularMeshDiscretizationMethod::POINT_IN_OBJECT);
gridBuilder = MultipleGridBuilder::makeShared(gridFactory);
-
- // init logger to avoid segmentation fault in buildGrids
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::Level::WARNING);
- logging::Logger::timeStamp(logging::Logger::ENABLE);
- logging::Logger::enablePrintedRankNumbers(logging::Logger::ENABLE);
}
};
diff --git a/src/gpu/GridGenerator/grid/distributions/Distribution.cpp b/src/gpu/GridGenerator/grid/distributions/Distribution.cpp
index a6e11ac909186618d765596f15263035b3b6401a..31d2e2f8a927e7141d80a55f4164dfcb0f52a8e0 100644
--- a/src/gpu/GridGenerator/grid/distributions/Distribution.cpp
+++ b/src/gpu/GridGenerator/grid/distributions/Distribution.cpp
@@ -46,9 +46,9 @@ Distribution DistributionHelper::getDistribution27()
d27.dir_start = STARTDIR;
d27.dir_end = ENDDIR;
- d27.dirs = new int[(ENDDIR + 1) * DIMENSION];
+ d27.dirs.resize((ENDDIR + 1) * DIMENSION);
- d27.directions = new Direction[ENDDIR + 1];
+ d27.directions.resize(ENDDIR + 1);
d27.directions[DIR_P00] = Direction(DIR_27_E_X, DIR_27_E_Y, DIR_27_E_Z);
d27.directions[DIR_M00] = Direction(DIR_27_W_X, DIR_27_W_Y, DIR_27_W_Z);
d27.directions[DIR_0P0] = Direction(DIR_27_N_X, DIR_27_N_Y, DIR_27_N_Z);
diff --git a/src/gpu/GridGenerator/grid/distributions/Distribution.h b/src/gpu/GridGenerator/grid/distributions/Distribution.h
index 7982abc235b020003526b10c885f4936bf661936..39cea3747e71a5c26bfd9172267366284dbc94ff 100644
--- a/src/gpu/GridGenerator/grid/distributions/Distribution.h
+++ b/src/gpu/GridGenerator/grid/distributions/Distribution.h
@@ -73,8 +73,8 @@ struct Distribution
typedef const Direction* const_iterator;
real* f;
- int *dirs;
- Direction* directions;
+ std::vector<int> dirs;
+ std::vector<Direction> directions;
int dir_start;
int dir_end;
const char* name;
diff --git a/src/gpu/GridGenerator/io/GridVTKWriter/GridVTKWriter.cpp b/src/gpu/GridGenerator/io/GridVTKWriter/GridVTKWriter.cpp
index 7f818f3217e682f21c2b41c62070924243fcb3b0..e5ddf7932e8505c713387f96157a80626d37aa1e 100644
--- a/src/gpu/GridGenerator/io/GridVTKWriter/GridVTKWriter.cpp
+++ b/src/gpu/GridGenerator/io/GridVTKWriter/GridVTKWriter.cpp
@@ -38,8 +38,8 @@
#include <sstream>
#include <memory>
-#include "basics/basics/writer/WbWriterVtkXmlBinary.h"
-#include "basics/basics/container/CbArray3D.h"
+#include "basics/writer/WbWriterVtkXmlBinary.h"
+#include "basics/container/CbArray3D.h"
#include "geometries/Vertex/Vertex.h"
@@ -85,7 +85,7 @@ void GridVTKWriter::writeGridToVTKXML(SPtr<Grid> grid, const std::string& name)
std::vector<std::string> nodedatanames;
std::vector< std::vector<double> > nodedata;
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Write Grid to XML VTK (*.vtu) output file : " + name + "_Part_" + std::to_string(part) + "\n";
+ VF_LOG_INFO("Write Grid to XML VTK (*.vtu) output file : {}_Part_{}", name, part);
nodedatanames.emplace_back("types");
nodedatanames.emplace_back("sparse_id");
@@ -154,7 +154,7 @@ void GridVTKWriter::writeGridToVTKXML(SPtr<Grid> grid, const std::string& name)
}
}
WbWriterVtkXmlBinary::getInstance()->writeOctsWithNodeData(name + "_Part_" + std::to_string(part), nodes, cells, nodedatanames, nodedata);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "done. \n";
+ VF_LOG_INFO("done.");
}
}
@@ -282,14 +282,14 @@ void GridVTKWriter::initalVtkWriter(WRITING_FORMAT format, const std::string& na
{
GridVTKWriter::format = format;
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Write Grid to vtk output file : " + name + "\n";
+ VF_LOG_INFO("Write Grid to vtk output file: {}", name);
std::string mode = "w";
if (isBinaryWritingFormat())
mode = "wb";
GridVTKWriter::openFile(name, mode);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << " Output file opened ...\n";
+ VF_LOG_INFO("Output file opened ...");
}
bool GridVTKWriter::isBinaryWritingFormat()
@@ -306,14 +306,14 @@ void GridVTKWriter::writeVtkFile(SPtr<Grid> grid)
GridVTKWriter::writeTypes(grid);
GridVTKWriter::closeFile();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Output file closed\n";
+ VF_LOG_INFO("Output file closed");
}
void GridVTKWriter::openFile(const std::string& name, const std::string& mode)
{
file = fopen(name.c_str(), mode.c_str());
if(file==NULL)
- *logging::out << logging::Logger::INFO_HIGH << " cannot open file ...\n";
+ VF_LOG_CRITICAL("cannot open file {}", name);
}
void GridVTKWriter::closeFile()
diff --git a/src/gpu/GridGenerator/io/QLineWriter.cpp b/src/gpu/GridGenerator/io/QLineWriter.cpp
index 29894e8d589fb59c1dbf57e08692dddfc03619a1..1aece49ceeabc5ca195146f2ac6dcb7ba960f3ea 100644
--- a/src/gpu/GridGenerator/io/QLineWriter.cpp
+++ b/src/gpu/GridGenerator/io/QLineWriter.cpp
@@ -36,7 +36,7 @@
#include <string>
#include <fstream>
-#include "basics/basics/utilities/UbTuple.h"
+#include "basics/utilities/UbTuple.h"
#include "geometries/Vertex/Vertex.h"
@@ -50,7 +50,7 @@ void QLineWriter::writeArrows(std::string fileName, SPtr<GeometryBoundaryConditi
{
if (geometryBoundaryCondition == nullptr)
{
- *logging::out << logging::Logger::WARNING << "(QLineWriter::writeArrows) no geometry bc on this grid level.\n";
+ VF_LOG_WARNING("(QLineWriter::writeArrows) no geometry bc on this grid level.");
return;
}
std::vector<UbTupleFloat3> nodes;
diff --git a/src/gpu/GridGenerator/io/STLReaderWriter/STLReader.cpp b/src/gpu/GridGenerator/io/STLReaderWriter/STLReader.cpp
index d3eb221265b2f8c79d5aece8729585733c2d60e8..669d7fb258759266b06a5cc214befdb3f1a6ec29 100644
--- a/src/gpu/GridGenerator/io/STLReaderWriter/STLReader.cpp
+++ b/src/gpu/GridGenerator/io/STLReaderWriter/STLReader.cpp
@@ -55,17 +55,17 @@ std::vector<Triangle> STLReader::readSTL(const std::string& name)
line[strcspn(line.c_str(), "\r\n")] = 0;
if (strcmp(line.c_str(), "solid ascii") == 0) {
file.close();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "start reading ascii STL file: " + name + "\n";
+ VF_LOG_INFO("start reading ascii STL file: {}" , name);
return readASCIISTL(name);
}
else {
file.close();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "start reading binary STL file: " + name + "\n";
+ VF_LOG_INFO("start reading binary STL file: {}" , name);
+
return readBinarySTL(name);
}
}
-
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "can't open STL-file" + name + " ... exit program! \n";
+ VF_LOG_CRITICAL("can't open STL-file {} ... exit program!" , name);
exit(1);
}
@@ -81,7 +81,7 @@ std::vector<Triangle> STLReader::readASCIISTL(const std::string& name)
const int lines = countLinesInFile(name);
const int nTriangles = (lines) / 7; // seven lines per triangle
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Number of Triangles: " << nTriangles << "\n";
+ VF_LOG_INFO("Number of Triangles: {}" , nTriangles);
std::vector<Triangle> triangles;
std::string line;
@@ -109,8 +109,7 @@ std::vector<Triangle> STLReader::readASCIISTL(const std::string& name)
std::vector<Triangle> STLReader::readASCIISTLWithPatches(const std::string& name, const std::vector<uint> ignorePatches)
{
- *logging::out << logging::Logger::INFO_HIGH << "Start reading ascii STL file:\n";
- *logging::out << logging::Logger::INFO_HIGH << " " + name + "\n";
+ VF_LOG_INFO("Start reading ascii STL file: {}" , name);
std::vector<Triangle> triangles;
@@ -141,9 +140,10 @@ std::vector<Triangle> STLReader::readASCIISTLWithPatches(const std::string& name
ignoreCurrentPatch = std::find( ignorePatches.begin(), ignorePatches.end(), currentPatchIndex ) != ignorePatches.end();
if( !ignoreCurrentPatch )
- *logging::out << logging::Logger::INFO_INTERMEDIATE << " Reading STL-Group " << line.substr( line.find(' ') + 1 ) << " as patch " << currentPatchIndex << "\n";
+ VF_LOG_INFO(" Reading STL-Group {} as patch {}" , line.substr( line.find(' ') + 1 ) , currentPatchIndex);
else
- *logging::out << logging::Logger::WARNING << " Ignoring STL-Group " << line.substr( line.find(' ') + 1 ) << " as patch " << currentPatchIndex << "\n";
+ VF_LOG_WARNING(" Ignoring STL-Group {} as patch {}" , line.substr( line.find(' ') + 1 ) , currentPatchIndex);
+
currentFacetLine++;
}
@@ -202,7 +202,7 @@ std::vector<Triangle> STLReader::readASCIISTLWithPatches(const std::string& name
file.close();
- *logging::out << logging::Logger::INFO_HIGH << "Done reading ascii STL file\n";
+ VF_LOG_INFO("Done reading ascii STL file");
return triangles;
}
@@ -217,8 +217,8 @@ 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);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Number of Triangles: " << nTriLong << "\n";
+ unsigned int nTriLong = *((unsigned int*)nTri);
+ VF_LOG_INFO("Number of Triangles: {}" , nTriLong);
std::vector<Triangle> triangles;
char facet[50];
@@ -248,18 +248,18 @@ std::vector<Triangle> STLReader::readSTL(const BoundingBox &box, const std::stri
line[strcspn(line.c_str(), "\r\n")] = 0;
if (strcmp(line.c_str(), "solid ascii") == 0) {
file.close();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "start reading ascii STL file: " + name + "\n";
+ VF_LOG_INFO("start reading ascii STL file {}", name);
return readASCIISTL(box, name);
}
else {
file.close();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "start reading binary STL file: " + name + "\n";
+ VF_LOG_INFO("start reading binary STL file {}", name);
std::vector<Triangle> triangles = readBinarySTL(box, name);
return triangles;
}
}
else {
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "can't open STL-file" + name + "\n";
+ VF_LOG_CRITICAL("can't open STL-file {}", name);
exit(1);
}
}
@@ -309,9 +309,9 @@ 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);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Number of Triangles complete geometry: " << nTriLong << "\n";
+ VF_LOG_INFO("Number of Triangles complete geometry: {}", nTriLong);
std::vector<Triangle> triangles;
char facet[50];
@@ -329,8 +329,8 @@ std::vector<Triangle> STLReader::readBinarySTL(const BoundingBox &box, const std
triangles.push_back(t);
}
int size = (int)triangles.size();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Number of Triangles in process: " << size << "\n";
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Complete reading STL file. \n";
+ VF_LOG_INFO("Number of Triangles in process: {}", size);
+ VF_LOG_INFO("Complete reading STL file");
(void)sizef;
fclose(file);
diff --git a/src/gpu/GridGenerator/io/STLReaderWriter/STLWriter.cpp b/src/gpu/GridGenerator/io/STLReaderWriter/STLWriter.cpp
index e29320cbd6867e1ae5a65cf41623780cd83aead7..c1f306839e7ed7a9815c041c4e000df044d43630 100644
--- a/src/gpu/GridGenerator/io/STLReaderWriter/STLWriter.cpp
+++ b/src/gpu/GridGenerator/io/STLReaderWriter/STLWriter.cpp
@@ -42,7 +42,7 @@
void STLWriter::writeSTL(std::vector<Triangle> &vec, const std::string &name, bool writeBinary)
{
const int size = (int)vec.size();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Write " << size << " Triangles to STL : " + name + "\n";
+ VF_LOG_INFO("Write {} Triangles to STL : {}" , size, name);
std::ios_base::openmode mode = std::ios::out;
if (writeBinary)
@@ -51,7 +51,7 @@ void STLWriter::writeSTL(std::vector<Triangle> &vec, const std::string &name, bo
std::ofstream ofstream(name, mode);
if (!ofstream.is_open()) {
- *logging::out << logging::Logger::INFO_HIGH << " Output file not open - exit function\n";
+ VF_LOG_WARNING("Output file not open - exit function");
return;
}
@@ -61,7 +61,7 @@ void STLWriter::writeSTL(std::vector<Triangle> &vec, const std::string &name, bo
writeAsciiSTL(ofstream, vec);
ofstream.close();
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Output file closed\n";
+ VF_LOG_INFO("Output file closed");
}
diff --git a/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.cpp b/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.cpp
index 0238434dc87b453dc21164577d8abd4ce1819793..d3a467b0511f7f4b40d06b4c6d9b57ff09b9694a 100644
--- a/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.cpp
+++ b/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.cpp
@@ -38,7 +38,7 @@
#include <omp.h>
#include <cmath>
-#include "Core/Timer/Timer.h"
+#include "Timer/Timer.h"
#include "grid/NodeValues.h"
#include "grid/Grid.h"
@@ -59,13 +59,13 @@ void SimulationFileWriter::write(const std::string& folder, SPtr<GridBuilder> bu
{
SimulationFileWriter::folder = folder;
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Start writing simulation files to " << folder << ":\n";
+ VF_LOG_INFO("Start writing simulation files to {}", folder);
auto timer = Timer::makeStart();
write(builder, format);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << " Time writing files: " << timer->getCurrentRuntimeInSeconds() << " sec\n";
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "Done writing simulation Files!\n";
+ VF_LOG_INFO(" Time writing files: {} sec", timer->getCurrentRuntimeInSeconds());
+ VF_LOG_INFO("Done writing simulation Files!");
}
@@ -79,7 +79,7 @@ void SimulationFileWriter::write(SPtr<GridBuilder> builder, FILEFORMAT format)
writeLevel(numberOfLevel);
//auto qs = createBCVectors(builder->getGrid(0));
- *logging::out << logging::Logger::INFO_INTERMEDIATE << " Coordinate and neighbor files:\n";
+ VF_LOG_INFO(" Coordinate and neighbor files:");
for (uint level = 0; level < numberOfLevel; level++)
{
writeNumberNodes(builder, level);
@@ -95,10 +95,10 @@ void SimulationFileWriter::write(SPtr<GridBuilder> builder, FILEFORMAT format)
}
}
- *logging::out << logging::Logger::INFO_INTERMEDIATE << " Boundary Condition files:\n";
+ VF_LOG_INFO(" Boundary Condition files:");
writeBoundaryQsFile(builder);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << " Communication files:\n";
+ VF_LOG_INFO(" Communication files:");
writeCommunicationFiles(builder);
closeFiles();
@@ -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/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h b/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h
index f3851abfd3372e5d3548cf7c0cd02344aa8acbaa..a4ba3d4b53f2feb63d0363bf47e92152bea05c57 100644
--- a/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h
+++ b/src/gpu/GridGenerator/io/SimulationFileWriter/SimulationFileWriter.h
@@ -40,8 +40,6 @@
#include <vector>
#include <array>
-#include "Core/NonCreatable.h"
-
#include "gpu/GridGenerator/global.h"
class UnstructuredGridBuilder;
@@ -57,7 +55,7 @@ enum class FILEFORMAT
BINARY, ASCII
};
-class SimulationFileWriter : private NonCreatable
+class SimulationFileWriter
{
public:
GRIDGENERATOR_EXPORT static void write(const std::string& folder, SPtr<GridBuilder> builder, FILEFORMAT format);
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/CalcTurbulenceIntensity.cpp b/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.cpp
index 9572252965e1c619702370f8b9a3756bf035035e..681e4702b5f119c0f0c29273ee5d868a32fca0c7 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/CalcTurbulenceIntensity.cpp
@@ -8,7 +8,7 @@
#include "Calculation/CalcTurbulenceIntensity.h"
#include <cuda_runtime.h>
#include <helper_cuda.h>
-#include <basics/Core/StringUtilities/StringUtil.h>
+#include <basics/StringUtilities/StringUtil.h>
void allocTurbulenceIntensity(Parameter *para, CudaMemoryManager *cudaMemoryManager)
{
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp b/src/gpu/VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp
index 49543f37df7fb54290f4ab6c09edb8d10c0b67be..334212f903e62608676a3473523182113a7a7723 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/CollisisionStrategy.cpp
@@ -1,7 +1,7 @@
#include "CollisionStrategy.h"
#include "Parameter/CudaStreamManager.h"
#include "Parameter/Parameter.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
std::function<void(UpdateGrid27 *updateGrid, Parameter *para, int level, unsigned int t)>
getFunctionForCollisionAndExchange(const bool useStreams, const int numberOfMpiProcesses,
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp b/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
index bb20d25bbc6b82e1d2b3dddd8a2f732a384cdb6d..2bb2bd943f6f24a8b904f949a43e75426e497ba1 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/Cp.cpp
@@ -7,7 +7,7 @@
#include <fstream>
#include <sstream>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include <cassert>
//#include <math.h>
@@ -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/DragLift.cpp b/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp
index 97d2af28ef7f801e817dd6cae6ad58d244249e02..2c2dc19795959c87a02705778a9768210580be41 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/DragLift.cpp
@@ -7,7 +7,7 @@
#include <fstream>
#include <sstream>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
//#include <math.h>
//#include "LB.h"
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp b/src/gpu/VirtualFluids_GPU/Calculation/ForceCalculations.cpp
index cc1d2eb748b01835b46f5fc69f47ed3ddc17a28d..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"
@@ -9,7 +9,7 @@
#include <sstream>
#include "GPU/CudaMemoryManager.h"
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
//using namespace std;
//////////////////////////////////////////////////////////////////////////
@@ -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/Calculation/PlaneCalculations.cpp b/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
index 13b6bd662a1b51a9a7a850211751c8b8b5ecf329..6557a2a0730c14cc1b26097c5025827128d3a1ce 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/PlaneCalculations.cpp
@@ -9,7 +9,7 @@
#include <sstream>
//using namespace std;
//////////////////////////////////////////////////////////////////////////
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
void setSizeOfPlane(Parameter* para, int lev, unsigned int z)
{
diff --git a/src/gpu/VirtualFluids_GPU/Calculation/RefinementStrategy.cpp b/src/gpu/VirtualFluids_GPU/Calculation/RefinementStrategy.cpp
index f1c9bb8e53f81a554091a5e230ba09556b084167..9428b07987f832ae0101196a8a430495fe27d508 100644
--- a/src/gpu/VirtualFluids_GPU/Calculation/RefinementStrategy.cpp
+++ b/src/gpu/VirtualFluids_GPU/Calculation/RefinementStrategy.cpp
@@ -1,7 +1,7 @@
#include "RefinementStrategy.h"
#include "Parameter/CudaStreamManager.h"
#include "Parameter/Parameter.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
std::function<void(UpdateGrid27 *updateGrid, Parameter *para, int level)>
getFunctionForRefinementAndExchange(const bool useStreams, const int numberOfMpiProcesses, const int maxLevel,
diff --git a/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutine.h b/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutine.h
index 39866728b713c9c0c72cb5c62ba02f242e0ca68c..26c017f939b0795457d74008a21cb9e7a4b75bd0 100644
--- a/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutine.h
+++ b/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutine.h
@@ -1,7 +1,7 @@
#ifndef INDEX_EXCHANGE
#define INDEX_EXCHANGE
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
namespace vf::gpu
{
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 d7f57c5630270f87cd7df08492d8ff96585d7a50..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/Core/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/ExchangeData27.cpp b/src/gpu/VirtualFluids_GPU/Communication/ExchangeData27.cpp
index bdd747ee856cb88e3c46ee93a0fedd394707a074..48a27efa674e5fa85d47cb9439c52d0c558dac44 100644
--- a/src/gpu/VirtualFluids_GPU/Communication/ExchangeData27.cpp
+++ b/src/gpu/VirtualFluids_GPU/Communication/ExchangeData27.cpp
@@ -82,7 +82,7 @@ void copyEdgeNodes(std::vector<LBMSimulationParameter::EdgeNodePositions> &edgeN
int numNodesInBufferSend = 0;
#pragma omp parallel for
- for (uint i = 0; i < edgeNodes.size(); i++) {
+ for (int i = 0; i < (int)edgeNodes.size(); i++) {
indexInSubdomainRecv = edgeNodes[i].indexOfProcessNeighborRecv;
indexInSubdomainSend = edgeNodes[i].indexOfProcessNeighborSend;
numNodesInBufferRecv = recvProcessNeighborHost[indexInSubdomainRecv].numberOfNodes;
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 8dfed771a57f5f5e1ced5d480d31d6b17d841863..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));
}
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridProvider.h
index 5503338182b2d6f3ded362985ffe066b1f54e33f..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;
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp
index a40770c12eca4d0bfa13fa4d5ca3e87631c1005c..000e97e9a14e51d140dfa30cb325d2a04cd83f50 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.cpp
@@ -35,11 +35,6 @@ GridReader::GridReader(FILEFORMAT format, std::shared_ptr<Parameter> para, std::
channelDirections[5] = "bottom";
}
-GridReader::~GridReader()
-{
-
-}
-
bool GridReader::getBinaer()
{
return binaer;
@@ -58,7 +53,7 @@ void rearrangeGeometry(Parameter* para, int lev)
void GridReader::allocArrays_CoordNeighborGeo()
{
- std::cout << "-----Config Arrays Coord, Neighbor, Geo------" << std::endl;
+ VF_LOG_TRACE("-----Config Arrays Coord, Neighbor, Geo------");
CoordNeighborGeoV coordX(para->getcoordX(), binaer, true);
CoordNeighborGeoV coordY(para->getcoordY(), binaer, true);
@@ -70,15 +65,15 @@ void GridReader::allocArrays_CoordNeighborGeo()
CoordNeighborGeoV geoV(para->getgeoVec(), binaer, false);
uint maxLevel = coordX.getLevel();
- std::cout << "Number of Level: " << maxLevel + 1 << std::endl;
+ VF_LOG_INFO("Number of Level: {}", maxLevel + 1);
uint numberOfNodesGlobal = 0;
- std::cout << "Number of Nodes: " << std::endl;
+ VF_LOG_INFO("Number of Nodes: ");
for (uint level = 0; level <= maxLevel; level++)
{
const uint numberOfNodesPerLevel = coordX.getSize(level) + 1;
numberOfNodesGlobal += numberOfNodesPerLevel;
- std::cout << "Level " << level << " = " << numberOfNodesPerLevel << " Nodes" << std::endl;
+ VF_LOG_INFO("Level {} = {} Nodes", level, numberOfNodesPerLevel);
setNumberOfNodes(numberOfNodesPerLevel, level);
@@ -105,13 +100,14 @@ void GridReader::allocArrays_CoordNeighborGeo()
cudaMemoryManager->cudaCopySP(level);
cudaMemoryManager->cudaCopyCoord(level);
}
- std::cout << "Number of Nodes: " << numberOfNodesGlobal << std::endl;
- std::cout << "-----finish Coord, Neighbor, Geo------" <<std::endl;
+ VF_LOG_INFO("Number of Nodes: {}", numberOfNodesGlobal);
+ VF_LOG_TRACE("-----finish Config Arrays Coord, Neighbor, Geo------");
}
void GridReader::allocArrays_BoundaryValues()
{
- std::cout << "------read BoundaryValues------" <<std::endl;
+ VF_LOG_TRACE("------read BoundaryValues-------");
+
this->makeReader(para);
this->setChannelBoundaryCondition();
@@ -142,7 +138,7 @@ void GridReader::allocArrays_BoundaryValues()
void GridReader::allocArrays_OffsetScale()
{
- std::cout << "-----Config Arrays OffsetScale------" << std::endl;
+ VF_LOG_TRACE("------Config Arrays OffsetScale-------");
OffsetScale *obj_offCF = new OffsetScale(para->getscaleOffsetCF(), true);
OffsetScale *obj_offFC = new OffsetScale(para->getscaleOffsetFC(), true);
OffsetScale *obj_scaleCFC = new OffsetScale(para->getscaleCFC(), false);
@@ -157,9 +153,9 @@ void GridReader::allocArrays_OffsetScale()
for (int i = 0; i<level; i++) {
unsigned int tempCF = obj_offCF->getSize(i);
- std::cout << "Groesse der Daten CF vom Level " << i << " : " << tempCF << std::endl;
+ VF_LOG_INFO("Size Data CF from Level {}: {}", i, tempCF);
unsigned int tempFC = obj_offFC->getSize(i);
- std::cout << "Groesse der Daten FC vom Level " << i << " : " << tempFC << std::endl;
+ VF_LOG_INFO("Size Data CF from Level {}: {}", i, tempFC);
AnzahlKnotenGesCF += tempCF;
AnzahlKnotenGesFC += tempFC;
@@ -194,8 +190,8 @@ void GridReader::allocArrays_OffsetScale()
cudaMemoryManager->cudaCopyInterfaceOffFC(i);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
}
- std::cout << "Gesamtanzahl Knoten CF = " << AnzahlKnotenGesCF << std::endl;
- std::cout << "Gesamtanzahl Knoten FC = " << AnzahlKnotenGesFC << std::endl;
+ VF_LOG_INFO("Total number of Nodes CF = {}", AnzahlKnotenGesCF);
+ VF_LOG_INFO("Total number of Nodes FC = {}", AnzahlKnotenGesFC);
delete obj_offCF;
delete obj_offFC;
@@ -203,21 +199,21 @@ void GridReader::allocArrays_OffsetScale()
delete obj_scaleCFF;
delete obj_scaleFCC;
delete obj_scaleFCF;
- std::cout << "-----Ende OffsetScale------" << std::endl;
+ VF_LOG_TRACE("Finish OffsetScale");
}
void GridReader::allocArrays_taggedFluidNodes() {
- std::cout << "GridReader::allocArrays_fluidNodeIndices not implemented" << std::endl;
+ VF_LOG_WARNING("GridReader::allocArrays_fluidNodeIndices not implemented");
// TODO
}
void GridReader::tagFluidNodeIndices(const std::vector<uint>& taggedFluidNodeIndices, CollisionTemplate tag, uint level){
- std::cout << "GridReader::tagFluidNodeIndices not implemented" << std::endl;
+ VF_LOG_WARNING("GridReader::tagFluidNodeIndices not implemented");
// TODO
}
void GridReader::sortFluidNodeTags(){
- std::cout << "GridReader::sortFluidNodeTags not implemented" << std::endl;
+ VF_LOG_WARNING("GridReader::sortFluidNodeTags not implemented");
// TODO
}
@@ -230,7 +226,7 @@ void GridReader::setPressureValues(int channelSide) const
if (sizePerLevel > 0)
{
- std::cout << "size pressure level " << level << " : " << sizePerLevel << std::endl;
+ VF_LOG_INFO("size pressure level {}: {}", level, sizePerLevel);
cudaMemoryManager->cudaAllocPress(level);
@@ -261,7 +257,7 @@ void GridReader::fillVelocityVectors(int channelSide)
real *veloY_ValuesPerSide = new real[sizePerLevel];
real *veloZ_ValuesPerSide = new real[sizePerLevel];
- std::cout << "size velocity level " << level << " : " << sizePerLevel << std::endl;
+ VF_LOG_INFO("size velocity level {}: {}", level, sizePerLevel);
BC_Values[channelSide]->setVelocityValues(veloX_ValuesPerSide, veloY_ValuesPerSide, veloZ_ValuesPerSide, level);
for (int i = 0; i < sizePerLevel; i++) {
@@ -283,7 +279,7 @@ void GridReader::setVelocityValues() {
for (int level = 0; level < (int)(velocityX_BCvalues.size()); level++) {
int sizePerLevel = (int) velocityX_BCvalues[level].size();
- std::cout << "complete size velocity level " << level << " : " << sizePerLevel << std::endl;
+ VF_LOG_INFO("Complete size velocity level {}: {}", level, sizePerLevel);
setVelocitySizePerLevel(level, sizePerLevel);
if (sizePerLevel > 1) {
@@ -314,7 +310,7 @@ void GridReader::setOutflowValues(int channelSide) const
if (sizePerLevel > 1)
{
- std::cout << "size outflow level " << level << " : " << sizePerLevel << std::endl;
+ VF_LOG_INFO("size outflow level {}: {}", level, sizePerLevel);
cudaMemoryManager->cudaAllocOutflowBC(level);
@@ -390,7 +386,7 @@ void GridReader::initalValuesDomainDecompostion(int level)
{
////////////////////////////////////////////////////////////////////////////////////////
//send
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for X send buffer, Level " << i << " : " << tempSend << "\n";
+ VF_LOG_INFO("size of Data for X send buffer, Level {} : {}", i, tempSend);
////////////////////////////////////////////////////////////////////////////////////////
para->setNumberOfProcessNeighborsX((unsigned int)procNeighborsSendX.size(), i, "send");
para->getParH(i)->sendProcessNeighborX[j].rankNeighbor = neighborRankX[j];
@@ -548,7 +544,7 @@ void GridReader::initalValuesDomainDecompostion(int level)
void GridReader::allocArrays_BoundaryQs()
{
- std::cout << "------read BoundaryQs-------" <<std::endl;
+ VF_LOG_TRACE("------read BoundaryQs-------");
std::vector<std::shared_ptr<BoundaryQs> > BC_Qs(channelDirections.size());
this->makeReader(BC_Qs, para);
@@ -572,7 +568,7 @@ void GridReader::allocArrays_BoundaryQs()
if (para->getIsGeo())
setGeoQs(obj_geomQ);
- std::cout << "-----finish BoundaryQs------" <<std::endl;
+ VF_LOG_TRACE("------finish BoundaryQs-------");
}
@@ -912,6 +908,6 @@ void GridReader::setChannelBoundaryCondition()
for (std::size_t i = 0; i < channelDirections.size(); i++)
{
this->channelBoundaryConditions[i] = BC_Values[i]->getBoundaryCondition();
- std::cout << this->channelDirections[i] << " Boundary: " << channelBoundaryConditions[i] << std::endl;
+ VF_LOG_INFO("{} Boundary: {}", this->channelDirections[i], channelBoundaryConditions[i]);
}
}
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
index 041d2c3ce94592f792c5a850eebd14c07f4db1b4..d244e76569fe213978086ab412725e4450da66e4 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderFiles/GridReader.h
@@ -35,7 +35,7 @@ private:
public:
GridReader(FILEFORMAT format, std::shared_ptr<Parameter> para,
std::shared_ptr<CudaMemoryManager> cudaMemoryManager);
- ~GridReader() override;
+ ~GridReader() {};
void allocArrays_CoordNeighborGeo() override;
void allocArrays_BoundaryValues() override;
void allocArrays_OffsetScale() override;
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
index 5c4bd25256303c00e57a799fb860ffddb8c05e30..fee1bce343b5a501238a08efcf219c1f890247d9 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp
@@ -15,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;
@@ -59,15 +59,15 @@ void GridGenerator::initalGridInformations()
void GridGenerator::allocArrays_CoordNeighborGeo()
{
const uint numberOfLevels = builder->getNumberOfGridLevels();
- std::cout << "Number of Level: " << numberOfLevels << std::endl;
+ VF_LOG_INFO("Number of Level: {}", numberOfLevels);
int numberOfNodesGlobal = 0;
- std::cout << "Number of Nodes: " << std::endl;
+ VF_LOG_INFO("Number of Nodes: ");
for (uint level = 0; level < numberOfLevels; level++)
{
const uint numberOfNodesPerLevel = builder->getNumberOfNodes(level) + 1;
numberOfNodesGlobal += numberOfNodesPerLevel;
- std::cout << "Level " << level << " = " << numberOfNodesPerLevel << " Nodes" << std::endl;
+ VF_LOG_INFO("Level {} = {} Nodes", level, numberOfNodesPerLevel);
setNumberOfNodes(numberOfNodesPerLevel, level);
@@ -100,11 +100,9 @@ void GridGenerator::allocArrays_CoordNeighborGeo()
cudaMemoryManager->cudaCopyCoord(level);
if(para->getIsBodyForce())
cudaMemoryManager->cudaCopyBodyForce(level);
-
- //std::cout << verifyNeighborIndices(level);
}
- std::cout << "Number of Nodes: " << numberOfNodesGlobal << std::endl;
- std::cout << "-----finish Coord, Neighbor, Geo------" << std::endl;
+ VF_LOG_INFO("Number of Nodes: {}", numberOfNodesGlobal);
+ VF_LOG_TRACE("-----finish Coord, Neighbor, Geo------");
}
void GridGenerator::allocArrays_taggedFluidNodes() {
@@ -203,20 +201,18 @@ void GridGenerator::sortFluidNodeTags() {
void GridGenerator::allocArrays_BoundaryValues()
{
- std::cout << "------read BoundaryValues------" << std::endl;
- int blocks;
+ VF_LOG_TRACE("-----alloc BoundaryValues------");
for (uint level = 0; level < builder->getNumberOfGridLevels(); level++) {
const auto numberOfPressureValues = int(builder->getPressureSize(level));
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size pressure level " << level << " : " << numberOfPressureValues << "\n";
+ VF_LOG_INFO("size pressure level {}: {}", level, numberOfPressureValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->pressureBC.numberOfBCnodes = 0;
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);
@@ -228,13 +224,13 @@ void GridGenerator::allocArrays_BoundaryValues()
for (uint level = 0; level < builder->getNumberOfGridLevels(); level++) {
const auto numberOfSlipValues = int(builder->getSlipSize(level));
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size slip level " << level << " : " << numberOfSlipValues << "\n";
+ VF_LOG_INFO("size slip level {}: {}", level, numberOfSlipValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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);
@@ -247,16 +243,13 @@ void GridGenerator::allocArrays_BoundaryValues()
for (uint level = 0; level < builder->getNumberOfGridLevels(); level++) {
const auto numberOfStressValues = int(builder->getStressSize(level));
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size stress level " << level << " : " << numberOfStressValues << "\n";
+ VF_LOG_INFO("size stress level {}: {}", level, numberOfStressValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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.kArray = numberOfStressValues;
-
+ 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,
@@ -278,15 +271,14 @@ void GridGenerator::allocArrays_BoundaryValues()
for (uint level = 0; level < builder->getNumberOfGridLevels(); level++) {
const auto numberOfVelocityValues = int(builder->getVelocitySize(level));
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size velocity level " << level << " : " << numberOfVelocityValues << "\n";
+ VF_LOG_INFO("size velocity level {}: {}", level, numberOfVelocityValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->velocityBC.numberOfBCnodes = 0;
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);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -304,8 +296,8 @@ void GridGenerator::allocArrays_BoundaryValues()
//////////////////////////////////////////////////////////////////////////
para->getParH(level)->TempVel.kTemp = para->getParH(level)->velocityBC.numberOfBCnodes;
//cout << "Groesse kTemp = " << para->getParH(i)->TempPress.kTemp << endl;
- std::cout << "getTemperatureInit = " << para->getTemperatureInit() << std::endl;
- std::cout << "getTemperatureBC = " << para->getTemperatureBC() << std::endl;
+ VF_LOG_INFO("getTemperatureInit = {}", para->getTemperatureInit());
+ VF_LOG_INFO("getTemperatureBC = {}", para->getTemperatureBC());
//////////////////////////////////////////////////////////////////////////
cudaMemoryManager->cudaAllocTempVeloBC(level);
//cout << "nach alloc " << endl;
@@ -332,9 +324,9 @@ void GridGenerator::allocArrays_BoundaryValues()
for (uint level = 0; level < builder->getNumberOfGridLevels(); level++) {
const auto numberOfPrecursorValues = int(builder->getPrecursorSize(level));
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size precursor level " << level << " : " << numberOfPrecursorValues << "\n";
+ 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;
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -432,14 +424,13 @@ void GridGenerator::allocArrays_BoundaryValues()
para->setUseGeometryValues(true);
for (uint level = 0; level < builder->getNumberOfGridLevels(); level++) {
int numberOfGeometryValues = builder->getGeometrySize(level);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size geometry values, Level " << level << " : " << numberOfGeometryValues << "\n";
+ VF_LOG_INFO("size geometry values, Level {} : {}", level, numberOfGeometryValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
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);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -527,8 +518,7 @@ void GridGenerator::initalValuesDomainDecompostion()
para->getParH(level)->sendProcessNeighborX.back().rankNeighbor =
builder->getCommunicationProcess(direction);
////////////////////////////////////////////////////////////////////////////////////////
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for X send buffer, \t\tLevel " << level << " : " << tempSend
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for X send buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempSend, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->sendProcessNeighborX.back().numberOfNodes = tempSend;
para->getParD(level)->sendProcessNeighborX.back().numberOfNodes = tempSend;
@@ -542,8 +532,7 @@ void GridGenerator::initalValuesDomainDecompostion()
para->getParD(level)->sendProcessNeighborX.back().memsizeFs = sizeof(real) * tempSend;
////////////////////////////////////////////////////////////////////////////////////////
// recv
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for X receive buffer, \tLevel " << level << " : " << tempRecv
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for X receive buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempRecv, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->recvProcessNeighborX.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -593,8 +582,7 @@ void GridGenerator::initalValuesDomainDecompostion()
}
////////////////////////////////////////////////////////////////////////////////////////
// send
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for Y send buffer, \t\tLevel " << level << " : " << tempSend
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for Y send buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempSend, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->sendProcessNeighborY.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -611,8 +599,7 @@ void GridGenerator::initalValuesDomainDecompostion()
para->getParD(level)->sendProcessNeighborY.back().memsizeFs = sizeof(real) * tempSend;
////////////////////////////////////////////////////////////////////////////////////////
// recv
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for Y receive buffer, \tLevel " << level << " : " << tempRecv
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for Y receive buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempRecv, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->recvProcessNeighborY.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -662,8 +649,7 @@ void GridGenerator::initalValuesDomainDecompostion()
}
////////////////////////////////////////////////////////////////////////////////////////
// send
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for Z send buffer, \t\tLevel " << level << " : " << tempSend
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for Z send buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempSend, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->sendProcessNeighborZ.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -680,8 +666,7 @@ void GridGenerator::initalValuesDomainDecompostion()
para->getParD(level)->sendProcessNeighborZ.back().memsizeFs = sizeof(real) * tempSend;
////////////////////////////////////////////////////////////////////////////////////////
// recv
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for Z receive buffer, \tLevel " << level << " : " << tempRecv
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for Z receive buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempRecv, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->recvProcessNeighborZ.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -735,8 +720,7 @@ void GridGenerator::initalValuesDomainDecompostion()
if (tempSend > 0) {
////////////////////////////////////////////////////////////////////////////////////////
// send
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for X send buffer, \t\tLevel " << level << " : " << tempSend
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for X send buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempSend, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->sendProcessNeighborF3X.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -755,8 +739,7 @@ void GridGenerator::initalValuesDomainDecompostion()
sizeof(real) * para->getParH(level)->sendProcessNeighborF3X.back().numberOfGs;
////////////////////////////////////////////////////////////////////////////////////////
// recv
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for X receive buffer, \tLevel " << level << " : " << tempRecv
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for X recv buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempRecv, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->recvProcessNeighborF3X.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -801,8 +784,7 @@ void GridGenerator::initalValuesDomainDecompostion()
if (tempSend > 0) {
////////////////////////////////////////////////////////////////////////////////////////
// send
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for Y send buffer, \t\tLevel " << level << " : " << tempSend
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for Y send buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempSend, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->sendProcessNeighborF3Y.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -821,8 +803,7 @@ void GridGenerator::initalValuesDomainDecompostion()
sizeof(real) * para->getParH(level)->sendProcessNeighborF3Y.back().numberOfGs;
////////////////////////////////////////////////////////////////////////////////////////
// recv
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for Y receive buffer, \tLevel " << level << " : " << tempRecv
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for Y recv buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempRecv, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->recvProcessNeighborF3Y.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -867,8 +848,7 @@ void GridGenerator::initalValuesDomainDecompostion()
if (tempSend > 0) {
////////////////////////////////////////////////////////////////////////////////////////
// send
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for Z send buffer, \t\tLevel " << level << " : " << tempSend
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for Z send buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempSend, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->sendProcessNeighborF3Z.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -887,8 +867,7 @@ void GridGenerator::initalValuesDomainDecompostion()
sizeof(real) * para->getParH(level)->sendProcessNeighborF3Z.back().numberOfGs;
////////////////////////////////////////////////////////////////////////////////////////
// recv
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of Data for Z receive buffer, \tLevel " << level << " : " << tempRecv
- << " \t(neighbor rank: " << builder->getCommunicationProcess(direction) << ")\n";
+ VF_LOG_INFO("size of Data for Z recv buffer, \t\tLevel {}: {} \t(neighbor rank: {})", level, tempRecv, builder->getCommunicationProcess(direction));
////////////////////////////////////////////////////////////////////////////////////////
para->getParH(level)->recvProcessNeighborF3Z.back().rankNeighbor =
builder->getCommunicationProcess(direction);
@@ -926,15 +905,14 @@ void GridGenerator::initalValuesDomainDecompostion()
void GridGenerator::allocArrays_BoundaryQs()
{
- std::cout << "------read BoundaryQs-------" << std::endl;
+ VF_LOG_TRACE("allocArrays_BoundaryQs()");
for (uint i = 0; i < builder->getNumberOfGridLevels(); i++) {
const auto numberOfPressureValues = (int)builder->getPressureSize(i);
if (numberOfPressureValues > 0)
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size Pressure: " << i << " : " << numberOfPressureValues << "\n";
- //cout << "Groesse Pressure: " << i << " : " << temp1 << "MyID: " << para->getMyID() << endl;
+ VF_LOG_INFO("size Pressure: {}: {}", i, numberOfPressureValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//preprocessing
real* QQ = para->getParH(i)->pressureBC.q27[0];
@@ -946,17 +924,15 @@ void GridGenerator::allocArrays_BoundaryQs()
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- // advection - diffusion stuff
- //cout << "vor advec diff" << endl;
- if (para->getDiffOn() == true) {
+ // advection - diffusion
+ if (para->getDiffOn()) {
//////////////////////////////////////////////////////////////////////////
//cout << "vor setzen von kTemp" << endl;
para->getParH(i)->TempPress.kTemp = numberOfPressureValues;
para->getParD(i)->TempPress.kTemp = numberOfPressureValues;
- std::cout << "Groesse TempPress.kTemp = " << para->getParH(i)->TempPress.kTemp << std::endl;
+ VF_LOG_INFO("size TempPress.kTemp: {}: {}", i, para->getParH(i)->TempPress.kTemp);
//////////////////////////////////////////////////////////////////////////
cudaMemoryManager->cudaAllocTempPressBC(i);
- //cout << "nach alloc" << endl;
//////////////////////////////////////////////////////////////////////////
for (int m = 0; m < numberOfPressureValues; m++)
{
@@ -965,9 +941,7 @@ void GridGenerator::allocArrays_BoundaryQs()
para->getParH(i)->TempPress.k[m] = para->getParH(i)->pressureBC.k[m];
}
//////////////////////////////////////////////////////////////////////////
- //cout << "vor copy" << endl;
cudaMemoryManager->cudaCopyTempPressBCHD(i);
- //cout << "nach copy" << endl;
//////////////////////////////////////////////////////////////////////////
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -980,8 +954,7 @@ void GridGenerator::allocArrays_BoundaryQs()
int numberOfSlipValues = (int)builder->getSlipSize(i);
if (numberOfSlipValues > 0)
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size Slip: " << i << " : " << numberOfSlipValues << "\n";
- //cout << "Groesse Pressure: " << i << " : " << temp1 << "MyID: " << para->getMyID() << endl;
+ VF_LOG_INFO("size Slip: {}: {}", i, numberOfSlipValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//preprocessing
real* QQ = para->getParH(i)->slipBC.q27[0];
@@ -1000,8 +973,7 @@ void GridGenerator::allocArrays_BoundaryQs()
int numberOfStressValues = (int)builder->getStressSize(i);
if (numberOfStressValues > 0)
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size Stress: " << i << " : " << numberOfStressValues << "\n";
- //cout << "Groesse Pressure: " << i << " : " << temp1 << "MyID: " << para->getMyID() << endl;
+ VF_LOG_INFO("size Stress: {}: {}", i, numberOfStressValues);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//preprocessing
real* QQ = para->getParH(i)->stressBC.q27[0];
@@ -1020,8 +992,7 @@ void GridGenerator::allocArrays_BoundaryQs()
const auto numberOfVelocityNodes = int(builder->getVelocitySize(i));
if (numberOfVelocityNodes > 0)
{
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size velocity level " << i << " : " << numberOfVelocityNodes << "\n";
- //cout << "Groesse velocity level: " << i << " : " << temp3 << "MyID: " << para->getMyID() << "\n";
+ VF_LOG_INFO("size velocity level {}: {}", i, numberOfVelocityNodes);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//preprocessing
real* QQ = para->getParH(i)->velocityBC.q27[0];
@@ -1034,12 +1005,11 @@ void GridGenerator::allocArrays_BoundaryQs()
//////////////////////////////////////////////////////////////////////////
para->getParH(i)->TempVel.kTemp = numberOfVelocityNodes;
para->getParD(i)->TempVel.kTemp = numberOfVelocityNodes;
- std::cout << "Groesse TempVel.kTemp = " << para->getParH(i)->TempPress.kTemp << std::endl;
- std::cout << "getTemperatureInit = " << para->getTemperatureInit() << std::endl;
- std::cout << "getTemperatureBC = " << para->getTemperatureBC() << std::endl;
+ VF_LOG_INFO("size TempVel.kTemp: {}", para->getParH(i)->TempVel.kTemp);
+ VF_LOG_INFO("getTemperatureInit: {}", para->getTemperatureInit());
+ VF_LOG_INFO("getTemperatureBC: {}", para->getTemperatureBC());
//////////////////////////////////////////////////////////////////////////
cudaMemoryManager->cudaAllocTempVeloBC(i);
- //cout << "nach alloc " << "\n";
//////////////////////////////////////////////////////////////////////////
for (int m = 0; m < numberOfVelocityNodes; m++)
{
@@ -1048,11 +1018,7 @@ void GridGenerator::allocArrays_BoundaryQs()
para->getParH(i)->TempVel.velo[m] = para->getVelocity();
para->getParH(i)->TempVel.k[m] = para->getParH(i)->velocityBC.k[m];
}
- //////////////////////////////////////////////////////////////////////////
- //cout << "vor copy " << "\n";
cudaMemoryManager->cudaCopyTempVeloBCHD(i);
- //cout << "nach copy " << "\n";
- //////////////////////////////////////////////////////////////////////////
}
cudaMemoryManager->cudaCopyVeloBC(i);
}
@@ -1062,7 +1028,7 @@ void GridGenerator::allocArrays_BoundaryQs()
const auto numberOfPrecursorNodes = int(builder->getPrecursorSize(i));
if (numberOfPrecursorNodes > 0)
{
- std::cout << "size velocity level " << i << " : " << numberOfPrecursorNodes << std::endl;
+ VF_LOG_INFO("size velocity level {}: {}", i, numberOfPrecursorNodes);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//preprocessing
real* QQ = para->getParH(i)->precursorBC.q27[0];
@@ -1105,7 +1071,7 @@ void GridGenerator::allocArrays_BoundaryQs()
for (uint i = 0; i < builder->getNumberOfGridLevels(); i++) {
const int numberOfGeometryNodes = builder->getGeometrySize(i);
- *logging::out << logging::Logger::INFO_INTERMEDIATE << "size of GeomBoundaryQs, Level " << i << " : " << numberOfGeometryNodes << "\n";
+ VF_LOG_INFO("size of GeomBoundaryQs, Level {}: {}", i, numberOfGeometryNodes);
para->getParH(i)->geometryBC.numberOfBCnodes = numberOfGeometryNodes;
para->getParD(i)->geometryBC.numberOfBCnodes = para->getParH(i)->geometryBC.numberOfBCnodes;
@@ -1170,8 +1136,7 @@ void GridGenerator::allocArrays_BoundaryQs()
}
}
-
- std::cout << "-----finish BoundaryQs------" << std::endl;
+ VF_LOG_TRACE("-----finish BoundaryQs------");
}
void GridGenerator::allocArrays_OffsetScale()
@@ -1181,8 +1146,8 @@ void GridGenerator::allocArrays_OffsetScale()
const uint numberOfNodesPerLevelCF = builder->getNumberOfNodesCF(level);
const uint numberOfNodesPerLevelFC = builder->getNumberOfNodesFC(level);
- std::cout << "number of nodes CF Level " << level << " : " << numberOfNodesPerLevelCF << std::endl;
- std::cout << "number of nodes FC level " << level << " : " << numberOfNodesPerLevelFC << std::endl;
+ VF_LOG_INFO("number of nodes CF Level {}: {}", level, numberOfNodesPerLevelCF);
+ VF_LOG_INFO("number of nodes FC Level {}: {}", level, numberOfNodesPerLevelFC);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//size CF
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/GridGenerator.h
index c97ed02a64da1d5fafa18150c75d149f96484d44..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,9 +67,8 @@ 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() override;
-
+ 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 3009bc4ae449b917f494cdf39145a2e94df2ddb8..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,
@@ -104,9 +107,6 @@ protected:
private:
void SetUp() override
{
- logging::Logger::addStream(&std::cout);
- logging::Logger::setDebugLevel(logging::Logger::WARNING);
-
para = std::make_shared<Parameter>();
para->setMaxLevel(level + 1); // setMaxLevel resizes parH and parD
for (uint i = 0; i <= level; i++) {
@@ -116,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 014c725e30c58921e783810a8332ff0865e7938c..0b0401d3424f7a953bf2fa92d0382fd9256a635a 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h
@@ -9,7 +9,7 @@
#include <memory>
#include <vector>
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
class Parameter;
class GridBuilder;
@@ -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 289b1607dd6acd47a88594a2b0a4497cdf6e7649..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
@@ -57,16 +67,16 @@ private:
std::vector<uint> fluidNodeIndicesBorder;
public:
- GridImpDouble(Object *object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta,
+ GridImpDouble(SPtr<Object> object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta,
Distribution d, uint level)
: GridImp(object, startX, startY, startZ, endX, endY, endZ, delta, d, level)
{
}
- static SPtr<GridImpDouble> makeShared(Object *object, real startX, real startY, real startZ, real endX, real endY,
+ static SPtr<GridImpDouble> makeShared(SPtr<Object> object, real startX, real startY, real startZ, real endX, real endY,
real endZ, real delta, Distribution d, uint level)
{
- SPtr<GridImpDouble> grid(new GridImpDouble(object, startX, startY, startZ, endX, endY, endZ, delta, d, level));
+ SPtr<GridImpDouble> grid(std::make_shared<GridImpDouble>(object, startX, startY, startZ, endX, endY, endZ, delta, d, level));
return grid;
}
};
@@ -119,8 +129,6 @@ protected:
private:
void SetUp() override
{
- logging::Logger::addStream(&std::cout);
-
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);
@@ -141,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)
@@ -216,8 +226,6 @@ protected:
private:
void SetUp() override
{
- logging::Logger::addStream(&std::cout);
-
para = testingVF::createParameterForLevel(level);
para->setNumberOfProcessNeighborsX(numberOfProcessNeighbors, level, "send");
@@ -337,8 +345,6 @@ protected:
private:
void SetUp() override
{
- logging::Logger::addStream(&std::cout);
-
para = testingVF::createParameterForLevel(level);
para->setNumberOfProcessNeighborsY(numberOfProcessNeighbors, level, "send");
@@ -458,8 +464,6 @@ protected:
private:
void SetUp() override
{
- logging::Logger::addStream(&std::cout);
-
para = testingVF::createParameterForLevel(level);
para->setNumberOfProcessNeighborsZ(numberOfProcessNeighbors, level, "send");
@@ -550,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/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.h b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.h
index 600b31aef4ff99080a8e580a24625b35463990ac..f619d785e1f6c30cee0c698cbc9d8dd8249f414f 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.h
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.h
@@ -6,7 +6,7 @@
#ifndef InterpolationCellGrouper_H
#define InterpolationCellGrouper_H
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
#include <basics/PointerDefinitions.h>
#include <memory>
#include <vector>
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp
index 8fa9a8a71ee5e60a129d06dffa09b8247766b88c..4f4e8525f17ef004d65ee2eaa3d4d533d9d40734 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp
@@ -38,7 +38,7 @@ private:
std::vector<uint> fluidNodeIndicesBorder;
public:
- GridImpDouble(Object *object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta,
+ GridImpDouble(SPtr<Object> object, real startX, real startY, real startZ, real endX, real endY, real endZ, real delta,
Distribution d, uint level)
: GridImp(object, startX, startY, startZ, endX, endY, endZ, delta, d, level)
{
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/FindQ/FindQ.cpp b/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
index 19be37ed5324f48627506bb3e2508a9a1b97cf52..bc12456ceb632b3249d8757fe23c811aad6ec541 100644
--- a/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
+++ b/src/gpu/VirtualFluids_GPU/FindQ/FindQ.cpp
@@ -1,5 +1,5 @@
#include "FindQ/FindQ.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
#include "lbm/constants/D3Q27.h"
using namespace vf::lbm::dir;
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/EnstrophyAnalyzer.cu b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu
index 54968be403374831b9db4277f6726f44e7a43485..e447062d292908c02800c4559cc4444476290629 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu
@@ -325,7 +325,6 @@ EnstrophyAnalyzer::EnstrophyAnalyzer(SPtr<Parameter> para, uint analyzeIter)
void EnstrophyAnalyzer::writeToFile( std::string filename )
{
- //*logging::out << logging::Logger::INFO_INTERMEDIATE << "EnstrophyAnalyzer::writeToFile( " << filename << " )" << "\n";
std::cout << "EnstrophyAnalyzer::writeToFile( " << filename << " )" << "\n";
std::ofstream file;
@@ -338,7 +337,6 @@ void EnstrophyAnalyzer::writeToFile( std::string filename )
file.close();
std::cout << "done!\n";
- //*logging::out << logging::Logger::INFO_INTERMEDIATE << "done!\n";
}
diff --git a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
index 27915f1acdfc9bfecc291442727647dc4abda206..ab5c52e77cd4c028e044bfd6ec4b25b974f80ee2 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.h
@@ -7,7 +7,7 @@
#include "PointerDefinitions.h"
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "VirtualFluids_GPU_export.h"
class Parameter;
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/Init27.cu b/src/gpu/VirtualFluids_GPU/GPU/Init27.cu
index d6d099fec7d3c77f9d55f9cc961b4b984dfb0cce..ff844cfecd9e4cad02e41879ddd68246d0fe9ab2 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/Init27.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/Init27.cu
@@ -358,7 +358,7 @@ __global__ void LBInitNonEqPartSP27( unsigned int* neighborX,
//////////////////////////////////////////////////////////////////////////
- // the following code is copy and pasted from VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
+ // the following code is copy and pasted from VirtualFluidsVisitors/InitDistributionsBlockVisitor.cpp
// i.e. Konstantins code
real ax = dvx1dx;
diff --git a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu
index bc847aee5c208213698aaf1f92b007a8deb0bdb1..df88632f8fd48b3ae8d50b444a65076ab0a0c12f 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu
+++ b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu
@@ -139,7 +139,6 @@ KineticEnergyAnalyzer::KineticEnergyAnalyzer(SPtr<Parameter> para, uint analyzeI
void KineticEnergyAnalyzer::writeToFile(std::string filename)
{
- //*logging::out << logging::Logger::INFO_INTERMEDIATE << "KineticEnergyAnalyzer::writeToFile( " << filename << " )" << "\n";
std::cout << "KineticEnergyAnalyzer::writeToFile( " << filename << " )" << "\n";
std::ofstream file;
@@ -151,7 +150,6 @@ void KineticEnergyAnalyzer::writeToFile(std::string filename)
file.close();
- //*logging::out << logging::Logger::INFO_INTERMEDIATE << "done!\n";
std::cout << "done!\n";
}
diff --git a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
index ca5a97aaef3432dfef78a1ce8822e85dca115207..11759c24460a1541d9aa66e325e6b04c15c1d488 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.h
@@ -7,7 +7,7 @@
#include "PointerDefinitions.h"
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "VirtualFluids_GPU_export.h"
class Parameter;
diff --git a/src/gpu/VirtualFluids_GPU/GPU/TurbulentViscosityKernels.h b/src/gpu/VirtualFluids_GPU/GPU/TurbulentViscosityKernels.h
index c5c470a5f178f4377f6bf0d0ed29cd8191968529..74d0e69a181e94c6d34e9207f203fb852d9d2fd1 100644
--- a/src/gpu/VirtualFluids_GPU/GPU/TurbulentViscosityKernels.h
+++ b/src/gpu/VirtualFluids_GPU/GPU/TurbulentViscosityKernels.h
@@ -38,7 +38,7 @@
#include <cuda_runtime.h>
#include "LBM/LB.h"
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include <basics/constants/NumericConstants.h>
using namespace vf::basics::constant;
diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
index 27c061ce99f71c349ac1c479efb5f9b780cff3b2..7b7b857d5c3ac157445bb154aecfb4dfa9c4b0bc 100644
--- a/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
+++ b/src/gpu/VirtualFluids_GPU/Kernel/Utilities/KernelFactory/KernelFactoryImp.cpp
@@ -1,5 +1,7 @@
#include "KernelFactoryImp.h"
+#include <logger/Logger.h>
+
#include "Parameter/Parameter.h"
#include "Kernel/Utilities/KernelTypes.h"
@@ -94,7 +96,7 @@ void KernelFactoryImp::setKernelAtLevel(std::vector<std::shared_ptr<Kernel>> ker
std::shared_ptr<Kernel> KernelFactoryImp::makeKernel(std::shared_ptr<Parameter> para, std::string kernel, int level)
{
- printf("Instantiating Kernel: %s\n", kernel.c_str());
+ VF_LOG_INFO("Instantiating Kernel: {}", kernel);
std::shared_ptr<KernelImp> newKernel;
std::shared_ptr<CheckParameterStrategy> checkStrategy;
diff --git a/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.h
index 1c069a364ab5ef2837ffd05d0ef4b6488365e4e3..d961452575b905acb96fbc1c30ff0d5e71af2722 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.h
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/ADKernelManager.h
@@ -33,7 +33,7 @@
#ifndef ADVECTION_DIFFUSION_H
#define ADVECTION_DIFFUSION_H
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "PointerDefinitions.h"
#include "VirtualFluids_GPU_export.h"
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/GridScalingKernelManager.h b/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManager.h
index ef1e175ed149e6a89016c76249ce31aa1f1828f9..0c24801506b9a19985d1a805b349d0b58e9bbf84 100644
--- a/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManager.h
+++ b/src/gpu/VirtualFluids_GPU/KernelManager/GridScalingKernelManager.h
@@ -36,7 +36,7 @@
#include "LBM/LB.h"
#include "PointerDefinitions.h"
#include "VirtualFluids_GPU_export.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
#include <functional>
#include <memory>
#include <stdexcept>
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/LB.h b/src/gpu/VirtualFluids_GPU/LBM/LB.h
index 1598e2c67421767e73fedb97e2a2afdbe38b6281..ead35be5e8b60534105b84badb2e96c98e9adfc5 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/LB.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/LB.h
@@ -70,7 +70,7 @@
#define INTERFACE_B 5
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include <string>
#include <vector>
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
index 27a1ceca71fd1bef7e3af8a5a8820f75a15ee2ed..dddc795ccda96b49a03373c05a701f32662e9565 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.cpp
@@ -25,7 +25,7 @@
#include "Output/VeloASCIIWriter.hpp"
//////////////////////////////////////////////////////////////////////////
#include "Utilities/Buffer2D.hpp"
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
//////////////////////////////////////////////////////////////////////////
#include "Init/InitLattice.h"
#include "Init/VfReader.h"
@@ -419,6 +419,18 @@ void Simulation::setFactories(std::unique_ptr<KernelFactory> &&kernelFactory_,
this->preProcessorFactory = std::move(preProcessorFactory_);
}
+void Simulation::initTimers()
+{
+ previousTimestepForAveraging = para->getTimeCalcMedStart();
+ previousTimestepForTurbulenceIntensityCalculation = 0;
+ timestepForMeasuringPoints = 0;
+
+ para->setStepEnsight(0);
+
+ averageTimer = std::make_unique<Timer>("Average performance");
+ averageTimer->startTimer();
+}
+
void Simulation::allocNeighborsOffsetsScalesAndBoundaries(GridProvider &gridProvider)
{
@@ -431,603 +443,546 @@ void Simulation::allocNeighborsOffsetsScalesAndBoundaries(GridProvider &gridProv
void Simulation::run()
{
- unsigned int timestep, t_prev;
- uint t_turbulenceIntensity = 0;
- unsigned int t_MP = 0;
-
- //////////////////////////////////////////////////////////////////////////
- para->setStepEnsight(0);
-
- //turning Ship
- real Pi = (real)3.14159265358979323846;
- real delta_x_F = (real)0.1;
- real delta_t_F = (real)((double)para->getVelocity() * (double)delta_x_F / (double)3.75);
- real delta_t_C = (real)(delta_t_F * pow(2.,para->getMaxLevel()));
- real timesteps_C = (real)(12.5 / delta_t_C);
- real AngularVelocity = (real)(12.5 / timesteps_C * Pi / 180.);
- para->setAngularVelocity(AngularVelocity);
- for (int i = 0; i<= para->getMaxLevel(); i++)
- {
- para->getParD(i)->deltaPhi = (real)(para->getAngularVelocity()/(pow(2.,i)));
- }
- //////////////////////////////////////////////////////////////////////////
-
- t_prev = para->getTimeCalcMedStart();
-
- Timer* averageTimer = new Timer("Average performance");
- averageTimer->startTimer();
+ this->initTimers();
+
+ //////////////////////////////////////////////////////////////////////////
+ // turning Ship
+ real Pi = (real)3.14159265358979323846;
+ real delta_x_F = (real)0.1;
+ real delta_t_F = (real)((double)para->getVelocity() * (double)delta_x_F / (double)3.75);
+ real delta_t_C = (real)(delta_t_F * pow(2., para->getMaxLevel()));
+ real timesteps_C = (real)(12.5 / delta_t_C);
+ real AngularVelocity = (real)(12.5 / timesteps_C * Pi / 180.);
+ para->setAngularVelocity(AngularVelocity);
+ for (int i = 0; i <= para->getMaxLevel(); i++) {
+ para->getParD(i)->deltaPhi = (real)(para->getAngularVelocity() / (pow(2., i)));
+ }
////////////////////////////////////////////////////////////////////////////////
// Time loop
////////////////////////////////////////////////////////////////////////////////
- for(timestep=para->getTimestepStart();timestep<=para->getTimestepEnd();timestep++)
+ for(uint timestep=para->getTimestepStart();timestep<=para->getTimestepEnd();timestep++)
{
- this->updateGrid27->updateGrid(0, timestep);
-
- ////////////////////////////////////////////////////////////////////////////////
- //Particles
- ////////////////////////////////////////////////////////////////////////////////
- if (para->getCalcParticles()) propagateParticles(para.get(), timestep);
- ////////////////////////////////////////////////////////////////////////////////
-
-
-
-
- ////////////////////////////////////////////////////////////////////////////////
- // run Analyzers for kinetic energy and enstrophy for TGV in 3D
- // these analyzers only work on level 0
- ////////////////////////////////////////////////////////////////////////////////
- if (this->kineticEnergyAnalyzer || this->enstrophyAnalyzer) {
- updateGrid27->exchangeData(0);
- }
+ this->calculateTimestep(timestep);
+ }
- if( this->kineticEnergyAnalyzer ) this->kineticEnergyAnalyzer->run(timestep);
- if( this->enstrophyAnalyzer ) this->enstrophyAnalyzer->run(timestep);
- ////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+ // printDragLift(para);
+ ////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+ if (para->getDiffOn() == true) printPlaneConc(para.get(), cudaMemoryManager.get());
+ ////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+ ////for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
+ ////{
+ //// if (para->getParH(lev)->cpTop.size() > 0)
+ //// {
+ //// printCpTop(para, lev);
+ //// }
+ ////}
+ // for (int lev = 7; lev <= 8; lev++)
+ //{
+ // printCpTop(para, lev);
+ //}
+ ////printCpTop(para);
+ ////printCpBottom(para);
+ ////printCpBottom2(para);
+ ////////////////////////////////////////////////////////////////////////////////
+ // //////////////////////////////////////////////////////////////////////////
+ // //Copy Measure Values
+ // for (int lev=para->getCoarse(); lev <= para->getFine(); lev++)
+ //{
+ // VF_LOG_INFO("Copy MeasurePoints at level = {}", lev);
+ // para->cudaCopyMeasurePointsToHost(lev);
+ // para->copyMeasurePointsArrayToVector(lev);
+ // VF_LOG_INFO("Write MeasurePoints at level = {}", lev);
+ // for(int j = 0; j < (int)para->getParH(lev)->MP.size(); j++)
+ // {
+ // MeasurePointWriter::writeMeasurePoints(para, lev, j, 0);
+ // }
+ //}
+ // //////////////////////////////////////////////////////////////////////////
+}
- ////////////////////////////////////////////////////////////////////////////////
- //Calc Median
- ////////////////////////////////////////////////////////////////////////////////
- if (para->getCalcMedian() && ((int)timestep >= para->getTimeCalcMedStart()) && ((int)timestep <= para->getTimeCalcMedEnd()))
+void Simulation::calculateTimestep(uint timestep)
+{
+ this->updateGrid27->updateGrid(0, timestep);
+ ////////////////////////////////////////////////////////////////////////////////
+ //Particles
+ ////////////////////////////////////////////////////////////////////////////////
+ if (para->getCalcParticles()) propagateParticles(para.get(), timestep);
+ ////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+ // run Analyzers for kinetic energy and enstrophy for TGV in 3D
+ // these analyzers only work on level 0
+ ////////////////////////////////////////////////////////////////////////////////
+ if (this->kineticEnergyAnalyzer || this->enstrophyAnalyzer) {
+ updateGrid27->exchangeData(0);
+ }
+ if( this->kineticEnergyAnalyzer ) this->kineticEnergyAnalyzer->run(timestep);
+ if( this->enstrophyAnalyzer ) this->enstrophyAnalyzer->run(timestep);
+ ////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+ //Calc Median
+ ////////////////////////////////////////////////////////////////////////////////
+ if (para->getCalcMedian() && ((int)timestep >= para->getTimeCalcMedStart()) && ((int)timestep <= para->getTimeCalcMedEnd()))
+ {
+ for (int lev=para->getCoarse(); lev <= para->getFine(); lev++)
{
- for (int lev=para->getCoarse(); lev <= para->getFine(); lev++)
- {
- //CalcMedSP27(para->getParD(lev)->vx_SP_Med,
- // para->getParD(lev)->vy_SP_Med,
- // para->getParD(lev)->vz_SP_Med,
- // para->getParD(lev)->rho_SP_Med,
- // para->getParD(lev)->press_SP_Med,
- // para->getParD(lev)->geoSP,
- // para->getParD(lev)->neighborX_SP,
- // para->getParD(lev)->neighborY_SP,
- // para->getParD(lev)->neighborZ_SP,
- // para->getParD(lev)->size_Mat_SP,
- // para->getParD(lev)->numberofthreads,
- // para->getParD(lev)->d0SP.f[0],
- // para->getParD(lev)->evenOrOdd);
- //getLastCudaError("CalcMacSP27 execution failed");
-
- CalcMedCompSP27(para->getParD(lev)->vx_SP_Med,
- para->getParD(lev)->vy_SP_Med,
- para->getParD(lev)->vz_SP_Med,
- para->getParD(lev)->rho_SP_Med,
- para->getParD(lev)->press_SP_Med,
- para->getParD(lev)->typeOfGridNode,
- para->getParD(lev)->neighborX,
- para->getParD(lev)->neighborY,
- para->getParD(lev)->neighborZ,
- para->getParD(lev)->numberOfNodes,
- para->getParD(lev)->numberofthreads,
- para->getParD(lev)->distributions.f[0],
- para->getParD(lev)->isEvenTimestep);
- getLastCudaError("CalcMacMedCompSP27 execution failed");
-
- }
+ //CalcMedSP27(para->getParD(lev)->vx_SP_Med,
+ // para->getParD(lev)->vy_SP_Med,
+ // para->getParD(lev)->vz_SP_Med,
+ // para->getParD(lev)->rho_SP_Med,
+ // para->getParD(lev)->press_SP_Med,
+ // para->getParD(lev)->geoSP,
+ // para->getParD(lev)->neighborX_SP,
+ // para->getParD(lev)->neighborY_SP,
+ // para->getParD(lev)->neighborZ_SP,
+ // para->getParD(lev)->size_Mat_SP,
+ // para->getParD(lev)->numberofthreads,
+ // para->getParD(lev)->d0SP.f[0],
+ // para->getParD(lev)->evenOrOdd);
+ //getLastCudaError("CalcMacSP27 execution failed");
+ CalcMedCompSP27(para->getParD(lev)->vx_SP_Med,
+ para->getParD(lev)->vy_SP_Med,
+ para->getParD(lev)->vz_SP_Med,
+ para->getParD(lev)->rho_SP_Med,
+ para->getParD(lev)->press_SP_Med,
+ para->getParD(lev)->typeOfGridNode,
+ para->getParD(lev)->neighborX,
+ para->getParD(lev)->neighborY,
+ para->getParD(lev)->neighborZ,
+ para->getParD(lev)->numberOfNodes,
+ para->getParD(lev)->numberofthreads,
+ para->getParD(lev)->distributions.f[0],
+ para->getParD(lev)->isEvenTimestep);
+ getLastCudaError("CalcMacMedCompSP27 execution failed");
}
-
- if (para->getCalcTurbulenceIntensity()) {
- for (int lev = para->getCoarse(); lev <= para->getFine(); lev++) {
- CalcTurbulenceIntensityDevice(
- para->getParD(lev)->vxx,
- para->getParD(lev)->vyy,
- para->getParD(lev)->vzz,
- para->getParD(lev)->vxy,
- para->getParD(lev)->vxz,
- para->getParD(lev)->vyz,
- para->getParD(lev)->vx_mean,
- para->getParD(lev)->vy_mean,
- para->getParD(lev)->vz_mean,
- para->getParD(lev)->distributions.f[0],
- para->getParD(lev)->typeOfGridNode,
- para->getParD(lev)->neighborX,
- para->getParD(lev)->neighborY,
- para->getParD(lev)->neighborZ,
- para->getParD(lev)->numberOfNodes,
- para->getParD(lev)->isEvenTimestep,
- para->getParD(lev)->numberofthreads
- );
- }
+ }
+ if (para->getCalcTurbulenceIntensity()) {
+ for (int lev = para->getCoarse(); lev <= para->getFine(); lev++) {
+ CalcTurbulenceIntensityDevice(
+ para->getParD(lev)->vxx,
+ para->getParD(lev)->vyy,
+ para->getParD(lev)->vzz,
+ para->getParD(lev)->vxy,
+ para->getParD(lev)->vxz,
+ para->getParD(lev)->vyz,
+ para->getParD(lev)->vx_mean,
+ para->getParD(lev)->vy_mean,
+ para->getParD(lev)->vz_mean,
+ para->getParD(lev)->distributions.f[0],
+ para->getParD(lev)->typeOfGridNode,
+ para->getParD(lev)->neighborX,
+ para->getParD(lev)->neighborY,
+ para->getParD(lev)->neighborZ,
+ para->getParD(lev)->numberOfNodes,
+ para->getParD(lev)->isEvenTimestep,
+ para->getParD(lev)->numberofthreads
+ );
}
- ////////////////////////////////////////////////////////////////////////////////
-
-
-
-
- ////////////////////////////////////////////////////////////////////////////////
- // CheckPoint
- ////////////////////////////////////////////////////////////////////////////////
- if(para->getDoCheckPoint() && para->getTimeDoCheckPoint()>0 && timestep%para->getTimeDoCheckPoint()==0 && timestep>0 && !para->overWritingRestart(timestep))
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+ // CheckPoint
+ ////////////////////////////////////////////////////////////////////////////////
+ if(para->getDoCheckPoint() && para->getTimeDoCheckPoint()>0 && timestep%para->getTimeDoCheckPoint()==0 && timestep>0 && !para->overWritingRestart(timestep))
+ {
+ averageTimer->stopTimer();
+ //////////////////////////////////////////////////////////////////////////
+ if( para->getDoCheckPoint() )
{
- averageTimer->stopTimer();
- //////////////////////////////////////////////////////////////////////////
-
- if( para->getDoCheckPoint() )
+ VF_LOG_INFO("Copy data for CheckPoint t = {}....", timestep);
+ for (int lev=para->getCoarse(); lev <= para->getFine(); lev++)
{
- VF_LOG_INFO("Copy data for CheckPoint t = {}....", timestep);
-
- for (int lev=para->getCoarse(); lev <= para->getFine(); lev++)
- {
- cudaMemoryManager->cudaCopyFsForCheckPoint(lev);
- }
-
- VF_LOG_INFO("Write data for CheckPoint t = {}...", timestep);
-
- const auto name = getFileName(para->getFName(), timestep, para->getMyProcessID());
- restart_object->serialize(name, para);
-
- VF_LOG_INFO("done");
+ cudaMemoryManager->cudaCopyFsForCheckPoint(lev);
}
- //////////////////////////////////////////////////////////////////////////
- averageTimer->startTimer();
+ VF_LOG_INFO("Write data for CheckPoint t = {}...", timestep);
+ const auto name = getFileName(para->getFName(), timestep, para->getMyProcessID());
+ restart_object->serialize(name, para);
+ VF_LOG_INFO("done");
}
- //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
- ////////////////////////////////////////////////////////////////////////////////
- //Measure Points
- ////////////////////////////////////////////////////////////////////////////////
- //set MP-Time
- if (para->getUseMeasurePoints())
+ //////////////////////////////////////////////////////////////////////////
+ averageTimer->startTimer();
+ }
+ //////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+ //Measure Points
+ ////////////////////////////////////////////////////////////////////////////////
+ //set MP-Time
+ if (para->getUseMeasurePoints())
+ {
+ if ((timestep%para->getTimestepForMP()) == 0)
{
- if ((timestep%para->getTimestepForMP()) == 0)
+ unsigned int valuesPerClockCycle = (unsigned int)(para->getclockCycleForMP() / para->getTimestepForMP());
+ for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
{
- unsigned int valuesPerClockCycle = (unsigned int)(para->getclockCycleForMP() / para->getTimestepForMP());
- for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
- {
- // VF_LOG_INFO("start level = {}", lev);
- LBCalcMeasurePoints27( para->getParD(lev)->VxMP, para->getParD(lev)->VyMP, para->getParD(lev)->VzMP,
- para->getParD(lev)->RhoMP, para->getParD(lev)->kMP, para->getParD(lev)->numberOfPointskMP,
- valuesPerClockCycle, t_MP, para->getParD(lev)->typeOfGridNode,
- para->getParD(lev)->neighborX, para->getParD(lev)->neighborY, para->getParD(lev)->neighborZ,
- para->getParD(lev)->numberOfNodes, para->getParD(lev)->distributions.f[0], para->getParD(lev)->numberofthreads,
- para->getParD(lev)->isEvenTimestep);
- }
- t_MP++;
+ // VF_LOG_INFO("start level = {}", lev);
+ LBCalcMeasurePoints27( para->getParD(lev)->VxMP, para->getParD(lev)->VyMP, para->getParD(lev)->VzMP,
+ para->getParD(lev)->RhoMP, para->getParD(lev)->kMP, para->getParD(lev)->numberOfPointskMP,
+ valuesPerClockCycle, timestepForMeasuringPoints, para->getParD(lev)->typeOfGridNode,
+ para->getParD(lev)->neighborX, para->getParD(lev)->neighborY, para->getParD(lev)->neighborZ,
+ para->getParD(lev)->numberOfNodes, para->getParD(lev)->distributions.f[0], para->getParD(lev)->numberofthreads,
+ para->getParD(lev)->isEvenTimestep);
}
-
- //Copy Measure Values
- if ((timestep % (unsigned int)para->getclockCycleForMP()) == 0)
+ timestepForMeasuringPoints++;
+ }
+ //Copy Measure Values
+ if ((timestep % (unsigned int)para->getclockCycleForMP()) == 0)
+ {
+ for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
{
- for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
+ cudaMemoryManager->cudaCopyMeasurePointsToHost(lev);
+ para->copyMeasurePointsArrayToVector(lev);
+ VF_LOG_INFO("Write MeasurePoints at level = {} and timestep = {}", lev, timestep);
+ for (int j = 0; j < (int)para->getParH(lev)->MP.size(); j++)
{
- cudaMemoryManager->cudaCopyMeasurePointsToHost(lev);
- para->copyMeasurePointsArrayToVector(lev);
- VF_LOG_INFO("Write MeasurePoints at level = {} and timestep = {}", lev, timestep);
- for (int j = 0; j < (int)para->getParH(lev)->MP.size(); j++)
- {
- MeasurePointWriter::writeMeasurePoints(para.get(), lev, j, timestep);
- }
- //MeasurePointWriter::calcAndWriteMeanAndFluctuations(para.get(), lev, t, para->getTStartOut());
+ MeasurePointWriter::writeMeasurePoints(para.get(), lev, j, timestep);
}
- t_MP = 0;
+ //MeasurePointWriter::calcAndWriteMeanAndFluctuations(para.get(), lev, t, para->getTStartOut());
}
+ timestepForMeasuringPoints = 0;
}
+ }
+ //////////////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////////////
+ ////get concentration at the plane
+ //////////////////////////////////////////////////////////////////////////////////
+ if (para->getDiffOn() && para->getCalcPlaneConc())
+ {
+ PlaneConcThS27( para->getParD(0)->ConcPlaneIn,
+ para->getParD(0)->cpTopIndex,
+ para->getParD(0)->numberOfPointsCpTop,
+ para->getParD(0)->typeOfGridNode,
+ para->getParD(0)->neighborX,
+ para->getParD(0)->neighborY,
+ para->getParD(0)->neighborZ,
+ para->getParD(0)->numberOfNodes,
+ para->getParD(0)->numberofthreads,
+ para->getParD(0)->distributionsAD.f[0],
+ para->getParD(0)->isEvenTimestep);
+ getLastCudaError("PlaneConcThS27 execution failed");
+ PlaneConcThS27( para->getParD(0)->ConcPlaneOut1,
+ para->getParD(0)->cpBottomIndex,
+ para->getParD(0)->numberOfPointsCpBottom,
+ para->getParD(0)->typeOfGridNode,
+ para->getParD(0)->neighborX,
+ para->getParD(0)->neighborY,
+ para->getParD(0)->neighborZ,
+ para->getParD(0)->numberOfNodes,
+ para->getParD(0)->numberofthreads,
+ para->getParD(0)->distributionsAD.f[0],
+ para->getParD(0)->isEvenTimestep);
+ getLastCudaError("PlaneConcThS27 execution failed");
+ PlaneConcThS27( para->getParD(0)->ConcPlaneOut2,
+ para->getParD(0)->pressureBC.kN,
+ para->getParD(0)->pressureBC.numberOfBCnodes,
+ para->getParD(0)->typeOfGridNode,
+ para->getParD(0)->neighborX,
+ para->getParD(0)->neighborY,
+ para->getParD(0)->neighborZ,
+ para->getParD(0)->numberOfNodes,
+ para->getParD(0)->numberofthreads,
+ para->getParD(0)->distributionsAD.f[0],
+ para->getParD(0)->isEvenTimestep);
+ getLastCudaError("PlaneConcThS27 execution failed");
//////////////////////////////////////////////////////////////////////////////////
-
-
-
-
+ ////Calculation of concentration at the plane
//////////////////////////////////////////////////////////////////////////////////
- ////get concentration at the plane
+ calcPlaneConc(para.get(), cudaMemoryManager.get(), 0);
+ }
+ //////////////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////////////
+ // File IO
+ ////////////////////////////////////////////////////////////////////////////////
+ //communicator->startTimer();
+ if(para->getTimestepOut()>0 && timestep%para->getTimestepOut()==0 && timestep>para->getTimestepStartOut())
+ {
//////////////////////////////////////////////////////////////////////////////////
- if (para->getDiffOn() && para->getCalcPlaneConc())
- {
- PlaneConcThS27( para->getParD(0)->ConcPlaneIn,
- para->getParD(0)->cpTopIndex,
- para->getParD(0)->numberOfPointsCpTop,
- para->getParD(0)->typeOfGridNode,
- para->getParD(0)->neighborX,
- para->getParD(0)->neighborY,
- para->getParD(0)->neighborZ,
- para->getParD(0)->numberOfNodes,
- para->getParD(0)->numberofthreads,
- para->getParD(0)->distributionsAD.f[0],
- para->getParD(0)->isEvenTimestep);
- getLastCudaError("PlaneConcThS27 execution failed");
- PlaneConcThS27( para->getParD(0)->ConcPlaneOut1,
- para->getParD(0)->cpBottomIndex,
- para->getParD(0)->numberOfPointsCpBottom,
- para->getParD(0)->typeOfGridNode,
- para->getParD(0)->neighborX,
- para->getParD(0)->neighborY,
- para->getParD(0)->neighborZ,
- para->getParD(0)->numberOfNodes,
- para->getParD(0)->numberofthreads,
- para->getParD(0)->distributionsAD.f[0],
- para->getParD(0)->isEvenTimestep);
- getLastCudaError("PlaneConcThS27 execution failed");
- PlaneConcThS27( para->getParD(0)->ConcPlaneOut2,
- para->getParD(0)->pressureBC.kN,
- para->getParD(0)->pressureBC.numberOfBCnodes,
- para->getParD(0)->typeOfGridNode,
- para->getParD(0)->neighborX,
- para->getParD(0)->neighborY,
- para->getParD(0)->neighborZ,
- para->getParD(0)->numberOfNodes,
- para->getParD(0)->numberofthreads,
- para->getParD(0)->distributionsAD.f[0],
- para->getParD(0)->isEvenTimestep);
- getLastCudaError("PlaneConcThS27 execution failed");
- //////////////////////////////////////////////////////////////////////////////////
- ////Calculation of concentration at the plane
- //////////////////////////////////////////////////////////////////////////////////
- calcPlaneConc(para.get(), cudaMemoryManager.get(), 0);
- }
+ //if (para->getParD(0)->evenOrOdd==true) para->getParD(0)->evenOrOdd=false;
+ //else para->getParD(0)->evenOrOdd=true;
//////////////////////////////////////////////////////////////////////////////////
-
-
-
-
- ////////////////////////////////////////////////////////////////////////////////
- // File IO
- ////////////////////////////////////////////////////////////////////////////////
- //communicator->startTimer();
- if(para->getTimestepOut()>0 && timestep%para->getTimestepOut()==0 && timestep>para->getTimestepStartOut())
- {
- //////////////////////////////////////////////////////////////////////////////////
- //if (para->getParD(0)->evenOrOdd==true) para->getParD(0)->evenOrOdd=false;
- //else para->getParD(0)->evenOrOdd=true;
- //////////////////////////////////////////////////////////////////////////////////
-
//////////////////////////////////////////////////////////////////////////
averageTimer->stopTimer();
averageTimer->outputPerformance(timestep, para.get(), communicator);
//////////////////////////////////////////////////////////////////////////
+ if( para->getPrintFiles() )
+ {
+ readAndWriteFiles(timestep);
+ }
+ averageTimer->startTimer();
+ }
+}
- if( para->getPrintFiles() )
- {
- VF_LOG_INFO("Write files t = {} ...", timestep);
- for (int lev=para->getCoarse(); lev <= para->getFine(); lev++)
- {
- //////////////////////////////////////////////////////////////////////////
- //exchange data for valid post process
- updateGrid27->exchangeData(lev);
- //////////////////////////////////////////////////////////////////////////
- //if (para->getD3Qxx()==19)
- //{
- //CalcMac(para->getParD(lev)->vx, para->getParD(lev)->vy, para->getParD(lev)->vz, para->getParD(lev)->rho,
- // para->getParD(lev)->geo, para->getParD(lev)->size_Mat, para->getParD(lev)->gridNX, para->getParD(lev)->gridNY,
- // para->getParD(lev)->gridNZ, para->getParD(lev)->d0.f[0], para->getParD(lev)->evenOrOdd);
- //}
- //else if (para->getD3Qxx()==27)
- //{
- //if (para->getCalcMedian() && ((int)t > para->getTimeCalcMedStart()) && ((int)t <= para->getTimeCalcMedEnd()))
- //{
- // unsigned int tdiff = t - t_prev;
- // CalcMacMedSP27(para->getParD(lev)->vx_SP_Med,
- // para->getParD(lev)->vy_SP_Med,
- // para->getParD(lev)->vz_SP_Med,
- // para->getParD(lev)->rho_SP_Med,
- // para->getParD(lev)->press_SP_Med,
- // para->getParD(lev)->geoSP,
- // para->getParD(lev)->neighborX_SP,
- // para->getParD(lev)->neighborY_SP,
- // para->getParD(lev)->neighborZ_SP,
- // tdiff,
- // para->getParD(lev)->size_Mat_SP,
- // para->getParD(lev)->numberofthreads,
- // para->getParD(lev)->evenOrOdd);
- // getLastCudaError("CalcMacMedSP27 execution failed");
- //}
-
- //CalcMacSP27(para->getParD(lev)->vx_SP,
- // para->getParD(lev)->vy_SP,
- // para->getParD(lev)->vz_SP,
- // para->getParD(lev)->rho,
- // para->getParD(lev)->pressure,
- // para->getParD(lev)->geoSP,
- // para->getParD(lev)->neighborX_SP,
- // para->getParD(lev)->neighborY_SP,
- // para->getParD(lev)->neighborZ_SP,
- // para->getParD(lev)->size_Mat_SP,
- // para->getParD(lev)->numberofthreads,
- // para->getParD(lev)->d0SP.f[0],
- // para->getParD(lev)->evenOrOdd);
- // getLastCudaError("CalcMacSP27 execution failed");
-
-
- CalcMacCompSP27(para->getParD(lev)->velocityX,
- para->getParD(lev)->velocityY,
- para->getParD(lev)->velocityZ,
- para->getParD(lev)->rho,
- para->getParD(lev)->pressure,
- para->getParD(lev)->typeOfGridNode,
- para->getParD(lev)->neighborX,
- para->getParD(lev)->neighborY,
- para->getParD(lev)->neighborZ,
- para->getParD(lev)->numberOfNodes,
- para->getParD(lev)->numberofthreads,
- para->getParD(lev)->distributions.f[0],
- para->getParD(lev)->isEvenTimestep);
- getLastCudaError("CalcMacSP27 execution failed");
-
- // // overwrite with wall nodes
- // SetOutputWallVelocitySP27( para->getParD(lev)->numberofthreads,
- // para->getParD(lev)->velocityX,
- // para->getParD(lev)->velocityY,
- // para->getParD(lev)->velocityZ,
- // para->getParD(lev)->geometryBC.Vx,
- // para->getParD(lev)->geometryBC.Vy,
- // para->getParD(lev)->geometryBC.Vz,
- // para->getParD(lev)->geometryBC.numberOfBCnodes,
- // para->getParD(lev)->geometryBC.k,
- // para->getParD(lev)->rho,
- // para->getParD(lev)->pressure,
- // para->getParD(lev)->typeOfGridNode,
- // para->getParD(lev)->neighborX,
- // para->getParD(lev)->neighborY,
- // para->getParD(lev)->neighborZ,
- // para->getParD(lev)->size_Mat,
- // para->getParD(lev)->distributions.f[0],
- // para->getParD(lev)->isEvenTimestep);
- // getLastCudaError("SetOutputWallVelocitySP27 execution failed");
-
- // SetOutputWallVelocitySP27( para->getParD(lev)->numberofthreads,
- // para->getParD(lev)->velocityX,
- // para->getParD(lev)->velocityY,
- // para->getParD(lev)->velocityZ,
- // para->getParD(lev)->velocityBC.Vx,
- // para->getParD(lev)->velocityBC.Vy,
- // para->getParD(lev)->velocityBC.Vz,
- // para->getParD(lev)->velocityBC.numberOfBCnodes,
- // para->getParD(lev)->velocityBC.k,
- // para->getParD(lev)->rho,
- // para->getParD(lev)->pressure,
- // para->getParD(lev)->typeOfGridNode,
- // para->getParD(lev)->neighborX,
- // para->getParD(lev)->neighborY,
- // para->getParD(lev)->neighborZ,
- // para->getParD(lev)->size_Mat,
- // para->getParD(lev)->distributions.f[0],
- // para->getParD(lev)->isEvenTimestep);
- // getLastCudaError("SetOutputWallVelocitySP27 execution failed");
-
- //}
-
- cudaMemoryManager->cudaCopyPrint(lev);
- if (para->getCalcMedian())
- {
- cudaMemoryManager->cudaCopyMedianPrint(lev);
- }
-
- //////////////////////////////////////////////////////////////////////////
- //TODO: implement flag to write ASCII data
- if (para->getWriteVeloASCIIfiles())
- VeloASCIIWriter::writeVelocitiesAsTXT(para.get(), lev, timestep);
- //////////////////////////////////////////////////////////////////////////
- if( this->kineticEnergyAnalyzer || this->enstrophyAnalyzer )
- {
- std::string fname = para->getFName() + "_ID_" + StringUtil::toString<int>(para->getMyProcessID()) + "_t_" + StringUtil::toString<int>(timestep);
-
- if (this->kineticEnergyAnalyzer) this->kineticEnergyAnalyzer->writeToFile(fname);
- if (this->enstrophyAnalyzer) this->enstrophyAnalyzer->writeToFile(fname);
- }
- //////////////////////////////////////////////////////////////////////////
-
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- if (para->getDiffOn()==true)
- {
- if (para->getDiffMod() == 7)
- {
- CalcMacThS7( para->getParD(lev)->concentration,
- para->getParD(lev)->typeOfGridNode,
- para->getParD(lev)->neighborX,
- para->getParD(lev)->neighborY,
- para->getParD(lev)->neighborZ,
- para->getParD(lev)->numberOfNodes,
- para->getParD(lev)->numberofthreads,
- para->getParD(lev)->distributionsAD7.f[0],
- para->getParD(lev)->isEvenTimestep);
- getLastCudaError("CalcMacTh7 execution failed");
- }
- else if (para->getDiffMod() == 27)
- {
- CalcConcentration27(
- para->getParD(lev)->numberofthreads,
- para->getParD(lev)->concentration,
- para->getParD(lev)->typeOfGridNode,
- para->getParD(lev)->neighborX,
- para->getParD(lev)->neighborY,
- para->getParD(lev)->neighborZ,
- para->getParD(lev)->numberOfNodes,
- para->getParD(lev)->distributionsAD.f[0],
- para->getParD(lev)->isEvenTimestep);
- }
-
- cudaMemoryManager->cudaCopyConcentrationDeviceToHost(lev);
- //cudaMemoryCopy(para->getParH(lev)->Conc, para->getParD(lev)->Conc, para->getParH(lev)->mem_size_real_SP , cudaMemcpyDeviceToHost);
- }
- ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- ////print cp
- //if ((para->getParH(lev)->cpTop.size() > 0) && (t > para->getTStartOut()))
- //{
- // printCpTopIntermediateStep(para, t, lev);
- //}
- ////////////////////////////////////////////////////////////////////////////////
- //MeasurePointWriter::writeSpacialAverageForXZSlices(para, lev, t);
- ////////////////////////////////////////////////////////////////////////////////
- //MeasurePointWriter::writeTestAcousticXY(para, lev, t);
- //MeasurePointWriter::writeTestAcousticYZ(para, lev, t);
- //MeasurePointWriter::writeTestAcousticXZ(para, lev, t);
- ////////////////////////////////////////////////////////////////////////
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- ////test print press mirror
- //if (t > para->getTStartOut())
- //{
- // ////////////////////////////////////////////////////////////////////////////////
- // //Level 7
- // CalcCPtop27(para->getParD(7)->d0SP.f[0],
- // para->getParD(7)->cpTopIndex,
- // para->getParD(7)->numberOfPointsCpTop,
- // para->getParD(7)->cpPressTop,
- // para->getParD(7)->neighborX_SP,
- // para->getParD(7)->neighborY_SP,
- // para->getParD(7)->neighborZ_SP,
- // para->getParD(7)->size_Mat_SP,
- // para->getParD(7)->evenOrOdd,
- // para->getParD(7)->numberofthreads);
- // //////////////////////////////////////////////////////////////////////////////////
- // calcPressForMirror(para, 7);
- // ////////////////////////////////////////////////////////////////////////////////
- // //Level 8
- // CalcCPtop27(para->getParD(8)->d0SP.f[0],
- // para->getParD(8)->cpTopIndex,
- // para->getParD(8)->numberOfPointsCpTop,
- // para->getParD(8)->cpPressTop,
- // para->getParD(8)->neighborX_SP,
- // para->getParD(8)->neighborY_SP,
- // para->getParD(8)->neighborZ_SP,
- // para->getParD(8)->size_Mat_SP,
- // para->getParD(8)->evenOrOdd,
- // para->getParD(8)->numberofthreads);
- // //////////////////////////////////////////////////////////////////////////////////
- // calcPressForMirror(para, 8);
- // ////////////////////////////////////////////////////////////////////////////////
- // //print press mirror
- // printScalars(para, false);
- // ////////////////////////////////////////////////////////////////////////////////
- //}
- //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
- //t_prev = t;
-
- //////////////////////////////////////////////////////////////////////////
- ////Data Analysis
- ////AnalysisData::writeAnalysisData(para, t);
- //AnalysisData::writeAnalysisDataX(para, t);
- //AnalysisData::writeAnalysisDataZ(para, t);
- //////////////////////////////////////////////////////////////////////////
+void Simulation::readAndWriteFiles(uint timestep)
+{
+ VF_LOG_INFO("Write files t = {} ...", timestep);
- ////////////////////////////////////////////////////////////////////////
- //pressure difference
- ////////////////////////////////////////////////////////////////////////
- //if (para->getMyID() == para->getPressInID()) calcPressure(para, "in", 0);
- //else if (para->getMyID() == para->getPressOutID()) calcPressure(para, "out", 0);
- ////////////////////////////////////////////////////////////////////////
- //flow rate
- ////////////////////////////////////////////////////////////////////////
- //calcFlowRate(para, 0);
- ////////////////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////////////////
- //calculate 2nd, 3rd and higher order moments
- ////////////////////////////////////////////////////////////////////////
- if (para->getCalc2ndOrderMoments()) calc2ndMoments(para.get(), cudaMemoryManager.get());
- if (para->getCalc3rdOrderMoments()) calc3rdMoments(para.get(), cudaMemoryManager.get());
- if (para->getCalcHighOrderMoments()) calcHigherOrderMoments(para.get(), cudaMemoryManager.get());
- ////////////////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////////////////
- //calculate median on host
- ////////////////////////////////////////////////////////////////////////
- if (para->getCalcMedian() && ((int)timestep > para->getTimeCalcMedStart()) && ((int)timestep <= para->getTimeCalcMedEnd()) && ((timestep%(unsigned int)para->getclockCycleForMP())==0))
+ for (int lev=para->getCoarse(); lev <= para->getFine(); lev++)
+ {
+ //////////////////////////////////////////////////////////////////////////
+ //exchange data for valid post process
+ updateGrid27->exchangeData(lev);
+
+ // ////////////////////////////////////////////////////////////////////////
+ // if (para->getD3Qxx()==19)
+ // {
+ // CalcMac(para->getParD(lev)->vx, para->getParD(lev)->vy, para->getParD(lev)->vz, para->getParD(lev)->rho,
+ // para->getParD(lev)->geo, para->getParD(lev)->size_Mat, para->getParD(lev)->gridNX, para->getParD(lev)->gridNY,
+ // para->getParD(lev)->gridNZ, para->getParD(lev)->d0.f[0], para->getParD(lev)->evenOrOdd);
+ // }
+ // else if (para->getD3Qxx()==27)
+ // {
+ // if (para->getCalcMedian() && ((int)t > para->getTimeCalcMedStart()) && ((int)t <= para->getTimeCalcMedEnd()))
+ // {
+ // unsigned int tdiff = t - t_prev;
+ // CalcMacMedSP27(para->getParD(lev)->vx_SP_Med,
+ // para->getParD(lev)->vy_SP_Med,
+ // para->getParD(lev)->vz_SP_Med,
+ // para->getParD(lev)->rho_SP_Med,
+ // para->getParD(lev)->press_SP_Med,
+ // para->getParD(lev)->geoSP,
+ // para->getParD(lev)->neighborX_SP,
+ // para->getParD(lev)->neighborY_SP,
+ // para->getParD(lev)->neighborZ_SP,
+ // tdiff,
+ // para->getParD(lev)->size_Mat_SP,
+ // para->getParD(lev)->numberofthreads,
+ // para->getParD(lev)->evenOrOdd);
+ // getLastCudaError("CalcMacMedSP27 execution failed");
+ // }
+ // CalcMacSP27(para->getParD(lev)->vx_SP,
+ // para->getParD(lev)->vy_SP,
+ // para->getParD(lev)->vz_SP,
+ // para->getParD(lev)->rho,
+ // para->getParD(lev)->pressure,
+ // para->getParD(lev)->geoSP,
+ // para->getParD(lev)->neighborX_SP,
+ // para->getParD(lev)->neighborY_SP,
+ // para->getParD(lev)->neighborZ_SP,
+ // para->getParD(lev)->size_Mat_SP,
+ // para->getParD(lev)->numberofthreads,
+ // para->getParD(lev)->d0SP.f[0],
+ // para->getParD(lev)->evenOrOdd);
+ // getLastCudaError("CalcMacSP27 execution failed");
+ CalcMacCompSP27(para->getParD(lev)->velocityX,
+ para->getParD(lev)->velocityY,
+ para->getParD(lev)->velocityZ,
+ para->getParD(lev)->rho,
+ para->getParD(lev)->pressure,
+ para->getParD(lev)->typeOfGridNode,
+ para->getParD(lev)->neighborX,
+ para->getParD(lev)->neighborY,
+ para->getParD(lev)->neighborZ,
+ para->getParD(lev)->numberOfNodes,
+ para->getParD(lev)->numberofthreads,
+ para->getParD(lev)->distributions.f[0],
+ para->getParD(lev)->isEvenTimestep);
+ getLastCudaError("CalcMacSP27 execution failed");
+ // // overwrite with wall nodes
+ // SetOutputWallVelocitySP27( para->getParD(lev)->numberofthreads,
+ // para->getParD(lev)->velocityX,
+ // para->getParD(lev)->velocityY,
+ // para->getParD(lev)->velocityZ,
+ // para->getParD(lev)->geometryBC.Vx,
+ // para->getParD(lev)->geometryBC.Vy,
+ // para->getParD(lev)->geometryBC.Vz,
+ // para->getParD(lev)->geometryBC.numberOfBCnodes,
+ // para->getParD(lev)->geometryBC.k,
+ // para->getParD(lev)->rho,
+ // para->getParD(lev)->pressure,
+ // para->getParD(lev)->typeOfGridNode,
+ // para->getParD(lev)->neighborX,
+ // para->getParD(lev)->neighborY,
+ // para->getParD(lev)->neighborZ,
+ // para->getParD(lev)->size_Mat,
+ // para->getParD(lev)->distributions.f[0],
+ // para->getParD(lev)->isEvenTimestep);
+ // getLastCudaError("SetOutputWallVelocitySP27 execution failed");
+ // SetOutputWallVelocitySP27( para->getParD(lev)->numberofthreads,
+ // para->getParD(lev)->velocityX,
+ // para->getParD(lev)->velocityY,
+ // para->getParD(lev)->velocityZ,
+ // para->getParD(lev)->velocityBC.Vx,
+ // para->getParD(lev)->velocityBC.Vy,
+ // para->getParD(lev)->velocityBC.Vz,
+ // para->getParD(lev)->velocityBC.numberOfBCnodes,
+ // para->getParD(lev)->velocityBC.k,
+ // para->getParD(lev)->rho,
+ // para->getParD(lev)->pressure,
+ // para->getParD(lev)->typeOfGridNode,
+ // para->getParD(lev)->neighborX,
+ // para->getParD(lev)->neighborY,
+ // para->getParD(lev)->neighborZ,
+ // para->getParD(lev)->size_Mat,
+ // para->getParD(lev)->distributions.f[0],
+ // para->getParD(lev)->isEvenTimestep);
+ // getLastCudaError("SetOutputWallVelocitySP27 execution failed");
+ // }
+
+ cudaMemoryManager->cudaCopyPrint(lev);
+ if (para->getCalcMedian())
+ {
+ cudaMemoryManager->cudaCopyMedianPrint(lev);
+ }
+ //////////////////////////////////////////////////////////////////////////
+ //TODO: implement flag to write ASCII data
+ if (para->getWriteVeloASCIIfiles())
+ VeloASCIIWriter::writeVelocitiesAsTXT(para.get(), lev, timestep);
+ //////////////////////////////////////////////////////////////////////////
+ if( this->kineticEnergyAnalyzer || this->enstrophyAnalyzer )
+ {
+ std::string fname = para->getFName() + "_ID_" + StringUtil::toString<int>(para->getMyProcessID()) + "_t_" + StringUtil::toString<int>(timestep);
+ if (this->kineticEnergyAnalyzer) this->kineticEnergyAnalyzer->writeToFile(fname);
+ if (this->enstrophyAnalyzer) this->enstrophyAnalyzer->writeToFile(fname);
+ }
+ //////////////////////////////////////////////////////////////////////////
+ if (para->getDiffOn()==true)
+ {
+ if (para->getDiffMod() == 7)
{
- unsigned int tdiff = timestep - t_prev;
- calcMedian(para.get(), tdiff);
-
- /////////////////////////////////
- //added for incremental averaging
- t_prev = timestep;
- resetMedian(para.get());
- /////////////////////////////////
+ CalcMacThS7( para->getParD(lev)->concentration,
+ para->getParD(lev)->typeOfGridNode,
+ para->getParD(lev)->neighborX,
+ para->getParD(lev)->neighborY,
+ para->getParD(lev)->neighborZ,
+ para->getParD(lev)->numberOfNodes,
+ para->getParD(lev)->numberofthreads,
+ para->getParD(lev)->distributionsAD7.f[0],
+ para->getParD(lev)->isEvenTimestep);
+ getLastCudaError("CalcMacTh7 execution failed");
}
- if (para->getCalcTurbulenceIntensity())
+ else if (para->getDiffMod() == 27)
{
- uint t_diff = timestep - t_turbulenceIntensity;
- calcTurbulenceIntensity(para.get(), cudaMemoryManager.get(), t_diff);
- //writeAllTiDatafToFile(para.get(), t);
- }
- ////////////////////////////////////////////////////////////////////////
- dataWriter->writeTimestep(para, timestep);
- ////////////////////////////////////////////////////////////////////////
- if (para->getCalcTurbulenceIntensity()) {
- t_turbulenceIntensity = timestep;
- resetVelocityFluctuationsAndMeans(para.get(), cudaMemoryManager.get());
+ CalcConcentration27(
+ para->getParD(lev)->numberofthreads,
+ para->getParD(lev)->concentration,
+ para->getParD(lev)->typeOfGridNode,
+ para->getParD(lev)->neighborX,
+ para->getParD(lev)->neighborY,
+ para->getParD(lev)->neighborZ,
+ para->getParD(lev)->numberOfNodes,
+ para->getParD(lev)->distributionsAD.f[0],
+ para->getParD(lev)->isEvenTimestep);
}
- ////////////////////////////////////////////////////////////////////////
- if (para->getCalcDragLift()) printDragLift(para.get(), cudaMemoryManager.get(), timestep);
- ////////////////////////////////////////////////////////////////////////
- if (para->getCalcParticles()) copyAndPrintParticles(para.get(), cudaMemoryManager.get(), timestep, false);
- ////////////////////////////////////////////////////////////////////////
- VF_LOG_INFO("... done");
- ////////////////////////////////////////////////////////////////////////
- }
-
+ cudaMemoryManager->cudaCopyConcentrationDeviceToHost(lev);
+ //cudaMemoryCopy(para->getParH(lev)->Conc, para->getParD(lev)->Conc, para->getParH(lev)->mem_size_real_SP , cudaMemcpyDeviceToHost);
+ }
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ ////print cp
+ //if ((para->getParH(lev)->cpTop.size() > 0) && (t > para->getTStartOut()))
+ //{
+ // printCpTopIntermediateStep(para, t, lev);
+ //}
+ ////////////////////////////////////////////////////////////////////////////////
+ //MeasurePointWriter::writeSpacialAverageForXZSlices(para, lev, t);
+ ////////////////////////////////////////////////////////////////////////////////
+ //MeasurePointWriter::writeTestAcousticXY(para, lev, t);
+ //MeasurePointWriter::writeTestAcousticYZ(para, lev, t);
+ //MeasurePointWriter::writeTestAcousticXZ(para, lev, t);
////////////////////////////////////////////////////////////////////////
- averageTimer->startTimer();
- }
}
-
- /////////////////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////////////////////////
- //printDragLift(para);
- ////////////////////////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////////////////////////
- if (para->getDiffOn()==true) printPlaneConc(para.get(), cudaMemoryManager.get());
- ////////////////////////////////////////////////////////////////////////////////
-
- ////////////////////////////////////////////////////////////////////////////////
- ////for (int lev = para->getCoarse(); lev <= para->getFine(); lev++)
- ////{
- //// if (para->getParH(lev)->cpTop.size() > 0)
- //// {
- //// printCpTop(para, lev);
- //// }
- ////}
- //for (int lev = 7; lev <= 8; lev++)
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ ////test print press mirror
+ //if (t > para->getTStartOut())
//{
- // printCpTop(para, lev);
+ // ////////////////////////////////////////////////////////////////////////////////
+ // //Level 7
+ // CalcCPtop27(para->getParD(7)->d0SP.f[0],
+ // para->getParD(7)->cpTopIndex,
+ // para->getParD(7)->numberOfPointsCpTop,
+ // para->getParD(7)->cpPressTop,
+ // para->getParD(7)->neighborX_SP,
+ // para->getParD(7)->neighborY_SP,
+ // para->getParD(7)->neighborZ_SP,
+ // para->getParD(7)->size_Mat_SP,
+ // para->getParD(7)->evenOrOdd,
+ // para->getParD(7)->numberofthreads);
+ // //////////////////////////////////////////////////////////////////////////////////
+ // calcPressForMirror(para, 7);
+ // ////////////////////////////////////////////////////////////////////////////////
+ // //Level 8
+ // CalcCPtop27(para->getParD(8)->d0SP.f[0],
+ // para->getParD(8)->cpTopIndex,
+ // para->getParD(8)->numberOfPointsCpTop,
+ // para->getParD(8)->cpPressTop,
+ // para->getParD(8)->neighborX_SP,
+ // para->getParD(8)->neighborY_SP,
+ // para->getParD(8)->neighborZ_SP,
+ // para->getParD(8)->size_Mat_SP,
+ // para->getParD(8)->evenOrOdd,
+ // para->getParD(8)->numberofthreads);
+ // //////////////////////////////////////////////////////////////////////////////////
+ // calcPressForMirror(para, 8);
+ // ////////////////////////////////////////////////////////////////////////////////
+ // //print press mirror
+ // printScalars(para, false);
+ // ////////////////////////////////////////////////////////////////////////////////
//}
- ////printCpTop(para);
- ////printCpBottom(para);
- ////printCpBottom2(para);
- ////////////////////////////////////////////////////////////////////////////////
-
- // //////////////////////////////////////////////////////////////////////////
- // //Copy Measure Values
- //for (int lev=para->getCoarse(); lev <= para->getFine(); lev++)
- //{
- // VF_LOG_INFO("Copy MeasurePoints at level = {}", lev);
- // para->cudaCopyMeasurePointsToHost(lev);
- // para->copyMeasurePointsArrayToVector(lev);
- // VF_LOG_INFO("Write MeasurePoints at level = {}", lev);
- // for(int j = 0; j < (int)para->getParH(lev)->MP.size(); j++)
- // {
- // MeasurePointWriter::writeMeasurePoints(para, lev, j, 0);
- // }
- //}
- // //////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ //t_prev = t;
+ //////////////////////////////////////////////////////////////////////////
+ ////Data Analysis
+ ////AnalysisData::writeAnalysisData(para, t);
+ //AnalysisData::writeAnalysisDataX(para, t);
+ //AnalysisData::writeAnalysisDataZ(para, t);
+ //////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
+ //pressure difference
+ ////////////////////////////////////////////////////////////////////////
+ //if (para->getMyID() == para->getPressInID()) calcPressure(para, "in", 0);
+ //else if (para->getMyID() == para->getPressOutID()) calcPressure(para, "out", 0);
+ ////////////////////////////////////////////////////////////////////////
+ //flow rate
+ ////////////////////////////////////////////////////////////////////////
+ //calcFlowRate(para, 0);
+ ////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
+ //calculate 2nd, 3rd and higher order moments
+ ////////////////////////////////////////////////////////////////////////
+ if (para->getCalc2ndOrderMoments()) calc2ndMoments(para.get(), cudaMemoryManager.get());
+ if (para->getCalc3rdOrderMoments()) calc3rdMoments(para.get(), cudaMemoryManager.get());
+ if (para->getCalcHighOrderMoments()) calcHigherOrderMoments(para.get(), cudaMemoryManager.get());
+ ////////////////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////////////////
+ //calculate median on host
+ ////////////////////////////////////////////////////////////////////////
+ if (para->getCalcMedian() && ((int)timestep > para->getTimeCalcMedStart()) && ((int)timestep <= para->getTimeCalcMedEnd()) && ((timestep%(unsigned int)para->getclockCycleForMP())==0))
+ {
+ unsigned int tdiff = timestep - previousTimestepForAveraging;
+ calcMedian(para.get(), tdiff);
+ /////////////////////////////////
+ //added for incremental averaging
+ previousTimestepForAveraging = timestep;
+ resetMedian(para.get());
+ /////////////////////////////////
+ }
+ if (para->getCalcTurbulenceIntensity())
+ {
+ uint t_diff = timestep - previousTimestepForTurbulenceIntensityCalculation;
+ calcTurbulenceIntensity(para.get(), cudaMemoryManager.get(), t_diff);
+ //writeAllTiDatafToFile(para.get(), t);
+ }
+ ////////////////////////////////////////////////////////////////////////
+ dataWriter->writeTimestep(para, timestep);
+ ////////////////////////////////////////////////////////////////////////
+ if (para->getCalcTurbulenceIntensity()) {
+ previousTimestepForTurbulenceIntensityCalculation = timestep;
+ resetVelocityFluctuationsAndMeans(para.get(), cudaMemoryManager.get());
+ }
+ ////////////////////////////////////////////////////////////////////////
+ if (para->getCalcDragLift())
+ {
+ printDragLift(para.get(), cudaMemoryManager.get(), timestep);
+ }
+ ////////////////////////////////////////////////////////////////////////
+ if (para->getCalcParticles()) copyAndPrintParticles(para.get(), cudaMemoryManager.get(), timestep, false);
+ ////////////////////////////////////////////////////////////////////////
+ VF_LOG_INFO("... done");
+ ////////////////////////////////////////////////////////////////////////
}
void Simulation::porousMedia()
diff --git a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
index 5bb58827ea58a8fe135b934f6e1aa0a5ee42cdfd..ba2a321707db4138aee9e1c30bae4dede017a5b8 100644
--- a/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
+++ b/src/gpu/VirtualFluids_GPU/LBM/Simulation.h
@@ -31,6 +31,7 @@ class EnstrophyAnalyzer;
class BoundaryConditionFactory;
class GridScalingFactory;
class TurbulenceModelFactory;
+class Timer;
class Simulation
{
@@ -44,16 +45,22 @@ public:
void run();
void setFactories(std::unique_ptr<KernelFactory> &&kernelFactory,
- std::unique_ptr<PreProcessorFactory> &&preProcessorFactory);
+ std::unique_ptr<PreProcessorFactory> &&preProcessorFactory);
void setDataWriter(std::shared_ptr<DataWriter> dataWriter);
void addKineticEnergyAnalyzer(uint tAnalyse);
void addEnstrophyAnalyzer(uint tAnalyse);
+ //! \brief can be used as an alternative to run(), if the simulation needs to be controlled from the outside (e. g. for fluid structure interaction FSI)
+ void calculateTimestep(uint timestep);
+ //! \brief needed to initialize the simulation timers if calculateTimestep is used instead of run()
+ void initTimers();
+
private:
void init(GridProvider &gridProvider, BoundaryConditionFactory *bcFactory, SPtr<TurbulenceModelFactory> tmFactory, GridScalingFactory *scalingFactory);
void allocNeighborsOffsetsScalesAndBoundaries(GridProvider& gridProvider);
void porousMedia();
void definePMarea(std::shared_ptr<PorousMedia>& pm);
+ void readAndWriteFiles(uint timestep);
std::unique_ptr<KernelFactory> kernelFactory;
std::shared_ptr<PreProcessorFactory> preProcessorFactory;
@@ -80,6 +87,13 @@ private:
SPtr<RestartObject> restart_object;
+ // Timer
+ std::unique_ptr<Timer> averageTimer;
+ uint previousTimestepForAveraging;
+ uint previousTimestepForTurbulenceIntensityCalculation;
+ uint timestepForMeasuringPoints;
+
+
//Forcing Calculation
std::shared_ptr<ForceCalculations> forceCalculator;
diff --git a/src/gpu/VirtualFluids_GPU/Output/AnalysisData.hpp b/src/gpu/VirtualFluids_GPU/Output/AnalysisData.hpp
index d091f38ea228d43345235132cd4947ff750436d6..882cc2b46c3faf3eb81a5296a7b8c6f2e1bc3ac8 100644
--- a/src/gpu/VirtualFluids_GPU/Output/AnalysisData.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/AnalysisData.hpp
@@ -3,7 +3,7 @@
#include "basics/utilities/UbFileOutputASCII.h"
#include "Parameter/Parameter.h"
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
class AnalysisData
{
diff --git a/src/gpu/VirtualFluids_GPU/Output/DataWriter.h b/src/gpu/VirtualFluids_GPU/Output/DataWriter.h
index 48a9b56da3abd5337e1c6042a7dcba3304c449e6..67a50867c1ef957c2e80b338f8597262508c468d 100644
--- a/src/gpu/VirtualFluids_GPU/Output/DataWriter.h
+++ b/src/gpu/VirtualFluids_GPU/Output/DataWriter.h
@@ -2,7 +2,7 @@
#define DATA_WRITER_H
#include "PointerDefinitions.h"
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include <memory>
#include <vector>
diff --git a/src/gpu/VirtualFluids_GPU/Output/EdgeNodeDebugWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/EdgeNodeDebugWriter.hpp
index 6498bbb0a2b787d70a3b11500549b2a8956ce67a..ee5333dfc130ac7dfdf7ab8c4de812a2916777fa 100644
--- a/src/gpu/VirtualFluids_GPU/Output/EdgeNodeDebugWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/EdgeNodeDebugWriter.hpp
@@ -5,7 +5,7 @@
#include <sstream>
#include <stdio.h>
// #include <math.h>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include "lbm/constants/D3Q27.h"
#include "LBM/LB.h"
#include "Parameter/Parameter.h"
@@ -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 a624a4c5b2efce654c8914e716da37a2a86a6d91..d61f993c48ca9f075e12028ef5d1271ba3858dae 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
@@ -13,7 +13,7 @@
#include <sstream>
#include <cmath>
-#include <Core/StringUtilities/StringUtil.h>
+#include <StringUtilities/StringUtil.h>
#include "Parameter/Parameter.h"
#include "GPU/CudaMemoryManager.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/InterfaceDebugWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/InterfaceDebugWriter.hpp
index 1989f93159c4b00b340f2b8dd184f6e6c215f679..4af9a50a123588e25f1ca9faa5c18581601f69d2 100644
--- a/src/gpu/VirtualFluids_GPU/Output/InterfaceDebugWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/InterfaceDebugWriter.hpp
@@ -3,7 +3,7 @@
#include <fstream>
#include <sstream>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include "lbm/constants/D3Q27.h"
#include "LBM/LB.h"
#include "Parameter/Parameter.h"
@@ -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/NeighborDebugWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/NeighborDebugWriter.hpp
index 57139d25ae4d046e1dd1be1f3ef5e179daf0872e..e506a56bb76a263ac8982a7e53f39e67c268e49b 100644
--- a/src/gpu/VirtualFluids_GPU/Output/NeighborDebugWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/NeighborDebugWriter.hpp
@@ -9,7 +9,7 @@
#include "lbm/constants/D3Q27.h"
#include <basics/writer/WbWriterVtkXmlBinary.h>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include "Utilities/FindNeighbors.h"
#include "gpu/VirtualFluids_GPU/Communication/Communicator.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp
index d567c695a0e33b7a88c2c8cf3bcb88093ce5b802..d075c78e53a45e96adea43c8846159f4ba128c6d 100644
--- a/src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/QDebugVtkWriter.hpp
@@ -4,11 +4,11 @@
#include <array>
#include <vector>
-#include "basics/Core/StringUtilities/StringUtil.h"
+#include "basics/StringUtilities/StringUtil.h"
#include "basics/utilities/UbSystem.h"
#include "basics/writer/WbWriterVtkXmlBinary.h"
#include "lbm/constants/D3Q27.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
#include "gpu/GridGenerator/grid/NodeValues.h"
#include "gpu/VirtualFluids_GPU/Communication/Communicator.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp b/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
index c1a3658d318eb47e84530bf437afa0bb6ba91743..d58526cab3b114e77bdb146053584795b05bac8a 100644
--- a/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
+++ b/src/gpu/VirtualFluids_GPU/Output/QDebugWriter.hpp
@@ -11,7 +11,7 @@
#include "Parameter/Parameter.h"
#include "basics/utilities/UbSystem.h"
#include <basics/writer/WbWriterVtkXmlBinary.h>
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
namespace QDebugWriter
{
@@ -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/TimeStepTimer.cpp b/src/gpu/VirtualFluids_GPU/Output/TimeStepTimer.cpp
index 78da4947d0c8196cda49fef754a3f44fc39d0a44..979c4349a084342a897a0269ffb86a3714065e96 100644
--- a/src/gpu/VirtualFluids_GPU/Output/TimeStepTimer.cpp
+++ b/src/gpu/VirtualFluids_GPU/Output/TimeStepTimer.cpp
@@ -1,6 +1,6 @@
#include "helper_cuda.h"
#include <cuda_runtime.h>
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "UbScheduler.h"
#include "Parameter/Parameter.h"
diff --git a/src/gpu/VirtualFluids_GPU/Output/TimeStepTimer.h b/src/gpu/VirtualFluids_GPU/Output/TimeStepTimer.h
index 982d1ce56bfadb7eddfd3d34d8d6b01ac6f92233..41bb9eba7ba09ddb092e644894eca0fde71fa27b 100644
--- a/src/gpu/VirtualFluids_GPU/Output/TimeStepTimer.h
+++ b/src/gpu/VirtualFluids_GPU/Output/TimeStepTimer.h
@@ -3,7 +3,7 @@
#include "helper_cuda.h"
#include <cuda_runtime.h>
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "UbScheduler.h"
#include "Parameter/Parameter.h"
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/Timer.h b/src/gpu/VirtualFluids_GPU/Output/Timer.h
index d035cbb6cef7ea9f8edabbd2894671a868c37eec..55ada64ad245ee41aa99a1185eba134a652067c9 100644
--- a/src/gpu/VirtualFluids_GPU/Output/Timer.h
+++ b/src/gpu/VirtualFluids_GPU/Output/Timer.h
@@ -2,9 +2,9 @@
#define TIMER_H
#include <cuda_runtime.h>
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "Parameter/Parameter.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
namespace vf::gpu{
class Communicator;
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.h b/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.h
index 1c32c641cbdec8ea3fe6c4121998220c4ed48369..a030c8939d70b01973f896be08280590503aeeb7 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.h
+++ b/src/gpu/VirtualFluids_GPU/Parameter/CudaStreamManager.h
@@ -33,9 +33,7 @@
#include "Core/DataTypes.h"
#include <cuda.h>
#include <cuda_runtime.h>
-#include <map>
-
-enum class CudaStreamIndex { Legacy, Bulk, SubDomainBorder, Precursor, ActuatorFarm };
+#include "DataTypes.h"
class CudaStreamManager
{
diff --git a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
index a381bb7443e8fabe2cd5aed21340f2be7f208a46..e75acaba0adceb7fdc69c34b8f71054b5da6b8e6 100644
--- a/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Parameter/Parameter.cpp
@@ -37,9 +37,17 @@
#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 "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include <basics/config/ConfigurationFile.h>
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/Particles/Particles.h b/src/gpu/VirtualFluids_GPU/Particles/Particles.h
index 7a6d003a08ef7f6517b6259c2c1b895676c6d80b..805817e2f7c6c64b27d60109ad8b6ee2c60cf5cc 100644
--- a/src/gpu/VirtualFluids_GPU/Particles/Particles.h
+++ b/src/gpu/VirtualFluids_GPU/Particles/Particles.h
@@ -4,7 +4,7 @@
#include "LBM/LB.h"
#include "GPU/GPU_Interface.h"
#include "GPU/CudaMemoryManager.h"
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include "Parameter/Parameter.h"
//void calcDragLift(Parameter* para, int lev);
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
index 857f03a1e6a5a9feb9fab67f5a8646bfbc8bcf9d..f2d4b27a159c3f3687bd58933b55558ca08cd16d 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/ActuatorFarm.cu
@@ -45,7 +45,7 @@
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
#include "basics/constants/NumericConstants.h"
-#include "logger/Logger.h"
+#include <logger/Logger.h>
using namespace vf::basics::constant;
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
index e3e172ebd9b7e46c3b6f175f3f79f796449b002f..90c434bd60e623175d5c8bfbbf23fa41f01e8a37 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PreCollisionInteractor.h
@@ -4,7 +4,7 @@
#include <string>
#include <vector>
-#include "Core/DataTypes.h"
+#include "DataTypes.h"
#include "PointerDefinitions.h"
#include "VirtualFluids_GPU_export.h"
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PrecursorWriter.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PrecursorWriter.cu
index 1a8260ef936e2707fb38fbbba71cdbfac692f350..99c60fd3d2aae2e796e0c95e624b9d5d33c30ef1 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PrecursorWriter.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/PrecursorWriter.cu
@@ -39,7 +39,7 @@
#include "cuda/CudaGrid.h"
#include "LBM/GPUHelperFunctions/KernelUtilities.h"
-#include "Core/StringUtilities/StringUtil.h"
+#include "StringUtilities/StringUtil.h"
#include "Parameter/Parameter.h"
#include "DataStructureInitializer/GridProvider.h"
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
index 2e58c1e3a29093bb0775a6d0cf33fc4c0315200d..0bef1048ba6a17462046880078859c0b7908842b 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu
@@ -39,7 +39,7 @@
#include "VirtualFluids_GPU/GPU/GeometryUtils.h"
#include <basics/constants/NumericConstants.h>
#include "basics/writer/WbWriterVtkXmlBinary.h"
-#include <Core/StringUtilities/StringUtil.h>
+#include <StringUtilities/StringUtil.h>
#include "Parameter/Parameter.h"
#include "DataStructureInitializer/GridProvider.h"
diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompSP27/InitCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompSP27/InitCompSP27_Device.cu
index 59953c573c738c3bfadf119be6d173918e970ef4..109ea18edf183b65106ce6ed86fea05d6b005d90 100644
--- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompSP27/InitCompSP27_Device.cu
+++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompSP27/InitCompSP27_Device.cu
@@ -355,7 +355,7 @@ __global__ void LB_Init_Comp_Neq_SP_27( unsigned int* neighborX,
//////////////////////////////////////////////////////////////////////////
- // the following code is copy and pasted from VirtualFluidsCore/Visitors/InitDistributionsBlockVisitor.cpp
+ // the following code is copy and pasted from VirtualFluidsVisitors/InitDistributionsBlockVisitor.cpp
// i.e. Konstantins code
real ax = dvx1dx;
diff --git a/src/gpu/VirtualFluids_GPU/Restart/RestartObject.h b/src/gpu/VirtualFluids_GPU/Restart/RestartObject.h
index 3d6db6e3a7aad82b2656d917a2b25b26c4ff4d92..963c6549fd41c80c77edc9a205679e8cbc627a1e 100644
--- a/src/gpu/VirtualFluids_GPU/Restart/RestartObject.h
+++ b/src/gpu/VirtualFluids_GPU/Restart/RestartObject.h
@@ -5,7 +5,7 @@
#include <string>
#include <vector>
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
class Parameter;
diff --git a/src/lbm/BGK.cpp b/src/lbm/BGK.cpp
index cb7d091041f90d42a4ea8e794b26d2e92581ea1b..b59572293e3ffd8f15e8edc864b2993e48b00296 100644
--- a/src/lbm/BGK.cpp
+++ b/src/lbm/BGK.cpp
@@ -1,12 +1,10 @@
#include "BGK.h"
-#include <basics/Core/DataTypes.h>
-#include <basics/Core/RealConstants.h>
+#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/BGK.h b/src/lbm/BGK.h
index 2c82f5bd445ee008954add02fd0d6d6093364e90..6cde85013dd92472022bbf7b93bc73e7940049a1 100644
--- a/src/lbm/BGK.h
+++ b/src/lbm/BGK.h
@@ -8,7 +8,7 @@
#define __device__
#endif
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
#include "KernelParameter.h"
diff --git a/src/lbm/Chimera.h b/src/lbm/Chimera.h
index af86c4cbe24b4cccb194f65edd1b3a4fb89b9377..8e54d47a42e164a89060f5009c112f5a69afd257 100644
--- a/src/lbm/Chimera.h
+++ b/src/lbm/Chimera.h
@@ -8,7 +8,7 @@
#define __device__
#endif
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
#include <basics/constants/NumericConstants.h>
diff --git a/src/lbm/CumulantChimera.cpp b/src/lbm/CumulantChimera.cpp
index 4d3382e70357dde2c0e663b32c18a881018ea670..f1257c4e579b36f868f3476282e79d44291750b1 100644
--- a/src/lbm/CumulantChimera.cpp
+++ b/src/lbm/CumulantChimera.cpp
@@ -1,13 +1,11 @@
-#include "CumulantChimera.h"
#include <cmath>
-#include <basics/Core/DataTypes.h>
-#include <basics/Core/RealConstants.h>
+#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/CumulantChimera.h b/src/lbm/CumulantChimera.h
index e8740c7d3f5b988a6fdc5c3b16ab6a90e0a28b83..c30a0c07912953cff45e3734c0b60fa7a03acd53 100644
--- a/src/lbm/CumulantChimera.h
+++ b/src/lbm/CumulantChimera.h
@@ -8,7 +8,7 @@
#define __device__
#endif
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
#include "KernelParameter.h"
diff --git a/src/lbm/KernelParameter.h b/src/lbm/KernelParameter.h
index 18c4f2a4b20b84d9d519993f3ddb54cf612d4306..9c07524226a40aaa9e2c65e7ab028b07aec62ddc 100644
--- a/src/lbm/KernelParameter.h
+++ b/src/lbm/KernelParameter.h
@@ -8,7 +8,7 @@
#define __device__
#endif
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
namespace vf::lbm
diff --git a/src/lbm/MacroscopicQuantities.h b/src/lbm/MacroscopicQuantities.h
index c464e955669fcaa39b5c300e5c2c7e25dffef696..5a93222a5efae2d1814411053360d66ef132d62c 100644
--- a/src/lbm/MacroscopicQuantities.h
+++ b/src/lbm/MacroscopicQuantities.h
@@ -8,9 +8,9 @@
#define __device__
#endif
-#include <basics/Core/DataTypes.h>
+#include <basics/DataTypes.h>
+#include <basics/constants/NumericConstants.h>
-#include "constants/NumericConstants.h"
#include "constants/D3Q27.h"
diff --git a/src/lbm/constants/D3Q27.h b/src/lbm/constants/D3Q27.h
index c799331815ff92b41b3daf8433bcc10d026a8738..b6c05eae921ae66b43999ff01977f7a674ce505f 100644
--- a/src/lbm/constants/D3Q27.h
+++ b/src/lbm/constants/D3Q27.h
@@ -2,7 +2,7 @@
#define LBM_D3Q27_H
#include <map>
-#include "basics/Core/DataTypes.h"
+#include "basics/DataTypes.h"
namespace vf::lbm::dir
{
diff --git a/utilities/DirRename.py b/utilities/DirRename.py
index 3f01e630a931ec98454c9ac620c3f18d92d7e59a..2d0bd0541c5b86b1ca9746b8e7e6beb2cc7ef005 100644
--- a/utilities/DirRename.py
+++ b/utilities/DirRename.py
@@ -5,7 +5,7 @@ Created on Tue Dec 6 13:21:27 2022
@author: kutscher
"""
-filename = "d:/temp/MultiphaseNonReflectingOutflowBCAlgorithm.cpp"
+filename = "d:/temp/VF/4/MultiphaseScaleDistributionLBMKernel.cpp"
#read input file
fin = open(filename, "rt")
@@ -33,18 +33,18 @@ data = data.replace('[TN]', '[DIR_0PP]')
data = data.replace('[BS]', '[DIR_0MM]')
data = data.replace('[BN]', '[DIR_0PM]')
data = data.replace('[TS]', '[DIR_0MP]')
-data = data.replace('[NE ]', '[DIR_PP0]')
-data = data.replace('[SW ]', '[DIR_MM0]')
-data = data.replace('[SE ]', '[DIR_PM0]')
-data = data.replace('[NW ]', '[DIR_MP0]')
-data = data.replace('[TE ]', '[DIR_P0P]')
-data = data.replace('[BW ]', '[DIR_M0M]')
-data = data.replace('[BE ]', '[DIR_P0M]')
-data = data.replace('[TW ]', '[DIR_M0P]')
-data = data.replace('[TN ]', '[DIR_0PP]')
-data = data.replace('[BS ]', '[DIR_0MM]')
-data = data.replace('[BN ]', '[DIR_0PM]')
-data = data.replace('[TS ]', '[DIR_0MP]')
+data = data.replace('[NE]', '[DIR_PP0]')
+data = data.replace('[SW]', '[DIR_MM0]')
+data = data.replace('[SE]', '[DIR_PM0]')
+data = data.replace('[NW]', '[DIR_MP0]')
+data = data.replace('[TE]', '[DIR_P0P]')
+data = data.replace('[BW]', '[DIR_M0M]')
+data = data.replace('[BE]', '[DIR_P0M]')
+data = data.replace('[TW]', '[DIR_M0P]')
+data = data.replace('[TN]', '[DIR_0PP]')
+data = data.replace('[BS]', '[DIR_0MM]')
+data = data.replace('[BN]', '[DIR_0PM]')
+data = data.replace('[TS]', '[DIR_0MP]')
data = data.replace('[E]', '[DIR_P00]')
data = data.replace('[W]', '[DIR_M00]')
data = data.replace('[N]', '[DIR_0P0]')
@@ -108,33 +108,33 @@ data = data.replace('[B]', '[DIR_00M]')
# data = data.replace('D3Q27System::BSE', '[DIR_PMM]')
# data = data.replace('D3Q27System::BSW', '[DIR_MMM]')
-data = data.replace('REST)','DIR_000)')
-data = data.replace('TNE)', 'DIR_PPP)')
-data = data.replace('TNW)', 'DIR_MPP)')
-data = data.replace('TSE)', 'DIR_PMP)')
-data = data.replace('TSW)', 'DIR_MMP)')
-data = data.replace('BNE)', 'DIR_PPM)')
-data = data.replace('BNW)', 'DIR_MPM)')
-data = data.replace('BSE)', 'DIR_PMM)')
-data = data.replace('BSW)', 'DIR_MMM)')
-data = data.replace('NE)', 'DIR_PP0)')
-data = data.replace('SW)', 'DIR_MM0)')
-data = data.replace('SE)', 'DIR_PM0)')
-data = data.replace('NW)', 'DIR_MP0)')
-data = data.replace('TE)', 'DIR_P0P)')
-data = data.replace('BW)', 'DIR_M0M)')
-data = data.replace('BE)', 'DIR_P0M)')
-data = data.replace('TW)', 'DIR_M0P)')
-data = data.replace('TN)', 'DIR_0PP)')
-data = data.replace('BS)', 'DIR_0MM)')
-data = data.replace('BN)', 'DIR_0PM)')
-data = data.replace('TS)', 'DIR_0MP)')
-data = data.replace('E)', 'DIR_P00)')
-data = data.replace('W)', 'DIR_M00)')
-data = data.replace('N)', 'DIR_0P0)')
-data = data.replace('S)', 'DIR_0M0)')
-data = data.replace('T)', 'DIR_00P)')
-data = data.replace('B)', 'DIR_00M)')
+# data = data.replace('REST)','DIR_000)')
+# data = data.replace('TNE)', 'DIR_PPP)')
+# data = data.replace('TNW)', 'DIR_MPP)')
+# data = data.replace('TSE)', 'DIR_PMP)')
+# data = data.replace('TSW)', 'DIR_MMP)')
+# data = data.replace('BNE)', 'DIR_PPM)')
+# data = data.replace('BNW)', 'DIR_MPM)')
+# data = data.replace('BSE)', 'DIR_PMM)')
+# data = data.replace('BSW)', 'DIR_MMM)')
+# data = data.replace('NE)', 'DIR_PP0)')
+# data = data.replace('SW)', 'DIR_MM0)')
+# data = data.replace('SE)', 'DIR_PM0)')
+# data = data.replace('NW)', 'DIR_MP0)')
+# data = data.replace('TE)', 'DIR_P0P)')
+# data = data.replace('BW)', 'DIR_M0M)')
+# data = data.replace('BE)', 'DIR_P0M)')
+# data = data.replace('TW)', 'DIR_M0P)')
+# data = data.replace('TN)', 'DIR_0PP)')
+# data = data.replace('BS)', 'DIR_0MM)')
+# data = data.replace('BN)', 'DIR_0PM)')
+# data = data.replace('TS)', 'DIR_0MP)')
+# data = data.replace('E)', 'DIR_P00)')
+# data = data.replace('W)', 'DIR_M00)')
+# data = data.replace('N)', 'DIR_0P0)')
+# data = data.replace('S)', 'DIR_0M0)')
+# data = data.replace('T)', 'DIR_00P)')
+# data = data.replace('B)', 'DIR_00M)')
# data = data.replace('REST','DIR_000')
# data = data.replace('TNE', 'DIR_PPP')
diff --git a/utilities/ci-regression-tests/generate-ci.py b/utilities/ci-regression-tests/generate-ci.py
new file mode 100644
index 0000000000000000000000000000000000000000..834728b5b22d7cf566019483a3c405e75c6fc837
--- /dev/null
+++ b/utilities/ci-regression-tests/generate-ci.py
@@ -0,0 +1,23 @@
+from jinja2 import Template
+from pathlib import Path
+
+TEMPLATES_DIR = Path(__file__).parent
+REGRESSION_CI_TEMPLATE = TEMPLATES_DIR / "regression-tests-ci.yml.j2"
+GENERATED_DIR = Path("generated")
+REGRESSION_CI_FILE = GENERATED_DIR / "regression-tests-ci.yml"
+TEST_FILE_DIR = Path("regression-tests")
+
+
+def build_regression_job_string(regression_tests: list[str]) -> str:
+ template = Template(REGRESSION_CI_TEMPLATE.read_text())
+ return template.render(regression_tests=regression_tests)
+
+
+def main():
+ regression_tests_files = [item.stem for item in TEST_FILE_DIR.glob("*_test.sh")]
+ regression_tests_ci_file = build_regression_job_string(regression_tests_files)
+ REGRESSION_CI_FILE.write_text(regression_tests_ci_file)
+
+if __name__ == "__main__":
+ GENERATED_DIR.mkdir(parents=True, exist_ok=True)
+ main()
\ No newline at end of file
diff --git a/utilities/ci-regression-tests/regression-tests-ci.yml.j2 b/utilities/ci-regression-tests/regression-tests-ci.yml.j2
new file mode 100644
index 0000000000000000000000000000000000000000..f162ff0c855130ffb8f2cc1c391a62360577b82a
--- /dev/null
+++ b/utilities/ci-regression-tests/regression-tests-ci.yml.j2
@@ -0,0 +1,26 @@
+image: git.rz.tu-bs.de:4567/irmb/virtualfluids/ubuntu22_04:1.0
+
+stages:
+ - test
+
+.regression-test:
+ stage: test
+
+ needs: []
+
+ tags:
+ - gpu
+ - linux
+
+ before_script:
+ - chmod +x ./regression-tests/*
+ - pip install fieldcompare
+
+{% for regression_test in regression_tests %}
+run-regression-test-{{ regression_test }}:
+ extends: .regression-test
+
+ script:
+ - ./regression-tests/{{ regression_test }}.sh
+
+{% endfor %}
diff --git a/utilities/ci-regression-tests/requirements.txt b/utilities/ci-regression-tests/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bb0794f9960967b2c8aac7fc4bf1162d0e68c85f
--- /dev/null
+++ b/utilities/ci-regression-tests/requirements.txt
@@ -0,0 +1 @@
+Jinja2==3.1.2
\ No newline at end of file
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