diff --git a/.clang-tidy b/.clang-tidy
new file mode 100644
index 0000000000000000000000000000000000000000..162294555c718c3912376188b34fa1fe3287c9ad
--- /dev/null
+++ b/.clang-tidy
@@ -0,0 +1,68 @@
+---
+Checks: '-*,bugprone-*,-bugprone-exception-escape,misc-*,-misc-misplaced-const,modernize-*,-modernize-use-auto,-modernize-loop-convert,-modernize-pass-by-value,-modernize-raw-string-literal,-modernize-use-using,-modernize-avoid-bind,-modernize-return-braced-init-list,-modernize-use-transparent-functors,-modernize-redundant-void-arg,performance-*'
+WarningsAsErrors: '*'
+HeaderFilterRegex: ''
+AnalyzeTemporaryDtors: false
+FormatStyle: none
+User: si11fita
+CheckOptions:
+ - key: modernize-loop-convert.MaxCopySize
+ value: '16'
+ - key: modernize-loop-convert.MinConfidence
+ value: reasonable
+ - key: modernize-loop-convert.NamingStyle
+ value: CamelCase
+ - key: modernize-make-shared.IgnoreMacros
+ value: '1'
+ - key: modernize-make-shared.IncludeStyle
+ value: '0'
+ - key: modernize-make-shared.MakeSmartPtrFunction
+ value: 'std::make_shared'
+ - key: modernize-make-shared.MakeSmartPtrFunctionHeader
+ value: memory
+ - key: modernize-make-unique.IgnoreMacros
+ value: '1'
+ - key: modernize-make-unique.IncludeStyle
+ value: '0'
+ - key: modernize-make-unique.MakeSmartPtrFunction
+ value: 'std::make_unique'
+ - key: modernize-make-unique.MakeSmartPtrFunctionHeader
+ value: memory
+ - key: modernize-pass-by-value.IncludeStyle
+ value: llvm
+ - key: modernize-pass-by-value.ValuesOnly
+ value: '0'
+ - key: modernize-raw-string-literal.ReplaceShorterLiterals
+ value: '0'
+ - key: modernize-replace-auto-ptr.IncludeStyle
+ value: llvm
+ - key: modernize-replace-random-shuffle.IncludeStyle
+ value: llvm
+ - key: modernize-use-auto.RemoveStars
+ value: '0'
+ - key: modernize-use-default-member-init.IgnoreMacros
+ value: '1'
+ - key: modernize-use-default-member-init.UseAssignment
+ value: '0'
+ - key: modernize-use-emplace.ContainersWithPushBack
+ value: '::std::vector;::std::list;::std::deque'
+ - key: modernize-use-emplace.SmartPointers
+ value: '::std::shared_ptr;::std::unique_ptr;::std::auto_ptr;::std::weak_ptr'
+ - key: modernize-use-emplace.TupleMakeFunctions
+ value: '::std::make_pair;::std::make_tuple'
+ - key: modernize-use-emplace.TupleTypes
+ value: '::std::pair;::std::tuple'
+ - key: modernize-use-equals-default.IgnoreMacros
+ value: '1'
+ - key: modernize-use-noexcept.ReplacementString
+ value: ''
+ - key: modernize-use-noexcept.UseNoexceptFalse
+ value: '1'
+ - key: modernize-use-nullptr.NullMacros
+ value: 'NULL'
+ - key: modernize-use-transparent-functors.SafeMode
+ value: '0'
+ - key: modernize-use-using.IgnoreMacros
+ value: '1'
+...
+
diff --git a/.gitignore b/.gitignore
index 9dc5287059e5c93198c1cd4418b7fa972676751f..80be18e0c806e91e88bd5ae7fd8a10d5e1b0ea32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@ ui_*
qrc_*
*~
+# macOS
+**/.DS_Store
+
# Backup files of kate/kwrite
# Generated files
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae96208da8541f44fc3d5cd468a07694cf2f003d..cd9f1cd494e09dd2fbdddf55709de77075ab3219 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@
###############################################################################
stages:
+ - pretest
- test
- deploy
@@ -28,7 +29,7 @@ stages:
- mkdir $CI_PROJECT_DIR/build
- cd $CI_PROJECT_DIR/build
- if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
- - cmake .. -DWALBERLA_BUFFER_DEBUG=$WALBERLA_BUFFER_DEBUG -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS -DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS
+ - cmake .. -DWALBERLA_BUFFER_DEBUG=$WALBERLA_BUFFER_DEBUG -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS -DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS -DWALBERLA_ENABLE_GUI=$WALBERLA_ENABLE_GUI
- cmake . -LAH
- make -j $NUM_BUILD_CORES -l $NUM_CORES
- ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES
@@ -36,99 +37,87 @@ stages:
- docker
-.build_serial_template: &build_serial_definition
- <<: *build_definition
- variables:
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "OFF"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- CMAKE_BUILD_TYPE: "Release"
- WALBERLA_BUFFER_DEBUG: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- WALBERLA_BUILD_WITH_METIS: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-
-
-.build_mpionly_template: &build_mpionly_definition
- <<: *build_definition
- variables:
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- CMAKE_BUILD_TYPE: "Release"
- WALBERLA_BUFFER_DEBUG: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- WALBERLA_BUILD_WITH_METIS: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-
-
-.build_hybrid_template: &build_hybrid_definition
- <<: *build_definition
- variables:
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "ON"
- OMP_NUM_THREADS: "4"
- OMP_WAIT_POLICY: "PASSIVE"
- CMAKE_BUILD_TYPE: "Release"
- WALBERLA_BUFFER_DEBUG: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- WALBERLA_BUILD_WITH_METIS: "ON"
- WALBERLA_BUILD_WITH_PARMETIS: "ON"
-
-.build_serial_dbg_template: &build_serial_dbg_definition
- <<: *build_definition
- variables:
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "OFF"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- WALBERLA_BUFFER_DEBUG: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- WALBERLA_BUILD_WITH_METIS: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-
-
-.build_mpionly_dbg_template: &build_mpionly_dbg_definition
- <<: *build_definition
- variables:
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "OFF"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- WALBERLA_BUFFER_DEBUG: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- WALBERLA_BUILD_WITH_METIS: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-
-
-.build_hybrid_dbg_template: &build_hybrid_dbg_definition
- <<: *build_definition
- variables:
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "ON"
- OMP_NUM_THREADS: "4"
- OMP_WAIT_POLICY: "PASSIVE"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- WALBERLA_BUFFER_DEBUG: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "ON"
- WALBERLA_BUILD_WITH_METIS: "ON"
- WALBERLA_BUILD_WITH_PARMETIS: "ON"
-
-.build_hybrid_dbg_sp_template: &build_hybrid_dbg_sp_definition
- <<: *build_definition
- variables:
- CTEST_EXCLUDE_LABELS: "longrun"
- WALBERLA_BUILD_WITH_MPI: "ON"
- WALBERLA_BUILD_WITH_OPENMP: "ON"
- OMP_NUM_THREADS: "4"
- OMP_WAIT_POLICY: "PASSIVE"
- CMAKE_BUILD_TYPE: "DebugOptimized"
- WALBERLA_BUFFER_DEBUG: "OFF"
- WALBERLA_DOUBLE_ACCURACY: "OFF"
- WALBERLA_BUILD_WITH_METIS: "OFF"
- WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+.variables: &build_serial_variables
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "OFF"
+ WALBERLA_BUILD_WITH_OPENMP: "OFF"
+ CMAKE_BUILD_TYPE: "Release"
+ WALBERLA_BUFFER_DEBUG: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+ WALBERLA_BUILD_WITH_METIS: "OFF"
+ WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+
+
+.variables: &build_mpionly_variables
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "OFF"
+ CMAKE_BUILD_TYPE: "Release"
+ WALBERLA_BUFFER_DEBUG: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+ WALBERLA_BUILD_WITH_METIS: "OFF"
+ WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+
+
+.variables: &build_hybrid_variables
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "ON"
+ OMP_NUM_THREADS: "4"
+ OMP_WAIT_POLICY: "PASSIVE"
+ CMAKE_BUILD_TYPE: "Release"
+ WALBERLA_BUFFER_DEBUG: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+ WALBERLA_BUILD_WITH_METIS: "ON"
+ WALBERLA_BUILD_WITH_PARMETIS: "ON"
+
+
+.variables: &build_serial_dbg_variables
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "OFF"
+ WALBERLA_BUILD_WITH_OPENMP: "OFF"
+ CMAKE_BUILD_TYPE: "DebugOptimized"
+ WALBERLA_BUFFER_DEBUG: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+ WALBERLA_BUILD_WITH_METIS: "OFF"
+ WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+
+
+.variables: &build_mpionly_dbg_variables
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "OFF"
+ CMAKE_BUILD_TYPE: "DebugOptimized"
+ WALBERLA_BUFFER_DEBUG: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+ WALBERLA_BUILD_WITH_METIS: "OFF"
+ WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+
+
+.variables: &build_hybrid_dbg_variables
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "ON"
+ OMP_NUM_THREADS: "4"
+ OMP_WAIT_POLICY: "PASSIVE"
+ CMAKE_BUILD_TYPE: "DebugOptimized"
+ WALBERLA_BUFFER_DEBUG: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "ON"
+ WALBERLA_BUILD_WITH_METIS: "ON"
+ WALBERLA_BUILD_WITH_PARMETIS: "ON"
+
+
+.variables: &build_hybrid_dbg_sp_variables
+ CTEST_EXCLUDE_LABELS: "longrun"
+ WALBERLA_BUILD_WITH_MPI: "ON"
+ WALBERLA_BUILD_WITH_OPENMP: "ON"
+ OMP_NUM_THREADS: "4"
+ OMP_WAIT_POLICY: "PASSIVE"
+ CMAKE_BUILD_TYPE: "DebugOptimized"
+ WALBERLA_BUFFER_DEBUG: "OFF"
+ WALBERLA_DOUBLE_ACCURACY: "OFF"
+ WALBERLA_BUILD_WITH_METIS: "OFF"
+ WALBERLA_BUILD_WITH_PARMETIS: "OFF"
###############################################################################
@@ -140,573 +129,1349 @@ stages:
intel_16_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
- intel
intel_16_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
- intel
intel_16_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
- intel
intel_16_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
- intel
intel_16_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
- intel
intel_16_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
- - cuda
- docker
- intel
intel_16_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
- intel
intel_17_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_17_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_17_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_17_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_17_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_17_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
- intel
intel_17_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - docker
+ - intel
+
+intel_18_serial:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+ - intel
+
+intel_18_mpionly:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+ - intel
+
+intel_18_hybrid:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 1
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - cuda
+ - docker
+ - intel
+
+intel_18_serial_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - cuda
+ - docker
+ - intel
+
+intel_18_mpionly_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+ - intel
+
+intel_18_hybrid_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+ - intel
+
+intel_18_hybrid_dbg_sp:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+ - intel
+
+intel_19_serial:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - docker
+ - intel
+
+intel_19_mpionly:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - docker
+ - intel
+
+intel_19_hybrid:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - docker
+ - intel
+
+intel_19_serial_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - docker
+ - intel
+
+intel_19_mpionly_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - docker
+ - intel
+
+intel_19_hybrid_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - docker
+ - intel
+
+intel_19_hybrid_dbg_sp:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
- docker
- intel
gcc_5_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
gcc_5_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
gcc_5_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
gcc_5_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
gcc_5_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
gcc_5_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
- cuda
- docker
gcc_5_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- cuda
- docker
gcc_6_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_6_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_6_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_6_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_6_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_6_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_6_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
gcc_7_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
+ - cuda
- docker
gcc_7_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
+ - cuda
- docker
gcc_7_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+ stage: pretest
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
+ - cuda
- docker
gcc_7_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 1
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
+ - cuda
- docker
gcc_7_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
+ - cuda
- docker
gcc_7_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
+ - cuda
- docker
gcc_7_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
+ - cuda
- docker
clang_3.6_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.6_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.6_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.6_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
- - cuda
- docker
clang_3.7_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.7_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.7_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.7_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.8_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.8_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.8_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.8_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.8_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.8_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.8_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- - cuda
- docker
clang_3.9_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_3.9_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_3.9_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_3.9_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_3.9_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_3.9_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_3.9_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_4.0_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_4.0_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_4.0_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_4.0_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_4.0_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_4.0_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_4.0_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_5.0_serial:
- <<: *build_serial_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_5.0_mpionly:
- <<: *build_mpionly_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_5.0_hybrid:
- <<: *build_hybrid_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_5.0_serial_dbg:
- <<: *build_serial_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_5.0_mpionly_dbg:
- <<: *build_mpionly_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_5.0_hybrid_dbg:
- <<: *build_hybrid_dbg_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
clang_5.0_hybrid_dbg_sp:
- <<: *build_hybrid_dbg_sp_definition
+ <<: *build_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - docker
+
+clang_6.0_serial:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+
+clang_6.0_mpionly:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+
+clang_6.0_hybrid:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+
+clang_6.0_serial_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+
+clang_6.0_mpionly_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+
+clang_6.0_hybrid_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+
+clang_6.0_hybrid_dbg_sp:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "ON"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - cuda
+ - docker
+
+clang_7.0_serial:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+ variables:
+ <<: *build_serial_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - docker
+
+clang_7.0_mpionly:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+ variables:
+ <<: *build_mpionly_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ only:
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
+ tags:
+ - docker
+
+clang_7.0_hybrid:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+ variables:
+ <<: *build_hybrid_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - docker
+
+clang_7.0_serial_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+ variables:
+ <<: *build_serial_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - docker
+
+clang_7.0_mpionly_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+ variables:
+ <<: *build_mpionly_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - docker
+
+clang_7.0_hybrid_dbg:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+ variables:
+ <<: *build_hybrid_dbg_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ tags:
+ - docker
+
+clang_7.0_hybrid_dbg_sp:
+ <<: *build_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+ stage: pretest
+ variables:
+ <<: *build_hybrid_dbg_sp_variables
+ WALBERLA_BUILD_WITH_CUDA: "OFF"
+ WALBERLA_ENABLE_GUI: 0
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
- docker
@@ -728,6 +1493,9 @@ doc:
- cmake ..
- cmake . -LAH
- make doc
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
tags:
- docker
artifacts:
@@ -743,8 +1511,29 @@ doc:
## ##
###############################################################################
+clang-tidy:
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+ script:
+ - $CXX --version
+ - cmake --version
+ - mkdir $CI_PROJECT_DIR/build
+ - cd $CI_PROJECT_DIR/build
+ - cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWALBERLA_BUFFER_DEBUG=ON -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=ON -DCMAKE_BUILD_TYPE=Debug -DWALBERLA_BUILD_WITH_METIS=ON -DWALBERLA_BUILD_WITH_PARMETIS=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON -DWALBERLA_DOUBLE_ACCURACY=ON
+ - cmake . -LAH
+ - utilities/filterCompileCommands.py compile_commands.json
+ - run-clang-tidy.py -quiet | tee clang-tidy-output.txt
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
+ artifacts:
+ paths:
+ - $CI_PROJECT_DIR/build/clang-tidy-output.txt
+ tags:
+ - docker
+
+
cppcheck:
- image: walberla/cppcheck
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/cppcheck
script:
- cppcheck --version
- cppcheck . --max-configs=10 --enable=warning --enable=style --enable=performance --enable=portability -i src/gui/extern -i src/geometry/structured/extern -i sqlite3.c -i StackWalker.cpp -I src/ -I tests/ -I apps/ -D WALBERLA_BUILD_WITH_MPI -D WALBERLA_BUILD_WITH_METIS -D WALBERLA_BUILD_WITH_BOOST_THREAD -D WALBERLA_BUILD_WITH_PYTHON --xml 2> report.xml
@@ -752,7 +1541,8 @@ cppcheck:
artifacts:
untracked: true
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
@@ -780,7 +1570,8 @@ coverage:
paths:
- coverage/
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
tags:
- docker
variables:
@@ -821,6 +1612,9 @@ msvc-14_Hybrid_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
msvc-14_Hybrid_SP_Dbg:
<<: *win_build_definition
@@ -832,7 +1626,8 @@ msvc-14_Hybrid_SP_Dbg:
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "OFF"
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
msvc-14_Hybrid:
<<: *win_build_definition
@@ -844,7 +1639,8 @@ msvc-14_Hybrid:
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
msvc-14_Serial_Dbg:
<<: *win_build_definition
@@ -856,7 +1652,8 @@ msvc-14_Serial_Dbg:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
msvc-14_Serial:
<<: *win_build_definition
@@ -868,7 +1665,8 @@ msvc-14_Serial:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
msvc-14_MpiOnly_Dbg:
<<: *win_build_definition
@@ -880,7 +1678,8 @@ msvc-14_MpiOnly_Dbg:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
msvc-14_MpiOnly:
<<: *win_build_definition
@@ -892,7 +1691,8 @@ msvc-14_MpiOnly:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
msvc-14.1_Hybrid_Dbg:
@@ -904,6 +1704,9 @@ msvc-14.1_Hybrid_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
msvc-14.1_Hybrid_SP_Dbg:
<<: *win_build_definition
@@ -914,6 +1717,9 @@ msvc-14.1_Hybrid_SP_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "OFF"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
msvc-14.1_Hybrid:
<<: *win_build_definition
@@ -924,6 +1730,9 @@ msvc-14.1_Hybrid:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "ON"
WALBERLA_DOUBLE_ACCURACY: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
msvc-14.1_Serial_Dbg:
<<: *win_build_definition
@@ -934,6 +1743,9 @@ msvc-14.1_Serial_Dbg:
WALBERLA_BUILD_WITH_MPI: "OFF"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
msvc-14.1_Serial:
<<: *win_build_definition
@@ -945,7 +1757,8 @@ msvc-14.1_Serial:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
msvc-14.1_MpiOnly_Dbg:
<<: *win_build_definition
@@ -956,6 +1769,9 @@ msvc-14.1_MpiOnly_Dbg:
WALBERLA_BUILD_WITH_MPI: "ON"
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
msvc-14.1_MpiOnly:
<<: *win_build_definition
@@ -967,7 +1783,8 @@ msvc-14.1_MpiOnly:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_DOUBLE_ACCURACY: "ON"
only:
- - triggers
+ variables:
+ - $ENABLE_NIGHTLY_BUILDS
###############################################################################
@@ -1003,6 +1820,9 @@ mac_Serial_Dbg:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PYTHON: "ON"
WALBERLA_BUILD_WITH_CUDA: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
mac_Serial:
<<: *mac_build_definition
@@ -1013,6 +1833,9 @@ mac_Serial:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PYTHON: "ON"
WALBERLA_BUILD_WITH_CUDA: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
mac_MpiOnly_Dbg:
<<: *mac_build_definition
@@ -1023,6 +1846,9 @@ mac_MpiOnly_Dbg:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PYTHON: "ON"
WALBERLA_BUILD_WITH_CUDA: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
mac_MpiOnly:
<<: *mac_build_definition
@@ -1033,6 +1859,9 @@ mac_MpiOnly:
WALBERLA_BUILD_WITH_OPENMP: "OFF"
WALBERLA_BUILD_WITH_PYTHON: "ON"
WALBERLA_BUILD_WITH_CUDA: "ON"
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
###############################################################################
@@ -1089,3 +1918,64 @@ conda-py35-linux:
- apt-get update
- apt-get install -y build-essential
- conda build --python=3.5 --user=lssfau utilities/conda/walberla
+
+
+###############################################################################
+## ##
+## Benchmarks ##
+## ##
+###############################################################################
+
+.benchmark_template: &benchmark_definition
+ script:
+ - apt-get update --fix-missing
+ - apt-get install -y python3-influxdb python3-git
+ - $CXX --version
+ - cmake --version
+ - ccache --version
+ - mpirun --version
+ - export CCACHE_BASEDIR=$CI_PROJECT_DIR
+ - mkdir $CI_PROJECT_DIR/build
+ - cd $CI_PROJECT_DIR/build
+ - cmake .. -DWALBERLA_BUFFER_DEBUG=OFF -DWALBERLA_BUILD_TESTS=OFF -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=OFF -DWALBERLA_BUILD_TOOLS=OFF -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_CUDA=OFF -DWALBERLA_BUILD_WITH_PYTHON=OFF -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=RELEASE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=ON -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_METIS=OFF -DWALBERLA_BUILD_WITH_PARMETIS=OFF -DWALBERLA_OPTIMIZE_FOR_LOCALHOST=ON -DWALBERLA_BUILD_WITH_FASTMATH=ON -DWALBERLA_BUILD_WITH_LTO=ON
+ - cmake . -LAH
+ - cd apps/benchmarks/PeriodicGranularGas
+ - make -j 20
+ - export PATH=$PATH:/usr/local/likwid/bin
+ - likwid-setFrequencies -t 0
+ - likwid-setFrequencies -g performance
+ - likwid-setFrequencies -f 3.3 # set frequency to 3.3
+ - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --DEM --syncNextNeighbor | tee PeriodicGranularGas_DEM_NN.txt
+ - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --DEM --syncShadowOwners | tee PeriodicGranularGas_DEM_SO.txt
+ - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticFrictionlessContact | tee PeriodicGranularGas_HCSITS_NN_IFC.txt
+ - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --ApproximateInelasticCoulombContactByDecoupling | tee PeriodicGranularGas_HCSITS_NN_AICCBD.txt
+ - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticCoulombContactByDecoupling | tee PeriodicGranularGas_HCSITS_NN_ICCBD.txt
+ - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticGeneralizedMaximumDissipationContact | tee PeriodicGranularGas_HCSITS_NN_IGMDC.txt
+ - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncShadowOwners --InelasticFrictionlessContact | tee PeriodicGranularGas_HCSITS_SO_IFC.txt
+ - python3 upload.py
+ only:
+ variables:
+ - $ENABLE_BENCHMARKS
+ tags:
+ - docker-benchmark
+ artifacts:
+ paths:
+ - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_DEM_NN.txt
+ - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_DEM_SO.txt
+ - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_IFC.txt
+ - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_AICCBD.txt
+ - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_ICCBD.txt
+ - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_IGMDC.txt
+ - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_SO_IFC.txt
+
+benchmark_intel19:
+ <<: *benchmark_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+
+benchmark_gcc7:
+ <<: *benchmark_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+
+benchmark_clang7:
+ <<: *benchmark_definition
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
\ No newline at end of file
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 65d88317f9734455c873ea661d7a545a4df987cf..ea429d78e53cf8ea4c0e8ee5f21521c6a760fdc7 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -4,6 +4,7 @@ List of contributors
Christian Feichtinger
Christian Godenschwager
Christoph Rettinger
+Christoph Schwarzmeier
Daniel Ritter
Daniela Anderl
David Staubach
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ee1e578c7a963ec1f5f40c907fce8aa647b1b6b..b97052f4d570e1b108b0107df78a90b69bc9f060 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1086,17 +1086,8 @@ if ( WALBERLA_BUILD_WITH_CUDA )
list( APPEND CUDA_NVCC_FLAGS "-Wno-deprecated-gpu-targets")
- # FindCUDA does not respect system includes i.e. there are also warnings for boost etc reported (as of cmake 3.5.1)
- # if all includes are added to the flags manually as sytem includes they occur double on the command line
- # but the compiler seems to note the "isystem" not the "-I"
- # it is also not possible to get all system include directories - so as a workaround we at least add boost here
- # as system include
- foreach( boostInclude ${Boost_INCLUDE_DIRS} AND NOT WALBERLA_CXX_COMPILER_IS_MSVC )
- list( APPEND CUDA_NVCC_FLAGS "-isystem ${boostInclude}" )
- endforeach()
-
if ( NOT "${CUDA_NVCC_FLAGS}" MATCHES "-std=" AND NOT WALBERLA_CXX_COMPILER_IS_MSVC )
- list ( APPEND CUDA_NVCC_FLAGS "-std=c++11" )
+ list ( APPEND CUDA_NVCC_FLAGS "-std=c++14" )
endif ()
# Bug with gcc5 and cuda7.5:
@@ -1327,3 +1318,12 @@ add_subdirectory ( apps )
waLBerla_export()
############################################################################################################################
+
+############################################################################################################################
+##
+## clang-tidy
+##
+############################################################################################################################
+
+waLBerla_link_files_to_builddir( .clang-tidy )
+add_subdirectory( utilities )
diff --git a/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/AMRSedimentSettling.cpp b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/AMRSedimentSettling.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..3bb791552152d802519ea2f321309a14c696f147
--- /dev/null
+++ b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/AMRSedimentSettling.cpp
@@ -0,0 +1,2244 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file AMRSedimentSettling.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "blockforest/Initialization.h"
+#include "blockforest/communication/UniformBufferedScheme.h"
+#include "blockforest/loadbalancing/all.h"
+#include "blockforest/AABBRefinementSelection.h"
+
+#include "boundary/all.h"
+
+#include "core/DataTypes.h"
+#include "core/Environment.h"
+#include "core/SharedFunctor.h"
+#include "core/debug/Debug.h"
+#include "core/debug/TestSubsystem.h"
+#include "core/math/all.h"
+#include "core/timing/RemainingTimeLogger.h"
+#include "core/mpi/Broadcast.h"
+
+#include "domain_decomposition/SharedSweep.h"
+#include "domain_decomposition/BlockSweepWrapper.h"
+
+#include "field/AddToStorage.h"
+#include "field/StabilityChecker.h"
+#include "field/communication/PackInfo.h"
+
+#include "lbm/boundary/all.h"
+#include "lbm/communication/PdfFieldPackInfo.h"
+#include "lbm/field/AddToStorage.h"
+#include "lbm/field/PdfField.h"
+#include "lbm/field/VelocityFieldWriter.h"
+#include "lbm/lattice_model/D3Q19.h"
+#include "lbm/refinement/all.h"
+#include "lbm/sweeps/CellwiseSweep.h"
+#include "lbm/sweeps/SweepWrappers.h"
+
+#include "pe/basic.h"
+#include "pe/Types.h"
+#include "pe/fcd/GJKEPACollideFunctor.h"
+#include "pe/vtk/BodyVtkOutput.h"
+#include "pe/vtk/SphereVtkOutput.h"
+#include "pe/vtk/EllipsoidVtkOutput.h"
+#include "pe/cr/ICR.h"
+#include "pe/synchronization/ClearSynchronization.h"
+#include "pe/amr/InfoCollection.h"
+#include "pe/amr/weight_assignment/WeightAssignmentFunctor.h"
+#include "pe/amr/weight_assignment/MetisAssignmentFunctor.h"
+
+#include "pe_coupling/amr/all.h"
+#include "pe_coupling/mapping/all.h"
+#include "pe_coupling/momentum_exchange_method/all.h"
+#include "pe_coupling/utility/all.h"
+
+#include "timeloop/SweepTimeloop.h"
+
+#include "vtk/all.h"
+#include "field/vtk/all.h"
+#include "lbm/vtk/all.h"
+
+namespace amr_sediment_settling
+{
+
+///////////
+// USING //
+///////////
+
+using namespace walberla;
+using walberla::uint_t;
+
+//////////////
+// TYPEDEFS //
+//////////////
+
+// PDF field, flag field & body field
+typedef lbm::D3Q19< lbm::collision_model::TRT, false> LatticeModel_T;
+typedef LatticeModel_T::Stencil Stencil_T;
+typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+
+typedef walberla::uint8_t flag_t;
+typedef FlagField< flag_t > FlagField_T;
+typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
+typedef GhostLayerField< Vector3<real_t>, 1 > VelocityField_T;
+
+const uint_t FieldGhostLayers = 4;
+
+// boundary handling
+typedef lbm::NoSlip< LatticeModel_T, flag_t > NoSlip_T;
+
+typedef pe_coupling::CurvedLinear< LatticeModel_T, FlagField_T > MO_T;
+
+typedef boost::tuples::tuple< NoSlip_T, MO_T > BoundaryConditions_T;
+typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
+
+typedef boost::tuple<pe::Sphere, pe::Ellipsoid, pe::Plane> BodyTypeTuple;
+
+///////////
+// FLAGS //
+///////////
+
+const FlagUID Fluid_Flag( "fluid" );
+const FlagUID NoSlip_Flag( "no slip" );
+const FlagUID MO_Flag( "moving obstacle" );
+const FlagUID FormerMO_Flag( "former moving obstacle" );
+
+
+//////////////////////////////////////
+// DYNAMIC REFINEMENT FUNCTIONALITY //
+//////////////////////////////////////
+
+
+/*
+ * Refinement check based on gradient magnitude
+ * If gradient magnitude is below lowerLimit in all cells of a block, that block could be coarsened.
+ * If the gradient value is above the upperLimit for at least one cell, that block gets marked for refinement.
+ * Else, the block remains on the current level.
+ */
+template< typename LatticeModel_T, typename Filter_T >
+class VectorGradientRefinement
+{
+public:
+ typedef GhostLayerField< Vector3<real_t>, 1 > VectorField_T;
+ typedef typename LatticeModel_T::Stencil Stencil_T;
+
+ VectorGradientRefinement( const ConstBlockDataID & fieldID, const Filter_T & filter,
+ const real_t upperLimit, const real_t lowerLimit, const uint_t maxLevel ) :
+ fieldID_( fieldID ), filter_( filter ),
+ upperLimit_( upperLimit ), lowerLimit_( lowerLimit ), maxLevel_( maxLevel )
+ {}
+
+ void operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > & blocksAlreadyMarkedForRefinement,
+ const BlockForest & forest );
+
+private:
+
+ ConstBlockDataID fieldID_;
+
+ Filter_T filter_;
+
+ real_t upperLimit_;
+ real_t lowerLimit_;
+
+ uint_t maxLevel_;
+
+}; // class GradientRefinement
+
+template< typename LatticeModel_T, typename Filter_T >
+void VectorGradientRefinement< LatticeModel_T, Filter_T >::operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > &, const BlockForest & )
+{
+ for( auto it = minTargetLevels.begin(); it != minTargetLevels.end(); ++it )
+ {
+ const Block * const block = it->first;
+
+ const uint_t currentLevelOfBlock = block->getLevel();
+
+ const VectorField_T * uField = block->template getData< VectorField_T >( fieldID_ );
+
+ if( uField == nullptr )
+ {
+ it->second = uint_t(0);
+ continue;
+ }
+
+ Matrix3<real_t> uGradient( real_t(0) );
+
+ bool refine( false );
+ bool coarsen( true );
+
+ filter_( *block );
+
+ WALBERLA_FOR_ALL_CELLS_XYZ( uField,
+
+ std::vector< Vector3<real_t> > uValues( Stencil_T::Size, Vector3<real_t>(real_t(0)) );
+
+ Vector3<real_t> uInCenterCell = uField->get( x,y,z );
+
+ for( auto dir = Stencil_T::beginNoCenter(); dir != Stencil_T::end(); ++dir)
+ {
+ // check if boundary treatment is necessary
+ if( filter_( x+dir.cx(),y+dir.cy(),z+dir.cz() ) )
+ {
+ // copy from center cell
+ uValues[ *dir ] = uInCenterCell;
+ } else {
+ uValues[ *dir ] = uField->get( x+dir.cx(),y+dir.cy(),z+dir.cz() );
+ }
+ }
+
+ // obtain the matrix grad(u) with the help of the gradient formula from
+ // See: Ramadugu et al - Lattice differential operators for computational physics (2013)
+ // with T = c_s**2
+ const auto inv_c_s_sqr = real_t(3);
+ uGradient = real_t(0);
+ for( auto dir = Stencil_T::beginNoCenter(); dir != Stencil_T::end(); ++dir)
+ {
+ real_t cx = real_c(dir.cx());
+ real_t cy = real_c(dir.cy());
+ real_t cz = real_c(dir.cz());
+
+ // grad(ux)
+ real_t ux = uValues[ *dir ][0];
+ uGradient[ 0 ] += LatticeModel_T::w[ dir.toIdx() ] * cx * ux;
+ uGradient[ 3 ] += LatticeModel_T::w[ dir.toIdx() ] * cy * ux;
+ uGradient[ 6 ] += LatticeModel_T::w[ dir.toIdx() ] * cz * ux;
+
+ // grad(uy)
+ real_t uy = uValues[ *dir ][1];
+ uGradient[ 1 ] += LatticeModel_T::w[ dir.toIdx() ] * cx * uy;
+ uGradient[ 4 ] += LatticeModel_T::w[ dir.toIdx() ] * cy * uy;
+ uGradient[ 7 ] += LatticeModel_T::w[ dir.toIdx() ] * cz * uy;
+
+ // grad(uz)
+ real_t uz = uValues[ *dir ][2];
+ uGradient[ 2 ] += LatticeModel_T::w[ dir.toIdx() ] * cx * uz;
+ uGradient[ 5 ] += LatticeModel_T::w[ dir.toIdx() ] * cy * uz;
+ uGradient[ 8 ] += LatticeModel_T::w[ dir.toIdx() ] * cz * uz;
+
+ }
+ uGradient *= inv_c_s_sqr;
+
+ auto norm = real_t(0);
+ //compute maximums norm of 3x3 matrix
+ for (auto i = uint_t(0); i < uint_t(3*3); ++i)
+ norm = std::max(norm, std::fabs(uGradient[i]));
+
+ if( norm > lowerLimit_ )
+ {
+ coarsen = false;
+ if( norm > upperLimit_ )
+ refine = true;
+ }
+
+ )
+
+ if( refine && currentLevelOfBlock < maxLevel_ )
+ {
+ WALBERLA_ASSERT( !coarsen );
+ it->second = currentLevelOfBlock + uint_t(1);
+ }
+ if( coarsen && currentLevelOfBlock > uint_t(0) )
+ {
+ WALBERLA_ASSERT( !refine );
+ it->second = currentLevelOfBlock - uint_t(1);
+ }
+ }
+}
+
+
+// Load estimators for spheres and ellipsoids, obtained at SuperMUC Phase 2
+// See Sec. 3 in the paper for more infos
+
+/////////////
+// Spheres //
+/////////////
+real_t fittedLBMWeightEvaluationFunctionSpheres(const pe_coupling::BlockInfo& blockInfo)
+{
+ uint_t Ce = blockInfo.numberOfCells;
+ uint_t F = blockInfo.numberOfFluidCells;
+
+ // from fits with optimized D3Q19 LBM kernel (no forces)
+ real_t weight = real_t(9.990957667738165e-06) * real_c(Ce) + real_t(0.00015749920523711047) * real_c(F) + real_t(-0.08232498905584973);
+ return weight;
+}
+
+real_t fittedBHWeightEvaluationFunctionSpheres(const pe_coupling::BlockInfo& blockInfo)
+{
+ uint_t Ce = blockInfo.numberOfCells;
+ uint_t NB = blockInfo.numberOfNearBoundaryCells;
+
+ // from fits with optimized D3Q19 LBM kernel (no forces)
+ real_t weight = real_t(6.654810986939097e-06) * real_c(Ce) + real_t(0.0007061414693533274) * real_c(NB) + real_t(-0.1094292992294259);
+ return weight;
+}
+
+real_t fittedCoupling1WeightEvaluationFunctionSpheres(const pe_coupling::BlockInfo& blockInfo)
+{
+ uint_t Ce = blockInfo.numberOfCells;
+ uint_t F = blockInfo.numberOfFluidCells;
+ uint_t Pl = blockInfo.numberOfLocalBodies;
+ uint_t Ps = blockInfo.numberOfShadowBodies;
+
+ // from fits with optimized D3Q19 LBM kernel (no forces)
+ real_t weight = real_t(3.07542641675429e-06) * real_c(Ce) + real_t(2.419364600880769e-07) * real_c(F) + real_t(0.01413718259604757) * real_c(Pl) + real_t(0.027761707343462727) * real_c(Ps) + real_t(-0.13991481483939272);
+ return weight;
+}
+
+real_t fittedCoupling2WeightEvaluationFunctionSpheres(const pe_coupling::BlockInfo& blockInfo)
+{
+ uint_t Ce = blockInfo.numberOfCells;
+ uint_t F = blockInfo.numberOfFluidCells;
+ uint_t Pl = blockInfo.numberOfLocalBodies;
+ uint_t Ps = blockInfo.numberOfShadowBodies;
+
+ // from fits with optimized D3Q19 LBM kernel (no forces)
+ real_t weight = real_t(5.988401232749505e-06) * real_c(Ce) + real_t(3.903532223977357e-06) * real_c(F) + real_t(-0.008802674250816316) * real_c(Pl) + real_t(0.02505020738346139) * real_c(Ps) + real_t(-0.12970723676003335);
+ return weight;
+}
+
+real_t fittedPEWeightEvaluationFunctionSpheres(const pe_coupling::BlockInfo& blockInfo)
+{
+ uint_t Pl = blockInfo.numberOfLocalBodies;
+ uint_t Ps = blockInfo.numberOfShadowBodies;
+ uint_t Ct = blockInfo.numberOfContacts;
+ uint_t Sc = blockInfo.numberOfPeSubCycles;
+
+ // from fits with optimized D3Q19 LBM kernel (no forces)
+ real_t cPlPs2 = real_t(1.1562854544700417e-06);
+ real_t cPl = real_t(0.0009620525068318354);
+ real_t cPs = real_t(0.00027549401081063894);
+ real_t cCt = real_t(0.0014801932788115464);
+ real_t c = real_t(0.01883682418448259);
+ real_t weight = real_c(Sc) * ( cPlPs2 * real_c(Pl+Ps) * real_c(Pl+Ps) + cPl * real_c(Pl) + cPs * real_c(Ps) + cCt * real_c(Ct) + c );
+ return weight;
+}
+
+real_t fittedTotalWeightEvaluationFunctionSpheres(const pe_coupling::BlockInfo& blockInfo)
+{
+ return fittedLBMWeightEvaluationFunctionSpheres(blockInfo) + fittedBHWeightEvaluationFunctionSpheres(blockInfo) +
+ fittedCoupling1WeightEvaluationFunctionSpheres(blockInfo) + fittedCoupling2WeightEvaluationFunctionSpheres(blockInfo) +
+ fittedPEWeightEvaluationFunctionSpheres(blockInfo);
+}
+
+////////////////
+// Ellipsoids //
+////////////////
+real_t fittedLBMWeightEvaluationFunctionEllipsoids(const pe_coupling::BlockInfo& blockInfo)
+{
+ uint_t Ce = blockInfo.numberOfCells;
+ uint_t F = blockInfo.numberOfFluidCells;
+ uint_t NB = blockInfo.numberOfNearBoundaryCells;
+
+ // from fits with optimized D3Q19 LBM kernel (no forces)
+ real_t cCe = real_t(4.69973868717e-05);
+ real_t cF = real_t(0.000110568537442);
+ real_t weight = cCe * real_c(Ce) + cF * real_c(F);
+ if( NB > uint_t(0) ) weight += real_t(5.96551488486e-05) * real_c(Ce) + real_t(-5.75351782026e-05) * real_c(F) + real_t(0.000695800745231) * real_c(NB);
+ return weight;
+}
+
+real_t fittedCouplingWeightEvaluationFunctionEllipsoids(const pe_coupling::BlockInfo& blockInfo)
+{
+ uint_t Ce = blockInfo.numberOfCells;
+ uint_t F = blockInfo.numberOfFluidCells;
+ uint_t Pl = blockInfo.numberOfLocalBodies;
+ uint_t Ps = blockInfo.numberOfShadowBodies;
+
+ // from fits with optimized D3Q19 LBM kernel (no forces)
+ real_t cCe = real_t(0.000176674935526);
+ real_t cF = real_t(-0.000170513513027);
+ real_t cPl = real_t(0.0252031634776);
+ real_t cPs = real_t(0.0356835220918);
+ real_t weight = real_t(0);
+ if( (Pl + Ps ) > uint_t(0) ) weight = cCe * real_c(Ce) + cF * real_c(F) + cPl * real_c(Pl) + cPs * real_c(Ps);
+ return weight;
+}
+
+real_t fittedPEWeightEvaluationFunctionEllipsoids(const pe_coupling::BlockInfo& blockInfo)
+{
+ uint_t Pl = blockInfo.numberOfLocalBodies;
+ uint_t Ps = blockInfo.numberOfShadowBodies;
+ uint_t Ct = blockInfo.numberOfContacts;
+ uint_t Sc = blockInfo.numberOfPeSubCycles;
+
+ // from fits with optimized D3Q19 LBM kernel (no forces)
+ real_t cPlPs2 = real_t(8.24153555785e-06);
+ real_t cPl = real_t(0.00135966650494);
+ real_t cPs = real_t(0.00440464092538);
+ real_t cCt = real_t(0.0216278259881);
+ real_t weight = real_c(Sc) * ( cPlPs2 * real_c(Pl+Ps) * real_c(Pl+Ps) + cPl * real_c(Pl) + cPs * real_c(Ps) + cCt * real_c(Ct) );
+ return weight;
+}
+
+real_t fittedTotalWeightEvaluationFunctionEllipsoids(const pe_coupling::BlockInfo& blockInfo)
+{
+ return fittedLBMWeightEvaluationFunctionEllipsoids(blockInfo) +
+ fittedCouplingWeightEvaluationFunctionEllipsoids(blockInfo) +
+ fittedPEWeightEvaluationFunctionEllipsoids(blockInfo);
+}
+
+
+struct TimingPoolLogger
+{
+ TimingPoolLogger( WcTimingPool & timingPool, const SweepTimeloop & timeloop, const uint_t interval )
+ : timingPool_( timingPool ), timeloop_( timeloop ), interval_( interval )
+ {
+ }
+
+ void operator()()
+ {
+ if( interval_ > uint_t(0) && timeloop_.getCurrentTimeStep() % interval_ == uint_t(0) )
+ {
+ timingPool_.logResultOnRoot();
+ }
+ }
+
+private:
+ WcTimingPool & timingPool_;
+ const SweepTimeloop & timeloop_;
+ uint_t interval_;
+};
+
+struct TimingTreeLogger
+{
+ TimingTreeLogger( WcTimingTree & timingTree, const SweepTimeloop & timeloop, const uint_t interval )
+ : timingTree_( timingTree ), timeloop_( timeloop ), interval_( interval )
+ {
+ }
+
+ void operator()()
+ {
+ if( interval_ > uint_t(0) && timeloop_.getCurrentTimeStep() % interval_ == uint_t(0) )
+ {
+ timingTree_.synchronize();
+ auto reducedTimingTree = timingTree_.getReduced();
+ WALBERLA_LOG_INFO_ON_ROOT( reducedTimingTree );
+ }
+ }
+
+private:
+ WcTimingTree & timingTree_;
+ const SweepTimeloop & timeloop_;
+ uint_t interval_;
+};
+
+/////////////////////
+// BLOCK STRUCTURE //
+/////////////////////
+
+static void refinementSelection( SetupBlockForest& forest, uint_t levels, const AABB & refinementBox )
+{
+ auto dx = real_t(1); // dx on finest level
+ for (auto &block : forest) {
+ uint_t blockLevel = block.getLevel();
+ uint_t levelScalingFactor = ( uint_t(1) << (levels - uint_t(1) - blockLevel) );
+ real_t dxOnLevel = dx * real_c(levelScalingFactor);
+ AABB blockAABB = block.getAABB();
+
+ // extend block AABB by ghostlayers
+ AABB extendedBlockAABB = blockAABB.getExtended( dxOnLevel * real_c(FieldGhostLayers) );
+
+ if( extendedBlockAABB.intersects( refinementBox ) )
+ if( blockLevel < ( levels - uint_t(1) ) )
+ block.setMarker( true );
+ }
+}
+
+static void workloadAndMemoryAssignment( SetupBlockForest& forest )
+{
+ for (auto &block : forest) {
+ block.setWorkload( numeric_cast< workload_t >( uint_t(1) << block.getLevel() ) );
+ block.setMemory( numeric_cast< memory_t >(1) );
+ }
+}
+
+static shared_ptr< StructuredBlockForest > createBlockStructure( const AABB & domainAABB, Vector3<uint_t> blockSizeInCells,
+ uint_t numberOfLevels, const AABB & refinementBox,
+ bool useBox, const std::string & loadDistributionStrategy,
+ bool keepGlobalBlockInformation = false )
+{
+ SetupBlockForest sforest;
+
+ Vector3<uint_t> numberOfFineBlocksPerDirection( uint_c(domainAABB.size(0)) / blockSizeInCells[0],
+ uint_c(domainAABB.size(1)) / blockSizeInCells[1],
+ uint_c(domainAABB.size(2)) / blockSizeInCells[2] );
+
+ for(uint_t i = 0; i < 3; ++i )
+ {
+ WALBERLA_CHECK_EQUAL( numberOfFineBlocksPerDirection[i] * blockSizeInCells[i], uint_c(domainAABB.size(i)),
+ "Domain can not be decomposed in direction " << i << " into fine blocks of size " << blockSizeInCells[i] );
+ }
+
+ uint_t levelScalingFactor = ( uint_t(1) << ( numberOfLevels - uint_t(1) ) );
+ Vector3<uint_t> numberOfCoarseBlocksPerDirection( numberOfFineBlocksPerDirection / levelScalingFactor );
+
+ for(uint_t i = 0; i < 3; ++i )
+ {
+ WALBERLA_CHECK_EQUAL(numberOfCoarseBlocksPerDirection[i] * levelScalingFactor, numberOfFineBlocksPerDirection[i],
+ "Domain can not be refined in direction " << i << " according to the specified number of levels!" );
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT(" - refinement box: " << refinementBox);
+
+ MPIManager::instance()->useWorldComm();
+
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, numberOfLevels, refinementBox ) );
+ sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
+
+ Vector3<bool> periodicity( true, true, false);
+ if( useBox )
+ {
+ periodicity[0] = false;
+ periodicity[1] = false;
+ }
+ sforest.init( domainAABB,
+ numberOfCoarseBlocksPerDirection[0], numberOfCoarseBlocksPerDirection[1], numberOfCoarseBlocksPerDirection[2],
+ periodicity[0], periodicity[1], periodicity[2]);
+
+ // calculate process distribution
+ const memory_t memoryLimit = math::Limits< memory_t >::inf();
+
+ if( loadDistributionStrategy == "Hilbert" )
+ {
+ bool useHilbert = true;
+ sforest.balanceLoad( blockforest::StaticLevelwiseCurveBalance(useHilbert), uint_c( MPIManager::instance()->numProcesses() ), real_t(0), memoryLimit, true );
+ } else if ( loadDistributionStrategy == "Morton" )
+ {
+ bool useHilbert = false;
+ sforest.balanceLoad( blockforest::StaticLevelwiseCurveBalance(useHilbert), uint_c( MPIManager::instance()->numProcesses() ), real_t(0), memoryLimit, true );
+ } else if ( loadDistributionStrategy == "ParMetis" )
+ {
+ blockforest::StaticLevelwiseParMetis::Algorithm algorithm = blockforest::StaticLevelwiseParMetis::Algorithm::PARMETIS_PART_GEOM_KWAY;
+ blockforest::StaticLevelwiseParMetis staticParMetis(algorithm);
+ sforest.balanceLoad( staticParMetis, uint_c( MPIManager::instance()->numProcesses() ), real_t(0), memoryLimit, true );
+ } else if (loadDistributionStrategy == "Diffusive" )
+ {
+ // also use Hilbert curve here
+ bool useHilbert = true;
+ sforest.balanceLoad( blockforest::StaticLevelwiseCurveBalance(useHilbert), uint_c( MPIManager::instance()->numProcesses() ), real_t(0), memoryLimit, true );
+ } else
+ {
+ WALBERLA_ABORT("Load distribution strategy \"" << loadDistributionStrategy << "\t not implemented! - Aborting" );
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT( sforest );
+
+
+ // create StructuredBlockForest (encapsulates a newly created BlockForest)
+ shared_ptr< StructuredBlockForest > sbf =
+ make_shared< StructuredBlockForest >( make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), sforest, keepGlobalBlockInformation ),
+ blockSizeInCells[0], blockSizeInCells[1], blockSizeInCells[2]);
+ sbf->createCellBoundingBoxes();
+
+ return sbf;
+}
+
+/////////////////////////////////////
+// BOUNDARY HANDLING CUSTOMIZATION //
+/////////////////////////////////////
+class MyBoundaryHandling : public blockforest::AlwaysInitializeBlockDataHandling< BoundaryHandling_T >
+{
+public:
+ MyBoundaryHandling( const weak_ptr< StructuredBlockStorage > & blocks,
+ const BlockDataID & flagFieldID, const BlockDataID & pdfFieldID, const BlockDataID & bodyFieldID ) :
+ blocks_( blocks ), flagFieldID_( flagFieldID ), pdfFieldID_( pdfFieldID ), bodyFieldID_ ( bodyFieldID )
+ {}
+
+ BoundaryHandling_T * initialize( IBlock * const block ) override;
+
+private:
+
+ weak_ptr< StructuredBlockStorage > blocks_;
+
+ const BlockDataID flagFieldID_;
+ const BlockDataID pdfFieldID_;
+ const BlockDataID bodyFieldID_;
+
+
+}; // class MyBoundaryHandling
+
+BoundaryHandling_T * MyBoundaryHandling::initialize( IBlock * const block )
+{
+ WALBERLA_ASSERT_NOT_NULLPTR( block );
+
+ auto * flagField = block->getData< FlagField_T >( flagFieldID_ );
+ auto * pdfField = block->getData< PdfField_T > ( pdfFieldID_ );
+ auto * bodyField = block->getData< BodyField_T >( bodyFieldID_ );
+
+ const auto fluid = flagField->flagExists( Fluid_Flag ) ? flagField->getFlag( Fluid_Flag ) : flagField->registerFlag( Fluid_Flag );
+
+ auto blocksPtr = blocks_.lock();
+ WALBERLA_CHECK_NOT_NULLPTR( blocksPtr );
+
+ BoundaryHandling_T * handling = new BoundaryHandling_T( "moving obstacle boundary handling", flagField, fluid,
+ boost::tuples::make_tuple( NoSlip_T( "NoSlip", NoSlip_Flag, pdfField ),
+ MO_T( "MO", MO_Flag, pdfField, flagField, bodyField, fluid, *blocksPtr, *block ) ),
+ BoundaryHandling_T::Mode::ENTIRE_FIELD_TRAVERSAL);
+
+ handling->fillWithDomain( FieldGhostLayers );
+
+ return handling;
+}
+
+
+//*******************************************************************************************************************
+
+
+//*******************************************************************************************************************
+/*!\brief Evaluating the position and velocity of the sediments
+ *
+ */
+//*******************************************************************************************************************
+class PropertyLogger
+{
+public:
+ PropertyLogger( SweepTimeloop* timeloop, const shared_ptr< StructuredBlockStorage > & blocks,
+ const BlockDataID & bodyStorageID, const std::string & fileName, bool fileIO) :
+ timeloop_( timeloop ), blocks_( blocks ), bodyStorageID_( bodyStorageID ), fileName_( fileName ), fileIO_(fileIO),
+ meanPos_( real_t(0) ), meanVel_( real_t(0) ), maxVel_( real_t(0) )
+ {
+ if ( fileIO_ )
+ {
+ WALBERLA_ROOT_SECTION()
+ {
+ std::ofstream file;
+ file.open( fileName_.c_str() );
+ file << "#\t pos\t vel\t maxVel\n";
+ file.close();
+ }
+ }
+ }
+
+ void operator()()
+ {
+ const uint_t timestep (timeloop_->getCurrentTimeStep() );
+
+ auto numSediments = uint_t(0);
+ auto meanPos = real_t(0);
+ auto meanVel = real_t(0);
+ auto maxVel = real_t(0);
+
+ for( auto blockIt = blocks_->begin(); blockIt != blocks_->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ meanPos += bodyIt->getPosition()[2];
+ meanVel += bodyIt->getLinearVel()[2];
+ maxVel = std::max(maxVel, std::fabs(bodyIt->getLinearVel()[2]));
+ ++numSediments;
+ }
+ }
+
+ WALBERLA_MPI_SECTION()
+ {
+ mpi::allReduceInplace( numSediments, mpi::SUM );
+ mpi::allReduceInplace( meanPos, mpi::SUM );
+ mpi::allReduceInplace( meanVel, mpi::SUM );
+ mpi::allReduceInplace( maxVel, mpi::MAX );
+ }
+
+ meanPos /= real_c(numSediments);
+ meanVel /= real_c(numSediments);
+
+ meanPos_ = meanPos;
+ meanVel_ = meanVel;
+ maxVel_ = maxVel;
+
+ if( fileIO_ )
+ writeToFile( timestep );
+ }
+
+ real_t getMeanPosition() const
+ {
+ return meanPos_;
+ }
+
+ real_t getMaxVelocity() const
+ {
+ return maxVel_;
+ }
+
+ real_t getMeanVelocity() const
+ {
+ return meanVel_;
+ }
+
+
+private:
+ void writeToFile( uint_t timestep )
+ {
+ WALBERLA_ROOT_SECTION()
+ {
+ std::ofstream file;
+ file.open( fileName_.c_str(), std::ofstream::app );
+
+ file << timestep << "\t" << meanPos_ << "\t" << meanVel_ << "\t" << maxVel_ << "\n";
+ file.close();
+ }
+ }
+
+ SweepTimeloop* timeloop_;
+ shared_ptr< StructuredBlockStorage > blocks_;
+ const BlockDataID bodyStorageID_;
+ std::string fileName_;
+ bool fileIO_;
+
+ real_t meanPos_;
+ real_t meanVel_;
+ real_t maxVel_;
+};
+
+void clearBoundaryHandling( BlockForest & forest, const BlockDataID & boundaryHandlingID )
+{
+ for( auto blockIt = forest.begin(); blockIt != forest.end(); ++blockIt )
+ {
+ auto * boundaryHandling = blockIt->getData<BoundaryHandling_T>(boundaryHandlingID);
+ boundaryHandling->clear( FieldGhostLayers );
+ }
+}
+
+void clearBodyField( BlockForest & forest, const BlockDataID & bodyFieldID )
+{
+ for( auto blockIt = forest.begin(); blockIt != forest.end(); ++blockIt )
+ {
+ auto * bodyField = blockIt->getData<BodyField_T>(bodyFieldID);
+ bodyField->setWithGhostLayer( NULL );
+ }
+}
+
+void recreateBoundaryHandling( BlockForest & forest, const BlockDataID & boundaryHandlingID )
+{
+ for( auto blockIt = forest.begin(); blockIt != forest.end(); ++blockIt )
+ {
+ auto * boundaryHandling = blockIt->getData<BoundaryHandling_T>(boundaryHandlingID);
+ boundaryHandling->fillWithDomain( FieldGhostLayers );
+ }
+}
+
+
+class TimingEvaluator
+{
+public:
+ TimingEvaluator( WcTimingPool & levelwiseTimingPool, WcTimingTree & peTimingTree, uint_t numberOfLevels)
+ : levelwiseTimingPool_( levelwiseTimingPool ), peTimingTree_( peTimingTree ), numberOfLevels_( numberOfLevels )
+ {}
+
+ real_t getTimings(const std::vector<std::string> & timerNames, uint_t level )
+ {
+
+ auto timing = real_t(0);
+ for (const auto &timerName : timerNames)
+ {
+ std::string timerNameLvlWise = timerName;// +
+ // put level between timer string and possible suffix
+ auto suffixBegin = timerNameLvlWise.find_first_of('[');
+ if( suffixBegin != std::string::npos)
+ {
+ // suffix detected
+ auto suffixEnd = timerNameLvlWise.find_last_of(']');
+ if( suffixEnd != std::string::npos)
+ {
+ auto timerString = timerNameLvlWise.substr(0,suffixBegin);
+ auto suffixString = timerNameLvlWise.substr(suffixBegin,suffixEnd-suffixBegin+1);
+
+ timerNameLvlWise = timerString + "(" + std::to_string(level) + ") " + suffixString; // NOLINT
+
+ }
+ else
+ {
+ WALBERLA_ABORT("Invalid timer string");
+ }
+ }
+ else
+ {
+ timerNameLvlWise += " (" + std::to_string(level) + ")";;
+ }
+
+ if( levelwiseTimingPool_.timerExists(timerNameLvlWise))
+ timing += levelwiseTimingPool_[timerNameLvlWise].total();
+
+ if( level == numberOfLevels_- 1)
+ {
+ if( peTimingTree_.timerExists(timerName))
+ timing += peTimingTree_[timerName].total();
+ }
+ }
+
+ return timing;
+ }
+
+
+private:
+
+ WcTimingPool & levelwiseTimingPool_;
+ WcTimingTree & peTimingTree_;
+ uint_t numberOfLevels_;
+};
+
+
+real_t weightEvaluation(BlockForest & forest,
+ const shared_ptr<pe_coupling::InfoCollection>& couplingInfoCollection,
+ const shared_ptr<pe::InfoCollection> & peInfoCollection,
+ real_t peBlockBaseWeight,
+ const std::string & loadEvaluationStrategy,
+ uint_t level,
+ bool useEllipsoids )
+{
+ auto weight = real_t(0);
+ for( auto blockIt = forest.begin(); blockIt != forest.end(); ++blockIt )
+ {
+ if( forest.getLevel(*blockIt) != level) continue;
+
+
+ auto * block = static_cast<blockforest::Block*> (&(*blockIt));
+ const auto &blockID = block->getId();
+
+ if(loadEvaluationStrategy == "LBM")
+ {
+ auto infoIt = couplingInfoCollection->find( blockID );
+ weight += pe_coupling::amr::defaultWeightEvaluationFunction(infoIt->second);
+
+ }else if(loadEvaluationStrategy == "PE")
+ {
+ auto infoIt = peInfoCollection->find( blockID );
+ weight += real_c(infoIt->second.numberOfLocalBodies) + peBlockBaseWeight;
+ }else if(loadEvaluationStrategy == "Fit" || loadEvaluationStrategy == "FitMulti")
+ {
+ auto infoIt = couplingInfoCollection->find( blockID );
+ if( useEllipsoids )
+ {
+ weight += fittedTotalWeightEvaluationFunctionEllipsoids(infoIt->second);
+ }
+ else
+ {
+ weight += fittedTotalWeightEvaluationFunctionSpheres(infoIt->second);
+ }
+ }else
+ {
+ WALBERLA_ABORT("Load balancing strategy not defined");
+ }
+ }
+ return weight;
+}
+
+
+uint_t evaluateEdgeCut(BlockForest & forest)
+{
+
+ //note: only works for edges in uniform grids
+
+ auto edgecut = uint_t(0); // = edge weights between processes
+
+ for( auto blockIt = forest.begin(); blockIt != forest.end(); ++blockIt )
+ {
+ auto * block = static_cast<blockforest::Block*> (&(*blockIt));
+
+ real_t blockVolume = block->getAABB().volume();
+ real_t approximateEdgeLength = std::cbrt( blockVolume );
+
+ uint_t faceNeighborWeight = uint_c(approximateEdgeLength * approximateEdgeLength ); //common face
+ uint_t edgeNeighborWeight = uint_c(approximateEdgeLength); //common edge
+ uint_t cornerNeighborWeight = uint_c( 1 ); //common corner
+
+
+ for( const uint_t idx : blockforest::getFaceNeighborhoodSectionIndices() )
+ {
+ for (auto nb = uint_t(0); nb < block->getNeighborhoodSectionSize(idx); ++nb)
+ {
+ if( block->neighborExistsRemotely(idx,nb) ) edgecut += faceNeighborWeight;
+ }
+ }
+
+ for( const uint_t idx : blockforest::getEdgeNeighborhoodSectionIndices() )
+ {
+ for (auto nb = uint_t(0); nb < block->getNeighborhoodSectionSize(idx); ++nb)
+ {
+ if( block->neighborExistsRemotely(idx,nb) ) edgecut += edgeNeighborWeight;
+ }
+ }
+
+ for( const uint_t idx : blockforest::getCornerNeighborhoodSectionIndices() )
+ {
+ for (auto nb = uint_t(0); nb < block->getNeighborhoodSectionSize(idx); ++nb)
+ {
+ if( block->neighborExistsRemotely(idx,nb) ) edgecut += cornerNeighborWeight;
+ }
+ }
+ }
+ return edgecut;
+}
+
+
+void evaluateTotalSimulationTimePassed(WcTimingPool & timeloopTimingPool, real_t & totalSimTime, real_t & totalLBTime)
+{
+ shared_ptr< WcTimingPool> reduced = timeloopTimingPool.getReduced(WcTimingPool::REDUCE_TOTAL, 0);
+
+ std::string simulationString("LBM refinement time step");
+ auto totalTime = real_t(0);
+ WALBERLA_ROOT_SECTION(){
+ totalTime = (*reduced)[simulationString].total();
+ }
+ totalSimTime = totalTime;
+
+ std::string lbString("refinement checking");
+ auto lbTime = real_t(0);
+ WALBERLA_ROOT_SECTION(){
+ lbTime = (*reduced)[lbString].total();
+ }
+ totalLBTime = lbTime;
+
+}
+
+void createSedimentLayer(uint_t numberOfSediments, const AABB & generationDomain, real_t diameter, real_t heightBorder,
+ pe::MaterialID peMaterial,
+ pe::cr::HCSITS & cr, const std::function<void(void)> & syncCall,
+ const shared_ptr< StructuredBlockForest > & blocks,
+ const shared_ptr<pe::BodyStorage> & globalBodyStorage, BlockDataID bodyStorageID,
+ real_t gravitationalAcceleration, bool useEllipsoids, bool shortRun)
+{
+ WALBERLA_LOG_INFO_ON_ROOT("Starting creation of sediments");
+
+ auto xParticle = real_t(0);
+ auto yParticle = real_t(0);
+ auto zParticle = real_t(0);
+
+ for( uint_t nSed = 0; nSed < numberOfSediments; ++nSed )
+ {
+
+ WALBERLA_ROOT_SECTION()
+ {
+ xParticle = math::realRandom<real_t>(generationDomain.xMin(), generationDomain.xMax());
+ yParticle = math::realRandom<real_t>(generationDomain.yMin(), generationDomain.yMax());
+ zParticle = math::realRandom<real_t>(generationDomain.zMin(), generationDomain.zMax());
+ }
+
+ WALBERLA_MPI_SECTION()
+ {
+ mpi::broadcastObject( xParticle );
+ mpi::broadcastObject( yParticle );
+ mpi::broadcastObject( zParticle );
+ }
+
+ if( useEllipsoids )
+ {
+ // prolate ellipsoids
+ auto axisFactor = real_t(1.5);
+ real_t axisFactor2 = std::sqrt(real_t(1)/axisFactor);
+ real_t radius = diameter * real_t(0.5);
+ pe::createEllipsoid( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( xParticle, yParticle, zParticle ), Vector3<real_t>(axisFactor*radius, axisFactor2*radius, axisFactor2*radius), peMaterial );
+ }
+ else
+ {
+ pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( xParticle, yParticle, zParticle ), diameter * real_t(0.5), peMaterial );
+ }
+
+ }
+
+ syncCall();
+
+ // carry out 100 simulations to resolve all overlaps
+ for (auto pet = uint_t(1); pet <= uint_t(100); ++pet)
+ {
+ cr.timestep( real_t(1) );
+ syncCall();
+
+ // reset all velocities to zero
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->setLinearVel(Vector3<real_t>(real_t(0)));
+ bodyIt->setAngularVel(Vector3<real_t>(real_t(0)));
+ }
+ }
+ }
+
+
+ const auto maxInitialPeSteps = (shortRun) ? uint_t(10) : uint_t(200000);
+ const auto dt_PE_init = real_t(1);
+
+ real_t gravityGeneration = real_t(0.1) * gravitationalAcceleration;
+ cr.setGlobalLinearAcceleration(Vector3<real_t>(real_t(0), real_t(0), gravityGeneration));
+
+ auto oldMinBodyPosition = real_t(0);
+ real_t convergenceLimit = std::fabs(gravityGeneration);
+ for (auto pet = uint_t(1); pet <= maxInitialPeSteps; ++pet)
+ {
+ cr.timestep( dt_PE_init );
+ syncCall();
+
+ real_t minBodyPosition = generationDomain.zMax();
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ minBodyPosition = std::min(bodyIt->getPosition()[2], minBodyPosition);
+ }
+ }
+
+ WALBERLA_MPI_SECTION()
+ {
+ mpi::allReduceInplace(minBodyPosition, mpi::MIN);
+ }
+
+ if( minBodyPosition > heightBorder ) break;
+
+ if( pet % 500 == 0)
+ {
+ if( std::fabs(minBodyPosition - oldMinBodyPosition) / minBodyPosition < convergenceLimit ) break;
+ oldMinBodyPosition = minBodyPosition;
+ }
+
+ WALBERLA_ROOT_SECTION()
+ {
+ if( pet % 100 == 0)
+ {
+ WALBERLA_LOG_INFO("[" << pet << "] Min position of all bodies = " << minBodyPosition << " with goal height " << heightBorder);
+ }
+ }
+
+ }
+
+ // revert gravitational acceleration to 'real' direction
+ cr.setGlobalLinearAcceleration(Vector3<real_t>(real_t(0), real_t(0), -gravityGeneration));
+
+ // carry out a few time steps to relax the system towards the real condition
+ const auto relaxationTimeSteps = uint_t(std::sqrt(real_t(2)/std::fabs(gravitationalAcceleration)));
+ WALBERLA_LOG_INFO_ON_ROOT("Carrying out " << relaxationTimeSteps << " more time steps with correct gravity");
+ for (auto pet = uint_t(1); pet <= relaxationTimeSteps; ++pet)
+ {
+ cr.timestep(dt_PE_init);
+ syncCall();
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT("Sediment layer creation done!");
+
+ // reset all velocities to zero
+ Vector3<real_t> initialBodyVelocity(real_t(0));
+ WALBERLA_LOG_INFO_ON_ROOT("Setting initial velocity " << initialBodyVelocity << " of all bodies");
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->setLinearVel(initialBodyVelocity);
+ bodyIt->setAngularVel(Vector3<real_t>(real_t(0)));
+ }
+ }
+
+ cr.setGlobalLinearAcceleration(Vector3<real_t>(real_t(0)));
+}
+
+
+//*******************************************************************************************************************
+/*!\brief Simulation of settling particles inside a rectangular column filled with viscous fluid
+ *
+ * This application is used in the paper
+ * Rettinger, Ruede - "Dynamic Load Balancing Techniques for Particulate Flow Simulations", submitted to Computation
+ * in Section 4 to apply the load estimator and to evaluate different load distribution strategies.
+ *
+ * It, however, features several different command line arguments that can be used to tweak the simulation.
+ * The setup can be horizontally period, a box or a hopper geometry (configurable, as in the paper).
+ * The size, resolution and used blocks for the domain partitioning can be changed.
+ * It even features adaptive mesh refinement, with different refinement criteria:
+ * - particle based (always on, also for global bodies like bounding planes)
+ * - optionally: vorticity- or gradient-based (with lower and upper limits)
+ * Since the paper, however, uses a uniform grid, many evaluation functionalities might not work properly for this case.
+ * Initially, all particles are pushed upwards to obtain a dense packing at the top plane.
+ *
+ * Most importantly, the load balancing can be modified:
+ * - load estimation strategies:
+ * - pure LBM = number of cells per block = constant workload per block
+ * - pure PE = number of local particles + baseweight
+ * - coupling based load estimator = use fitted function from Sec. 3 of paper
+ * - load distribution strategies:
+ * - space-filling curves: Hilbert and Morton
+ * - ParMETIS (and several algorithms and parameters, also multiple constraints possible)
+ * - diffusive (and options)
+ * - load balancing (/refinement check ) frequency
+ */
+//*******************************************************************************************************************
+int main( int argc, char **argv )
+{
+ debug::enterTestMode();
+
+ mpi::Environment env( argc, argv );
+
+ ///////////////////
+ // Customization //
+ ///////////////////
+
+ // simulation control
+ bool shortRun = false;
+ bool funcTest = false;
+ bool fileIO = true;
+ bool logging = false; // logging of physical components
+ uint_t vtkWriteFreqDD = 0; //domain decomposition
+ uint_t vtkWriteFreqBo = 0; //bodies
+ uint_t vtkWriteFreqFl = 0; //fluid
+ uint_t vtkWriteFreq = 0; //general
+ std::string baseFolder = "vtk_out_AMRSedimentSettling"; // folder for vtk and file output
+
+ // physical setup
+ auto GalileoNumber = real_t(50);
+ auto densityRatio = real_t(1.5);
+ auto diameter = real_t(15);
+ auto solidVolumeFraction = real_t(0.1);
+ auto blockSize = uint_t(32);
+ auto XBlocks = uint_t(12);
+ auto YBlocks = uint_t(12);
+ auto ZBlocks = uint_t(16);
+ bool useBox = false;
+ bool useHopper = false;
+ bool useEllipsoids = false;
+ auto hopperRelHeight = real_t(0.5); // for hopper setup
+ auto hopperRelOpening = real_t(0.3); // for hopper setup
+
+ auto timestepsOnFinestLevel = uint_t(80000);
+
+ //numerical parameters
+ bool averageForceTorqueOverTwoTimSteps = true;
+ auto numberOfLevels = uint_t(1);
+ auto refinementCheckFrequency = uint_t(100);
+ auto numPeSubCycles = uint_t(10);
+
+ // refinement criteria
+ auto lowerFluidRefinementLimit = real_t(0);
+ auto upperFluidRefinementLimit = std::numeric_limits<real_t>::infinity();
+ bool useVorticityCriterion = false;
+ bool useGradientCriterion = false;
+
+ // load balancing
+ std::string loadEvaluationStrategy = "LBM"; //LBM, PE, Fit
+ std::string loadDistributionStrategy = "Hilbert"; //Morton, Hilbert, ParMetis, Diffusive
+
+ auto parMetis_ipc2redist = real_t(1000);
+ auto parMetisTolerance = real_t(-1);
+ std::string parMetisAlgorithmString = "ADAPTIVE_REPART";
+
+ auto diffusionFlowIterations = uint_t(15);
+ auto diffusionMaxIterations = uint_t(20);
+
+
+ for( int i = 1; i < argc; ++i )
+ {
+ if( std::strcmp( argv[i], "--shortRun" ) == 0 ) { shortRun = true; continue; }
+ if( std::strcmp( argv[i], "--funcTest" ) == 0 ) { funcTest = true; continue; }
+ if( std::strcmp( argv[i], "--fileIO" ) == 0 ) { fileIO = true; continue; }
+ if( std::strcmp( argv[i], "--logging" ) == 0 ) { logging = true; continue; }
+ if( std::strcmp( argv[i], "--vtkWriteFreqDD" ) == 0 ) { vtkWriteFreqDD = uint_c( std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--vtkWriteFreqBo" ) == 0 ) { vtkWriteFreqBo = uint_c( std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--vtkWriteFreqFl" ) == 0 ) { vtkWriteFreqFl = uint_c( std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--vtkWriteFreq" ) == 0 ) { vtkWriteFreq = uint_c( std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--baseFolder" ) == 0 ) { baseFolder = argv[++i]; continue; }
+ if( std::strcmp( argv[i], "--densityRatio" ) == 0 ) { densityRatio = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--Ga" ) == 0 ) { GalileoNumber = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--diameter" ) == 0 ) { diameter = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--blockSize" ) == 0 ) { blockSize = uint_c(std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--XBlocks" ) == 0 ) { XBlocks = uint_c(std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--YBlocks" ) == 0 ) { YBlocks = uint_c(std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--ZBlocks" ) == 0 ) { ZBlocks = uint_c(std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--useBox" ) == 0 ) { useBox = true; continue; }
+ if( std::strcmp( argv[i], "--useHopper" ) == 0 ) { useHopper = true; continue; }
+ if( std::strcmp( argv[i], "--hopperHeight" ) == 0 ) { hopperRelHeight = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--hopperOpening" ) == 0 ) { hopperRelOpening = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--timesteps" ) == 0 ) { timestepsOnFinestLevel = uint_c(std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--noForceAveraging" ) == 0 ) { averageForceTorqueOverTwoTimSteps = false; continue; }
+ if( std::strcmp( argv[i], "--numPeSubCycles" ) == 0 ) { numPeSubCycles = uint_c(std::atof( argv[++i] )); continue; }
+ if( std::strcmp( argv[i], "--numLevels" ) == 0 ) { numberOfLevels = uint_c( std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--refinementCheckFrequency" ) == 0 ) { refinementCheckFrequency = uint_c( std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--lowerLimit" ) == 0 ) { lowerFluidRefinementLimit = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--upperLimit" ) == 0 ) { upperFluidRefinementLimit = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--useVorticityCriterion" ) == 0 ) { useVorticityCriterion = true; continue; }
+ if( std::strcmp( argv[i], "--useGradientCriterion" ) == 0 ) { useGradientCriterion = true; continue; }
+ if( std::strcmp( argv[i], "--loadEvaluationStrategy" ) == 0 ) { loadEvaluationStrategy = argv[++i]; continue; }
+ if( std::strcmp( argv[i], "--loadDistributionStrategy" ) == 0 ) { loadDistributionStrategy = argv[++i]; continue; }
+ if( std::strcmp( argv[i], "--ipc2redist" ) == 0 ) { parMetis_ipc2redist = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--parMetisTolerance" ) == 0 ) { parMetisTolerance = std::atof( argv[++i] ); continue; }
+ if( std::strcmp( argv[i], "--parMetisAlgorithm" ) == 0 ) { parMetisAlgorithmString = argv[++i]; continue; }
+ if( std::strcmp( argv[i], "--diffusionFlowIterations" ) == 0 ) { diffusionFlowIterations = uint_c(std::atof(argv[++i])); continue; }
+ if( std::strcmp( argv[i], "--diffusionMaxIterations" ) == 0 ) { diffusionMaxIterations = uint_c(std::atof(argv[++i])); continue; }
+ if( std::strcmp( argv[i], "--useEllipsoids" ) == 0 ) { useEllipsoids = true; continue; }
+ WALBERLA_ABORT("Unrecognized command line argument found: " << argv[i]);
+ }
+
+ if( funcTest )
+ {
+ walberla::logging::Logging::instance()->setLogLevel(logging::Logging::LogLevel::WARNING);
+ }
+
+ if( fileIO || logging )
+ {
+ WALBERLA_ROOT_SECTION(){
+ // create base directory if it does not yet exist
+ filesystem::path tpath( baseFolder );
+ if( !filesystem::exists( tpath ) )
+ filesystem::create_directory( tpath );
+ }
+ }
+
+ if( useVorticityCriterion && useGradientCriterion )
+ {
+ WALBERLA_ABORT("Use either vorticity or gradient criterion for refinement!");
+ }
+
+ if( loadEvaluationStrategy != "LBM" && loadEvaluationStrategy != "PE" && loadEvaluationStrategy != "Fit" && loadEvaluationStrategy != "FitMulti")
+ {
+ WALBERLA_ABORT("Invalid load evaluation strategy: " << loadEvaluationStrategy);
+ }
+
+ if( vtkWriteFreq != 0 )
+ {
+ vtkWriteFreqDD = vtkWriteFreq;
+ vtkWriteFreqBo = vtkWriteFreq;
+ vtkWriteFreqFl = vtkWriteFreq;
+ }
+
+ if( diameter > real_c(blockSize) )
+ {
+ WALBERLA_LOG_WARNING("PE Body Synchronization might not work since bodies are large compared to block size!");
+ }
+
+ if( useHopper )
+ {
+ WALBERLA_CHECK(hopperRelHeight >= real_t(0) && hopperRelHeight <= real_t(1), "Invalid relative hopper height of " << hopperRelHeight);
+ WALBERLA_CHECK(hopperRelOpening >= real_t(0) && hopperRelOpening <= real_t(1), "Invalid relative hopper opening of " << hopperRelOpening);
+ }
+
+
+ //////////////////////////
+ // NUMERICAL PARAMETERS //
+ //////////////////////////
+
+ const Vector3<uint_t> domainSize( XBlocks * blockSize, YBlocks * blockSize, ZBlocks * blockSize );
+ const auto domainVolume = real_t(domainSize[0] * domainSize[1] * domainSize[2]);
+ const real_t sphereVolume = math::M_PI / real_t(6) * diameter * diameter * diameter;
+ const uint_t numberOfSediments = uint_c(std::ceil(solidVolumeFraction * domainVolume / sphereVolume));
+
+ real_t expectedSedimentVolumeFraction = (useBox||useHopper) ? real_t(0.45) : real_t(0.52);
+ const real_t expectedSedimentedVolume = real_t(1)/expectedSedimentVolumeFraction * real_c(numberOfSediments) * sphereVolume;
+ const real_t expectedSedimentedHeight = std::max(diameter, expectedSedimentedVolume / real_c(domainSize[0] * domainSize[1]));
+
+ const auto uRef = real_t(0.02);
+ const real_t xRef = diameter;
+ const real_t tRef = xRef / uRef;
+
+ const real_t gravitationalAcceleration = uRef * uRef / ( (densityRatio-real_t(1)) * diameter );
+ const real_t viscosity = uRef * diameter / GalileoNumber;
+ const real_t omega = lbm::collision_model::omegaFromViscosity(viscosity);
+ const real_t tau = real_t(1) / omega;
+
+ const auto loggingDisplayFrequency = uint_t(100);
+
+ const auto dx = real_t(1);
+ const real_t overlap = real_t( 1.5 ) * dx;
+
+ if( useVorticityCriterion && floatIsEqual(lowerFluidRefinementLimit, real_t(0)) && std::isinf(upperFluidRefinementLimit) )
+ {
+ // use computed criterion instead of user input
+ lowerFluidRefinementLimit = real_t(0.05) * uRef;
+ upperFluidRefinementLimit = real_t(0.1) * uRef;
+ }
+
+ const uint_t finestLevel = numberOfLevels - uint_t(1);
+ std::stringstream omega_msg;
+ for( uint_t i = 0; i < numberOfLevels; ++i )
+ {
+ real_t omegaLvl = lbm::collision_model::levelDependentRelaxationParameter( i, omega, finestLevel );
+ omega_msg << omegaLvl << " ( on level " << i << ", tau = " << real_t(1)/omega << " ), ";
+ }
+
+ const uint_t levelScalingFactor = ( uint_t(1) << finestLevel );
+ const uint_t lbmTimeStepsPerTimeLoopIteration = levelScalingFactor;
+
+ const uint_t timesteps = funcTest ? 1 : ( shortRun ? uint_t(100) : uint_t( timestepsOnFinestLevel / lbmTimeStepsPerTimeLoopIteration ) );
+
+ WALBERLA_LOG_INFO_ON_ROOT("Setup (in simulation, i.e. lattice, units):");
+ WALBERLA_LOG_INFO_ON_ROOT(" - domain size = " << domainSize);
+ WALBERLA_LOG_INFO_ON_ROOT(" - sediment diameter = " << diameter );
+ WALBERLA_LOG_INFO_ON_ROOT(" - Galileo number = " << GalileoNumber );
+ WALBERLA_LOG_INFO_ON_ROOT(" - number of sediments: " << numberOfSediments);
+ WALBERLA_LOG_INFO_ON_ROOT(" - densityRatio = " << densityRatio );
+ WALBERLA_LOG_INFO_ON_ROOT(" - fluid: relaxation time (tau) = " << tau << ", kin. visc = " << viscosity );
+ WALBERLA_LOG_INFO_ON_ROOT(" - gravitational acceleration = " << gravitationalAcceleration );
+ WALBERLA_LOG_INFO_ON_ROOT(" - reference values: x = " << xRef << ", t = " << tRef << ", vel = " << uRef);
+ WALBERLA_LOG_INFO_ON_ROOT(" - omega: " << omega_msg.str());
+ WALBERLA_LOG_INFO_ON_ROOT(" - number of levels: " << numberOfLevels);
+ WALBERLA_LOG_INFO_ON_ROOT(" - number of pe sub cycles: " << numPeSubCycles);
+ if( useVorticityCriterion )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - using vorticity criterion with lower limit = " << lowerFluidRefinementLimit << " and upper limit = " << upperFluidRefinementLimit );
+ }
+ if( useGradientCriterion )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - using gradient criterion with lower limit = " << lowerFluidRefinementLimit << " and upper limit = " << upperFluidRefinementLimit );
+ }
+ if( vtkWriteFreqDD > 0 )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - writing vtk files of domain decomposition to folder \"" << baseFolder << "\" with frequency " << vtkWriteFreqDD);
+ }
+ if( vtkWriteFreqBo > 0 )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - writing vtk files of bodies data to folder \"" << baseFolder << "\" with frequency " << vtkWriteFreqBo);
+ }
+ if( vtkWriteFreqFl > 0 )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - writing vtk files of fluid data to folder \"" << baseFolder << "\" with frequency " << vtkWriteFreqFl);
+ }
+ if( useEllipsoids )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - using (prolate) ellipsoids as sediments");
+ }
+ if( useBox )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - using box setup");
+ }
+ else if ( useHopper )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - using hopper setup");
+ }
+ else
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - using horizontally periodic domain");
+ }
+
+
+
+ if( refinementCheckFrequency == 0 && numberOfLevels != 1 )
+ {
+ // determine check frequency automatically based on maximum admissible velocity and block sizes
+ auto uMax = real_t(0.1);
+ refinementCheckFrequency = uint_c(( overlap + real_c(blockSize) - real_t(2) * real_t(FieldGhostLayers) * dx) / uMax) / lbmTimeStepsPerTimeLoopIteration;
+ }
+ WALBERLA_LOG_INFO_ON_ROOT(" - refinement / load balancing check frequency (coarse time steps): " << refinementCheckFrequency);
+ WALBERLA_LOG_INFO_ON_ROOT(" - load evaluation strategy: " << loadEvaluationStrategy);
+ WALBERLA_LOG_INFO_ON_ROOT(" - load distribution strategy: " << loadDistributionStrategy);
+
+ ///////////////////////////
+ // BLOCK STRUCTURE SETUP //
+ ///////////////////////////
+
+ Vector3<uint_t> blockSizeInCells( blockSize );
+
+ AABB simulationDomain( real_t(0), real_t(0), real_t(0), real_c(domainSize[0]), real_c(domainSize[1]), real_c(domainSize[2]) );
+ AABB sedimentDomain( real_t(0), real_t(0), real_c(domainSize[2]) - expectedSedimentedHeight, real_c(domainSize[0]), real_c(domainSize[1]), real_c(domainSize[2]) );
+
+ AABB initialRefinementDomain = sedimentDomain;
+ if( useBox || useHopper )
+ {
+ // require finest levels also along bounding planes -> initially refine everywhere
+ initialRefinementDomain = simulationDomain;
+ }
+
+ auto blocks = createBlockStructure( simulationDomain, blockSizeInCells, numberOfLevels, initialRefinementDomain, (useBox||useHopper), loadDistributionStrategy );
+
+ //write initial domain decomposition to file
+ if( vtkWriteFreqDD > 0 )
+ {
+ vtk::writeDomainDecomposition( blocks, "initial_domain_decomposition", baseFolder );
+ }
+
+
+ /////////////////
+ // PE COUPLING //
+ /////////////////
+
+ // set up pe functionality
+ shared_ptr<pe::BodyStorage> globalBodyStorage = make_shared<pe::BodyStorage>();
+ pe::SetBodyTypeIDs<BodyTypeTuple>::execute();
+
+ auto bodyStorageID = blocks->addBlockData(pe::createStorageDataHandling<BodyTypeTuple>(), "pe Body Storage");
+ auto ccdID = blocks->addBlockData(pe::ccd::createHashGridsDataHandling( globalBodyStorage, bodyStorageID ), "CCD");
+ BlockDataID fcdID = (useEllipsoids) ? blocks->addBlockData( pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::GJKEPACollideFunctor>(), "FCD" )
+ : blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
+
+ WcTimingTree timingTreePE;
+
+ // set up collision response
+ pe::cr::HCSITS cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, &timingTreePE );
+ cr.setMaxIterations(10);
+ cr.setRelaxationModel( pe::cr::HardContactSemiImplicitTimesteppingSolvers::ApproximateInelasticCoulombContactByDecoupling );
+
+ // set up synchronization procedure
+ std::function<void(void)> syncCall = std::bind( pe::syncNextNeighbors<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, &timingTreePE, overlap, false );
+
+ // create pe bodies
+
+ // add the sediments
+ auto peMaterial = pe::createMaterial( "mat", densityRatio, real_t(1), real_t(0.25), real_t(0.25), real_t(0), real_t(200), real_t(100), real_t(100), real_t(100) );
+
+ // create two planes at bottom and top of domain for a horizontally periodic box
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,0,1), Vector3<real_t>(0,0,0), peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,0,-1), Vector3<real_t>(0,0,simulationDomain.zMax()), peMaterial );
+ if( useBox )
+ {
+ // add four more planes to obtain a closed box
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(1,0,0), Vector3<real_t>(0,0,0), peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(-1,0,0), Vector3<real_t>(simulationDomain.xMax(),0,0), peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,1,0), Vector3<real_t>(0,0,0), peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,-1,0), Vector3<real_t>(0,simulationDomain.yMax(),0), peMaterial );
+ }
+ else if ( useHopper )
+ {
+ // box bounding planes
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(1,0,0), Vector3<real_t>(0,0,0), peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(-1,0,0), Vector3<real_t>(simulationDomain.xMax(),0,0), peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,1,0), Vector3<real_t>(0,0,0), peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,-1,0), Vector3<real_t>(0,simulationDomain.yMax(),0), peMaterial );
+
+ //hopper planes
+ real_t xMax = simulationDomain.xMax();
+ real_t yMax = simulationDomain.yMax();
+ real_t zMax = simulationDomain.zMax();
+ Vector3<real_t> p1(0,0,hopperRelHeight*zMax);
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(p1[2],0,hopperRelOpening*xMax-p1[0]), p1, peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,p1[2],hopperRelOpening*yMax-p1[0]), p1, peMaterial );
+
+ Vector3<real_t> p2(xMax,yMax,hopperRelHeight*zMax);
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(-p2[2],0,-((real_t(1)-hopperRelOpening)*xMax-p2[0])), p2, peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,-p2[2],-((real_t(1)-hopperRelOpening)*yMax-p2[1])), p2, peMaterial );
+ }
+
+ AABB sedimentGenerationDomain( real_t(0), real_t(0), real_t(0.5)*real_c(domainSize[2]), real_c(domainSize[0]), real_c(domainSize[1]), real_c(domainSize[2]) );
+ createSedimentLayer(numberOfSediments, sedimentGenerationDomain, diameter, sedimentDomain.zMin(), peMaterial, cr, syncCall, blocks, globalBodyStorage, bodyStorageID, gravitationalAcceleration, useEllipsoids, shortRun );
+
+ // reset timer to not cover init stats
+ timingTreePE.reset();
+
+ // now we can use the information about the body positions to adapt the refinement
+
+ ///////////////////////////
+ // DYNAMIC REFINEMENT, 1 //
+ ///////////////////////////
+
+ auto & blockforest = blocks->getBlockForest();
+ blockforest.recalculateBlockLevelsInRefresh( true );
+ blockforest.alwaysRebalanceInRefresh( true ); //load balancing every time refresh is triggered
+ blockforest.reevaluateMinTargetLevelsAfterForcedRefinement( false );
+ blockforest.allowRefreshChangingDepth( false );
+ blockforest.allowMultipleRefreshCycles( false ); // otherwise info collections are invalid
+
+ {
+ blockforest::CombinedMinTargetLevelDeterminationFunctions initialMinTargetLevelDeterminationFunctions;
+
+ blockforest::AABBRefinementSelection aabbRefinementSelection;
+ aabbRefinementSelection.addAABB(sedimentDomain,finestLevel );
+ initialMinTargetLevelDeterminationFunctions.add( aabbRefinementSelection );
+
+ // refinement along global bodies (bounding planes) to have consistent mapping (required for CLI always, or SimpleBB with non-AABB planes)
+ real_t blockExtension = real_c(FieldGhostLayers);
+ pe_coupling::amr::GlobalBodyPresenceLevelDetermination globalBodyPresenceRefinement( globalBodyStorage, finestLevel, blockExtension, pe_coupling::selectGlobalBodies );
+ initialMinTargetLevelDeterminationFunctions.add(globalBodyPresenceRefinement);
+
+ blockforest.setRefreshMinTargetLevelDeterminationFunction( initialMinTargetLevelDeterminationFunctions );
+
+ for ( auto refreshCycle = uint_t(0); refreshCycle < finestLevel; ++refreshCycle)
+ {
+
+ WALBERLA_LOG_INFO_ON_ROOT("Refreshing blockforest...")
+
+ // check refinement criterions and refine/coarsen if necessary
+ uint_t stampBefore = blocks->getBlockForest().getModificationStamp();
+ blocks->refresh();
+ uint_t stampAfter = blocks->getBlockForest().getModificationStamp();
+
+ if( stampBefore == stampAfter )
+ {
+ break;
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT("Recreating data structures..");
+
+ // rebuild PE data structures
+ pe::clearSynchronization( blockforest, bodyStorageID);
+
+ syncCall();
+
+ for (auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt)
+ {
+ auto * ccd = blockIt->getData< pe::ccd::ICCD >( ccdID );
+ ccd->reloadBodies();
+ }
+ }
+ }
+
+ uint_t numberOfInitialFineBlocks = blockforest.getNumberOfBlocks(finestLevel);
+ mpi::allReduceInplace(numberOfInitialFineBlocks, mpi::SUM);
+ WALBERLA_LOG_INFO_ON_ROOT("Total number of initial fine blocks in simulation: " << numberOfInitialFineBlocks);
+
+ uint_t numberOfProcesses = uint_c(MPIManager::instance()->numProcesses());
+
+
+ ///////////////////////
+ // ADD DATA TO BLOCKS //
+ ////////////////////////
+
+ // create the lattice model
+ LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::TRT::constructWithMagicNumber( omega, lbm::collision_model::TRT::threeSixteenth, finestLevel ) );
+
+ // add PDF field
+ BlockDataID pdfFieldID = lbm::addPdfFieldToStorage< LatticeModel_T >( blocks, "pdf field (zyxf)", latticeModel,
+ Vector3< real_t >( real_t(0) ), real_t(1),
+ FieldGhostLayers, field::zyxf );
+ // add flag field
+ BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field", FieldGhostLayers );
+
+ // add body field
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf, FieldGhostLayers );
+
+ // add velocity field and utility
+ BlockDataID velocityFieldID = field::addToStorage<VelocityField_T>( blocks, "velocity field", Vector3<real_t>(real_t(0)), field::zyxf, uint_t(2) );
+
+ typedef lbm::VelocityFieldWriter< PdfField_T, VelocityField_T > VelocityFieldWriter_T;
+ BlockSweepWrapper< VelocityFieldWriter_T > velocityFieldWriter( blocks, VelocityFieldWriter_T( pdfFieldID, velocityFieldID ) );
+
+
+ shared_ptr<blockforest::communication::NonUniformBufferedScheme<stencil::D3Q27> > velocityCommunicationScheme = make_shared<blockforest::communication::NonUniformBufferedScheme<stencil::D3Q27> >( blocks );
+ velocityCommunicationScheme->addPackInfo( make_shared< field::refinement::PackInfo<VelocityField_T, stencil::D3Q27> >( velocityFieldID ) );
+
+ // add boundary handling & initialize outer domain boundaries
+ BlockDataID boundaryHandlingID = blocks->addBlockData( make_shared< MyBoundaryHandling >( blocks, flagFieldID, pdfFieldID, bodyFieldID ),
+ "boundary handling" );
+
+ // map planes into the LBM simulation -> act as no-slip boundaries
+ //pe_coupling::mapBodies< BoundaryHandling_T >( *blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectGlobalBodies );
+ pe_coupling::mapMovingBodies< BoundaryHandling_T >( *blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectGlobalBodies );
+
+ // map pe bodies into the LBM simulation
+ pe_coupling::mapMovingBodies< BoundaryHandling_T >( *blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectRegularBodies );
+
+
+ // force averaging functionality
+ shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer1 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
+ std::function<void(void)> storeForceTorqueInCont1 = std::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
+
+ shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer2 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
+ std::function<void(void)> setForceTorqueOnBodiesFromCont2 = std::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
+
+ shared_ptr<pe_coupling::ForceTorqueOnBodiesScaler> forceScaler = make_shared<pe_coupling::ForceTorqueOnBodiesScaler>(blocks, bodyStorageID, real_t(0.5));
+ std::function<void(void)> setForceScalingFactorToOne = std::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(1));
+ std::function<void(void)> setForceScalingFactorToHalf = std::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(0.5));
+
+ if( averageForceTorqueOverTwoTimSteps ) {
+ bodiesFTContainer2->store();
+
+ setForceScalingFactorToOne();
+ }
+
+ ///////////////////////////
+ // DYNAMIC REFINEMENT, 2 //
+ ///////////////////////////
+
+ blockforest::CombinedMinTargetLevelDeterminationFunctions minTargetLevelDeterminationFunctions;
+
+ // add refinement criterion based on particle presence
+ shared_ptr<pe_coupling::InfoCollection> couplingInfoCollection = walberla::make_shared<pe_coupling::InfoCollection>();
+ pe_coupling::amr::BodyPresenceLevelDetermination particlePresenceRefinement( couplingInfoCollection, finestLevel );
+
+ minTargetLevelDeterminationFunctions.add( particlePresenceRefinement );
+
+ // also add (possible) refinement criteria based on fluid quantities
+
+ if( useVorticityCriterion )
+ {
+ // add refinement criterion based on vorticity magnitude
+ field::FlagFieldEvaluationFilter<FlagField_T> flagFieldFilter( flagFieldID, Fluid_Flag );
+ lbm::refinement::VorticityBasedLevelDetermination< field::FlagFieldEvaluationFilter<FlagField_T> > vorticityRefinement(
+ velocityFieldID, flagFieldFilter, upperFluidRefinementLimit, lowerFluidRefinementLimit, finestLevel );
+
+ minTargetLevelDeterminationFunctions.add( vorticityRefinement );
+ }
+
+ if( useGradientCriterion )
+ {
+ // add refinement criterion based on velocity gradient magnitude
+ field::FlagFieldEvaluationFilter<FlagField_T> flagFieldFilter( flagFieldID, Fluid_Flag );
+ VectorGradientRefinement< LatticeModel_T, field::FlagFieldEvaluationFilter<FlagField_T> > gradientRefinement(
+ velocityFieldID, flagFieldFilter, upperFluidRefinementLimit, lowerFluidRefinementLimit, finestLevel );
+
+ minTargetLevelDeterminationFunctions.add( gradientRefinement );
+ }
+
+ // refinement along global bodies (bounding planes) to have consistent mapping (required for CLI always, or SimpleBB with non-AABB planes)
+ real_t blockExtension = real_c(FieldGhostLayers);
+ pe_coupling::amr::GlobalBodyPresenceLevelDetermination globalBodyPresenceRefinement( globalBodyStorage, finestLevel, blockExtension, pe_coupling::selectGlobalBodies );
+ minTargetLevelDeterminationFunctions.add(globalBodyPresenceRefinement);
+
+ blockforest.setRefreshMinTargetLevelDeterminationFunction( minTargetLevelDeterminationFunctions );
+
+ bool curveAllGather = true;
+ bool balanceLevelwise = true;
+
+ auto peBlockBaseWeight = real_t(1); //default value, might not be the best
+ shared_ptr<pe::InfoCollection> peInfoCollection = walberla::make_shared<pe::InfoCollection>();
+
+ if( loadDistributionStrategy == "Hilbert" || loadDistributionStrategy == "Morton")
+ {
+ if( loadDistributionStrategy == "Hilbert")
+ {
+ bool useHilbert = true;
+ blockforest.setRefreshPhantomBlockMigrationPreparationFunction( blockforest::DynamicCurveBalance< blockforest::PODPhantomWeight<real_t> >( useHilbert, curveAllGather, balanceLevelwise ) );
+ }
+ else if (loadDistributionStrategy == "Morton" )
+ {
+ bool useHilbert = false;
+ blockforest.setRefreshPhantomBlockMigrationPreparationFunction( blockforest::DynamicCurveBalance< blockforest::PODPhantomWeight<real_t> >( useHilbert, curveAllGather, balanceLevelwise ) );
+ }
+
+ blockforest.setRefreshPhantomBlockDataPackFunction(blockforest::PODPhantomWeightPackUnpack<real_t>());
+ blockforest.setRefreshPhantomBlockDataUnpackFunction(blockforest::PODPhantomWeightPackUnpack<real_t>());
+
+ if( loadEvaluationStrategy == "Fit" )
+ {
+ if( useEllipsoids )
+ {
+ pe_coupling::amr::WeightAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, fittedTotalWeightEvaluationFunctionEllipsoids);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ } else{
+ pe_coupling::amr::WeightAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, fittedTotalWeightEvaluationFunctionSpheres);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ }
+ else if( loadEvaluationStrategy == "PE" )
+ {
+ pe::amr::WeightAssignmentFunctor weightAssignmentFunctor(peInfoCollection, peBlockBaseWeight );
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ else if( loadEvaluationStrategy == "LBM" )
+ {
+ pe_coupling::amr::WeightAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, pe_coupling::amr::defaultWeightEvaluationFunction);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ else
+ {
+ WALBERLA_ABORT("Invalid load evaluation strategy: " << loadEvaluationStrategy);
+ }
+
+ }
+ else if( loadDistributionStrategy == "ParMetis")
+ {
+ uint_t ncon = 1;
+ if( loadEvaluationStrategy == "FitMulti")
+ {
+ ncon = 2;
+ }
+
+ blockforest::DynamicParMetis::Algorithm parMetisAlgorithm = blockforest::DynamicParMetis::stringToAlgorithm(parMetisAlgorithmString);
+ blockforest::DynamicParMetis::WeightsToUse parMetisWeightsToUse = blockforest::DynamicParMetis::WeightsToUse::PARMETIS_BOTH_WEIGHTS;
+ blockforest::DynamicParMetis::EdgeSource parMetisEdgeSource = blockforest::DynamicParMetis::EdgeSource::PARMETIS_EDGES_FROM_EDGE_WEIGHTS;
+
+ blockforest::DynamicParMetis dynamicParMetis(parMetisAlgorithm, parMetisWeightsToUse, parMetisEdgeSource, ncon);
+ dynamicParMetis.setipc2redist(parMetis_ipc2redist);
+
+ real_t loadImbalanceTolerance = (parMetisTolerance < real_t(1)) ? std::max(real_t(1.05), real_t(1) + real_t(1) / ( real_c(numberOfInitialFineBlocks) / real_c(numberOfProcesses) ) ) : parMetisTolerance;
+ std::vector<double> parMetisLoadImbalanceTolerance(ncon, double(loadImbalanceTolerance));
+ dynamicParMetis.setImbalanceTolerance(parMetisLoadImbalanceTolerance[0], 0);
+
+ WALBERLA_LOG_INFO_ON_ROOT(" - ParMetis configuration: ");
+ WALBERLA_LOG_INFO_ON_ROOT(" - algorithm = " << dynamicParMetis.algorithmToString() );
+ WALBERLA_LOG_INFO_ON_ROOT(" - weights to use = " << dynamicParMetis.weightsToUseToString() );
+ WALBERLA_LOG_INFO_ON_ROOT(" - edge source = " << dynamicParMetis.edgeSourceToString() );
+ WALBERLA_LOG_INFO_ON_ROOT(" - ncon = " << ncon );
+ WALBERLA_LOG_INFO_ON_ROOT(" - ipc2redist parameter = " << dynamicParMetis.getipc2redist() );
+
+ blockforest.setRefreshPhantomBlockDataPackFunction(blockforest::DynamicParMetisBlockInfoPackUnpack());
+ blockforest.setRefreshPhantomBlockDataUnpackFunction(blockforest::DynamicParMetisBlockInfoPackUnpack());
+
+ if( loadEvaluationStrategy == "Fit" )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - load imbalance tolerance = <" << parMetisLoadImbalanceTolerance[0] << ">" );
+ if( useEllipsoids )
+ {
+ pe_coupling::amr::MetisAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, fittedTotalWeightEvaluationFunctionEllipsoids);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ } else{
+ pe_coupling::amr::MetisAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, fittedTotalWeightEvaluationFunctionSpheres);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ }
+ else if( loadEvaluationStrategy == "FitMulti" )
+ {
+ double imbalanceTolerancePE = 10.;
+ parMetisLoadImbalanceTolerance[1] = std::min(imbalanceTolerancePE, real_c(MPIManager::instance()->numProcesses()));
+ WALBERLA_LOG_INFO_ON_ROOT(" - load imbalance tolerances = <" << parMetisLoadImbalanceTolerance[0] << ", " << parMetisLoadImbalanceTolerance[1] << ">" );
+ dynamicParMetis.setImbalanceTolerance(parMetisLoadImbalanceTolerance[1], 1);
+
+ if( useEllipsoids )
+ {
+ std::vector< std::function<real_t(const pe_coupling::BlockInfo&)> > weightEvaluationFunctions(ncon);
+ weightEvaluationFunctions[0] = fittedLBMWeightEvaluationFunctionEllipsoids;
+ weightEvaluationFunctions[1] = fittedPEWeightEvaluationFunctionEllipsoids;
+ pe_coupling::amr::MetisAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, weightEvaluationFunctions);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ } else{
+ std::vector< std::function<real_t(const pe_coupling::BlockInfo&)> > weightEvaluationFunctions(ncon);
+ weightEvaluationFunctions[0] = fittedLBMWeightEvaluationFunctionSpheres;
+ weightEvaluationFunctions[1] = fittedPEWeightEvaluationFunctionSpheres;
+ pe_coupling::amr::MetisAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, weightEvaluationFunctions);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ }
+ else if( loadEvaluationStrategy == "PE" )
+ {
+ pe::amr::MetisAssignmentFunctor weightAssignmentFunctor(peInfoCollection, peBlockBaseWeight );
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ else if( loadEvaluationStrategy == "LBM" )
+ {
+ pe_coupling::amr::MetisAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, pe_coupling::amr::defaultWeightEvaluationFunction);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ else
+ {
+ WALBERLA_ABORT("Invalid load evaluation strategy: " << loadEvaluationStrategy);
+ }
+
+ blockforest.setRefreshPhantomBlockMigrationPreparationFunction( dynamicParMetis );
+
+ }
+ else if( loadDistributionStrategy == "Diffusive")
+ {
+ using DB_T = blockforest::DynamicDiffusionBalance< blockforest::PODPhantomWeight<real_t> >;
+ DB_T dynamicDiffusion(diffusionMaxIterations, diffusionFlowIterations );
+ dynamicDiffusion.setMode(DB_T::Mode::DIFFUSION_PUSH);
+
+ WALBERLA_LOG_INFO_ON_ROOT(" - Dynamic diffusion configuration: ");
+ WALBERLA_LOG_INFO_ON_ROOT(" - max iterations = " << dynamicDiffusion.getMaxIterations() );
+ WALBERLA_LOG_INFO_ON_ROOT(" - flow iterations = " << dynamicDiffusion.getFlowIterations());
+
+ blockforest.setRefreshPhantomBlockDataPackFunction(blockforest::PODPhantomWeightPackUnpack<real_t>());
+ blockforest.setRefreshPhantomBlockDataUnpackFunction(blockforest::PODPhantomWeightPackUnpack<real_t>());
+ blockforest.setRefreshPhantomBlockMigrationPreparationFunction( dynamicDiffusion );
+
+ if( loadEvaluationStrategy == "Fit" )
+ {
+ if( useEllipsoids )
+ {
+ pe_coupling::amr::WeightAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, fittedTotalWeightEvaluationFunctionEllipsoids);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ } else{
+ pe_coupling::amr::WeightAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, fittedTotalWeightEvaluationFunctionSpheres);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ }
+ else if( loadEvaluationStrategy == "PE" )
+ {
+ pe::amr::WeightAssignmentFunctor weightAssignmentFunctor(peInfoCollection, peBlockBaseWeight );
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ else if( loadEvaluationStrategy == "LBM" )
+ {
+ pe_coupling::amr::WeightAssignmentFunctor weightAssignmentFunctor(couplingInfoCollection, pe_coupling::amr::defaultWeightEvaluationFunction);
+ blockforest.setRefreshPhantomBlockDataAssignmentFunction(weightAssignmentFunctor);
+ }
+ else
+ {
+ WALBERLA_ABORT("Invalid load evaluation strategy: " << loadEvaluationStrategy);
+ }
+
+ } else
+ {
+ WALBERLA_ABORT("Load distribution strategy \"" << loadDistributionStrategy << "\t not implemented! - Aborting" );
+ }
+
+
+ ///////////////
+ // TIME LOOP //
+ ///////////////
+
+ // create the timeloop
+ SweepTimeloop timeloop( blocks->getBlockStorage(), timesteps );
+
+ if( vtkWriteFreqBo != uint_t(0) ) {
+
+ // pe bodies
+ if (useEllipsoids) {
+ auto bodyVtkOutput = make_shared<pe::EllipsoidVtkOutput>(bodyStorageID, blocks->getBlockStorage());
+ auto bodyVTK = vtk::createVTKOutput_PointData(bodyVtkOutput, "bodies", vtkWriteFreqBo, baseFolder);
+ timeloop.addFuncBeforeTimeStep(vtk::writeFiles(bodyVTK), "VTK (sediment data)");
+
+ } else {
+ auto bodyVtkOutput = make_shared<pe::SphereVtkOutput>(bodyStorageID, blocks->getBlockStorage());
+ auto bodyVTK = vtk::createVTKOutput_PointData(bodyVtkOutput, "bodies", vtkWriteFreqBo, baseFolder);
+ timeloop.addFuncBeforeTimeStep(vtk::writeFiles(bodyVTK), "VTK (sediment data)");
+ }
+ }
+
+ if( vtkWriteFreqFl != uint_t(0) ) {
+
+ // pdf field
+ auto pdfFieldVTK = vtk::createVTKOutput_BlockData(blocks, "fluid_field", vtkWriteFreqFl, 0, false, baseFolder);
+
+ field::FlagFieldCellFilter<FlagField_T> fluidFilter(flagFieldID);
+ fluidFilter.addFlag(Fluid_Flag);
+ pdfFieldVTK->addCellInclusionFilter(fluidFilter);
+
+ pdfFieldVTK->addCellDataWriter(
+ make_shared<lbm::VelocityVTKWriter<LatticeModel_T, float> >(pdfFieldID, "VelocityFromPDF"));
+ pdfFieldVTK->addCellDataWriter(
+ make_shared<lbm::DensityVTKWriter<LatticeModel_T, float> >(pdfFieldID, "DensityFromPDF"));
+
+ timeloop.addFuncBeforeTimeStep(vtk::writeFiles(pdfFieldVTK), "VTK (fluid field data)");
+ }
+
+ if( vtkWriteFreqDD != uint_t(0) ) {
+ auto domainDecompVTK = vtk::createVTKOutput_DomainDecomposition(blocks, "domain_decomposition", vtkWriteFreqDD, baseFolder );
+ timeloop.addFuncBeforeTimeStep( vtk::writeFiles(domainDecompVTK), "VTK (domain decomposition)");
+ }
+
+ WcTimingPool timeloopTiming;
+ shared_ptr<WcTimingPool> timeloopRefinementTiming = make_shared<WcTimingPool>();
+ shared_ptr<WcTimingPool> timeloopRefinementTimingLevelwise = make_shared<WcTimingPool>();
+
+
+ auto sweep = lbm::makeCellwiseSweep< LatticeModel_T, FlagField_T >( pdfFieldID, flagFieldID, Fluid_Flag );
+ auto refinementTimestep = lbm::refinement::makeTimeStep< LatticeModel_T, BoundaryHandling_T >( blocks, sweep, pdfFieldID, boundaryHandlingID );
+
+ refinementTimestep->enableTiming( timeloopRefinementTiming, timeloopRefinementTimingLevelwise );
+
+ // Averaging the force/torque over two time steps is said to damp oscillations of the interaction force/torque.
+ // See Ladd - " Numerical simulations of particulate suspensions via a discretized Boltzmann equation. Part 1. Theoretical foundation", 1994, p. 302
+ if( averageForceTorqueOverTwoTimSteps ) {
+
+ // store force/torque from hydrodynamic interactions in container1
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(storeForceTorqueInCont1), "Force Storing", finestLevel);
+
+ // set force/torque from previous time step (in container2)
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(setForceTorqueOnBodiesFromCont2), "Force setting", finestLevel);
+
+ // average the force/torque by scaling it with factor 1/2 (except in first timestep and directly after refinement, there it is 1)
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(SharedFunctor<pe_coupling::ForceTorqueOnBodiesScaler>(forceScaler)), "Force averaging", finestLevel);
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(setForceScalingFactorToHalf), "Force scaling adjustment", finestLevel);
+
+ // swap containers
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(pe_coupling::BodyContainerSwapper(bodiesFTContainer1, bodiesFTContainer2)), "Swap FT container", finestLevel);
+
+ }
+
+ Vector3<real_t> gravitationalForce( real_t(0), real_t(0), -(densityRatio - real_t(1)) * gravitationalAcceleration * sphereVolume );
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(pe_coupling::ForceOnBodiesAdder( blocks, bodyStorageID, gravitationalForce )), "Gravitational force", finestLevel );
+
+ // add pe timesteps
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(pe_coupling::TimeStep( blocks, bodyStorageID, cr, syncCall, real_t(1), numPeSubCycles)),
+ "pe Time Step", finestLevel );
+
+ // add sweep for updating the pe body mapping into the LBM simulation
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::SweepAsFunctorWrapper( pe_coupling::BodyMapping< BoundaryHandling_T >( blocks, boundaryHandlingID, bodyStorageID, globalBodyStorage, bodyFieldID, MO_Flag, FormerMO_Flag, pe_coupling::selectRegularBodies ), blocks ),
+ "Body Mapping", finestLevel );
+
+ // add sweep for restoring PDFs in cells previously occupied by pe bodies
+ typedef pe_coupling::EquilibriumReconstructor< LatticeModel_T, BoundaryHandling_T > Reconstructor_T;
+ Reconstructor_T reconstructor( blocks, boundaryHandlingID, pdfFieldID, bodyFieldID );
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::SweepAsFunctorWrapper( pe_coupling::PDFReconstruction< LatticeModel_T, BoundaryHandling_T, Reconstructor_T > ( blocks,
+ boundaryHandlingID, bodyStorageID, globalBodyStorage, bodyFieldID, reconstructor, FormerMO_Flag, Fluid_Flag ), blocks ),
+ "PDF Restore", finestLevel );
+
+
+ // add LBM sweep with refinement
+ timeloop.addFuncBeforeTimeStep( makeSharedFunctor( refinementTimestep ), "LBM refinement time step" );
+
+ std::string loggingFileName( baseFolder + "/Logging_Ga");
+ loggingFileName += std::to_string(uint_c(GalileoNumber));
+ loggingFileName += "_lvl";
+ loggingFileName += std::to_string(numberOfLevels);
+ loggingFileName += ".txt";
+ if( logging )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(" - writing logging output to file \"" << loggingFileName << "\"");
+ }
+ shared_ptr< PropertyLogger > logger = walberla::make_shared< PropertyLogger >( &timeloop, blocks, bodyStorageID,
+ loggingFileName, fileIO );
+ if(logging)
+ {
+ timeloop.addFuncAfterTimeStep( SharedFunctor< PropertyLogger >( logger ), "Property logger" );
+ }
+
+
+ timeloop.addFuncAfterTimeStep( RemainingTimeLogger( timeloop.getNrOfTimeSteps() ), "Remaining Time Logger" );
+
+
+ // add top level timing pool output
+ timeloop.addFuncAfterTimeStep( TimingPoolLogger( timeloopTiming, timeloop, loggingDisplayFrequency ), "Regular Timing Logger" );
+
+ // add regular refinement timing pool output
+ timeloop.addFuncAfterTimeStep( TimingPoolLogger( *timeloopRefinementTiming, timeloop, loggingDisplayFrequency ), "Refinement Timing Logger" );
+
+ // add level wise timing pool output
+ //if( numberOfLevels != uint_t(1))
+ timeloop.addFuncAfterTimeStep( TimingPoolLogger( *timeloopRefinementTimingLevelwise, timeloop, loggingDisplayFrequency ), "Refinement Levelwise Timing Logger" );
+
+ // add PE timing tree output
+ timeloop.addFuncAfterTimeStep( TimingTreeLogger( timingTreePE, timeloop, loggingDisplayFrequency ), "PE Timing Tree Timing Logger" );
+
+
+ ////////////////////////
+ // EXECUTE SIMULATION //
+ ////////////////////////
+
+ uint_t loadEvaluationFrequency = refinementCheckFrequency;
+ TimingEvaluator timingEvaluator( *timeloopRefinementTimingLevelwise, timingTreePE, numberOfLevels );
+
+ // file for simulation infos
+ std::string infoFileName( baseFolder + "/simulation_info.txt");
+ WALBERLA_ROOT_SECTION()
+ {
+ std::ofstream file;
+ file.open( infoFileName.c_str(), std::fstream::out | std::fstream::trunc );
+ file << "#i\t t\t tSim\t tLB\t numProcs\t levelwise blocks (min/max/sum)\n";
+ file.close();
+ }
+
+ // process local timing measurements and predicted loads
+ std::string processLocalFiles(baseFolder + "/processLocalFiles");
+ WALBERLA_ROOT_SECTION()
+ {
+ filesystem::path tpath( processLocalFiles );
+ if( !filesystem::exists( tpath ) )
+ filesystem::create_directory( tpath );
+ }
+ std::string measurementFileProcessName(processLocalFiles + "/measurements_" + std::to_string(MPIManager::instance()->rank()) + ".txt");
+ {
+ std::ofstream file;
+ file.open( measurementFileProcessName.c_str(), std::fstream::out | std::fstream::trunc );
+ file << "#i\t t\t mTotSim\t mLB\t mLBM\t mBH\t mCoup1\t mCoup2\t mRB\t cLBM\t cRB\t numBlocks\n";
+ file.close();
+ }
+
+ std::string predictionFileProcessName(processLocalFiles + "/predictions_" + std::to_string(MPIManager::instance()->rank()) + ".txt");
+ {
+ std::ofstream file;
+ file.open( predictionFileProcessName.c_str(), std::fstream::out | std::fstream::trunc );
+ file << "#i\t t\t wlLBM\t wlBH\t wlCoup1\t wlCoup2\t wlRB\t edgecut\t numBlocks\n";
+ file.close();
+ }
+
+ std::vector<std::string> LBMTimer;
+ LBMTimer.emplace_back("collide");
+ LBMTimer.emplace_back("stream");
+ LBMTimer.emplace_back("stream & collide");
+
+ std::vector<std::string> bhTimer;
+ bhTimer.emplace_back("boundary handling");
+
+ std::vector<std::string> couplingTimer1;
+ couplingTimer1.emplace_back("Body Mapping");
+ std::vector<std::string> couplingTimer2;
+ couplingTimer2.emplace_back("PDF Restore");
+
+ std::vector<std::string> peTimer;
+ peTimer.emplace_back("Simulation Step.Collision Detection");
+ peTimer.emplace_back("Simulation Step.Collision Response Integration");
+ peTimer.emplace_back("Simulation Step.Collision Response Resolution.Collision Response Solving");
+
+ std::vector<std::string> LBMCommTimer;
+ LBMCommTimer.emplace_back("communication equal level [pack & send]");
+ LBMCommTimer.emplace_back("communication equal level [wait & unpack]");
+
+ std::vector<std::string> peCommTimer;
+ //Adapt if using different collision response (like DEM!)
+ peCommTimer.emplace_back("Simulation Step.Collision Response Resolution.Velocity Sync");
+ peCommTimer.emplace_back("Sync");
+
+
+ real_t terminationPosition = expectedSedimentedHeight;
+ real_t terminationVelocity = real_t(0.05) * uRef;
+
+ auto oldmTotSim = real_t(0);
+ auto oldmLB = real_t(0);
+
+ auto measurementFileCounter = uint_t(0);
+ auto predictionFileCounter = uint_t(0);
+
+ std::string loadEvaluationStep("load evaluation");
+
+ // time loop
+ for (uint_t i = 0; i < timesteps; ++i )
+ {
+
+ // evaluate measurements (note: reflect simulation behavior BEFORE the evaluation)
+ if( loadEvaluationFrequency > 0 && i % loadEvaluationFrequency == 0 && i > 0 && fileIO)
+ {
+
+ timeloopTiming[loadEvaluationStep].start();
+
+ // write process local timing measurements to files (per process, per load balancing step)
+ {
+
+ // evaluate all required timers
+ uint_t evalLevel = finestLevel;
+
+ real_t mTotSim = ( timeloopTiming.timerExists("LBM refinement time step") ) ? timeloopTiming["LBM refinement time step"].total() : real_t(0);
+
+ real_t mLB = ( timeloopTiming.timerExists("refinement checking") ) ? timeloopTiming["refinement checking"].total() : real_t(0);
+
+ real_t mLBM = timingEvaluator.getTimings(LBMTimer, evalLevel);
+ real_t mBH = timingEvaluator.getTimings(bhTimer, evalLevel);
+ real_t mCoup1 = timingEvaluator.getTimings(couplingTimer1, evalLevel);
+ real_t mCoup2 = timingEvaluator.getTimings(couplingTimer2, evalLevel);
+ real_t mPE = timingEvaluator.getTimings(peTimer, evalLevel);
+
+ real_t cLBM = timingEvaluator.getTimings(LBMCommTimer, evalLevel);
+ real_t cRB = timingEvaluator.getTimings(peCommTimer, evalLevel);
+
+ auto & forest = blocks->getBlockForest();
+ uint_t numBlocks = forest.getNumberOfBlocks(finestLevel);
+
+ // write to process local file
+ std::ofstream file;
+ file.open( measurementFileProcessName.c_str(), std::ofstream::app );
+ file << measurementFileCounter << "\t " << real_c(i) / tRef << "\t"
+ << mTotSim - oldmTotSim << "\t" << mLB - oldmLB << "\t" << mLBM << "\t" << mBH << "\t" << mCoup1 << "\t"
+ << mCoup2 << "\t" << mPE << "\t" << cLBM << "\t" << cRB << "\t" << numBlocks << "\n";
+ file.close();
+
+ oldmTotSim = mTotSim;
+ oldmLB = mLB;
+ measurementFileCounter++;
+
+ // reset timers to have measurement from evaluation to evaluation point
+ timeloopRefinementTimingLevelwise->clear();
+ timingTreePE.reset();
+
+ }
+
+ // evaluate general simulation infos (on root)
+ {
+ real_t totalTimeToCurrentTimestep, totalLBTimeToCurrentTimestep;
+ evaluateTotalSimulationTimePassed(timeloopTiming, totalTimeToCurrentTimestep, totalLBTimeToCurrentTimestep);
+ std::vector<math::DistributedSample> numberOfBlocksPerLevel(numberOfLevels);
+
+ auto & forest = blocks->getBlockForest();
+ for( uint_t lvl = 0; lvl < numberOfLevels; ++lvl)
+ {
+ uint_t numBlocks = forest.getNumberOfBlocks(lvl);
+ numberOfBlocksPerLevel[lvl].castToRealAndInsert(numBlocks);
+ }
+
+ for( uint_t lvl = 0; lvl < numberOfLevels; ++lvl)
+ {
+ numberOfBlocksPerLevel[lvl].mpiGatherRoot();
+ }
+
+ WALBERLA_ROOT_SECTION()
+ {
+ std::ofstream file;
+ file.open( infoFileName.c_str(), std::ofstream::app );
+ file << i << "\t " << real_c(i) / tRef << "\t"
+ << totalTimeToCurrentTimestep << "\t " << totalLBTimeToCurrentTimestep << "\t " << numberOfProcesses << "\t ";
+
+ for( uint_t lvl = 0; lvl < numberOfLevels; ++lvl)
+ {
+ file << uint_c(numberOfBlocksPerLevel[numberOfLevels-1-lvl].min()) << "\t ";
+ file << uint_c(numberOfBlocksPerLevel[numberOfLevels-1-lvl].max()) << "\t ";
+ file << uint_c(numberOfBlocksPerLevel[numberOfLevels-1-lvl].sum()) << "\t ";
+ }
+ file << "\n";
+
+ file.close();
+ }
+ }
+
+ timeloopTiming[loadEvaluationStep].end();
+
+ }
+
+
+ if( refinementCheckFrequency != 0 && i % refinementCheckFrequency == 0)
+ {
+
+ WALBERLA_LOG_INFO_ON_ROOT("Checking for refinement and load balancing...")
+
+ std::string refinementCheckStep("refinement checking");
+ timeloopTiming[refinementCheckStep].start();
+
+ if( loadEvaluationStrategy != "LBM" ) {
+
+ // first evaluate all data that is required for the refinement checks
+
+ // update info collections for the particle presence based check and the load balancing:
+ auto &forest = blocks->getBlockForest();
+ pe_coupling::createWithNeighborhood<BoundaryHandling_T>(forest, boundaryHandlingID, bodyStorageID, ccdID,
+ fcdID, numPeSubCycles, *couplingInfoCollection);
+ pe::createWithNeighborhood(forest, bodyStorageID, *peInfoCollection);
+
+ // for the fluid property based check:
+ if (useVorticityCriterion || useGradientCriterion) {
+ velocityFieldWriter();
+ (*velocityCommunicationScheme)();
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT("Refreshing blockforest...")
+
+ // check refinement criterions and refine/coarsen if necessary
+ uint_t stampBefore = blocks->getBlockForest().getModificationStamp();
+ blocks->refresh();
+ uint_t stampAfter = blocks->getBlockForest().getModificationStamp();
+
+ bool recreatingNecessary = false;
+
+ if (stampBefore != stampAfter) {
+ recreatingNecessary = true;
+ }
+
+ bool reducedRecreationFlag = mpi::allReduce(recreatingNecessary, mpi::LOGICAL_OR);
+
+ if (reducedRecreationFlag != recreatingNecessary) {
+ WALBERLA_LOG_INFO("Reduced recreation flag different from individual one");
+ }
+
+ recreatingNecessary = reducedRecreationFlag;
+
+ if (recreatingNecessary) {
+
+ WALBERLA_LOG_INFO_ON_ROOT("Recreating data structures..");
+
+ // rebuild PE data structures
+ pe::clearSynchronization(blockforest, bodyStorageID);
+
+ syncCall();
+
+ for (auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt) {
+ auto * ccd = blockIt->getData<pe::ccd::ICCD>(ccdID);
+ ccd->reloadBodies();
+ }
+
+ clearBoundaryHandling(forest, boundaryHandlingID);
+ clearBodyField(forest, bodyFieldID);
+
+ if (averageForceTorqueOverTwoTimSteps) {
+
+ // clear containers from old values
+ bodiesFTContainer1->clear();
+ bodiesFTContainer2->clear();
+
+ // initialize FT container on all blocks anew, i.e. with the currently acting force/torque, which is zero after the refinement step
+ bodiesFTContainer2->store();
+
+ // set force scaling factor to one after refinement since force history is not present on blocks after refinement
+ // thus the usual averaging of 1/2 (over two time steps) can not be carried out, i.e. it would lead to 1/2 of the acting force
+ // the scaling factor is thus adapted for the next timestep to 1, and then changed back to 1/2 (in the timeloop)
+ setForceScalingFactorToOne();
+ }
+
+ recreateBoundaryHandling(forest, boundaryHandlingID);
+
+ // re-set the no-slip flags along the walls
+ pe_coupling::mapMovingBodies<BoundaryHandling_T>(*blocks, boundaryHandlingID, bodyStorageID,
+ *globalBodyStorage, bodyFieldID, MO_Flag,
+ pe_coupling::selectGlobalBodies);
+
+ // re-map the body into the domain (initializing the bodyField as well)
+ pe_coupling::mapMovingBodies<BoundaryHandling_T>(*blocks, boundaryHandlingID, bodyStorageID,
+ *globalBodyStorage, bodyFieldID, MO_Flag,
+ pe_coupling::selectRegularBodies);
+ }
+
+ }
+
+ timeloopTiming[refinementCheckStep].end();
+ }
+
+ // evaluate predictions (note: reflect the predictions for all upcoming simulations, thus the corresponding measurements have to be taken afterwards)
+ if( loadEvaluationFrequency > 0 && i % loadEvaluationFrequency == 0 && fileIO)
+ {
+
+ timeloopTiming[loadEvaluationStep].start();
+
+ // write process local load predictions to files (per process, per load balancing step)
+ {
+
+ auto wlLBM = real_t(0);
+ auto wlBH = real_t(0);
+ auto wlCoup1 = real_t(0);
+ auto wlCoup2 = real_t(0);
+ auto wlRB = real_t(0);
+
+ auto & forest = blocks->getBlockForest();
+ pe_coupling::createWithNeighborhood<BoundaryHandling_T>(forest, boundaryHandlingID, bodyStorageID, ccdID, fcdID, numPeSubCycles, *couplingInfoCollection);
+
+ for( auto blockIt = forest.begin(); blockIt != forest.end(); ++blockIt ) {
+ auto * block = static_cast<blockforest::Block *> (&(*blockIt));
+ const auto &blockID = block->getId();
+ auto infoIt = couplingInfoCollection->find(blockID);
+ auto blockInfo = infoIt->second;
+
+ if( useEllipsoids )
+ {
+ WALBERLA_ABORT("Not yet implemented!");
+ }
+ else
+ {
+ wlLBM += fittedLBMWeightEvaluationFunctionSpheres(blockInfo);
+ wlBH += fittedBHWeightEvaluationFunctionSpheres(blockInfo);
+ wlCoup1 += fittedCoupling1WeightEvaluationFunctionSpheres(blockInfo);
+ wlCoup2 += fittedCoupling2WeightEvaluationFunctionSpheres(blockInfo);
+ wlRB += fittedPEWeightEvaluationFunctionSpheres(blockInfo);
+ }
+
+ }
+
+ // note: we count the edge weight doubled here in total (to and from the other process). ParMetis only counts one direction.
+ uint_t edgecut = evaluateEdgeCut(forest);
+
+ uint_t numBlocks = forest.getNumberOfBlocks(finestLevel);
+
+ std::ofstream file;
+ file.open( predictionFileProcessName.c_str(), std::ofstream::app );
+ file << predictionFileCounter << "\t " << real_c(i) / tRef << "\t"
+ << wlLBM << "\t" << wlBH << "\t" << wlCoup1 << "\t" << wlCoup2 << "\t" << wlRB << "\t"
+ << edgecut << "\t" << numBlocks << "\n";
+ file.close();
+
+ predictionFileCounter++;;
+ }
+
+ timeloopTiming[loadEvaluationStep].end();
+
+ }
+
+ // perform a single simulation step
+ timeloop.singleStep( timeloopTiming );
+
+
+ if( logging )
+ {
+ real_t curMeanPos = logger->getMeanPosition();
+ real_t curMeanVel = logger->getMeanVelocity();
+ if( curMeanPos <= terminationPosition && std::fabs(curMeanVel) < terminationVelocity )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT("Sediments passed terminal mean position " << terminationPosition << " and reached velocity " << curMeanVel << " - terminating simulation!");
+ break;
+ }
+ }
+
+ }
+
+ timeloopTiming.logResultOnRoot();
+
+
+ return EXIT_SUCCESS;
+}
+
+} // namespace amr_sediment_settling
+
+int main( int argc, char **argv ){
+ amr_sediment_settling::main(argc, argv);
+}
diff --git a/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5d3db5ef36996a33723f2b203c98bc2986fc6f7f
--- /dev/null
+++ b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/CMakeLists.txt
@@ -0,0 +1,5 @@
+waLBerla_add_executable( NAME WorkloadEvaluation FILES WorkloadEvaluation.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk )
+
+if( WALBERLA_BUILD_WITH_PARMETIS )
+ waLBerla_add_executable( NAME AMRSedimentSettling FILES AMRSedimentSettling.cpp DEPENDS blockforest boundary core field lbm pe pe_coupling postprocessing stencil timeloop vtk )
+endif()
\ No newline at end of file
diff --git a/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/WorkloadEvaluation.cpp b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/WorkloadEvaluation.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..0a4fef688ee44f1e0f1b4bf56be41f9b637cd2ef
--- /dev/null
+++ b/apps/benchmarks/AdaptiveMeshRefinementFluidParticleCoupling/WorkloadEvaluation.cpp
@@ -0,0 +1,980 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file WorkLoadEvaluation.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "blockforest/Initialization.h"
+#include "blockforest/communication/UniformBufferedScheme.h"
+
+#include "boundary/all.h"
+
+#include "core/DataTypes.h"
+#include "core/Environment.h"
+#include "core/debug/Debug.h"
+#include "core/debug/TestSubsystem.h"
+#include "core/logging/Logging.h"
+#include "core/math/all.h"
+#include "core/SharedFunctor.h"
+#include "core/timing/RemainingTimeLogger.h"
+#include "core/mpi/MPIManager.h"
+#include "core/mpi/Reduce.h"
+#include "core/mpi/Broadcast.h"
+
+#include "domain_decomposition/SharedSweep.h"
+
+#include "field/AddToStorage.h"
+#include "field/communication/PackInfo.h"
+
+#include "lbm/boundary/all.h"
+#include "lbm/communication/PdfFieldPackInfo.h"
+#include "lbm/field/AddToStorage.h"
+#include "lbm/field/MacroscopicValueCalculation.h"
+#include "lbm/field/PdfField.h"
+#include "lbm/lattice_model/D3Q19.h"
+#include "lbm/lattice_model/ForceModel.h"
+#include "lbm/sweeps/CellwiseSweep.h"
+#include "lbm/sweeps/SweepWrappers.h"
+#include "lbm/BlockForestEvaluation.h"
+
+#include "stencil/D3Q27.h"
+
+#include "timeloop/SweepTimeloop.h"
+
+#include "pe/basic.h"
+#include "pe/cr/ICR.h"
+#include "pe/fcd/GJKEPACollideFunctor.h"
+#include "pe/vtk/BodyVtkOutput.h"
+#include "pe/vtk/EllipsoidVtkOutput.h"
+#include "pe/vtk/SphereVtkOutput.h"
+
+#include "pe_coupling/mapping/all.h"
+#include "pe_coupling/momentum_exchange_method/all.h"
+#include "pe_coupling/utility/all.h"
+
+#include "vtk/all.h"
+#include "field/vtk/all.h"
+#include "lbm/vtk/all.h"
+
+#include <vector>
+#include <iomanip>
+#include <iostream>
+
+namespace workload_evaluation
+{
+
+///////////
+// USING //
+///////////
+
+using namespace walberla;
+using walberla::uint_t;
+
+// PDF field, flag field & body field
+typedef lbm::D3Q19< lbm::collision_model::TRT, false> LatticeModel_T;
+
+typedef LatticeModel_T::Stencil Stencil_T;
+typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+
+typedef walberla::uint8_t flag_t;
+typedef FlagField< flag_t > FlagField_T;
+typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
+
+const uint_t FieldGhostLayers = 1;
+
+// boundary handling
+typedef pe_coupling::CurvedLinear< LatticeModel_T, FlagField_T > MO_CLI_T;
+
+typedef boost::tuples::tuple<MO_CLI_T > BoundaryConditions_T;
+typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
+
+typedef boost::tuple<pe::Sphere, pe::Ellipsoid, pe::Plane> BodyTypeTuple;
+
+///////////
+// FLAGS //
+///////////
+
+const FlagUID Fluid_Flag ( "fluid" );
+const FlagUID MO_CLI_Flag ( "moving obstacle CLI" );
+const FlagUID FormerMO_Flag( "former moving obstacle" );
+
+
+/////////////////////////////////////
+// BOUNDARY HANDLING CUSTOMIZATION //
+/////////////////////////////////////
+
+class MyBoundaryHandling
+{
+public:
+
+ MyBoundaryHandling( const BlockDataID & flagFieldID, const BlockDataID & pdfFieldID, const BlockDataID & bodyFieldID, bool useEntireFieldTraversal ) :
+ flagFieldID_( flagFieldID ), pdfFieldID_( pdfFieldID ), bodyFieldID_ ( bodyFieldID ), useEntireFieldTraversal_( useEntireFieldTraversal ) {}
+
+ BoundaryHandling_T * operator()( IBlock* const block, const StructuredBlockStorage* const storage ) const;
+
+private:
+
+ const BlockDataID flagFieldID_;
+ const BlockDataID pdfFieldID_;
+ const BlockDataID bodyFieldID_;
+ bool useEntireFieldTraversal_;
+
+}; // class MyBoundaryHandling
+
+BoundaryHandling_T * MyBoundaryHandling::operator()( IBlock * const block, const StructuredBlockStorage * const storage ) const
+{
+ WALBERLA_ASSERT_NOT_NULLPTR( block );
+ WALBERLA_ASSERT_NOT_NULLPTR( storage );
+
+ auto * flagField = block->getData< FlagField_T >( flagFieldID_ );
+ auto * pdfField = block->getData< PdfField_T > ( pdfFieldID_ );
+ auto * bodyField = block->getData< BodyField_T >( bodyFieldID_ );
+
+ const auto fluid = flagField->flagExists( Fluid_Flag ) ? flagField->getFlag( Fluid_Flag ) : flagField->registerFlag( Fluid_Flag );
+
+ BoundaryHandling_T::Mode mode = (useEntireFieldTraversal_) ? BoundaryHandling_T::Mode::ENTIRE_FIELD_TRAVERSAL : BoundaryHandling_T::Mode::OPTIMIZED_SPARSE_TRAVERSAL ;
+
+ BoundaryHandling_T * handling = new BoundaryHandling_T( "fixed obstacle boundary handling", flagField, fluid,
+ boost::tuples::make_tuple( MO_CLI_T ( "MO_CLI", MO_CLI_Flag, pdfField, flagField, bodyField, fluid, *storage, *block ) ),
+ mode);
+
+ // boundaries are set by mapping the planes into the domain
+
+ handling->fillWithDomain( FieldGhostLayers );
+
+ return handling;
+}
+
+
+class CollisionPropertiesEvaluator
+{
+public:
+ explicit CollisionPropertiesEvaluator( pe::cr::ICR & collisionResponse ) : collisionResponse_( collisionResponse )
+ {}
+
+ real_t get()
+ {
+ real_t maxPen = std::fabs(collisionResponse_.getMaximumPenetration());
+ WALBERLA_MPI_SECTION()
+ {
+ mpi::allReduceInplace( maxPen, mpi::MAX );
+ }
+ return maxPen;
+ }
+
+private:
+ pe::cr::ICR & collisionResponse_;
+};
+
+class ContactDistanceEvaluator
+{
+public:
+ ContactDistanceEvaluator( const shared_ptr< StructuredBlockStorage > & blocks, const BlockDataID ccdID, const BlockDataID fcdID ) :
+ blocks_( blocks ), ccdID_(ccdID), fcdID_(fcdID)
+ {}
+
+ real_t get()
+ {
+ auto maximumPenetration = real_t(0);
+ for (auto it = blocks_->begin(); it != blocks_->end(); ++it) {
+ IBlock ¤tBlock = *it;
+
+ auto *ccd = currentBlock.getData<pe::ccd::ICCD>(ccdID_);
+ auto *fcd = currentBlock.getData<pe::fcd::IFCD>(fcdID_);
+ ccd->generatePossibleContacts();
+ pe::Contacts& contacts = fcd->generateContacts( ccd->getPossibleContacts() );
+ size_t numContacts( contacts.size() );
+
+ for( size_t i = 0; i < numContacts; ++i )
+ {
+ const pe::ContactID c( &contacts[i] );
+ maximumPenetration = std::max( maximumPenetration, std::fabs(c->getDistance()));
+ }
+ }
+ WALBERLA_MPI_SECTION()
+ {
+ mpi::allReduceInplace( maximumPenetration, mpi::MAX );
+ }
+ return maximumPenetration;
+ }
+private:
+ shared_ptr< StructuredBlockStorage > blocks_;
+ const BlockDataID ccdID_;
+ const BlockDataID fcdID_;
+};
+
+class MaxVelocityEvaluator
+{
+public:
+ MaxVelocityEvaluator( const shared_ptr< StructuredBlockStorage > & blocks, const BlockDataID bodyStorageID ) :
+ blocks_( blocks ), bodyStorageID_(bodyStorageID)
+ {}
+
+ Vector3<real_t> get()
+ {
+ auto maxVelX = real_t(0);
+ auto maxVelY = real_t(0);
+ auto maxVelZ = real_t(0);
+
+ for (auto it = blocks_->begin(); it != blocks_->end(); ++it) {
+
+ for( auto bodyIt = pe::LocalBodyIterator::begin(*it, bodyStorageID_ ); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt ) {
+ auto vel = bodyIt->getLinearVel();
+ maxVelX = std::max(maxVelX, std::fabs(vel[0]));
+ maxVelY = std::max(maxVelY, std::fabs(vel[1]));
+ maxVelZ = std::max(maxVelZ, std::fabs(vel[2]));
+ }
+ }
+ WALBERLA_MPI_SECTION()
+ {
+ mpi::allReduceInplace( maxVelX, mpi::MAX );
+ mpi::allReduceInplace( maxVelY, mpi::MAX );
+ mpi::allReduceInplace( maxVelZ, mpi::MAX );
+ }
+ return Vector3<real_t>(maxVelX, maxVelY, maxVelZ);
+ }
+
+ real_t getMagnitude()
+ {
+ auto magnitude = real_t(0);
+
+ for (auto it = blocks_->begin(); it != blocks_->end(); ++it) {
+
+ for( auto bodyIt = pe::LocalBodyIterator::begin(*it, bodyStorageID_ ); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt ) {
+ magnitude = std::max(magnitude, bodyIt->getLinearVel().length());
+ }
+ }
+ WALBERLA_MPI_SECTION()
+ {
+ mpi::allReduceInplace( magnitude, mpi::MAX );
+ }
+ return magnitude;
+
+ }
+
+private:
+ shared_ptr< StructuredBlockStorage > blocks_;
+ const BlockDataID bodyStorageID_;
+};
+
+void evaluateFluidQuantities(const shared_ptr< StructuredBlockStorage > & blocks, const BlockDataID boundaryHandlingID,
+ uint_t & numCells, uint_t & numFluidCells, uint_t & numNBCells )
+{
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt)
+ {
+ auto * boundaryHandling = blockIt->getData< BoundaryHandling_T >( boundaryHandlingID );
+ auto xyzSize = boundaryHandling->getFlagField()->xyzSize();
+ numCells += xyzSize.numCells();
+
+ for(auto z = cell_idx_t(xyzSize.zMin()); z <= cell_idx_t(xyzSize.zMax()); ++z ){
+ for(auto y = cell_idx_t(xyzSize.yMin()); y <= cell_idx_t(xyzSize.yMax()); ++y ){
+ for(auto x = cell_idx_t(xyzSize.xMin()); x <= cell_idx_t(xyzSize.xMax()); ++x ) {
+ if (boundaryHandling->isDomain(x, y, z)) {
+ ++numFluidCells;
+ }
+ if (boundaryHandling->isNearBoundary(x, y, z)) {
+ ++numNBCells;
+ }
+ }
+ }
+ }
+ }
+}
+
+void evaluatePEQuantities( const shared_ptr< StructuredBlockStorage > & blocks, const BlockDataID bodyStorageID,
+ const pe::cr::ICR & cr,
+ uint_t & numLocalParticles, uint_t & numShadowParticles, uint_t & numContacts)
+{
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt) {
+ auto * bodyStorage = blockIt->getData<pe::Storage>(bodyStorageID);
+ pe::BodyStorage const & localStorage = (*bodyStorage)[pe::StorageType::LOCAL];
+ pe::BodyStorage const & shadowStorage = (*bodyStorage)[pe::StorageType::SHADOW];
+ numLocalParticles += localStorage.size();
+ numShadowParticles += shadowStorage.size();
+
+ numContacts += cr.getNumberOfContactsTreated();
+ }
+}
+
+void evaluateTimers(WcTimingPool & timingPool, WcTimingTree & peTimingTree,
+ const std::vector<std::vector<std::string> > & timerKeys,
+ std::vector<real_t> & timings )
+{
+
+ for (auto & timingsIt : timings)
+ {
+ timingsIt = real_t(0);
+ }
+
+ timingPool.unifyRegisteredTimersAcrossProcesses();
+ peTimingTree.synchronize();
+
+ auto scalingFactor = real_t(1000); // milliseconds
+
+ for (auto i = uint_t(0); i < timerKeys.size(); ++i )
+ {
+ auto keys = timerKeys[i];
+ for (const auto &timerName : keys)
+ {
+ if(timingPool.timerExists(timerName))
+ {
+ timings[i] += real_c(timingPool[timerName].total()) * scalingFactor;
+ }
+ if(peTimingTree.timerExists(timerName))
+ {
+ timings[i] += real_c(peTimingTree[timerName].total()) * scalingFactor;
+ }
+ }
+
+ }
+}
+
+void resetTimers(WcTimingPool & timingPool, WcTimingTree & peTimingTree)
+{
+ timingPool.clear();
+ peTimingTree.reset();
+}
+
+//*******************************************************************************************************************
+/*! Application to evaluate the workload (time measurements) for a fluid-particle simulation
+ *
+ * This application is used in the paper
+ * Rettinger, Ruede - "Dynamic Load Balancing Techniques for Particulate Flow Simulations", submitted to Computation
+ * in Section 3 to develop and calibrate the workload estimator.
+ * The setup features settling particle inside a horizontally periodic box.
+ * A comprehensive description is given in Sec. 3.3 of the paper.
+ * It uses 4 x 4 x 5 blocks for domain partitioning.
+ * For each block ( = each process), the block local quantities are evaluated as well as the timing infos of
+ * the fluid-particle interaction algorithm. Those infos are then written to files that can be used later on
+ * for function fitting to obtain a workload estimator.
+ *
+ * NOTE: Since this estimator relies on timing measurements, this evaluation procedure should be carried out everytime
+ * a different implementation, hardware or algorithm is used.
+ *
+ */
+//*******************************************************************************************************************
+int main( int argc, char **argv )
+{
+ debug::enterTestMode();
+
+ mpi::Environment env( argc, argv );
+
+
+ auto solidVolumeFraction = real_t(0.2);
+
+ // LBM / numerical parameters
+ auto blockSize = uint_t(32);
+ auto uSettling = real_t(0.1); // characteristic settling velocity
+ auto diameter = real_t(10);
+
+ auto Ga = real_t(30); //Galileo number
+ auto numPeSubCycles = uint_t(10);
+
+ auto vtkIOFreq = uint_t(0);
+ auto timestepsNonDim = real_t(2.5);
+ auto numSamples = uint_t(2000);
+ std::string baseFolder = "workload_files"; // folder for vtk and file output
+
+ bool useEllipsoids = false;
+ bool optimizeForSmallObstacleFraction = false;
+ bool noFileOutput = false;
+ bool fixBodies = false;
+ bool useEntireFieldTraversal = true;
+ bool averageForceTorqueOverTwoTimSteps = true;
+ bool useFusedStreamCollide = false;
+
+
+ for( int i = 1; i < argc; ++i )
+ {
+ if( std::strcmp( argv[i], "--vtkIOFreq" ) == 0 ) { vtkIOFreq = uint_c( std::atof( argv[++i] ) ); continue; }
+ if( std::strcmp( argv[i], "--noFileOutput" ) == 0 ) { noFileOutput = true; continue; }
+ if( std::strcmp( argv[i], "--basefolder" ) == 0 ) { baseFolder = argv[++i]; continue; }
+ if( std::strcmp( argv[i], "--solidVolumeFraction" ) == 0 ) { solidVolumeFraction = real_c(std::atof( argv[++i] )); continue; }
+ if( std::strcmp( argv[i], "--diameter" ) == 0 ) { diameter = real_c(std::atof( argv[++i] )); continue; }
+ if( std::strcmp( argv[i], "--blockSize" ) == 0 ) { blockSize = uint_c(std::atof( argv[++i]) ); continue; }
+ if( std::strcmp( argv[i], "--uSettling" ) == 0 ) { uSettling = real_c(std::atof( argv[++i] )); continue; }
+ if( std::strcmp( argv[i], "--Ga" ) == 0 ) { Ga = real_c(std::atof( argv[++i] )); continue; }
+ if( std::strcmp( argv[i], "--timestepsNonDim" ) == 0 ) { timestepsNonDim = real_c(std::atof( argv[++i] )); continue; }
+ if( std::strcmp( argv[i], "--numPeSubCycles" ) == 0 ) { numPeSubCycles = uint_c(std::atof( argv[++i] )); continue; }
+ if( std::strcmp( argv[i], "--useEllipsoids" ) == 0 ) { useEllipsoids = true; continue; }
+ if( std::strcmp( argv[i], "--optSmallSVF" ) == 0 ) { optimizeForSmallObstacleFraction = true; continue; }
+ if( std::strcmp( argv[i], "--fixBodies" ) == 0 ) { fixBodies = true; continue; }
+ if( std::strcmp( argv[i], "--useEntireFieldTraversal" ) == 0 ) { useEntireFieldTraversal = true; continue; }
+ if( std::strcmp( argv[i], "--numSamples" ) == 0 ) { numSamples = uint_c(std::atof( argv[++i] )); continue; }
+ if( std::strcmp( argv[i], "--noForceAveraging" ) == 0 ) { averageForceTorqueOverTwoTimSteps = false; continue; }
+ if( std::strcmp( argv[i], "--useFusedStreamCollide" ) == 0 ) { useFusedStreamCollide = true; continue; }
+ WALBERLA_ABORT("Unrecognized command line argument found: " << argv[i]);
+ }
+
+ WALBERLA_CHECK(diameter > real_t(1));
+ WALBERLA_CHECK(uSettling > real_t(0));
+ WALBERLA_CHECK(Ga > real_t(0));
+ WALBERLA_CHECK(solidVolumeFraction > real_t(0));
+ WALBERLA_CHECK(solidVolumeFraction < real_t(0.65));
+
+ ///////////////////////////
+ // SIMULATION PROPERTIES //
+ ///////////////////////////
+
+ const auto XBlocks = uint_t(4);
+ const auto YBlocks = uint_t(4);
+ const auto ZBlocks = uint_t(5);
+
+ if( MPIManager::instance()->numProcesses() != XBlocks * YBlocks * ZBlocks )
+ {
+ WALBERLA_LOG_WARNING_ON_ROOT("WARNING! You have specified less or more processes than number of blocks -> the time measurements are no longer blockwise!")
+ }
+
+ if( diameter > real_c(blockSize) )
+ {
+ WALBERLA_LOG_WARNING_ON_ROOT("The bodies might be too large to work with the currently used synchronization!");
+ }
+
+
+ WALBERLA_LOG_INFO_ON_ROOT("Using setup with sedimenting particles -> creating two planes and applying gravitational force")
+ if( useEllipsoids ){ WALBERLA_LOG_INFO_ON_ROOT("using ELLIPSOIDS"); }
+ else{ WALBERLA_LOG_INFO_ON_ROOT("using SPHERES"); }
+
+
+ const uint_t XCells = blockSize * XBlocks;
+ const uint_t YCells = blockSize * YBlocks;
+ const uint_t ZCells = blockSize * ZBlocks;
+
+ const real_t topWallOffset = real_t(1.05) * real_t(blockSize); // move the top wall downwards to take away a certain portion of the overall domain
+
+
+ // determine number of spheres to generate, if necessary scale diameter a bit to reach desired solid volume fraction
+ real_t domainHeight = real_c(ZCells) - topWallOffset;
+ real_t fluidVolume = real_c( XCells * YCells ) * domainHeight;
+ real_t solidVolume = solidVolumeFraction * fluidVolume;
+ uint_t numberOfParticles = uint_c(std::ceil(solidVolume / ( math::M_PI / real_t(6) * diameter * diameter * diameter )));
+ diameter = std::cbrt( solidVolume / ( real_c(numberOfParticles) * math::M_PI / real_t(6) ) );
+
+ auto densityRatio = real_t(2.5);
+
+ real_t viscosity = uSettling * diameter / Ga;
+ const real_t omega = lbm::collision_model::omegaFromViscosity(viscosity);
+
+ const real_t gravitationalAcceleration = uSettling * uSettling / ( (densityRatio-real_t(1)) * diameter );
+
+ real_t tref = diameter / uSettling;
+ real_t Tref = domainHeight / uSettling;
+
+ uint_t timesteps = uint_c(timestepsNonDim * Tref);
+
+ const real_t dx = real_c(1);
+ WALBERLA_LOG_INFO_ON_ROOT("viscosity = " << viscosity);
+ WALBERLA_LOG_INFO_ON_ROOT("tau = " << real_t(1)/omega);
+ WALBERLA_LOG_INFO_ON_ROOT("diameter = " << diameter);
+ WALBERLA_LOG_INFO_ON_ROOT("solid volume fraction = " << solidVolumeFraction);
+ WALBERLA_LOG_INFO_ON_ROOT("domain size (in cells) = " << XCells << " x " << ZCells << " x " << ZCells);
+ WALBERLA_LOG_INFO_ON_ROOT("number of bodies = " << numberOfParticles);
+ WALBERLA_LOG_INFO_ON_ROOT("gravitational acceleration = " << gravitationalAcceleration);
+ WALBERLA_LOG_INFO_ON_ROOT("Ga = " << Ga);
+ WALBERLA_LOG_INFO_ON_ROOT("uSettling = " << uSettling);
+ WALBERLA_LOG_INFO_ON_ROOT("tref = " << tref);
+ WALBERLA_LOG_INFO_ON_ROOT("Tref = " << Tref);
+ WALBERLA_LOG_INFO_ON_ROOT("timesteps = " << timesteps);
+ WALBERLA_LOG_INFO_ON_ROOT("number of workload samples = " << numSamples);
+
+ // create folder to store logging files
+ WALBERLA_ROOT_SECTION()
+ {
+ walberla::filesystem::path path1( baseFolder );
+ if( !walberla::filesystem::exists( path1 ) )
+ walberla::filesystem::create_directory( path1 );
+ }
+
+
+ ///////////////////////////
+ // BLOCK STRUCTURE SETUP //
+ ///////////////////////////
+
+ Vector3<bool> periodicity( true );
+ periodicity[2] = false;
+
+ // create domain
+ shared_ptr< StructuredBlockForest > blocks = blockforest::createUniformBlockGrid( XBlocks, YBlocks, ZBlocks, blockSize, blockSize, blockSize, dx,
+ 0, false, false, //one block per process!
+ periodicity[0], periodicity[1], periodicity[2], //periodicity
+ false );
+
+ ////////
+ // PE //
+ ////////
+
+ shared_ptr<pe::BodyStorage> globalBodyStorage = make_shared<pe::BodyStorage>();
+ pe::SetBodyTypeIDs<BodyTypeTuple>::execute();
+ auto bodyStorageID = blocks->addBlockData(pe::createStorageDataHandling<BodyTypeTuple>(), "pe Body Storage");
+ auto ccdID = blocks->addBlockData(pe::ccd::createHashGridsDataHandling( globalBodyStorage, bodyStorageID ), "CCD");
+ BlockDataID fcdID = (useEllipsoids) ? blocks->addBlockData( pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::GJKEPACollideFunctor>(), "FCD" )
+ : blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
+
+ WcTimingTree timingTreePE;
+
+ pe::cr::HCSITS cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, &timingTreePE );
+ cr.setMaxIterations(10);
+ cr.setRelaxationModel( pe::cr::HardContactSemiImplicitTimesteppingSolvers::ApproximateInelasticCoulombContactByDecoupling );
+ cr.setErrorReductionParameter(real_t(0.8));
+
+ /////////////////
+ // PE COUPLING //
+ /////////////////
+
+ // connect to pe
+ const real_t overlap = real_c( 1.5 ) * dx;
+
+ std::function<void(void)> syncCall = std::bind( pe::syncNextNeighbors<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, &timingTreePE, overlap, false );
+
+ auto generationDomain = AABB( real_t(0), real_t(0), real_t(0), real_c(XCells), real_c(YCells), real_c(ZCells) - topWallOffset);
+ auto peMaterial = pe::createMaterial( "mat", densityRatio, real_t(1), real_t(0.25), real_t(0.25), real_t(0), real_t(200), real_t(100), real_t(100), real_t(100) );
+
+ // create two planes at bottom and top of domain
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,0,1), Vector3<real_t>(0,0,0), peMaterial );
+ pe::createPlane( *globalBodyStorage, 0, Vector3<real_t>(0,0,-1), Vector3<real_t>(0,0,real_c(ZCells)-topWallOffset), peMaterial );
+
+ auto xParticle = real_t(0);
+ auto yParticle = real_t(0);
+ auto zParticle = real_t(0);
+
+ for( uint_t nPart = 0; nPart < numberOfParticles; ++nPart )
+ {
+
+ WALBERLA_ROOT_SECTION()
+ {
+ xParticle = math::realRandom<real_t>(generationDomain.xMin(), generationDomain.xMax());
+ yParticle = math::realRandom<real_t>(generationDomain.yMin(), generationDomain.yMax());
+ zParticle = math::realRandom<real_t>(generationDomain.zMin(), generationDomain.zMax());
+ }
+
+ WALBERLA_MPI_SECTION()
+ {
+ mpi::broadcastObject( xParticle );
+ mpi::broadcastObject( yParticle );
+ mpi::broadcastObject( zParticle );
+ }
+
+ if( useEllipsoids )
+ {
+ // prolate ellipsoids
+ auto axisFactor = real_t(1.5);
+ real_t axisFactor2 = std::sqrt(real_t(1)/axisFactor);
+ real_t radius = diameter * real_t(0.5);
+ pe::createEllipsoid( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( xParticle, yParticle, zParticle ), Vector3<real_t>(axisFactor*radius, axisFactor2*radius, axisFactor2*radius), peMaterial );
+
+ } else{
+ pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( xParticle, yParticle, zParticle ), diameter * real_t(0.5), peMaterial );
+ }
+
+ }
+
+ syncCall();
+
+ // resolve possible overlaps of the particles due to the random initialization
+
+ // 100 iterations of solver to resolve all major overlaps
+ {
+ for (auto pet = uint_t(1); pet <= uint_t(100); ++pet )
+ {
+ cr.timestep( real_t(1) );
+ syncCall();
+
+ // reset all velocities to zero
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->setLinearVel(Vector3<real_t>(real_t(0)));
+ bodyIt->setAngularVel(Vector3<real_t>(real_t(0)));
+ }
+ }
+ }
+ }
+
+
+ // resolve remaining overlaps via particle simulation
+ {
+ const auto initialPeSteps = uint_t(2000);
+ const auto dt_PE_init = real_t(1);
+ const real_t overlapLimit = real_t(0.001) * diameter;
+
+ WALBERLA_LOG_INFO_ON_ROOT("Particle creation done --- resolving overlaps with goal all < " << overlapLimit / diameter * real_t(100) << "%");
+
+ CollisionPropertiesEvaluator collisionPropertiesEvaluator( cr );
+
+ ContactDistanceEvaluator contactDistanceEvaluator(blocks, ccdID, fcdID);
+ MaxVelocityEvaluator maxVelEvaluator(blocks, bodyStorageID);
+
+ for(auto pet = uint_t(1); pet <= initialPeSteps; ++pet )
+ {
+ cr.timestep( dt_PE_init );
+ syncCall();
+ real_t maxPen = collisionPropertiesEvaluator.get();
+
+ if( maxPen < overlapLimit )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT("Carried out " << pet << " PE-only time steps to resolve initial overlaps");
+ WALBERLA_LOG_INFO_ON_ROOT("Final max penetration from cr is " << maxPen << " = " << maxPen / diameter * real_t(100) << "%");
+
+ break;
+ }
+
+ real_t maxMagnitude = maxVelEvaluator.getMagnitude();
+
+ if( maxMagnitude * dt_PE_init > overlapLimit)
+ {
+ // avoid too large response velocities by setting them to zero
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->setLinearVel(Vector3<real_t>(real_t(0)));
+ bodyIt->setAngularVel(Vector3<real_t>(real_t(0)));
+ }
+ }
+ }
+ else
+ {
+ cr.setErrorReductionParameter(real_t(0.8));
+ }
+
+ if( pet % uint_t(20) == uint_t(0) )
+ {
+ WALBERLA_LOG_INFO_ON_ROOT(pet << " - current max overlap = " << maxPen / diameter * real_t(100) << "%, max vel magnitude = " << maxMagnitude );
+ }
+ }
+ }
+
+ // reset all velocities to zero
+ Vector3<real_t> initialBodyVelocity(real_t(0));
+
+ WALBERLA_LOG_INFO_ON_ROOT("Setting initial velocity " << initialBodyVelocity << " of all bodies");
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->setLinearVel(initialBodyVelocity);
+ bodyIt->setAngularVel(Vector3<real_t>(real_t(0)));
+ }
+ }
+
+ ///////////////////////
+ // ADD DATA TO BLOCKS //
+ ////////////////////////
+
+ // create the lattice model
+ LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::TRT::constructWithMagicNumber( omega ) );
+
+ // add PDF field
+ BlockDataID pdfFieldID = lbm::addPdfFieldToStorage< LatticeModel_T >( blocks, "pdf field (zyxf)", latticeModel,
+ Vector3< real_t >( real_t(0) ), real_t(1),
+ uint_t(1), field::zyxf );
+
+ // add flag field
+ BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field" );
+
+ // add body field
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
+
+ // add boundary handling & initialize outer domain boundaries
+ BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(
+ MyBoundaryHandling( flagFieldID, pdfFieldID, bodyFieldID, useEntireFieldTraversal ), "boundary handling" );
+
+
+ // initially map pe bodies into the LBM simulation
+ pe_coupling::mapMovingBodies< BoundaryHandling_T >( *blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_CLI_Flag );
+
+ lbm::BlockForestEvaluation<FlagField_T> bfEval(blocks, flagFieldID, Fluid_Flag);
+
+ WALBERLA_LOG_INFO_ON_ROOT(bfEval.loggingString());
+
+ ///////////////
+ // TIME LOOP //
+ ///////////////
+
+ // create the timeloop
+ SweepTimeloop timeloop( blocks->getBlockStorage(), timesteps );
+
+ if( vtkIOFreq != uint_t(0) )
+ {
+ // pe bodies
+ if(useEllipsoids)
+ {
+ auto bodyVtkOutput = make_shared<pe::EllipsoidVtkOutput>( bodyStorageID, blocks->getBlockStorage() );
+ auto bodyVTK = vtk::createVTKOutput_PointData( bodyVtkOutput, "bodies", vtkIOFreq, baseFolder );
+ timeloop.addFuncBeforeTimeStep( vtk::writeFiles( bodyVTK ), "VTK (body data)" );
+
+ }else
+ {
+ auto bodyVtkOutput = make_shared<pe::SphereVtkOutput>( bodyStorageID, blocks->getBlockStorage() );
+ auto bodyVTK = vtk::createVTKOutput_PointData( bodyVtkOutput, "bodies", vtkIOFreq, baseFolder );
+ timeloop.addFuncBeforeTimeStep( vtk::writeFiles( bodyVTK ), "VTK (body data)" );
+ }
+
+
+ // flag field
+ auto flagFieldVTK = vtk::createVTKOutput_BlockData( blocks, "flag_field", vtkIOFreq, 1, false, baseFolder );
+ flagFieldVTK->addCellDataWriter( make_shared< field::VTKWriter< FlagField_T > >( flagFieldID, "FlagField" ) );
+ timeloop.addFuncAfterTimeStep( vtk::writeFiles( flagFieldVTK ), "VTK (flag field data)" );
+
+ // pdf field
+ auto pdfFieldVTK = vtk::createVTKOutput_BlockData( blocks, "fluid_field", vtkIOFreq, 0, false, baseFolder );
+
+ field::FlagFieldCellFilter< FlagField_T > fluidFilter( flagFieldID );
+ fluidFilter.addFlag( Fluid_Flag );
+ pdfFieldVTK->addCellInclusionFilter( fluidFilter );
+
+ pdfFieldVTK->addCellDataWriter( make_shared< lbm::VelocityVTKWriter< LatticeModel_T, float > >( pdfFieldID, "VelocityFromPDF" ) );
+ pdfFieldVTK->addCellDataWriter( make_shared< lbm::DensityVTKWriter < LatticeModel_T, float > >( pdfFieldID, "DensityFromPDF" ) );
+
+ timeloop.addFuncBeforeTimeStep( vtk::writeFiles( pdfFieldVTK ), "VTK (fluid field data)" );
+
+ auto domainDecompVTK = vtk::createVTKOutput_DomainDecomposition(blocks, "domain_decomposition", vtkIOFreq, baseFolder );
+ timeloop.addFuncBeforeTimeStep( vtk::writeFiles(domainDecompVTK), "VTK (domain decomposition)");
+ }
+
+ // sweep for updating the pe body mapping into the LBM simulation
+ timeloop.add()
+ << Sweep( pe_coupling::BodyMapping< BoundaryHandling_T >( blocks, boundaryHandlingID, bodyStorageID, globalBodyStorage, bodyFieldID, MO_CLI_Flag, FormerMO_Flag, pe_coupling::selectRegularBodies ), "Body Mapping" );
+
+ // sweep for restoring PDFs in cells previously occupied by pe bodies
+ typedef pe_coupling::EquilibriumReconstructor< LatticeModel_T, BoundaryHandling_T > Reconstructor_T;
+ Reconstructor_T reconstructor( blocks, boundaryHandlingID, pdfFieldID, bodyFieldID);
+ timeloop.add()
+ << Sweep( pe_coupling::PDFReconstruction< LatticeModel_T, BoundaryHandling_T, Reconstructor_T >
+ ( blocks, boundaryHandlingID, bodyStorageID, globalBodyStorage, bodyFieldID, reconstructor, FormerMO_Flag, Fluid_Flag, pe_coupling::selectRegularBodies, optimizeForSmallObstacleFraction ), "PDF Restore" );
+
+ shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer1 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
+ std::function<void(void)> storeForceTorqueInCont1 = std::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
+ shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer2 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
+ std::function<void(void)> setForceTorqueOnBodiesFromCont2 = std::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
+ shared_ptr<pe_coupling::ForceTorqueOnBodiesScaler> forceScaler = make_shared<pe_coupling::ForceTorqueOnBodiesScaler>(blocks, bodyStorageID, real_t(1));
+ std::function<void(void)> setForceScalingFactorToHalf = std::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(0.5));
+
+ if( averageForceTorqueOverTwoTimSteps ) {
+ bodiesFTContainer2->store();
+ }
+
+
+ // setup of the LBM communication for synchronizing the pdf field between neighboring blocks
+ std::function< void () > commFunction;
+
+ blockforest::communication::UniformBufferedScheme< stencil::D3Q27 > scheme( blocks );
+ scheme.addPackInfo( make_shared< field::communication::PackInfo< PdfField_T > >( pdfFieldID ) );
+ commFunction = scheme;
+
+ auto sweep = lbm::makeCellwiseSweep< LatticeModel_T, FlagField_T >( pdfFieldID, flagFieldID, Fluid_Flag );
+
+ if( !useFusedStreamCollide )
+ {
+ // streaming & collide
+ timeloop.add() << Sweep( makeCollideSweep(sweep), "Collide" );
+ }
+
+ // add LBM communication function and boundary handling sweep (does the hydro force calculations and the no-slip treatment)
+ timeloop.add() << BeforeFunction( commFunction, "LBM Communication" )
+ << Sweep( BoundaryHandling_T::getBlockSweep( boundaryHandlingID ), "Boundary Handling" );
+
+ if( useFusedStreamCollide )
+ {
+ // streaming & collide
+ timeloop.add() << Sweep( makeSharedSweep(sweep), "Stream&Collide" );
+ } else
+ {
+ // streaming & collide
+ timeloop.add() << Sweep( makeStreamSweep(sweep), "Stream" );
+
+ }
+
+ // Averaging the force/torque over two time steps is said to damp oscillations of the interaction force/torque.
+ // See Ladd - " Numerical simulations of particulate suspensions via a discretized Boltzmann equation. Part 1. Theoretical foundation", 1994, p. 302
+ if( averageForceTorqueOverTwoTimSteps ) {
+
+ // store force/torque from hydrodynamic interactions in container1
+ timeloop.addFuncAfterTimeStep(storeForceTorqueInCont1, "Force Storing");
+
+ // set force/torque from previous time step (in container2)
+ timeloop.addFuncAfterTimeStep(setForceTorqueOnBodiesFromCont2, "Force setting");
+
+ // average the force/torque by scaling it with factor 1/2 (except in first timestep, there it is 1, which it is initially)
+ timeloop.addFuncAfterTimeStep( pe_coupling::ForceTorqueOnBodiesScaler(blocks, bodyStorageID, real_t(0.5)), "Force averaging");
+ timeloop.addFuncAfterTimeStep( setForceScalingFactorToHalf, "Force scaling adjustment" );
+
+ // swap containers
+ timeloop.addFuncAfterTimeStep( pe_coupling::BodyContainerSwapper( bodiesFTContainer1, bodiesFTContainer2 ), "Swap FT container" );
+
+ }
+
+ real_t sphereVolume = diameter * diameter * diameter * math::M_PI / real_t(6);
+ Vector3<real_t> gravitationalForce( real_t(0), real_t(0), -(densityRatio - real_t(1)) * gravitationalAcceleration * sphereVolume );
+ timeloop.addFuncAfterTimeStep(pe_coupling::ForceOnBodiesAdder( blocks, bodyStorageID, gravitationalForce ), "Gravitational force" );
+
+ if( fixBodies ) {
+ // reset all forces
+ timeloop.addFuncAfterTimeStep( pe_coupling::ForceTorqueOnBodiesResetter(blocks, bodyStorageID), "Force Resetting");
+ } else{
+ // add pe timesteps
+ timeloop.addFuncAfterTimeStep( pe_coupling::TimeStep( blocks, bodyStorageID, cr, syncCall, real_t(1), numPeSubCycles ), "pe Time Step" );
+ }
+
+ timeloop.addFuncAfterTimeStep( RemainingTimeLogger( timeloop.getNrOfTimeSteps() ), "Remaining Time Logger" );
+
+
+
+ ////////////////////////
+ // EXECUTE SIMULATION //
+ ////////////////////////
+
+ WcTimingPool timeloopTiming;
+
+ std::vector< std::vector<std::string> > timerKeys;
+ std::vector<std::string> LBMTimer;
+ LBMTimer.emplace_back("Stream&Collide");
+ LBMTimer.emplace_back("Stream");
+ LBMTimer.emplace_back("Collide");
+ timerKeys.push_back(LBMTimer);
+
+ std::vector<std::string> bhTimer;
+ bhTimer.emplace_back("Boundary Handling");
+ timerKeys.push_back(bhTimer);
+
+ std::vector<std::string> couplingTimer1;
+ couplingTimer1.emplace_back("Body Mapping");
+ std::vector<std::string> couplingTimer2;
+ couplingTimer2.emplace_back("PDF Restore");
+ timerKeys.push_back(couplingTimer1);
+ timerKeys.push_back(couplingTimer2);
+
+ std::vector<std::string> peTimer;
+ peTimer.emplace_back("Simulation Step.Collision Detection");
+ peTimer.emplace_back("Simulation Step.Collision Response Integration");
+ peTimer.emplace_back("Simulation Step.Collision Response Resolution.Collision Response Solving");
+ timerKeys.push_back(peTimer);
+
+ uint_t numCells, numFluidCells, numNBCells, numLocalParticles, numShadowParticles, numContacts;
+ numCells = uint_t(0);
+ numFluidCells = uint_t(0);
+ numNBCells = uint_t(0);
+ numLocalParticles = uint_t(0);
+ numShadowParticles = uint_t(0);
+ numContacts = uint_t(0);
+
+ std::vector<real_t> timings(timerKeys.size());
+
+ resetTimers(timeloopTiming, timingTreePE);
+
+ // every rank writes its own file -> numProcesses number of samples!
+ int myRank = MPIManager::instance()->rank();
+
+ std::string logFileName = baseFolder + "/load";
+ logFileName += "_settling";
+ if( useEllipsoids)
+ {
+ logFileName += "_ellipsoids";
+ }
+ else
+ {
+ logFileName += "_spheres";
+ }
+ logFileName += "_d" + std::to_string(int_c(std::ceil(diameter)));
+ logFileName += "_bs" + std::to_string(blockSize);
+ logFileName += "_" + std::to_string(myRank) + ".txt";
+
+
+ std::ofstream file;
+
+ if(!noFileOutput)
+ {
+ WALBERLA_LOG_INFO_ON_ROOT("Writing load info to file " << logFileName);
+ file.open( logFileName.c_str(), std::ofstream::app );
+ file << "# svf = " << solidVolumeFraction << ", d = " << diameter << ", domain = " << XCells << "x" << YCells << "x" << ZCells << "\n";
+ }
+
+
+ auto timeStepOfFirstTiming = uint_t(50);
+
+ if( timesteps - timeStepOfFirstTiming < numSamples )
+ {
+ WALBERLA_LOG_WARNING_ON_ROOT("Less actual time steps than number of required samples!");
+ }
+
+ uint_t nSample( 0 ); // number of current sample
+ real_t samplingFrequency = real_c(timesteps - timeStepOfFirstTiming) / real_c(numSamples);
+
+ // time loop
+ for (uint_t i = 1; i <= timesteps; ++i )
+ {
+ // perform a single simulation step
+ timeloop.singleStep( timeloopTiming );
+
+ // check if current time step should be included in sample
+ if( i >= uint_c( samplingFrequency * real_c(nSample) ) + timeStepOfFirstTiming )
+ {
+ // include -> evaluate all timers and quantities
+
+ evaluateFluidQuantities(blocks, boundaryHandlingID, numCells, numFluidCells, numNBCells);
+ evaluatePEQuantities(blocks, bodyStorageID, cr, numLocalParticles, numShadowParticles, numContacts);
+
+ evaluateTimers(timeloopTiming, timingTreePE, timerKeys, timings);
+
+ if(!noFileOutput)
+ {
+ real_t totalTime = std::accumulate(timings.begin(), timings.end(), real_t(0) );
+
+ file << timeloop.getCurrentTimeStep() << " " << real_c(timeloop.getCurrentTimeStep()) / Tref << " "
+ << numCells << " " << numFluidCells << " " << numNBCells << " "
+ << numLocalParticles << " " << numShadowParticles << " " << numContacts << " " << numPeSubCycles;
+ for (real_t timing : timings) {
+ file << " " << timing;
+ }
+ file << " " << totalTime << "\n";
+ }
+
+ numCells = uint_t(0);
+ numFluidCells = uint_t(0);
+ numNBCells = uint_t(0);
+ numLocalParticles = uint_t(0);
+ numShadowParticles = uint_t(0);
+ numContacts = uint_t(0);
+
+ ++nSample;
+ }
+
+ // reset timers to always include only a single time step in them
+ resetTimers(timeloopTiming, timingTreePE);
+ }
+
+ if(!noFileOutput) {
+ file.close();
+ }
+
+ //timeloopTiming.logResultOnRoot();
+
+ WALBERLA_LOG_INFO_ON_ROOT("Simulation finished!");
+
+ return 0;
+
+}
+
+} //namespace workload_evaluation
+
+int main( int argc, char **argv ){
+ workload_evaluation::main(argc, argv);
+}
diff --git a/apps/benchmarks/CMakeLists.txt b/apps/benchmarks/CMakeLists.txt
index 47f77911653f7c8eec3d68550711810a8606e153..4fa0c4cd0eaf8270c116a02aceb6d80ee5dccf40 100644
--- a/apps/benchmarks/CMakeLists.txt
+++ b/apps/benchmarks/CMakeLists.txt
@@ -1,9 +1,12 @@
+add_subdirectory( AdaptiveMeshRefinementFluidParticleCoupling )
add_subdirectory( ComplexGeometry )
+add_subdirectory( DEM )
add_subdirectory( MeshDistance )
add_subdirectory( CouetteFlow )
add_subdirectory( ForcesOnSphereNearPlaneInShearFlow )
add_subdirectory( NonUniformGrid )
add_subdirectory( MotionSingleHeavySphere )
+add_subdirectory( PeriodicGranularGas )
add_subdirectory( PoiseuilleChannel )
add_subdirectory( SchaeferTurek )
-add_subdirectory( UniformGrid )
\ No newline at end of file
+add_subdirectory( UniformGrid )
diff --git a/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp b/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp
index 52b02c6778457bdc1ae9b539c40c7cf8ba04867c..8a18cbccdbc2b9ae94280468cfd60349d85eff94 100644
--- a/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp
+++ b/apps/benchmarks/ComplexGeometry/ComplexGeometry.cpp
@@ -217,9 +217,9 @@ int main( int argc, char * argv[] )
typedef lbm::D3Q19<lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant> LatticeModel_T;
- typedef walberla::uint8_t flag_t;
- typedef FlagField< flag_t > FlagField_T;
- typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+ using flag_t = walberla::uint8_t;
+ using FlagField_T = FlagField<flag_t>;
+ using PdfField_T = lbm::PdfField<LatticeModel_T>;
LatticeModel_T latticeModel{ lbm::collision_model::SRT( omega ), lbm::force_model::SimpleConstant( bodyForce ) };
diff --git a/apps/benchmarks/ComplexGeometry/test.conf b/apps/benchmarks/ComplexGeometry/test.conf
index 4279c514f08abb430d63735905e4433d8fc53f73..1b43bfc4e6f1dfe2eff8953a1680cbf68b5f6b97 100644
--- a/apps/benchmarks/ComplexGeometry/test.conf
+++ b/apps/benchmarks/ComplexGeometry/test.conf
@@ -1,12 +1,12 @@
ComplexGeometry
{
meshFile cube.obj;
- coarseDx 0.2;
+ coarseDx 0.1;
coarseOmega 1.6;
coarseTimeSteps 1;
numLevels 2;
bodyForce <0.0001, 0, 0>;
- blockSize <8,8,8>;
+ blockSize <16,16,16>;
domainBlowUp <5,5,5>; // simulation domain is blow up factor times mesh size per dimension
Boundaries {
diff --git a/apps/benchmarks/CouetteFlow/CouetteFlow.cpp b/apps/benchmarks/CouetteFlow/CouetteFlow.cpp
index 815e6cdf1504ad4fdab43a6bcb3bc351363a7ba9..84ccd95cec98693e244d6f48e48abbca18932b20 100644
--- a/apps/benchmarks/CouetteFlow/CouetteFlow.cpp
+++ b/apps/benchmarks/CouetteFlow/CouetteFlow.cpp
@@ -91,7 +91,6 @@
#include "vtk/Initialization.h"
#include "vtk/VTKOutput.h"
-#include <boost/bind.hpp>
#include <boost/mpl/or.hpp>
#include <boost/type_traits/is_same.hpp>
@@ -99,7 +98,9 @@
#include <cmath>
#include <cstdlib>
#include <cstring>
+#include <functional>
#include <iostream>
+#include <memory>
#include <utility>
#include <vector>
@@ -138,12 +139,12 @@ typedef lbm::D3Q27< lbm::collision_model::TRT, true > D3Q27_TRT_COMP;
template< typename LatticeModel_T >
struct Types
{
- typedef typename LatticeModel_T::Stencil Stencil_T;
- typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+ using Stencil_T = typename LatticeModel_T::Stencil;
+ using PdfField_T = lbm::PdfField<LatticeModel_T>;
};
-typedef walberla::uint16_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint16_t;
+using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = uint_t(4);
@@ -241,7 +242,7 @@ class BorderRefinementSelection
public:
BorderRefinementSelection( const Setup & setup, const uint_t level, const real_t bufferDistance ) :
- setup_( setup ), level_( level ), bufferDistance_( bufferDistance ) {}
+ setup_( setup ), level_( level ), bufferDistance_( bufferDistance ) { WALBERLA_UNUSED(setup_); }
void operator()( SetupBlockForest & forest )
{
@@ -294,7 +295,7 @@ static shared_ptr< SetupBlockForest > createSetupBlockForest( const blockforest:
( setup.zCells + uint_t(2) * FieldGhostLayers ) ) * memoryPerCell;
forest->addRefinementSelectionFunction( refinementSelectionFunctions );
- forest->addWorkloadMemorySUIDAssignmentFunction( boost::bind( workloadAndMemoryAssignment, _1, memoryPerBlock ) );
+ forest->addWorkloadMemorySUIDAssignmentFunction( std::bind( workloadAndMemoryAssignment, std::placeholders::_1, memoryPerBlock ) );
forest->init( AABB( real_c(0), real_c(0), real_c(0), real_c( setup.xBlocks * setup.xCells ),
real_c( setup.yBlocks * setup.yCells ),
@@ -334,9 +335,9 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
MPIManager::instance()->useWorldComm();
- auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false ) );
+ auto bf = std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false );
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, setup.xCells, setup.yCells, setup.zCells ) );
+ auto sbf = std::make_shared< StructuredBlockForest >( bf, setup.xCells, setup.yCells, setup.zCells );
sbf->createCellBoundingBoxes();
return sbf;
@@ -349,9 +350,9 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
memoryPerCell, processMemoryLimit,
configBlock.getParameter< bool >( "outputSetupForest", false ) );
- auto bf = shared_ptr< blockforest::BlockForest >( new blockforest::BlockForest( uint_c( MPIManager::instance()->rank() ), *sforest, false ) );
+ auto bf = std::make_shared< blockforest::BlockForest >( uint_c( MPIManager::instance()->rank() ), *sforest, false );
- auto sbf = shared_ptr< blockforest::StructuredBlockForest >( new blockforest::StructuredBlockForest( bf, setup.xCells, setup.yCells, setup.zCells ) );
+ auto sbf = std::make_shared< blockforest::StructuredBlockForest >( bf, setup.xCells, setup.yCells, setup.zCells );
sbf->createCellBoundingBoxes();
return sbf;
@@ -398,7 +399,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block ) const
{
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
+ using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
FlagField_T * flagField = block->getData< FlagField_T >( flagFieldId_ );
PdfField_T * pdfField = block->getData< PdfField_T > ( pdfFieldId_ );
@@ -456,16 +457,16 @@ class ErrorVTKWriter : public vtk::BlockCellDataWriter< OutputType, 3 >
{
public:
- typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+ using PdfField_T = lbm::PdfField< LatticeModel_T >;
ErrorVTKWriter( const ConstBlockDataID & pdfFieldId, const std::string & id, const Setup & setup ) :
- vtk::BlockCellDataWriter< OutputType, 3 >( id ), bdid_( pdfFieldId ), pdf_( NULL ), setup_( setup ) {}
+ vtk::BlockCellDataWriter< OutputType, 3 >( id ), bdid_( pdfFieldId ), pdf_( nullptr ), setup_( setup ) {}
protected:
- void configure() { WALBERLA_ASSERT_NOT_NULLPTR( this->block_ ); pdf_ = this->block_->template getData< PdfField_T >( bdid_ ); }
+ void configure() override { WALBERLA_ASSERT_NOT_NULLPTR( this->block_ ); pdf_ = this->block_->template getData< PdfField_T >( bdid_ ); }
- OutputType evaluate( const cell_idx_t x, const cell_idx_t y, const cell_idx_t z, const cell_idx_t f )
+ OutputType evaluate( const cell_idx_t x, const cell_idx_t y, const cell_idx_t z, const cell_idx_t f ) override
{
WALBERLA_ASSERT_NOT_NULLPTR( pdf_ );
@@ -503,7 +504,7 @@ class MyVTKOutput {
public:
MyVTKOutput( const ConstBlockDataID & pdfField, const ConstBlockDataID & flagField,
- vtk::VTKOutput::BeforeFunction pdfGhostLayerSync, const Setup & setup ) :
+ const vtk::VTKOutput::BeforeFunction& pdfGhostLayerSync, const Setup & setup ) :
setup_( setup ), pdfField_( pdfField ), flagField_( flagField ), pdfGhostLayerSync_( pdfGhostLayerSync ) {}
void operator()( std::vector< shared_ptr<vtk::BlockCellDataWriterInterface> > & writers,
@@ -588,7 +589,7 @@ void addRefinementTimeStep( SweepTimeloop & timeloop, shared_ptr< blockforest::S
const bool syncComm, const bool fullComm, const bool linearExplosion,
shared_ptr< Sweep_T > & sweep, const std::string & info )
{
- typedef typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T BH_T;
+ using BH_T = typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T;
auto ts = lbm::refinement::makeTimeStep< LatticeModel_T, BH_T >( blocks, sweep, pdfFieldId, boundaryHandlingId );
ts->asynchronousCommunication( !syncComm );
@@ -611,7 +612,7 @@ struct AddRefinementTimeStep
{
if( pure )
{
- typedef lbm::SplitPureSweep< LatticeModel_T > Sweep_T;
+ using Sweep_T = lbm::SplitPureSweep< LatticeModel_T >;
auto mySweep = make_shared< Sweep_T >( pdfFieldId );
addRefinementTimeStep< LatticeModel_T, Sweep_T >( timeloop, blocks, pdfFieldId, boundaryHandlingId, timingPool, levelwiseTimingPool,
@@ -684,8 +685,8 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
Vector3< real_t >( initVelocity, real_c(0), real_c(0) ), real_t(1),
FieldGhostLayers, field::zyxf );
- typedef typename lbm::Adaptor<LatticeModel_T>::VelocityVector VelocityAdaptor_T;
- typedef typename lbm::Adaptor<LatticeModel_T>::Density DensityAdaptor_T;
+ using VelocityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::VelocityVector;
+ using DensityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::Density;
BlockDataID velocityAdaptorId = field::addFieldAdaptor< VelocityAdaptor_T >( blocks, pdfFieldId, "velocity adaptor" );
BlockDataID densityAdaptorId = field::addFieldAdaptor< DensityAdaptor_T >( blocks, pdfFieldId, "density adaptor" );
@@ -736,11 +737,11 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
// evaluation
- const auto exactSolutionFunction = boost::bind( exactVelocity, _1, blocks->getDomain(), setup.maxVelocity_L );
+ const auto exactSolutionFunction = std::bind( exactVelocity, std::placeholders::_1, blocks->getDomain(), setup.maxVelocity_L );
auto volumetricFlowRate = field::makeVolumetricFlowRateEvaluation< VelocityAdaptor_T, FlagField_T >( configBlock, blocks, velocityAdaptorId,
flagFieldId, Fluid_Flag,
- boost::bind( exactFlowRate, setup.flowRate_L ),
+ std::bind( exactFlowRate, setup.flowRate_L ),
exactSolutionFunction );
volumetricFlowRate->setNormalizationFactor( real_t(1) / setup.maxVelocity_L );
volumetricFlowRate->setDomainNormalization( Vector3<real_t>( real_t(1) ) );
@@ -994,7 +995,7 @@ int main( int argc, char **argv )
//WALBERLA_ROOT_SECTION() { logging::Logging::instance()->setLogLevel( logging::Logging::PROGRESS ); }
#ifdef _OPENMP
- if( std::getenv( "OMP_NUM_THREADS" ) == NULL )
+ if( std::getenv( "OMP_NUM_THREADS" ) == nullptr )
WALBERLA_ABORT( "If you are using a version of the program that was compiled with OpenMP you have to "
"specify the environment variable \'OMP_NUM_THREADS\' accordingly!" );
#endif
diff --git a/apps/benchmarks/DEM/CMakeLists.txt b/apps/benchmarks/DEM/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..138e92026d74c900b1f25cd172cef82de1b2bff2
--- /dev/null
+++ b/apps/benchmarks/DEM/CMakeLists.txt
@@ -0,0 +1 @@
+waLBerla_add_executable( NAME DEM FILES DEM.cpp DEPENDS blockforest core pe )
diff --git a/apps/benchmarks/DEM/DEM.cpp b/apps/benchmarks/DEM/DEM.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..52b6e856a4fb47403d3fb0e9db448c3b1756e460
--- /dev/null
+++ b/apps/benchmarks/DEM/DEM.cpp
@@ -0,0 +1,153 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file DEM.cpp
+//! \brief demonstration of basic functionality of DEM
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include "pe/basic.h"
+
+#include <blockforest/Initialization.h>
+#include <core/DataTypes.h>
+
+#include <string>
+
+namespace walberla {
+
+namespace dem {
+real_t calcCoefficientOfRestitution(const real_t k, const real_t gamma, const real_t meff)
+{
+ auto a = real_t(0.5) * gamma / meff;
+ return std::exp(-a * math::PI / std::sqrt(k / meff - a*a));
+}
+
+real_t calcCollisionTime(const real_t k, const real_t gamma, const real_t meff)
+{
+ auto a = real_t(0.5) * gamma / meff;
+ return math::PI / std::sqrt( k/meff - a*a);
+}
+}
+
+int main( int argc, char** argv )
+{
+ using namespace walberla;
+ using namespace walberla::pe;
+
+ typedef boost::tuple<Sphere, Plane> BodyTuple ;
+
+ walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
+
+ real_t dt = real_c(0.0001); //!< integration time
+ real_t radius = real_c(1); //!< particle radius
+ real_t density = real_c(2707); //!< particle density
+ real_t m = Sphere::calcMass( radius, density); //!< particle mass
+ std::string model = "kg"; //!< input model
+ real_t k = real_c(8.11e6); //!< linear spring stiffness
+ real_t gamma = real_c(6.86e1); //!< damper
+ real_t e = dem::calcCoefficientOfRestitution(k, gamma, m); //!< coefficient of restitution
+ real_t t = dem::calcCollisionTime(k, gamma, m); //!< collision time
+
+ for( int i = 1; i < argc; ++i )
+ {
+ if( std::strcmp( argv[i], "-dt" ) == 0 ) dt = real_c( std::stod( argv[++i] ) );
+ else if( std::strcmp( argv[i], "-radius" ) == 0 ) radius = real_c( std::stod( argv[++i] ) );
+ else if( std::strcmp( argv[i], "-density" ) == 0 ) density = real_c( std::stod( argv[++i] ) );
+ else if( std::strcmp( argv[i], "-kg" ) == 0 )
+ {
+ k = real_c( std::stod( argv[++i] ) );
+ gamma = real_c( std::stod( argv[++i] ) );
+ model = "kg";
+ }
+ else if( std::strcmp( argv[i], "-et" ) == 0 )
+ {
+ e = real_c( std::atof( argv[++i] ) );
+ t = real_c( std::atof( argv[++i] ) );
+ model = "et";
+ }
+ else WALBERLA_ABORT("Found invalid command line argument: \"" << argv[i] << "\" - aborting...");
+ }
+
+ m = Sphere::calcMass( radius, density);
+ if (model=="kg")
+ {
+ e = dem::calcCoefficientOfRestitution(k, gamma, m); //!< coefficient of restitution
+ t = dem::calcCollisionTime(k, gamma, m); //!< collision time
+ } else
+ WALBERLA_ABORT("unsupported model");
+
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+
+ // create blocks
+ shared_ptr< StructuredBlockForest > forest = blockforest::createUniformBlockGrid(
+ math::AABB(-5,-5,0,5,5,10),
+ uint_c( 1), uint_c( 1), uint_c( 1), // number of blocks in x,y,z direction
+ uint_c( 1), uint_c( 1), uint_c( 1), // how many cells per block (x,y,z)
+ true, // max blocks per process
+ false, false, false, // full periodicity
+ false);
+
+ SetBodyTypeIDs<BodyTuple>::execute();
+
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto hccdID = forest->addBlockData(ccd::createHashGridsDataHandling( globalBodyStorage, storageID ), "HCCD");
+ auto fcdID = forest->addBlockData(fcd::createGenericFCDDataHandling<BodyTuple, fcd::AnalyticCollideFunctor>(), "FCD");
+ cr::DEM cr(globalBodyStorage, forest->getBlockStoragePointer(), storageID, hccdID, fcdID);
+
+ const real_t static_cof ( real_t(0.4) / real_t(2) ); // Coefficient of static friction. Roughly 0.85 with high variation depending on surface roughness for low stresses. Note: pe doubles the input coefficient of friction for material-material contacts.
+ const real_t dynamic_cof ( static_cof ); // Coefficient of dynamic friction. Similar to static friction for low speed friction.
+ MaterialID material = createMaterial( "granular", density, e, static_cof, dynamic_cof, real_t( 0.5 ), 1, k, gamma, 0 );
+
+ pe::createPlane( *globalBodyStorage, 0, Vec3(0, 0, 1), forest->getDomain().minCorner(), material );
+
+ SphereID sp = pe::createSphere(
+ *globalBodyStorage,
+ forest->getBlockStorage(),
+ storageID,
+ 999999999,
+ Vec3(0,0,1),
+ real_c(1.0),
+ material);
+ WALBERLA_CHECK_NOT_NULLPTR(sp);
+ sp->setLinearVel( Vec3(0,0,-1) );
+
+ uint_t steps = 0;
+ do
+ {
+ cr.timestep( dt );
+ ++steps;
+ } while (cr.getNumberOfContacts() != 0);
+
+ WALBERLA_LOG_RESULT(std::setw(30) << "steps: " << steps );
+ WALBERLA_LOG_RESULT(std::setw(30) << "final velocity: " << sp->getLinearVel()[2]);
+ WALBERLA_LOG_RESULT(std::setw(30) << "final position: " << sp->getPosition()[2]);
+ WALBERLA_LOG_RESULT(std::setw(30) << "integration time: " << dt);
+ WALBERLA_LOG_RESULT(std::setw(30) << "particle radius: " << radius);
+ WALBERLA_LOG_RESULT(std::setw(30) << "particle density: " << density);
+ WALBERLA_LOG_RESULT(std::setw(30) << "particle mass: " << m);
+ WALBERLA_LOG_RESULT(std::setw(30) << "linear spring stiffness: " << k);
+ WALBERLA_LOG_RESULT(std::setw(30) << "damper: " << gamma);
+ WALBERLA_LOG_RESULT(std::setw(30) << "coefficient of restitution: " << e);
+ WALBERLA_LOG_RESULT(std::setw(30) << "collision time: " << t);
+
+ return EXIT_SUCCESS;
+}
+}
+
+int main( int argc, char** argv )
+{
+ return walberla::main(argc, argv);
+}
diff --git a/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp b/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp
index 62cd5258d085e029eedce2f53940177244d7d187..ccb7cc6318cc9838efae0063809658005c5564f8 100644
--- a/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp
+++ b/apps/benchmarks/ForcesOnSphereNearPlaneInShearFlow/ForcesOnSphereNearPlaneInShearFlow.cpp
@@ -20,6 +20,8 @@
#include "blockforest/Initialization.h"
#include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
#include "boundary/all.h"
@@ -62,6 +64,8 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
+
namespace forces_on_sphere_near_plane_in_shear_flow
{
@@ -78,11 +82,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 4;
@@ -109,7 +113,7 @@ const FlagUID MO_CLI_Flag( "moving obstacle CLI" );
// BLOCK STRUCTURE //
/////////////////////
-static void refinementSelection( SetupBlockForest& forest, uint_t levels, AABB refinementBox )
+static void refinementSelection( SetupBlockForest& forest, uint_t levels, const AABB& refinementBox )
{
real_t dx = real_t(1); // dx on finest level
for( auto block = forest.begin(); block != forest.end(); ++block )
@@ -177,7 +181,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( const AABB & do
WALBERLA_LOG_INFO_ON_ROOT(" - refinement box: " << refinementBox);
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, numberOfLevels, refinementBox ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, numberOfLevels, refinementBox ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( domainAABB, numberOfCoarseBlocksPerDirection[0], numberOfCoarseBlocksPerDirection[1], numberOfCoarseBlocksPerDirection[2], true, true, false );
@@ -576,7 +580,7 @@ int main( int argc, char **argv )
// set up synchronization procedure
const real_t overlap = real_t( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create pe bodies
@@ -608,7 +612,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field", FieldGhostLayers );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf, FieldGhostLayers );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf, FieldGhostLayers );
// add boundary handling
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >( MyBoundaryHandling( flagFieldID, pdfFieldID, bodyFieldID ), "boundary handling" );
diff --git a/apps/benchmarks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp b/apps/benchmarks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp
index fc6a084ffb1451de776451618b6d60e4c1873040..2e6f5af9f3ad4f510ad7d3088f6ae46b10318dd8 100644
--- a/apps/benchmarks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp
+++ b/apps/benchmarks/MotionSingleHeavySphere/MotionSingleHeavySphere.cpp
@@ -58,6 +58,7 @@
#include "vtk/Initialization.h"
#include "vtk/VTKOutput.h"
+#include <functional>
#include <memory>
@@ -77,11 +78,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
typedef std::pair< pe::BodyID, real_t > BodyAndVolumeFraction_T;
@@ -100,7 +101,7 @@ typedef pe_coupling::CurvedQuadratic< LatticeModel_T, FlagField_T > MEM_MR_T;
typedef boost::tuples::tuple< UBB_T, Outlet_T, MEM_BB_T, MEM_CLI_T, MEM_MR_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple;
+using BodyTypeTuple = boost::tuple<pe::Sphere>;
///////////
// FLAGS //
@@ -521,7 +522,7 @@ public:
VTKInfoLogger( SweepTimeloop* timeloop, const shared_ptr< StructuredBlockStorage > & blocks,
const ConstBlockDataID & bodyStorageID, const std::string & baseFolder,
- const Vector3<real_t> u_infty ) :
+ const Vector3<real_t>& u_infty ) :
timeloop_( timeloop ), blocks_( blocks ), bodyStorageID_( bodyStorageID ), baseFolder_( baseFolder ), u_infty_( u_infty )
{ }
@@ -805,15 +806,15 @@ int main( int argc, char **argv )
// set up collision response, here DEM solver
// in this test case, it is only used for the time integration
- pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, NULL);
+ pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr);
// set up synchronization procedure
const real_t overlap = real_t( 1.5 ) * dx;
std::function<void(void)> syncCall;
if( XBlocks <= uint_t(4) )
- syncCall = boost::bind( pe::syncNextNeighbors<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ syncCall = std::bind( pe::syncNextNeighbors<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
else
- syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
real_t xParticle = real_t(0);
@@ -831,7 +832,7 @@ int main( int argc, char **argv )
else if( int(Galileo) == 250 )
{
// add random perturbance for chaotic regime
- walberla::math::seedRandomGenerator( std::mt19937::result_type(std::time(0)) );
+ walberla::math::seedRandomGenerator( std::mt19937::result_type(std::time(nullptr)) );
xParticle = real_c( xlength ) * real_t(0.5) + walberla::math::realRandom( real_t(-0.5), real_t(0.5) );
yParticle = real_c( ylength ) * real_t(0.5) + walberla::math::realRandom( real_t(-0.5), real_t(0.5) );
@@ -882,7 +883,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage< FlagField_T >( blocks, "flag field" );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
// add body and volume fraction field
BlockDataID bodyAndVolumeFractionFieldID = field::addToStorage< BodyAndVolumeFractionField_T >( blocks, "body and volume fraction field",
@@ -1203,7 +1204,7 @@ int main( int argc, char **argv )
// reconstruct missing PDFs
- typedef pe_coupling::SphereNormalExtrapolationDirectionFinder ExtrapolationFinder_T;
+ using ExtrapolationFinder_T = pe_coupling::SphereNormalExtrapolationDirectionFinder;
ExtrapolationFinder_T extrapolationFinder( blocks, bodyFieldID );
typedef pe_coupling::ExtrapolationReconstructor< LatticeModel_T, BoundaryHandling_T, ExtrapolationFinder_T > Reconstructor_T;
Reconstructor_T reconstructor( blocks, boundaryHandlingID, pdfFieldID, bodyFieldID, extrapolationFinder, true );
diff --git a/apps/benchmarks/NonUniformGrid/NonUniformGrid.cpp b/apps/benchmarks/NonUniformGrid/NonUniformGrid.cpp
index 38057f0f3d602175851e763e5a4b416c04701a8b..68f90a8cfa0e4b27e7e1113e6455335d95c6866f 100644
--- a/apps/benchmarks/NonUniformGrid/NonUniformGrid.cpp
+++ b/apps/benchmarks/NonUniformGrid/NonUniformGrid.cpp
@@ -76,7 +76,9 @@
#include "vtk/VTKOutput.h"
#include <cstdlib>
+#include <functional>
#include <iostream>
+#include <memory>
@@ -103,12 +105,12 @@ typedef lbm::D3Q19< lbm::collision_model::D3Q19MRT, false > D3Q19_MRT_INCOMP;
template< typename LatticeModel_T >
struct Types
{
- typedef typename LatticeModel_T::Stencil Stencil_T;
- typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+ using Stencil_T = typename LatticeModel_T::Stencil;
+ using PdfField_T = lbm::PdfField< LatticeModel_T >;
};
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = uint_t(4);
const uint_t BlockForestLevels = uint_t(4);
@@ -279,7 +281,7 @@ void createSetupBlockForest( blockforest::SetupBlockForest & sforest, const Conf
uint_c( 19 * sizeof(real_t) ) ) / numeric_cast< memory_t >( 1024 * 1024 );
sforest.addRefinementSelectionFunction( refinementSelection );
- sforest.addWorkloadMemorySUIDAssignmentFunction( boost::bind( workloadAndMemoryAssignment, _1, memoryPerBlock ) );
+ sforest.addWorkloadMemorySUIDAssignmentFunction( std::bind( workloadAndMemoryAssignment, std::placeholders::_1, memoryPerBlock ) );
sforest.init( AABB( real_t(0), real_t(0), real_t(0), real_c( numberOfXBlocks * numberOfXCellsPerBlock ),
real_c( numberOfYBlocks * numberOfYCellsPerBlock ),
@@ -321,11 +323,11 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
MPIManager::instance()->useWorldComm();
- auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false ) );
+ auto bf = std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false );
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, numberOfXCellsPerBlock,
+ auto sbf = std::make_shared< StructuredBlockForest >( bf, numberOfXCellsPerBlock,
numberOfYCellsPerBlock,
- numberOfZCellsPerBlock ) );
+ numberOfZCellsPerBlock );
sbf->createCellBoundingBoxes();
return sbf;
@@ -336,11 +338,11 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
blockforest::SetupBlockForest sforest;
createSetupBlockForest( sforest, configBlock, uint_c( MPIManager::instance()->numProcesses() ) );
- auto bf = shared_ptr< blockforest::BlockForest >( new blockforest::BlockForest( uint_c( MPIManager::instance()->rank() ), sforest, false ) );
+ auto bf = std::make_shared< blockforest::BlockForest >( uint_c( MPIManager::instance()->rank() ), sforest, false );
- auto sbf = shared_ptr< blockforest::StructuredBlockForest >( new blockforest::StructuredBlockForest( bf, numberOfXCellsPerBlock,
+ auto sbf = std::make_shared< blockforest::StructuredBlockForest >( bf, numberOfXCellsPerBlock,
numberOfYCellsPerBlock,
- numberOfZCellsPerBlock ) );
+ numberOfZCellsPerBlock );
sbf->createCellBoundingBoxes();
return sbf;
@@ -441,12 +443,12 @@ class MyBoundaryHandling : public blockforest::AlwaysInitializeBlockDataHandling
{
public:
- typedef typename MyBoundaryTypes< LatticeModel_T >::NoSlip_T NoSlip_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::UBB_T UBB_T;
+ using NoSlip_T = typename MyBoundaryTypes< LatticeModel_T >::NoSlip_T;
+ using UBB_T = typename MyBoundaryTypes< LatticeModel_T >::UBB_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryConditions_T BoundaryConditions_T;
+ using BoundaryConditions_T = typename MyBoundaryTypes< LatticeModel_T >::BoundaryConditions_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T BoundaryHandling_T;
+ using BoundaryHandling_T = typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T;
@@ -454,7 +456,7 @@ public:
const BlockDataID & flagField, const BlockDataID & pdfField, const real_t velocity ) :
forest_( forest ), flagField_( flagField ), pdfField_( pdfField ), velocity_( velocity ) {}
- BoundaryHandling_T * initialize( IBlock * const block );
+ BoundaryHandling_T * initialize( IBlock * const block ) override;
private:
@@ -471,7 +473,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::initialize( IBlock * const block )
{
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
+ using PdfField_T = typename Types<LatticeModel_T>::PdfField_T;
WALBERLA_ASSERT_NOT_NULLPTR( block );
@@ -536,7 +538,7 @@ class MyVTKOutput {
public:
MyVTKOutput( const ConstBlockDataID & pdfField, const ConstBlockDataID & flagField,
- vtk::VTKOutput::BeforeFunction pdfGhostLayerSync ) :
+ const vtk::VTKOutput::BeforeFunction& pdfGhostLayerSync ) :
pdfField_( pdfField ), flagField_( flagField ), pdfGhostLayerSync_( pdfGhostLayerSync ) {}
void operator()( std::vector< shared_ptr<vtk::BlockCellDataWriterInterface> > & writers,
@@ -596,7 +598,7 @@ void addRefinementTimeStep( SweepTimeloop & timeloop, shared_ptr< blockforest::S
const bool syncComm, const bool fullComm, const bool linearExplosion,
shared_ptr< Sweep_T > & sweep, const std::string & info )
{
- typedef typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T BH_T;
+ using BH_T = typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T;
auto ts = lbm::refinement::makeTimeStep< LatticeModel_T, BH_T >( blocks, sweep, pdfFieldId, boundaryHandlingId );
ts->asynchronousCommunication( !syncComm );
@@ -619,7 +621,7 @@ struct AddRefinementTimeStep
{
if( pure )
{
- typedef lbm::SplitPureSweep< LatticeModel_T > Sweep_T;
+ using Sweep_T = lbm::SplitPureSweep< LatticeModel_T >;
auto mySweep = make_shared< Sweep_T >( pdfFieldId );
addRefinementTimeStep< LatticeModel_T, Sweep_T >( timeloop, blocks, pdfFieldId, boundaryHandlingId, timingPool, levelwiseTimingPool,
@@ -782,7 +784,7 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
}
else
{
- typedef blockforest::DynamicLevelwiseDiffusionBalance< blockforest::NoPhantomData > DLDB;
+ using DLDB = blockforest::DynamicLevelwiseDiffusionBalance<blockforest::NoPhantomData>;
DLDB balancer( diffusionMaxIterations, diffusionFlowIterations );
if( diffusionMode == 0 )
balancer.setMode( DLDB::DIFFUSION_PUSH );
@@ -911,7 +913,7 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
double refreshTime( 0.0 );
for( auto it = reducedTimeloopTiming->begin(); it != reducedTimeloopTiming->end(); ++it )
{
- if( it->first.compare( refreshFunctorName ) == 0 )
+ if( it->first == refreshFunctorName )
refreshTime += it->second.total();
else
restTime += it->second.total();
@@ -925,15 +927,15 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
for( auto it = reducedRefreshTiming->begin(); it != reducedRefreshTiming->end(); ++it )
{
- if( it->first.compare( "block level determination" ) == 0 )
+ if( it->first == "block level determination" )
blockLevelDeterminationTime += it->second.total();
- else if( it->first.compare( "block level determination (callback function)" ) == 0 )
+ else if( it->first == "block level determination (callback function)" )
blockLevelDeterminationTime += it->second.total();
- else if( it->first.compare( "block structure update (includes data migration)" ) == 0 )
+ else if( it->first == "block structure update (includes data migration)" )
dataMigrationTime += it->second.total();
- else if( it->first.compare( "phantom block redistribution (= load balancing)" ) == 0 )
+ else if( it->first == "phantom block redistribution (= load balancing)" )
loadBalanceTime += it->second.total();
- else if( it->first.compare( "phantom forest creation" ) == 0 )
+ else if( it->first == "phantom forest creation" )
phantomForestCreationTime += it->second.total();
}
@@ -1151,7 +1153,7 @@ int main( int argc, char **argv )
logging::Logging::printHeaderOnStream();
#ifdef _OPENMP
- if( std::getenv( "OMP_NUM_THREADS" ) == NULL )
+ if( std::getenv( "OMP_NUM_THREADS" ) == nullptr )
WALBERLA_ABORT( "If you are using a version of the benchmark that was compiled with OpenMP you have to "
"specify the environment variable \'OMP_NUM_THREADS\' accordingly!" );
#endif
diff --git a/apps/benchmarks/PeriodicGranularGas/CMakeLists.txt b/apps/benchmarks/PeriodicGranularGas/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d26f6314fd3d73bbac01b460da7240949a45350a
--- /dev/null
+++ b/apps/benchmarks/PeriodicGranularGas/CMakeLists.txt
@@ -0,0 +1,6 @@
+waLBerla_link_files_to_builddir( *.cfg )
+waLBerla_link_files_to_builddir( *.py )
+
+waLBerla_add_executable ( NAME PeriodicGranularGas
+ FILES PeriodicGranularGas.cpp
+ DEPENDS blockforest core pe )
diff --git a/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cfg b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..e281e9b0ecd0abe2ee48313040696d09d86d9db1
--- /dev/null
+++ b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cfg
@@ -0,0 +1,22 @@
+
+PeriodicGranularGas
+{
+ simulationCorner < 0, 0, 0 >;
+ simulationDomain < 30, 30, 30 >;
+ blocks < 2, 2, 2 >;
+ isPeriodic < 1, 1, 1 >;
+
+ radius 0.5;
+ spacing 1.0;
+ vMax 0.0;
+
+ dt 0.1;
+ simulationSteps 1000;
+ visSpacing 100;
+
+ HCSITSmaxIterations 10;
+ HCSITSRelaxationParameter 0.7;
+ HCSITSErrorReductionParameter 0.8;
+ HCSITSRelaxationModelStr ApproximateInelasticCoulombContactByDecoupling;
+ globalLinearAcceleration < 0, 0, 0 >;
+}
diff --git a/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..89fa83851387f7a88b125cf22af5fc85b13617a3
--- /dev/null
+++ b/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas.cpp
@@ -0,0 +1,265 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file PeriodicGranularGas.cpp
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include <pe/basic.h>
+#include <pe/vtk/SphereVtkOutput.h>
+
+#include <core/Abort.h>
+#include <core/Environment.h>
+#include <core/math/Random.h>
+#include <core/grid_generator/SCIterator.h>
+#include <core/logging/Logging.h>
+#include <core/timing/TimingTree.h>
+#include <core/waLBerlaBuildInfo.h>
+#include <vtk/VTKOutput.h>
+
+#include <functional>
+#include <memory>
+
+namespace walberla {
+using namespace walberla::pe;
+using namespace walberla::timing;
+
+using BodyTuple = boost::tuple<Sphere> ;
+
+int main( int argc, char ** argv )
+{
+ WcTimingTree tt;
+ Environment env(argc, argv);
+
+ logging::Logging::instance()->setStreamLogLevel(logging::Logging::INFO);
+ logging::Logging::instance()->setFileLogLevel(logging::Logging::INFO);
+
+ WALBERLA_LOG_INFO_ON_ROOT( "config file: " << argv[1] )
+ WALBERLA_LOG_INFO_ON_ROOT( "waLBerla Revision: " << WALBERLA_GIT_SHA1 );
+
+ math::seedRandomGenerator( static_cast<unsigned int>(1337 * mpi::MPIManager::instance()->worldRank()) );
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** READING COMMANDLINE ARGUMENTS ***");
+ bool bDEM = false;
+ bool bHCSITS = false;
+
+ bool bNN = false;
+ bool bSO = false;
+
+ bool bInelasticFrictionlessContact = false;
+ bool bApproximateInelasticCoulombContactByDecoupling = false;
+ bool bInelasticCoulombContactByDecoupling = false;
+ bool bInelasticGeneralizedMaximumDissipationContact = false;
+
+ for( int i = 1; i < argc; ++i )
+ {
+ if( std::strcmp( argv[i], "--DEM" ) == 0 ) bDEM = true;
+ if( std::strcmp( argv[i], "--HCSITS" ) == 0 ) bHCSITS = true;
+
+ if( std::strcmp( argv[i], "--syncNextNeighbor" ) == 0 ) bNN = true;
+ if( std::strcmp( argv[i], "--syncShadowOwners" ) == 0 ) bSO = true;
+
+ if( std::strcmp( argv[i], "--InelasticFrictionlessContact" ) == 0 ) bInelasticFrictionlessContact = true;
+ if( std::strcmp( argv[i], "--ApproximateInelasticCoulombContactByDecoupling" ) == 0 ) bApproximateInelasticCoulombContactByDecoupling = true;
+ if( std::strcmp( argv[i], "--InelasticCoulombContactByDecoupling" ) == 0 ) bInelasticCoulombContactByDecoupling = true;
+ if( std::strcmp( argv[i], "--InelasticGeneralizedMaximumDissipationContact" ) == 0 ) bInelasticGeneralizedMaximumDissipationContact = true;
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** READING CONFIG FILE ***");
+ auto cfg = env.config();
+ if (cfg == nullptr) WALBERLA_ABORT("No config specified!");
+ const Config::BlockHandle mainConf = cfg->getBlock( "PeriodicGranularGas" );
+
+ int simulationSteps = mainConf.getParameter<int>("simulationSteps", 10 );
+ WALBERLA_LOG_INFO_ON_ROOT("simulationSteps: " << simulationSteps);
+
+ real_t dt = mainConf.getParameter<real_t>("dt", real_c(0.01) );
+ WALBERLA_LOG_INFO_ON_ROOT("dt: " << dt);
+
+ const int visSpacing = mainConf.getParameter<int>("visSpacing", 1000 );
+ WALBERLA_LOG_INFO_ON_ROOT("visSpacing: " << visSpacing);
+ const std::string path = mainConf.getParameter<std::string>("path", "vtk_out" );
+ WALBERLA_LOG_INFO_ON_ROOT("path: " << path);
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** GLOBALBODYSTORAGE ***");
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** BLOCKFOREST ***");
+ // create forest
+ shared_ptr< BlockForest > forest = createBlockForestFromConfig( mainConf );
+ if (!forest)
+ {
+ WALBERLA_LOG_INFO_ON_ROOT( "No BlockForest created ... exiting!");
+ return EXIT_SUCCESS;
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT("simulationDomain: " << forest->getDomain());
+
+ WALBERLA_LOG_INFO_ON_ROOT("blocks: " << Vector3<uint_t>(forest->getXSize(), forest->getYSize(), forest->getZSize()) );
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** BODYTUPLE ***");
+ // initialize body type ids
+ SetBodyTypeIDs<BodyTuple>::execute();
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** STORAGEDATAHANDLING ***");
+ // add block data
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto ccdID = forest->addBlockData(ccd::createHashGridsDataHandling( globalBodyStorage, storageID ), "CCD");
+ auto fcdID = forest->addBlockData(fcd::createGenericFCDDataHandling<BodyTuple, fcd::AnalyticCollideFunctor>(), "FCD");
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** INTEGRATOR ***");
+ std::unique_ptr<cr::ICR> cr;
+ if (bDEM)
+ {
+ cr = std::make_unique<cr::DEM>(globalBodyStorage, forest, storageID, ccdID, fcdID, &tt);
+ WALBERLA_LOG_INFO_ON_ROOT("Using DEM!");
+ } else if (bHCSITS)
+ {
+ cr = std::make_unique<cr::HCSITS>(globalBodyStorage, forest, storageID, ccdID, fcdID, &tt);
+ configure(mainConf, *static_cast<cr::HCSITS*>(cr.get()));
+ WALBERLA_LOG_INFO_ON_ROOT("Using HCSITS!");
+
+ cr::HCSITS* hcsits = static_cast<cr::HCSITS*>(cr.get());
+
+ if (bInelasticFrictionlessContact)
+ {
+ hcsits->setRelaxationModel(cr::HCSITS::InelasticFrictionlessContact);
+ WALBERLA_LOG_INFO_ON_ROOT("Using InelasticFrictionlessContact!");
+ } else if (bApproximateInelasticCoulombContactByDecoupling)
+ {
+ hcsits->setRelaxationModel(cr::HCSITS::ApproximateInelasticCoulombContactByDecoupling);
+ WALBERLA_LOG_INFO_ON_ROOT("Using ApproximateInelasticCoulombContactByDecoupling!");
+ } else if (bInelasticCoulombContactByDecoupling)
+ {
+ hcsits->setRelaxationModel(cr::HCSITS::InelasticCoulombContactByDecoupling);
+ WALBERLA_LOG_INFO_ON_ROOT("Using InelasticCoulombContactByDecoupling!");
+ } else if (bInelasticGeneralizedMaximumDissipationContact)
+ {
+ hcsits->setRelaxationModel(cr::HCSITS::InelasticGeneralizedMaximumDissipationContact);
+ WALBERLA_LOG_INFO_ON_ROOT("Using InelasticGeneralizedMaximumDissipationContact!");
+ } else
+ {
+ WALBERLA_ABORT("Friction model could not be determined!");
+ }
+ } else
+ {
+ WALBERLA_ABORT("Model could not be determined!");
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** SYNCCALL ***");
+ std::function<void(void)> syncCallWithoutTT;
+ if (bNN)
+ {
+ syncCallWithoutTT = std::bind( pe::syncNextNeighbors<BodyTuple>, boost::ref(*forest), storageID, &tt, real_c(0.1), false );
+ WALBERLA_LOG_INFO_ON_ROOT("Using NextNeighbor sync!");
+ } else if (bSO)
+ {
+ syncCallWithoutTT = std::bind( pe::syncShadowOwners<BodyTuple>, boost::ref(*forest), storageID, &tt, real_c(0.1), false );
+ WALBERLA_LOG_INFO_ON_ROOT("Using ShadowOwner sync!");
+ } else
+ {
+ WALBERLA_ABORT("Synchronization method could not be determined!");
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** VTK ***");
+ auto vtkDomainOutput = vtk::createVTKOutput_DomainDecomposition( forest, "domain_decomposition", 1, "vtk_out", "simulation_step" );
+ auto vtkSphereHelper = make_shared<SphereVtkOutput>(storageID, *forest) ;
+ auto vtkSphereOutput = vtk::createVTKOutput_PointData(vtkSphereHelper, "Bodies", 1, "vtk_out", "simulation_step", false, false);
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** SETUP - START ***");
+ const real_t static_cof ( real_c(0.1) / 2 ); // Coefficient of static friction. Note: pe doubles the input coefficient of friction for material-material contacts.
+ const real_t dynamic_cof ( static_cof ); // Coefficient of dynamic friction. Similar to static friction for low speed friction.
+ MaterialID material = createMaterial( "granular", real_t( 1.0 ), 0, static_cof, dynamic_cof, real_t( 0.5 ), 1, 1, 0, 0 );
+
+ auto simulationDomain = forest->getDomain();
+ const auto& generationDomain = simulationDomain; // simulationDomain.getExtended(-real_c(0.5) * spacing);
+
+ const real_t spacing(1.0);
+ const real_t radius(0.5);
+ uint_t numParticles = uint_c(0);
+
+ for (auto& currentBlock : *forest)
+ {
+ for (auto it = grid_generator::SCIterator(currentBlock.getAABB().getIntersection(generationDomain), Vector3<real_t>(spacing, spacing, spacing) * real_c(0.5), spacing); it != grid_generator::SCIterator(); ++it)
+ {
+ SphereID sp = pe::createSphere( *globalBodyStorage, *forest, storageID, 0, *it, radius, material);
+ if (sp != nullptr) ++numParticles;
+ }
+ }
+ mpi::reduceInplace(numParticles, mpi::SUM);
+ WALBERLA_LOG_INFO_ON_ROOT("#particles created: " << numParticles);
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** SETUP - END ***");
+
+ // synchronize particles
+ syncCallWithoutTT();
+ syncCallWithoutTT();
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** SIMULATION - START ***");
+ WALBERLA_MPI_BARRIER();
+ WcTimer timer;
+ for (int i=0; i < simulationSteps; ++i)
+ {
+ if( i % 200 == 0 )
+ {
+ WALBERLA_LOG_DEVEL_ON_ROOT( "Timestep " << i << " / " << simulationSteps );
+ }
+
+ cr->timestep( real_c(dt) );
+ syncCallWithoutTT();
+
+// if( i % visSpacing == 0 )
+// {
+// vtkDomainOutput->write( );
+// vtkSphereOutput->write( );
+// }
+ }
+ WALBERLA_MPI_BARRIER();
+ timer.end();
+ WALBERLA_LOG_INFO_ON_ROOT("runtime: " << timer.average());
+ WALBERLA_LOG_INFO_ON_ROOT("*** SIMULATION - END ***");
+
+ auto temp = tt.getReduced( );
+ WALBERLA_ROOT_SECTION()
+ {
+ std::cout << temp;
+ }
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** CHECKING RESULT - START ***");
+ for (auto& currentBlock : *forest)
+ {
+ Storage * storage = currentBlock.getData< Storage >( storageID );
+ BodyStorage& localStorage = (*storage)[0];
+
+ auto bodyIt = localStorage.begin();
+ for (auto it = grid_generator::SCIterator(currentBlock.getAABB().getIntersection(generationDomain), Vector3<real_t>(spacing, spacing, spacing) * real_c(0.5), spacing);
+ it != grid_generator::SCIterator();
+ ++it, ++bodyIt)
+ {
+ WALBERLA_CHECK_UNEQUAL(bodyIt, localStorage.end());
+ WALBERLA_CHECK_FLOAT_EQUAL(bodyIt->getPosition(), *it);
+ }
+ }
+ WALBERLA_LOG_INFO_ON_ROOT("*** CHECKING RESULT - END ***");
+
+ return EXIT_SUCCESS;
+}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/apps/benchmarks/PeriodicGranularGas/upload.py b/apps/benchmarks/PeriodicGranularGas/upload.py
new file mode 100644
index 0000000000000000000000000000000000000000..799476c1d51d8d5a28a08c2a14b51c60df41f5ce
--- /dev/null
+++ b/apps/benchmarks/PeriodicGranularGas/upload.py
@@ -0,0 +1,187 @@
+import os
+import time
+import math
+import random
+import re
+from influxdb import InfluxDBClient
+from git import Repo
+
+
+def main():
+ try:
+ write_user_pw = os.environ["INFLUXDB_WRITE_USER"]
+ except KeyError:
+ import sys
+ print('Password for the InfluxDB write_user was not set.\n',
+ 'See https://docs.gitlab.com/ee/ci/variables/#secret-variables', file=sys.stderr)
+ exc_info = sys.exc_info()
+ raise exc_info[0].with_traceback(exc_info[1], exc_info[2])
+
+ client = InfluxDBClient('i10grafana.informatik.uni-erlangen.de', 8086,
+ 'pe', write_user_pw, 'pe')
+
+ #repo = Repo(search_parent_directories=True)
+ #commit = repo.head.commit
+
+ with open("PeriodicGranularGas_DEM_NN.txt") as f:
+ s = f.read()
+ m = re.search('runtime: (\d*.\d*)', s)
+
+ json_body = [
+ {
+ 'measurement': 'pe_benchmark',
+ 'tags': {
+ 'host' : os.uname()[1],
+ 'image' : os.environ["DOCKER_IMAGE_NAME"],
+ 'model' : 'DEM',
+ 'friction': 'Coulomb',
+ 'sync' : 'next neighbor'
+ },
+ 'time': int(time.time()),
+ 'fields': {'runtime': float(m.group(1))}
+ }
+ ]
+ print(float(m.group(1)))
+ client.write_points(json_body, time_precision='s')
+
+ #*************************************************
+
+ with open("PeriodicGranularGas_DEM_SO.txt") as f:
+ s = f.read()
+ m = re.search('runtime: (\d*.\d*)', s)
+
+ json_body = [
+ {
+ 'measurement': 'pe_benchmark',
+ 'tags': {
+ 'host' : os.uname()[1],
+ 'image' : os.environ["DOCKER_IMAGE_NAME"],
+ 'model' : 'DEM',
+ 'friction': 'Coulomb',
+ 'sync' : 'shadow owner'
+ },
+ 'time': int(time.time()),
+ 'fields': {'runtime': float(m.group(1))}
+ }
+ ]
+ print(float(m.group(1)))
+ client.write_points(json_body, time_precision='s')
+
+ #*************************************************
+
+ with open("PeriodicGranularGas_HCSITS_NN_IFC.txt") as f:
+ s = f.read()
+ m = re.search('runtime: (\d*.\d*)', s)
+
+ json_body = [
+ {
+ 'measurement': 'pe_benchmark',
+ 'tags': {
+ 'host' : os.uname()[1],
+ 'image' : os.environ["DOCKER_IMAGE_NAME"],
+ 'model' : 'HCSITS',
+ 'friction': 'InelasticFrictionlessContact',
+ 'sync' : 'next neighbor'
+ },
+ 'time': int(time.time()),
+ 'fields': {'runtime': float(m.group(1))}
+ }
+ ]
+ print(float(m.group(1)))
+ client.write_points(json_body, time_precision='s')
+
+ #*************************************************
+
+ with open("PeriodicGranularGas_HCSITS_NN_AICCBD.txt") as f:
+ s = f.read()
+ m = re.search('runtime: (\d*.\d*)', s)
+
+ json_body = [
+ {
+ 'measurement': 'pe_benchmark',
+ 'tags': {
+ 'host' : os.uname()[1],
+ 'image' : os.environ["DOCKER_IMAGE_NAME"],
+ 'model' : 'HCSITS',
+ 'friction': 'ApproximateInelasticCoulombContactByDecoupling',
+ 'sync' : 'next neighbor'
+ },
+ 'time': int(time.time()),
+ 'fields': {'runtime': float(m.group(1))}
+ }
+ ]
+ print(float(m.group(1)))
+ client.write_points(json_body, time_precision='s')
+
+ #*************************************************
+
+ with open("PeriodicGranularGas_HCSITS_NN_ICCBD.txt") as f:
+ s = f.read()
+ m = re.search('runtime: (\d*.\d*)', s)
+
+ json_body = [
+ {
+ 'measurement': 'pe_benchmark',
+ 'tags': {
+ 'host' : os.uname()[1],
+ 'image' : os.environ["DOCKER_IMAGE_NAME"],
+ 'model' : 'HCSITS',
+ 'friction': 'InelasticCoulombContactByDecoupling',
+ 'sync' : 'next neighbor'
+ },
+ 'time': int(time.time()),
+ 'fields': {'runtime': float(m.group(1))}
+ }
+ ]
+ print(float(m.group(1)))
+ client.write_points(json_body, time_precision='s')
+
+ #*************************************************
+
+ with open("PeriodicGranularGas_HCSITS_NN_IGMDC.txt") as f:
+ s = f.read()
+ m = re.search('runtime: (\d*.\d*)', s)
+
+ json_body = [
+ {
+ 'measurement': 'pe_benchmark',
+ 'tags': {
+ 'host' : os.uname()[1],
+ 'image' : os.environ["DOCKER_IMAGE_NAME"],
+ 'model' : 'HCSITS',
+ 'friction': 'InelasticGeneralizedMaximumDissipationContact',
+ 'sync' : 'next neighbor'
+ },
+ 'time': int(time.time()),
+ 'fields': {'runtime': float(m.group(1))}
+ }
+ ]
+ print(float(m.group(1)))
+ client.write_points(json_body, time_precision='s')
+
+ #*************************************************
+
+ with open("PeriodicGranularGas_HCSITS_SO_IFC.txt") as f:
+ s = f.read()
+ m = re.search('runtime: (\d*.\d*)', s)
+
+ json_body = [
+ {
+ 'measurement': 'pe_benchmark',
+ 'tags': {
+ 'host' : os.uname()[1],
+ 'image' : os.environ["DOCKER_IMAGE_NAME"],
+ 'model' : 'HCSITS',
+ 'friction': 'InelasticFrictionlessContact',
+ 'sync' : 'shadow owner'
+ },
+ 'time': int(time.time()),
+ 'fields': {'runtime': float(m.group(1))}
+ }
+ ]
+ print(float(m.group(1)))
+ client.write_points(json_body, time_precision='s')
+
+
+if __name__ == "__main__":
+ main()
diff --git a/apps/benchmarks/PoiseuilleChannel/PoiseuilleChannel.cpp b/apps/benchmarks/PoiseuilleChannel/PoiseuilleChannel.cpp
index d19c5f3c8bb803e8fdde12b549b9c40311817da9..dfb8eefd3ab839cf40924e6f709818bae2f0ea68 100644
--- a/apps/benchmarks/PoiseuilleChannel/PoiseuilleChannel.cpp
+++ b/apps/benchmarks/PoiseuilleChannel/PoiseuilleChannel.cpp
@@ -88,13 +88,13 @@
#include "vtk/Initialization.h"
#include "vtk/VTKOutput.h"
-#include <boost/bind.hpp>
-
#include <algorithm>
#include <cmath>
#include <cstdlib>
#include <cstring>
+#include <functional>
#include <iostream>
+#include <memory>
#include <utility>
#include <vector>
@@ -127,12 +127,12 @@ typedef lbm::D3Q27< lbm::collision_model::TRT, true, lbm::force_model::SimpleCo
template< typename LatticeModel_T >
struct Types
{
- typedef typename LatticeModel_T::Stencil Stencil_T;
- typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+ using Stencil_T = typename LatticeModel_T::Stencil;
+ using PdfField_T = lbm::PdfField<LatticeModel_T>;
};
-typedef walberla::uint16_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint16_t;
+using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = uint_t(4);
@@ -303,7 +303,7 @@ static shared_ptr< SetupBlockForest > createSetupBlockForest( const blockforest:
( setup.zCells + uint_t(2) * FieldGhostLayers ) ) * memoryPerCell;
forest->addRefinementSelectionFunction( refinementSelectionFunctions );
- forest->addWorkloadMemorySUIDAssignmentFunction( boost::bind( workloadAndMemoryAssignment, _1, memoryPerBlock ) );
+ forest->addWorkloadMemorySUIDAssignmentFunction( std::bind( workloadAndMemoryAssignment, std::placeholders::_1, memoryPerBlock ) );
forest->init( AABB( real_c(0), real_c(0), real_c(0), real_c( setup.xBlocks * setup.xCells ),
real_c( setup.yBlocks * setup.yCells ),
@@ -343,9 +343,9 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
MPIManager::instance()->useWorldComm();
- auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false ) );
+ auto bf = std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false );
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, setup.xCells, setup.yCells, setup.zCells ) );
+ auto sbf = std::make_shared< StructuredBlockForest >( bf, setup.xCells, setup.yCells, setup.zCells );
sbf->createCellBoundingBoxes();
return sbf;
@@ -358,9 +358,9 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
memoryPerCell, processMemoryLimit,
configBlock.getParameter< bool >( "outputSetupForest", false ) );
- auto bf = shared_ptr< blockforest::BlockForest >( new blockforest::BlockForest( uint_c( MPIManager::instance()->rank() ), *sforest, false ) );
+ auto bf = std::make_shared< blockforest::BlockForest >( uint_c( MPIManager::instance()->rank() ), *sforest, false );
- auto sbf = shared_ptr< blockforest::StructuredBlockForest >( new blockforest::StructuredBlockForest( bf, setup.xCells, setup.yCells, setup.zCells ) );
+ auto sbf = std::make_shared< blockforest::StructuredBlockForest >( bf, setup.xCells, setup.yCells, setup.zCells );
sbf->createCellBoundingBoxes();
return sbf;
@@ -478,7 +478,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block ) const
{
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
+ using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
FlagField_T * flagField = block->getData< FlagField_T >( flagFieldId_ );
PdfField_T * pdfField = block->getData< PdfField_T > ( pdfFieldId_ );
@@ -497,7 +497,7 @@ class CurvedDeltaValueCalculation
{
public:
- typedef typename LatticeModel_T::Stencil Stencil;
+ using Stencil = typename LatticeModel_T::Stencil;
CurvedDeltaValueCalculation( const shared_ptr< StructuredBlockForest > & blocks, const IBlock & block, const Channel & channel ) :
blocks_( blocks ), block_( block ), channel_( channel ) {}
@@ -587,16 +587,16 @@ class ErrorVTKWriter : public vtk::BlockCellDataWriter< OutputType, 3 >
{
public:
- typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+ using PdfField_T = lbm::PdfField< LatticeModel_T >;
ErrorVTKWriter( const ConstBlockDataID & pdfFieldId, const std::string & id, const Setup & setup ) :
- vtk::BlockCellDataWriter< OutputType, 3 >( id ), bdid_( pdfFieldId ), pdf_( NULL ), setup_( setup ) {}
+ vtk::BlockCellDataWriter< OutputType, 3 >( id ), bdid_( pdfFieldId ), pdf_( nullptr ), setup_( setup ) {}
protected:
- void configure() { WALBERLA_ASSERT_NOT_NULLPTR( this->block_ ); pdf_ = this->block_->template getData< PdfField_T >( bdid_ ); }
+ void configure() override { WALBERLA_ASSERT_NOT_NULLPTR( this->block_ ); pdf_ = this->block_->template getData< PdfField_T >( bdid_ ); }
- OutputType evaluate( const cell_idx_t x, const cell_idx_t y, const cell_idx_t z, const cell_idx_t f )
+ OutputType evaluate( const cell_idx_t x, const cell_idx_t y, const cell_idx_t z, const cell_idx_t f ) override
{
WALBERLA_ASSERT_NOT_NULLPTR( pdf_ );
@@ -657,7 +657,7 @@ class MyVTKOutput {
public:
MyVTKOutput( const ConstBlockDataID & pdfField, const ConstBlockDataID & flagField,
- vtk::VTKOutput::BeforeFunction pdfGhostLayerSync, const Setup & setup ) :
+ const vtk::VTKOutput::BeforeFunction& pdfGhostLayerSync, const Setup & setup ) :
setup_( setup ), pdfField_( pdfField ), flagField_( flagField ), pdfGhostLayerSync_( pdfGhostLayerSync ) {}
void operator()( std::vector< shared_ptr<vtk::BlockCellDataWriterInterface> > & writers,
@@ -786,8 +786,8 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
Vector3< real_t >( initVelocity, real_c(0), real_c(0) ), real_t(1),
FieldGhostLayers, field::zyxf );
- typedef typename lbm::Adaptor<LatticeModel_T>::VelocityVector VelocityAdaptor_T;
- typedef typename lbm::Adaptor<LatticeModel_T>::Density DensityAdaptor_T;
+ using VelocityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::VelocityVector;
+ using DensityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::Density;
BlockDataID velocityAdaptorId = field::addFieldAdaptor< VelocityAdaptor_T >( blocks, pdfFieldId, "velocity adaptor" );
BlockDataID densityAdaptorId = field::addFieldAdaptor< DensityAdaptor_T >( blocks, pdfFieldId, "density adaptor" );
@@ -834,7 +834,7 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
shared_ptr<WcTimingPool> refinementTimeStepTiming = make_shared<WcTimingPool>();
shared_ptr<WcTimingPool> refinementTimeStepLevelwiseTiming = make_shared<WcTimingPool>();
- typedef typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T BH_T;
+ using BH_T = typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T;
auto mySweep = lbm::makeCellwiseSweep< LatticeModel_T, FlagField_T >( pdfFieldId, flagFieldId, Fluid_Flag );
auto ts = lbm::refinement::makeTimeStep< LatticeModel_T, BH_T >( blocks, mySweep, pdfFieldId, boundaryHandlingId );
@@ -847,12 +847,12 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
// evaluation
- const auto exactSolutionFunction = setup.circularProfile ? boost::bind( exactPipeVelocity, _1, blocks, setup ) :
- boost::bind( exactPlatesVelocity, _1, blocks, setup );
+ const auto exactSolutionFunction = setup.circularProfile ? std::bind( exactPipeVelocity, std::placeholders::_1, blocks, setup ) :
+ std::bind( exactPlatesVelocity, std::placeholders::_1, blocks, setup );
auto volumetricFlowRate = field::makeVolumetricFlowRateEvaluation< VelocityAdaptor_T, FlagField_T >( configBlock, blocks, velocityAdaptorId,
flagFieldId, Fluid_Flag,
- boost::bind( exactFlowRate, setup.flowRate_L ),
+ std::bind( exactFlowRate, setup.flowRate_L ),
exactSolutionFunction );
volumetricFlowRate->setNormalizationFactor( real_t(1) / setup.maxVelocity_L );
volumetricFlowRate->setDomainNormalization( Vector3<real_t>( real_t(1) ) );
@@ -1107,7 +1107,7 @@ int main( int argc, char **argv )
//WALBERLA_ROOT_SECTION() { logging::Logging::instance()->setLogLevel( logging::Logging::PROGRESS ); }
#ifdef _OPENMP
- if( std::getenv( "OMP_NUM_THREADS" ) == NULL )
+ if( std::getenv( "OMP_NUM_THREADS" ) == nullptr )
WALBERLA_ABORT( "If you are using a version of the program that was compiled with OpenMP you have to "
"specify the environment variable \'OMP_NUM_THREADS\' accordingly!" );
#endif
diff --git a/apps/benchmarks/SchaeferTurek/SchaeferTurek.cpp b/apps/benchmarks/SchaeferTurek/SchaeferTurek.cpp
index ed907fc37b06df8e3e54691bebc52bc7ea7c495f..d62fac03260b19dbb9ad73e67d7daf5911fe2f34 100644
--- a/apps/benchmarks/SchaeferTurek/SchaeferTurek.cpp
+++ b/apps/benchmarks/SchaeferTurek/SchaeferTurek.cpp
@@ -84,6 +84,7 @@
#include "lbm/refinement/BoundarySetup.h"
#include "lbm/refinement/PdfFieldSyncPackInfo.h"
#include "lbm/refinement/TimeStep.h"
+#include "lbm/refinement/VorticityBasedLevelDetermination.h"
#include "lbm/sweeps/CellwiseSweep.h"
#include "lbm/sweeps/SplitPureSweep.h"
#include "lbm/sweeps/SplitSweep.h"
@@ -106,13 +107,14 @@
#include <boost/mpl/equal_to.hpp>
#include <boost/mpl/int.hpp>
#include <boost/mpl/or.hpp>
-#include <boost/bind.hpp>
#include <algorithm>
#include <cmath>
#include <cstdlib>
#include <cstring>
+#include <functional>
#include <iostream>
+#include <memory>
#include <utility>
#include <vector>
@@ -157,12 +159,12 @@ typedef lbm::D3Q27< lbm::collision_model::TRT, true > D3Q27_TRT_COMP;
template< typename LatticeModel_T >
struct Types
{
- typedef typename LatticeModel_T::Stencil Stencil_T;
- typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+ using Stencil_T = typename LatticeModel_T::Stencil;
+ using PdfField_T = lbm::PdfField< LatticeModel_T >;
};
-typedef walberla::uint16_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint16_t;
+using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = uint_t(4);
@@ -656,7 +658,7 @@ static shared_ptr< SetupBlockForest > createSetupBlockForest( const blockforest:
( setup.xCells + uint_t(2) * FieldGhostLayers ) ) * memoryPerCell;
forest->addRefinementSelectionFunction( refinementSelectionFunctions );
- forest->addWorkloadMemorySUIDAssignmentFunction( boost::bind( workloadMemoryAndSUIDAssignment, _1, memoryPerBlock, boost::cref( setup ) ) );
+ forest->addWorkloadMemorySUIDAssignmentFunction( std::bind( workloadMemoryAndSUIDAssignment, std::placeholders::_1, memoryPerBlock, std::cref( setup ) ) );
forest->init( AABB( real_c(0), real_c(0), real_c(0),
setup.H * ( real_c(setup.xBlocks) * real_c(setup.xCells) ) / ( real_c(setup.yzBlocks) * real_c(setup.yzCells) ), setup.H, setup.H ),
@@ -695,9 +697,9 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
MPIManager::instance()->useWorldComm();
- auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false ) );
+ auto bf = std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false );
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, setup.xCells, setup.yzCells, setup.pseudo2D ? uint_t(1) : setup.yzCells ) );
+ auto sbf = std::make_shared< StructuredBlockForest >( bf, setup.xCells, setup.yzCells, setup.pseudo2D ? uint_t(1) : setup.yzCells );
sbf->createCellBoundingBoxes();
return sbf;
@@ -710,9 +712,9 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
memoryPerCell, processMemoryLimit,
configBlock.getParameter< bool >( "outputSetupForest", false ) );
- auto bf = shared_ptr< blockforest::BlockForest >( new blockforest::BlockForest( uint_c( MPIManager::instance()->rank() ), *sforest, false ) );
+ auto bf = std::make_shared< blockforest::BlockForest >( uint_c( MPIManager::instance()->rank() ), *sforest, false );
- auto sbf = shared_ptr< blockforest::StructuredBlockForest >( new blockforest::StructuredBlockForest( bf, setup.xCells, setup.yzCells, setup.pseudo2D ? uint_t(1) : setup.yzCells ) );
+ auto sbf = std::make_shared< blockforest::StructuredBlockForest >( bf, setup.xCells, setup.yzCells, setup.pseudo2D ? uint_t(1) : setup.yzCells );
sbf->createCellBoundingBoxes();
return sbf;
@@ -798,17 +800,17 @@ class MyBoundaryHandling : public blockforest::AlwaysInitializeBlockDataHandling
{
public:
- typedef typename MyBoundaryTypes< LatticeModel_T >::NoSlip_T NoSlip_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::Obstacle_T Obstacle_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::Curved_T Curved_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::DynamicUBB_T DynamicUBB_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::Outlet21_T Outlet21_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::Outlet43_T Outlet43_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::PressureOutlet_T PressureOutlet_T;
+ using NoSlip_T = typename MyBoundaryTypes<LatticeModel_T>::NoSlip_T;
+ using Obstacle_T = typename MyBoundaryTypes<LatticeModel_T>::Obstacle_T;
+ using Curved_T = typename MyBoundaryTypes<LatticeModel_T>::Curved_T;
+ using DynamicUBB_T = typename MyBoundaryTypes<LatticeModel_T>::DynamicUBB_T;
+ using Outlet21_T = typename MyBoundaryTypes<LatticeModel_T>::Outlet21_T;
+ using Outlet43_T = typename MyBoundaryTypes<LatticeModel_T>::Outlet43_T;
+ using PressureOutlet_T = typename MyBoundaryTypes<LatticeModel_T>::PressureOutlet_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryConditions_T BoundaryConditions_T;
+ using BoundaryConditions_T = typename MyBoundaryTypes<LatticeModel_T>::BoundaryConditions_T;
- typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T BoundaryHandling_T;
+ using BoundaryHandling_T = typename MyBoundaryTypes<LatticeModel_T>::BoundaryHandling_T;
@@ -818,7 +820,7 @@ public:
flagFieldId_( flagFieldId ), pdfFieldId_( pdfFieldId ), blocks_( blocks ), setup_( setup ), timeTracker_( timeTracker )
{}
- BoundaryHandling_T * initialize( IBlock * const block );
+ BoundaryHandling_T * initialize( IBlock * const block ) override;
private:
@@ -836,7 +838,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::initialize( IBlock * const block )
{
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
+ using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
FlagField_T * flagField = block->getData< FlagField_T >( flagFieldId_ );
PdfField_T * pdfField = block->getData< PdfField_T > ( pdfFieldId_ );
@@ -865,7 +867,7 @@ class CurvedDeltaValueCalculation
{
public:
- typedef typename LatticeModel_T::Stencil Stencil;
+ using Stencil = typename LatticeModel_T::Stencil;
CurvedDeltaValueCalculation( const shared_ptr< StructuredBlockForest > & blocks, const IBlock & block, const Cylinder & cylinder ) :
blocks_( blocks ), block_( block ), cylinder_( cylinder ) {}
@@ -908,7 +910,7 @@ class BoundarySetter
{
public:
- typedef typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T BoundaryHandling_T;
+ using BoundaryHandling_T = typename MyBoundaryTypes< LatticeModel_T >::BoundaryHandling_T;
BoundarySetter( const weak_ptr<StructuredBlockForest> & blockForest, const BlockDataID & boundaryHandlingId, const Setup & setup,
const int obstacleBoundary, const int outletType,
@@ -1063,109 +1065,6 @@ Set<SUID> Pseudo2DBlockStateDetermination::operator()( const std::vector< std::p
}
-
-template< typename VectorField_T, typename Filter_T, bool Pseudo2D = false >
-class VorticityRefinement // used as a 'BlockForest::RefreshMinTargetLevelDeterminationFunction'
-{
-public:
-
- VorticityRefinement( const ConstBlockDataID & fieldId, const Filter_T & filter,
- const real_t upperLimit, const real_t lowerLimit, const uint_t maxLevel ) :
- fieldId_( fieldId ), filter_( filter ),
- upperLimit_( upperLimit * upperLimit ), lowerLimit_( lowerLimit * lowerLimit ), maxLevel_( maxLevel )
- {}
-
- void operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
- std::vector< const Block * > & blocksAlreadyMarkedForRefinement,
- const BlockForest & forest );
-
-private:
-
- ConstBlockDataID fieldId_;
-
- Filter_T filter_;
-
- real_t upperLimit_;
- real_t lowerLimit_;
-
- uint_t maxLevel_;
-
-}; // class VorticityRefinement
-
-template< typename VectorField_T, typename Filter_T, bool Pseudo2D >
-void VorticityRefinement< VectorField_T, Filter_T, Pseudo2D >::operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
- std::vector< const Block * > &, const BlockForest & )
-{
- for( auto it = minTargetLevels.begin(); it != minTargetLevels.end(); ++it )
- {
- const Block * const block = it->first;
- const VectorField_T * u = block->template getData< VectorField_T >( fieldId_ );
-
- if( u == NULL )
- {
- it->second = uint_t(0);
- continue;
- }
-
- CellInterval interval = u->xyzSize();
- Cell expand( cell_idx_c(-1), cell_idx_c(-1), Pseudo2D ? cell_idx_t(0) : cell_idx_c(-1) );
- interval.expand( expand );
-
- const cell_idx_t one( cell_idx_t(1) );
- const real_t half( real_c(0.5) );
-
- bool refine( false );
- bool coarsen( true );
-
- filter_( *block );
-
- WALBERLA_FOR_ALL_CELLS_IN_INTERVAL_XYZ( interval,
-
- if( filter_(x,y,z) && filter_(x+one,y,z) && filter_(x-one,y,z) && filter_(x,y+one,z) && filter_(x,y-one,z) &&
- ( Pseudo2D || (filter_(x,y,z+one) && filter_(x,y,z-one)) ) )
- {
- const Vector3< real_t > xa = u->get(x+one,y,z);
- const Vector3< real_t > xb = u->get(x-one,y,z);
- const Vector3< real_t > ya = u->get(x,y+one,z);
- const Vector3< real_t > yb = u->get(x,y-one,z);
- const Vector3< real_t > za = Pseudo2D ? Vector3< real_t >(0) : u->get(x,y,z+one);
- const Vector3< real_t > zb = Pseudo2D ? Vector3< real_t >(0) : u->get(x,y,z-one);
-
- // ATTENTION: dx/y/z is assumed to be equal to '1'!
- const real_t duzdy = half * ( ya[2] - yb[2] );
- const real_t duydz = half * ( za[1] - zb[1] );
- const real_t duxdz = half * ( za[0] - zb[0] );
- const real_t duzdx = half * ( xa[2] - xb[2] );
- const real_t duydx = half * ( xa[1] - xb[1] );
- const real_t duxdy = half * ( ya[0] - yb[0] );
-
- const Vector3< real_t > curl( duzdy - duydz, duxdz - duzdx, duydx - duxdy );
- const auto curlSqr = curl.sqrLength();
-
- if( curlSqr > lowerLimit_ )
- {
- coarsen = false;
- if( curlSqr > upperLimit_ )
- refine = true;
- }
- }
- )
-
- if( refine && block->getLevel() < maxLevel_ )
- {
- WALBERLA_ASSERT( !coarsen );
- it->second = block->getLevel() + uint_t(1);
- }
- if( coarsen && block->getLevel() > uint_t(0) )
- {
- WALBERLA_ASSERT( !refine );
- it->second = block->getLevel() - uint_t(1);
- }
- }
-}
-
-
-
// used as a 'BlockForest::RefreshMinTargetLevelDeterminationFunction
void keepInflowOutflowAtTheSameLevel( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
std::vector< const Block * > & blocksAlreadyMarkedForRefinement,
@@ -1266,7 +1165,7 @@ class Pseudo2DPhantomWeight // used as a 'PhantomBlockForest::PhantomBlockDataAs
{
public:
- typedef uint8_t weight_t;
+ using weight_t = uint8_t;
Pseudo2DPhantomWeight( const weight_t _weight ) : weight_( _weight ) {}
@@ -1332,7 +1231,7 @@ class MyVTKOutput {
public:
MyVTKOutput( const ConstBlockDataID & pdfField, const ConstBlockDataID & flagField,
- vtk::VTKOutput::BeforeFunction pdfGhostLayerSync ) :
+ const vtk::VTKOutput::BeforeFunction& pdfGhostLayerSync ) :
pdfField_( pdfField ), flagField_( flagField ), pdfGhostLayerSync_( pdfGhostLayerSync ) {}
void operator()( std::vector< shared_ptr<vtk::BlockCellDataWriterInterface> > & writers,
@@ -1398,13 +1297,13 @@ class Evaluation
{
public:
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
- typedef typename LatticeModel_T::Stencil Stencil_T;
+ using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
+ using Stencil_T = typename LatticeModel_T::Stencil;
Evaluation( const weak_ptr< StructuredBlockStorage > & blocks, const uint_t checkFrequency,
const BlockDataID & pdfFieldId, const BlockDataID & flagFieldId, const FlagUID & fluid, const FlagUID & obstacle,
const Setup & setup,
- const bool logToStream = true, const bool logToFile = true, const std::string filename = std::string("SchaeferTurek.txt"),
+ const bool logToStream = true, const bool logToFile = true, const std::string& filename = std::string("SchaeferTurek.txt"),
const Set<SUID> & requiredSelectors = Set<SUID>::emptySet(),
const Set<SUID> & incompatibleSelectors = Set<SUID>::emptySet() ) :
initialized_( false ), blocks_( blocks ),
@@ -1532,7 +1431,7 @@ void Evaluation< LatticeModel_T >::operator()()
if( setup_.evaluateStrouhal )
{
auto block = blocks->getBlock( setup_.pStrouhal );
- if( block != NULL )
+ if( block != nullptr )
{
const PdfField_T * const pdfField = block->template getData< PdfField_T >( pdfFieldId_ );
const auto cell = blocks->getBlockLocalCell( *block, setup_.pStrouhal );
@@ -2012,7 +1911,7 @@ void Evaluation< LatticeModel_T >::refresh()
int omega( 0 );
auto block = blocks->getBlock( setup_.pAlpha );
- if( block != NULL )
+ if( block != nullptr )
{
const FlagField_T * const flagField = block->template getData< FlagField_T >( flagFieldId_ );
@@ -2036,7 +1935,7 @@ void Evaluation< LatticeModel_T >::refresh()
}
block = blocks->getBlock( setup_.pOmega );
- if( block != NULL )
+ if( block != nullptr )
{
const FlagField_T * const flagField = block->template getData< FlagField_T >( flagFieldId_ );
@@ -2065,7 +1964,7 @@ void Evaluation< LatticeModel_T >::refresh()
if( alpha == 0 )
{
block = blocks->getBlock( setup_.pAlpha );
- if( block != NULL )
+ if( block != nullptr )
{
const FlagField_T * const flagField = block->template getData< FlagField_T >( flagFieldId_ );
@@ -2085,7 +1984,7 @@ void Evaluation< LatticeModel_T >::refresh()
if( omega == 0 )
{
block = blocks->getBlock( setup_.pOmega );
- if( block != NULL )
+ if( block != nullptr )
{
const FlagField_T * const flagField = block->template getData< FlagField_T >( flagFieldId_ );
@@ -2121,7 +2020,7 @@ void Evaluation< LatticeModel_T >::refresh()
int strouhal( 0 );
auto block = blocks->getBlock( setup_.pStrouhal );
- if( block != NULL )
+ if( block != nullptr )
{
const FlagField_T * const flagField = block->template getData< FlagField_T >( flagFieldId_ );
@@ -2181,7 +2080,7 @@ void Evaluation< LatticeModel_T >::evaluate( real_t & cDRealArea, real_t & cLRea
if( setup_.evaluatePressure )
{
auto block = blocks->getBlock( setup_.pAlpha );
- if( block != NULL )
+ if( block != nullptr )
{
const PdfField_T * const pdfField = block->template getData< PdfField_T >( pdfFieldId_ );
const auto cell = blocks->getBlockLocalCell( *block, setup_.pAlpha );
@@ -2190,7 +2089,7 @@ void Evaluation< LatticeModel_T >::evaluate( real_t & cDRealArea, real_t & cLRea
}
block = blocks->getBlock( setup_.pOmega );
- if( block != NULL )
+ if( block != nullptr )
{
const PdfField_T * const pdfField = block->template getData< PdfField_T >( pdfFieldId_ );
const auto cell = blocks->getBlockLocalCell( *block, setup_.pOmega );
@@ -2356,7 +2255,7 @@ void addRefinementTimeStep( SweepTimeloop & timeloop, shared_ptr< blockforest::S
const shared_ptr< Evaluation< LatticeModel_T > > & evaluation,
const shared_ptr< lbm::TimeTracker > & timeTracker )
{
- typedef typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T BH_T;
+ using BH_T = typename MyBoundaryHandling< LatticeModel_T >::BoundaryHandling_T;
auto ts = lbm::refinement::makeTimeStep< LatticeModel_T, BH_T >( blocks, sweep, pdfFieldId, boundaryHandlingId, None, Empty );
ts->asynchronousCommunication( !syncComm );
@@ -2385,7 +2284,7 @@ struct AddRefinementTimeStep
{
if( pure )
{
- typedef lbm::SplitPureSweep< LatticeModel_T > Sweep_T;
+ using Sweep_T = lbm::SplitPureSweep< LatticeModel_T >;
auto mySweep = make_shared< Sweep_T >( pdfFieldId );
addRefinementTimeStep< LatticeModel_T, Sweep_T >( timeloop, blocks, pdfFieldId, boundaryHandlingId, timingPool, levelwiseTimingPool,
@@ -2469,7 +2368,7 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
// add density adaptor
- typedef typename lbm::Adaptor<LatticeModel_T>::Density DensityAdaptor_T;
+ using DensityAdaptor_T = typename lbm::Adaptor< LatticeModel_T >::Density;
BlockDataID densityAdaptorId = field::addFieldAdaptor< DensityAdaptor_T >( blocks, pdfFieldId, "density adaptor", None, Empty );
// add velocity field + initialize velocity field writer (only used for simulations with an adaptive block structure)
@@ -2577,8 +2476,8 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
{
const real_t lowerLimit = configBlock.getParameter< real_t >( "curlLowerLimit" );
const real_t upperLimit = configBlock.getParameter< real_t >( "curlUpperLimit" );
-
- VorticityRefinement< VelocityField_T, field::FlagFieldEvaluationFilter<FlagField_T>, Is2D<LatticeModel_T>::value > vorticityRefinement(
+
+ lbm::refinement::VorticityBasedLevelDetermination< field::FlagFieldEvaluationFilter<FlagField_T>, Is2D<LatticeModel_T>::value > vorticityRefinement(
velocityFieldId, flagFieldFilter, upperLimit, lowerLimit, configBlock.getParameter< uint_t >( "maxLevel", uint_t(0) ) );
minTargetLevelDeterminationFunctions.add( vorticityRefinement );
@@ -2602,7 +2501,8 @@ void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeMod
adaptiveRefinementLog = oss.str();
}
- minTargetLevelDeterminationFunctions.add( boost::bind( keepInflowOutflowAtTheSameLevel, _1, _2, _3, boost::cref(setup) ) );
+ minTargetLevelDeterminationFunctions.add( std::bind( keepInflowOutflowAtTheSameLevel, std::placeholders::_1, std::placeholders::_2,
+ std::placeholders::_3, std::cref(setup) ) );
if( Is2D< LatticeModel_T >::value )
minTargetLevelDeterminationFunctions.add( pseudo2DTargetLevelCorrection );
@@ -3006,7 +2906,7 @@ int main( int argc, char **argv )
//WALBERLA_ROOT_SECTION() { logging::Logging::instance()->setLogLevel( logging::Logging::PROGRESS ); }
#ifdef _OPENMP
- if( std::getenv( "OMP_NUM_THREADS" ) == NULL )
+ if( std::getenv( "OMP_NUM_THREADS" ) == nullptr )
WALBERLA_ABORT( "If you are using a version of the program that was compiled with OpenMP you have to "
"specify the environment variable \'OMP_NUM_THREADS\' accordingly!" );
#endif
@@ -3171,7 +3071,7 @@ int main( int argc, char **argv )
refinementSelectionFunctions.add( cylinderRefinementSelection );
}
- refinementSelectionFunctions.add( boost::bind( setInflowOutflowToSameLevel, _1, setup ) );
+ refinementSelectionFunctions.add( std::bind( setInflowOutflowToSameLevel, std::placeholders::_1, setup ) );
if( setup.pseudo2D )
refinementSelectionFunctions.add( Pseudo2DRefinementSelectionCorrection );
diff --git a/apps/benchmarks/UniformGrid/UniformGrid.cpp b/apps/benchmarks/UniformGrid/UniformGrid.cpp
index 396faa8300a9e4a54b47c7f909bf40a929e6a7f6..c270b38ca3fcd07869ba7a25842b1dd90f196c0c 100644
--- a/apps/benchmarks/UniformGrid/UniformGrid.cpp
+++ b/apps/benchmarks/UniformGrid/UniformGrid.cpp
@@ -83,6 +83,7 @@
#include <cstdlib>
#include <iostream>
+#include <memory>
@@ -111,13 +112,13 @@ typedef lbm::D3Q27< lbm::collision_model::D3Q27Cumulant, true > D3Q27_CUMULANT_
template< typename LatticeModel_T >
struct Types
{
- typedef typename LatticeModel_T::Stencil Stencil_T;
- typedef typename LatticeModel_T::CommunicationStencil CommunicationStencil_T;
- typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+ using Stencil_T = typename LatticeModel_T::Stencil;
+ using CommunicationStencil_T = typename LatticeModel_T::CommunicationStencil;
+ using PdfField_T = lbm::PdfField< LatticeModel_T >;
};
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = 1;
@@ -286,7 +287,7 @@ void createSetupBlockForest( blockforest::SetupBlockForest & sforest, const Conf
{
MPIManager::instance()->useWorldComm();
- sforest.balanceLoad( blockforest::CartesianDistribution( numberOfXProcesses, numberOfYProcesses, numberOfZProcesses, NULL ),
+ sforest.balanceLoad( blockforest::CartesianDistribution( numberOfXProcesses, numberOfYProcesses, numberOfZProcesses, nullptr ),
numberOfXProcesses * numberOfYProcesses * numberOfZProcesses, real_t(0), 0, true );
}
@@ -316,11 +317,11 @@ shared_ptr< blockforest::StructuredBlockForest > createStructuredBlockForest( co
blockforest::SetupBlockForest sforest;
createSetupBlockForest( sforest, configBlock, uint_c( MPIManager::instance()->numProcesses() ), blocksPerProcess );
- auto bf = shared_ptr< blockforest::BlockForest >( new blockforest::BlockForest( uint_c( MPIManager::instance()->rank() ), sforest, false ) );
+ auto bf = std::make_shared< blockforest::BlockForest >( uint_c( MPIManager::instance()->rank() ), sforest, false );
- auto sbf = shared_ptr< blockforest::StructuredBlockForest >( new blockforest::StructuredBlockForest( bf, numberOfXCellsPerBlock,
+ auto sbf = std::make_shared< blockforest::StructuredBlockForest >( bf, numberOfXCellsPerBlock,
numberOfYCellsPerBlock,
- numberOfZCellsPerBlock ) );
+ numberOfZCellsPerBlock );
sbf->createCellBoundingBoxes();
return sbf;
@@ -367,7 +368,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block, const StructuredBlockStorage * const storage ) const
{
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField_T;
+ using PdfField_T = typename Types< LatticeModel_T >::PdfField_T;
WALBERLA_ASSERT_NOT_NULLPTR( block );
WALBERLA_ASSERT_NOT_NULLPTR( storage );
@@ -428,7 +429,7 @@ class MyVTKOutput {
public:
MyVTKOutput( const ConstBlockDataID & pdfField, const ConstBlockDataID & flagField,
- vtk::VTKOutput::BeforeFunction pdfGhostLayerSync ) :
+ const vtk::VTKOutput::BeforeFunction& pdfGhostLayerSync ) :
pdfField_( pdfField ), flagField_( flagField ), pdfGhostLayerSync_( pdfGhostLayerSync ) {}
void operator()( std::vector< shared_ptr<vtk::BlockCellDataWriterInterface> > & writers,
@@ -486,8 +487,8 @@ void MyVTKOutput<LatticeModel_T>::operator()( std::vector< shared_ptr<vtk::Block
template< typename LatticeModel_T, class Enable = void >
struct AddLB
{
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField;
- typedef typename Types<LatticeModel_T>::CommunicationStencil_T CommunicationStencil;
+ using PdfField = typename Types< LatticeModel_T >::PdfField_T;
+ using CommunicationStencil = typename Types< LatticeModel_T >::CommunicationStencil_T;
static void add( shared_ptr< blockforest::StructuredBlockForest > & blocks, SweepTimeloop & timeloop,
const BlockDataID & pdfFieldId, const BlockDataID & flagFieldId, const BlockDataID & boundaryHandlingId,
@@ -550,7 +551,7 @@ struct AddLB
{
if( pure )
{
- typedef lbm::SplitPureSweep< LatticeModel_T > Sweep_T;
+ using Sweep_T = lbm::SplitPureSweep< LatticeModel_T >;
auto sweep = make_shared< Sweep_T >( pdfFieldId );
timeloop.add() << Sweep( lbm::CollideSweep< Sweep_T >( sweep ), "split pure LB sweep (collide)" );
@@ -590,8 +591,8 @@ struct AddLB< LatticeModel_T, typename boost::enable_if_c< boost::mpl::or_<
lbm::collision_model::Cumulant_tag >
>::value >::type >
{
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField;
- typedef typename Types<LatticeModel_T>::CommunicationStencil_T CommunicationStencil;
+ using PdfField = typename Types< LatticeModel_T >::PdfField_T;
+ using CommunicationStencil = typename Types< LatticeModel_T >::CommunicationStencil_T;
static void add( shared_ptr< blockforest::StructuredBlockForest > & blocks, SweepTimeloop & timeloop,
const BlockDataID & pdfFieldId, const BlockDataID & flagFieldId, const BlockDataID & boundaryHandlingId,
@@ -658,7 +659,7 @@ template< typename LatticeModel_T >
void run( const shared_ptr< Config > & config, const LatticeModel_T & latticeModel,
const bool split, const bool pure, const bool fzyx, const bool fullComm, const bool fused, const bool directComm )
{
- typedef typename Types<LatticeModel_T>::PdfField_T PdfField;
+ using PdfField = typename Types<LatticeModel_T>::PdfField_T;
Config::BlockHandle configBlock = config->getBlock( "UniformGrid" );
@@ -847,7 +848,7 @@ int main( int argc, char **argv )
//WALBERLA_ROOT_SECTION() { logging::Logging::instance()->setLogLevel( logging::Logging::PROGRESS ); }
#ifdef _OPENMP
- if( std::getenv( "OMP_NUM_THREADS" ) == NULL )
+ if( std::getenv( "OMP_NUM_THREADS" ) == nullptr )
WALBERLA_ABORT( "If you are using a version of the benchmark that was compiled with OpenMP you have to "
"specify the environment variable \'OMP_NUM_THREADS\' accordingly!" );
#endif
diff --git a/apps/pythonmodule/PythonModule.cpp b/apps/pythonmodule/PythonModule.cpp
index 21febaefdd84d25a432e4689bd7ce5d06fe22a57..43afcff724a02aca9babb38e7eabc7db56e820bf 100644
--- a/apps/pythonmodule/PythonModule.cpp
+++ b/apps/pythonmodule/PythonModule.cpp
@@ -49,6 +49,7 @@ typedef bmpl::vector<
Field<walberla::real_t,3>,
Field<walberla::real_t,4>,
Field<walberla::real_t,5>,
+ Field<walberla::real_t,6>,
Field<walberla::real_t,9>,
Field<walberla::real_t,15>,
Field<walberla::real_t,19>,
@@ -62,7 +63,6 @@ typedef bmpl::vector<
Field<walberla::int64_t,2>,
Field<walberla::int64_t,3>,
Field<walberla::int64_t,4>,
- Field<walberla::int64_t,5>,
Field<walberla::uint8_t,1>,
Field<walberla::uint16_t,1>,
diff --git a/apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp b/apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp
index de0512d8dd7e24c7ae85cf706293d63e28b2a368..c2f3e7a12665bf780b9ff81febd5eddf22818a20 100644
--- a/apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp
+++ b/apps/showcases/BidisperseFluidizedBed/BidisperseFluidizedBedDPM.cpp
@@ -29,6 +29,8 @@
#include "core/grid_generator/SCIterator.h"
#include "core/logging/all.h"
+#include <domain_decomposition/SharedSweep.h>
+
#include "field/AddToStorage.h"
#include "field/communication/PackInfo.h"
#include "field/distributors/all.h"
@@ -77,14 +79,14 @@ const uint_t FieldGhostLayers( 1 );
typedef GhostLayerField< Matrix3<real_t>, 1 > TensorField_T;
typedef GhostLayerField< Vector3<real_t>, 1 > Vec3Field_T;
typedef GhostLayerField< real_t, 1 > ScalarField_T;
-typedef lbm::force_model::GuoField< Vec3Field_T > ForceModel_T;
+using ForceModel_T = lbm::force_model::GuoField<Vec3Field_T>;
typedef lbm::D3Q19< lbm::collision_model::SRTField<ScalarField_T>, false, ForceModel_T > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
// boundary handling
typedef lbm::NoSlip< LatticeModel_T, flag_t > NoSlip_T;
@@ -594,7 +596,7 @@ private:
uint_t numSpheres_;
};
-void setBodyVelocities(const shared_ptr<StructuredBlockStorage> & blockStorage, const BlockDataID & bodyStorageID, Vector3<real_t> velocity )
+void setBodyVelocities(const shared_ptr<StructuredBlockStorage> & blockStorage, const BlockDataID & bodyStorageID, const Vector3<real_t>& velocity )
{
for( auto blockIt = blockStorage->begin(); blockIt != blockStorage->end(); ++blockIt )
{
@@ -610,7 +612,7 @@ class DummySweep
{
public:
DummySweep( )
- {}
+ = default;
void operator()(IBlock * const /*block*/)
{}
@@ -889,8 +891,8 @@ int main( int argc, char **argv ) {
// connect to pe
const real_t overlap = real_t(1.5) * dx;
- auto syncCall = boost::bind(pe::syncNextNeighbors<BodyTypeTuple>, boost::ref(blocks->getBlockForest()),
- bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ auto syncCall = std::bind(pe::syncNextNeighbors<BodyTypeTuple>, std::ref(blocks->getBlockForest()),
+ bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
shared_ptr<CollisionPropertiesEvaluator> collisionPropertiesEvaluator = walberla::make_shared<CollisionPropertiesEvaluator>(*cr);
// create the spheres
@@ -1196,7 +1198,7 @@ int main( int argc, char **argv ) {
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::NearestNeighborFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -1204,7 +1206,7 @@ int main( int argc, char **argv ) {
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
} else if (interpol == Interpolation::IKernel) {
if (dist == Distribution::DNearestNeighbor) {
@@ -1214,7 +1216,7 @@ int main( int argc, char **argv ) {
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::KernelFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -1222,7 +1224,7 @@ int main( int argc, char **argv ) {
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
} else if (interpol == Interpolation::ITrilinear) {
if (dist == Distribution::DNearestNeighbor) {
@@ -1232,7 +1234,7 @@ int main( int argc, char **argv ) {
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::TrilinearFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -1240,7 +1242,7 @@ int main( int argc, char **argv ) {
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
}
@@ -1260,7 +1262,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1268,7 +1270,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::IKernel )
@@ -1279,7 +1281,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1287,7 +1289,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::ITrilinear )
@@ -1298,7 +1300,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1306,7 +1308,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
@@ -1320,7 +1322,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1328,7 +1330,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::IKernel )
@@ -1339,7 +1341,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1347,7 +1349,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::ITrilinear )
@@ -1358,7 +1360,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1366,7 +1368,7 @@ int main( int argc, char **argv ) {
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
@@ -1374,9 +1376,9 @@ int main( int argc, char **argv ) {
std::function<void(void)> lubricationEvaluationFunction;
if( lubricationCutOffDistance > real_t(0) )
{
- typedef pe_coupling::discrete_particle_methods::LubricationForceEvaluator LE_T;
+ using LE_T = pe_coupling::discrete_particle_methods::LubricationForceEvaluator;
shared_ptr<LE_T> lubEval = make_shared<LE_T>( blocks, globalBodyStorage, bodyStorageID, viscosity, lubricationCutOffDistance );
- lubricationEvaluationFunction = boost::bind(&LE_T::operator(), lubEval);
+ lubricationEvaluationFunction = std::bind(&LE_T::operator(), lubEval);
}
else
{
diff --git a/apps/tools/povrayFileCompressor/main.cpp b/apps/tools/povrayFileCompressor/main.cpp
index 4d56bc779ec523376c8aedab6ed0ef0867d95c25..a66acbf5d14379a9d43f566da4350f34e56af582 100644
--- a/apps/tools/povrayFileCompressor/main.cpp
+++ b/apps/tools/povrayFileCompressor/main.cpp
@@ -35,10 +35,10 @@ namespace filesystem = walberla::filesystem;
bool verbose;
bool quiet;
-#define PRINT_DEF(msg) if(!quiet) std::cout << msg;
-#define PRINT_VER(msg) if(verbose) std::cout << msg;
-#define PRINT_ERR(msg) { std::cerr << msg; return EXIT_FAILURE; }
-#define PRINT_WAR(msg) std::cerr << msg;
+#define PRINT_DEF(msg) if(!quiet) std::cout << msg; //NOLINT
+#define PRINT_VER(msg) if(verbose) std::cout << msg; //NOLINT
+#define PRINT_ERR(msg) { std::cerr << msg; return EXIT_FAILURE; } //NOLINT
+#define PRINT_WAR(msg) std::cerr << msg; //NOLINT
namespace walberla{
namespace geometry{
diff --git a/apps/tutorials/basics/01_BlocksAndFields.cpp b/apps/tutorials/basics/01_BlocksAndFields.cpp
index 7290160ded73ad63e87b97612a69a6ea793d17d5..670d557d634480a5203fdc46a8fd0cbf21c3e6dd 100644
--- a/apps/tutorials/basics/01_BlocksAndFields.cpp
+++ b/apps/tutorials/basics/01_BlocksAndFields.cpp
@@ -24,38 +24,38 @@
#include "gui/Gui.h"
#include "timeloop/SweepTimeloop.h"
+namespace walberla {
-using namespace walberla;
-
-
-Field<real_t,1> * createFields( IBlock * const block, StructuredBlockStorage * const storage )
-{
- return new Field<real_t,1> ( storage->getNumberOfXCells( *block ), // number of cells in x direction for this block
- storage->getNumberOfYCells( *block ), // number of cells in y direction for this block
- storage->getNumberOfZCells( *block ), // number of cells in z direction for this block
- real_c(0) ); // initial value
+Field<real_t, 1>* createFields(IBlock* const block, StructuredBlockStorage * const storage) {
+ return new Field<real_t,1>(storage->getNumberOfXCells(*block),
+ storage->getNumberOfYCells(*block),
+ storage->getNumberOfZCells(*block),
+ real_c(0));
}
-
int main( int argc, char ** argv )
{
walberla::Environment env( argc, argv );
-
- // create blocks
- shared_ptr< StructuredBlockForest > blocks = blockforest::createUniformBlockGrid(
- uint_c( 3), uint_c(2), uint_c( 4), // number of blocks in x,y,z direction
- uint_c(10), uint_c(8), uint_c(12), // how many cells per block (x,y,z)
- real_c(0.5), // dx: length of one cell in physical coordinates
- false, // one block per process? - "false" means all blocks to one process
- false, false, false ); // no periodicity
-
- // add a field to all blocks
+
+ shared_ptr<StructuredBlockForest> blocks = blockforest::createUniformBlockGrid(
+ uint_c(3), uint_c(2), uint_c(4),
+ uint_c(10), uint_c(8), uint_c(12),
+ real_c(0.5),
+ false,
+ false, false, false);
+
blocks->addStructuredBlockData< Field<real_t,1> >( &createFields, "My Field" );
+
SweepTimeloop timeloop( blocks, uint_c(1) );
-
GUI gui( timeloop, blocks, argc, argv );
gui.run();
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/basics/02_Sweeps.cpp b/apps/tutorials/basics/02_Sweeps.cpp
index 03ef87b5efb2d6a099c0919a8d87a44bd6ea3f0c..24bdffce6fed3de325e6dbd50cad52043049907a 100644
--- a/apps/tutorials/basics/02_Sweeps.cpp
+++ b/apps/tutorials/basics/02_Sweeps.cpp
@@ -24,10 +24,10 @@
#include "gui/Gui.h"
#include "timeloop/SweepTimeloop.h"
-#include <boost/bind.hpp>
+#include <functional>
-using namespace walberla;
+namespace walberla {
// some arbitrary value for our bogus algorithm
const int ARBITRARY_VALUE = 424242;
@@ -125,7 +125,7 @@ int main( int argc, char ** argv )
// registering the function sweep
auto pointerToTwoArgFunction = & simpleSweep;
- auto pointerToOneArgFunction = boost::bind( pointerToTwoArgFunction, _1, fieldID );
+ auto pointerToOneArgFunction = std::bind( pointerToTwoArgFunction, std::placeholders::_1, fieldID );
timeloop.add() << Sweep( pointerToOneArgFunction, "BogusAlgorithm" );
// registering the class sweep
@@ -138,3 +138,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/basics/03_GameOfLife.cpp b/apps/tutorials/basics/03_GameOfLife.cpp
index b2ad74da077c84e74ae4f177b000af076e143d75..92cc1146bdedf42b85c5481c0bc6166a401701cb 100644
--- a/apps/tutorials/basics/03_GameOfLife.cpp
+++ b/apps/tutorials/basics/03_GameOfLife.cpp
@@ -37,7 +37,7 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
+namespace walberla {
class GameOfLifeSweep
@@ -217,3 +217,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/01_BasicLBM.cpp b/apps/tutorials/lbm/01_BasicLBM.cpp
index 0b5b4cb3b0e5f9ad3d33e8ed9629896e353d3479..1380a1f10e052d8f09032cda1e943698a193d668 100644
--- a/apps/tutorials/lbm/01_BasicLBM.cpp
+++ b/apps/tutorials/lbm/01_BasicLBM.cpp
@@ -31,16 +31,16 @@
-using namespace walberla;
+namespace walberla {
-typedef lbm::D2Q9< lbm::collision_model::SRT > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef LatticeModel_T::CommunicationStencil CommunicationStencil_T;
+using LatticeModel_T = lbm::D2Q9<lbm::collision_model::SRT>;
+using Stencil_T = LatticeModel_T::Stencil;
+using CommunicationStencil_T = LatticeModel_T::CommunicationStencil;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
@@ -120,3 +120,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp b/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
index 29cc925d16145df3574b0e83e570b45c8177f796..77aea9d87a6153927b76bf7dedb4c92c51442784 100644
--- a/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
+++ b/apps/tutorials/lbm/02_BasicLBM_ExemplaryExtensions.cpp
@@ -30,17 +30,17 @@
-using namespace walberla;
+namespace walberla {
typedef lbm::D2Q9< lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef LatticeModel_T::CommunicationStencil CommunicationStencil_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using CommunicationStencil_T = LatticeModel_T::CommunicationStencil;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
@@ -641,3 +641,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp b/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
index bf86b74385c214639c0502ff4fadd741e39da90a..e28259f8d46d35eb081635ec455fa71be16b8caf 100644
--- a/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
+++ b/apps/tutorials/lbm/03_LBLidDrivenCavity.cpp
@@ -57,22 +57,21 @@
// USING //
///////////
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla {
//////////////
// TYPEDEFS //
//////////////
-typedef lbm::D3Q19< lbm::collision_model::SRT > LatticeModel_T; // the LB lattice model - here: D3Q19, SRT, incompressible, no additional forces
-typedef LatticeModel_T::Stencil Stencil_T; // just the D3Q19 stencil without LB specific information
-typedef LatticeModel_T::CommunicationStencil CommunicationStencil_T; // the stencil that is needed for the communication: This stencil determines which
+using LatticeModel_T = lbm::D3Q19<lbm::collision_model::SRT>; // the LB lattice model - here: D3Q19, SRT, incompressible, no additional forces
+using Stencil_T = LatticeModel_T::Stencil; // just the D3Q19 stencil without LB specific information
+using CommunicationStencil_T = LatticeModel_T::CommunicationStencil; // the stencil that is needed for the communication: This stencil determines which
// neighbor blocks are involved during the communication.
-typedef lbm::PdfField< LatticeModel_T > PdfField_T; // type of the PDF field that stores the 19 distribution functions
+using PdfField_T = lbm::PdfField<LatticeModel_T>; // type of the PDF field that stores the 19 distribution functions
-typedef walberla::uint8_t flag_t; // each flag consists of an 8 bit value and therefore can distinguish between 8 different markers/flags
-typedef FlagField< flag_t > FlagField_T; // the flag field: used for marking cells as fluid or obstacle cells
+using flag_t = walberla::uint8_t; // each flag consists of an 8 bit value and therefore can distinguish between 8 different markers/flags
+using FlagField_T = FlagField<flag_t>; // the flag field: used for marking cells as fluid or obstacle cells
// (also used for distinguishing between different boundary conditions
// -> every boundary condition possesses its own, unique flag)
@@ -416,3 +415,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/pde/01_SolvingPDE.cpp b/apps/tutorials/pde/01_SolvingPDE.cpp
index 9b059484d578881036ea75e9763122cfe93434df..55eb90fb22a099a27fefaf27d82c57307f76d0c3 100644
--- a/apps/tutorials/pde/01_SolvingPDE.cpp
+++ b/apps/tutorials/pde/01_SolvingPDE.cpp
@@ -36,10 +36,10 @@
#include <vector>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<real_t,1> ScalarField;
-typedef stencil::D2Q5 Stencil_T;
+using Stencil_T = stencil::D2Q5;
// function to initialize the boundaries of the source and destination fields
@@ -296,3 +296,9 @@ int main( int argc, char ** argv )
return 0;
}
+}
+
+int main( int argc, char ** argv )
+{
+ walberla::main(argc, argv);
+}
diff --git a/apps/tutorials/pde/02_HeatEquation.cpp b/apps/tutorials/pde/02_HeatEquation.cpp
index f4f42560b041a3c2983ac9950184377153e95bbc..931644c344b2770deec2a63ce653c7cc82c6d481 100644
--- a/apps/tutorials/pde/02_HeatEquation.cpp
+++ b/apps/tutorials/pde/02_HeatEquation.cpp
@@ -39,11 +39,11 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<real_t,1> ScalarField;
-typedef stencil::D2Q5 Stencil_T;
+using Stencil_T = stencil::D2Q5;
@@ -250,3 +250,9 @@ int main( int argc, char ** argv )
return 0;
}
+}
+
+int main( int argc, char ** argv )
+{
+ walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/apps/tutorials/pde/03_HeatEquation_Extensions.cpp b/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
index b34e3bbd341f0530c0f68371609de96b6a554484..15d8859c1997fb064f0f9715ea7171f1b248fed8 100644
--- a/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
+++ b/apps/tutorials/pde/03_HeatEquation_Extensions.cpp
@@ -40,11 +40,11 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<real_t,1> ScalarField;
-typedef stencil::D2Q5 Stencil_T;
+using Stencil_T = stencil::D2Q5;
@@ -347,3 +347,9 @@ int main( int argc, char ** argv )
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/apps/tutorials/pe/01_ConfinedGas.cpp b/apps/tutorials/pe/01_ConfinedGas.cpp
index c33b26d4b55b1fc40c29827685c10443a2db8ab2..3d9847922fabad67c5b4073665895259969626db 100644
--- a/apps/tutorials/pe/01_ConfinedGas.cpp
+++ b/apps/tutorials/pe/01_ConfinedGas.cpp
@@ -25,9 +25,10 @@
#include <core/grid_generator/HCPIterator.h>
#include <core/grid_generator/SCIterator.h>
#include <core/logging/Logging.h>
+#include <core/math/Random.h>
//! [Includes]
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
//! [BodyTypeTuple]
@@ -101,7 +102,7 @@ int main( int argc, char ** argv )
//! [Material]
auto simulationDomain = forest->getDomain();
- auto generationDomain = simulationDomain; // simulationDomain.getExtended(-real_c(0.5) * spacing);
+ const auto& generationDomain = simulationDomain; // simulationDomain.getExtended(-real_c(0.5) * spacing);
//! [Planes]
createPlane(*globalBodyStorage, 0, Vec3(1,0,0), simulationDomain.minCorner(), material );
createPlane(*globalBodyStorage, 0, Vec3(-1,0,0), simulationDomain.maxCorner(), material );
@@ -120,8 +121,8 @@ int main( int argc, char ** argv )
{
SphereID sp = createSphere( *globalBodyStorage, *forest, storageID, 0, *it, radius, material);
Vec3 rndVel(math::realRandom<real_t>(-vMax, vMax), math::realRandom<real_t>(-vMax, vMax), math::realRandom<real_t>(-vMax, vMax));
- if (sp != NULL) sp->setLinearVel(rndVel);
- if (sp != NULL) ++numParticles;
+ if (sp != nullptr) sp->setLinearVel(rndVel);
+ if (sp != nullptr) ++numParticles;
}
}
WALBERLA_LOG_INFO_ON_ROOT("#particles created: " << numParticles);
@@ -161,3 +162,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/apps/tutorials/pe/02_ConfinedGasExtended.cfg b/apps/tutorials/pe/02_ConfinedGasExtended.cfg
index 078bffef5e7c5e9d082e11bb32fb3af2ee63002f..f06e81138cd2e4f879e6d1f04d6267e279ea4598 100644
--- a/apps/tutorials/pe/02_ConfinedGasExtended.cfg
+++ b/apps/tutorials/pe/02_ConfinedGasExtended.cfg
@@ -5,5 +5,27 @@ ConfinedGasExtended
simulationDomain < 20, 20, 20 >;
blocks < 2, 2, 2 >;
isPeriodic < 0, 0, 0 >;
+ setupRun false;
+ simulationSteps 100;
+ visSpacing 10;
+}
+Raytracing
+{
+ image_x 640;
+ image_y 480;
+ fov_vertical 49.13;
+ image_output_directory .;
+ cameraPosition < -25, 10, 10 >;
+ lookAt < -5, 10, 10 >;
+ upVector < 0, 0, 1 >;
+ antiAliasFactor 2;
+ reductionMethod MPI_REDUCE;
+ backgroundColor < 0.18, 0.18, 0.18 >;
+ Lighting {
+ pointLightOrigin < -10, 10, 15 >;
+ ambientColor < 0.3, 0.3, 0.3 >;
+ diffuseColor < 1, 1, 1 >;
+ specularColor < 1, 1, 1 >;
+ }
}
diff --git a/apps/tutorials/pe/02_ConfinedGasExtended.cpp b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
index b1ac3e4a380c915c1883213706edead118920b9a..e1da27b0da9947bc4a9c6361e039f354e04ab84d 100644
--- a/apps/tutorials/pe/02_ConfinedGasExtended.cpp
+++ b/apps/tutorials/pe/02_ConfinedGasExtended.cpp
@@ -21,20 +21,25 @@
#include <pe/basic.h>
#include <pe/statistics/BodyStatistics.h>
#include <pe/vtk/SphereVtkOutput.h>
+#include <pe/raytracing/Raytracer.h>
#include <core/Abort.h>
#include <core/Environment.h>
#include <core/grid_generator/HCPIterator.h>
#include <core/grid_generator/SCIterator.h>
#include <core/logging/Logging.h>
+#include <core/math/Random.h>
#include <core/timing/TimingTree.h>
#include <core/waLBerlaBuildInfo.h>
#include <postprocessing/sqlite/SQLite.h>
#include <vtk/VTKOutput.h>
-using namespace walberla;
+#include <functional>
+
+namespace walberla {
using namespace walberla::pe;
using namespace walberla::timing;
+using namespace walberla::pe::raytracing;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -62,7 +67,7 @@ int main( int argc, char ** argv )
WALBERLA_LOG_INFO_ON_ROOT("*** READING CONFIG FILE ***");
auto cfg = env.config();
- if (cfg == NULL) WALBERLA_ABORT("No config specified!");
+ if (cfg == nullptr) WALBERLA_ABORT("No config specified!");
const Config::BlockHandle mainConf = cfg->getBlock( "ConfinedGasExtended" );
const std::string sqlFile = mainConf.getParameter< std::string >( "sqlFile", "ConfinedGas.sqlite" );
@@ -150,22 +155,35 @@ int main( int argc, char ** argv )
std::function<void(void)> syncCall;
if (!syncShadowOwners)
{
- syncCall = boost::bind( pe::syncNextNeighbors<BodyTuple>, boost::ref(*forest), storageID, &tt, real_c(0.0), false );
+ syncCall = std::bind( pe::syncNextNeighbors<BodyTuple>, std::ref(*forest), storageID, &tt, real_c(0.0), false );
} else
{
- syncCall = boost::bind( pe::syncShadowOwners<BodyTuple>, boost::ref(*forest), storageID, &tt, real_c(0.0), false );
+ syncCall = std::bind( pe::syncShadowOwners<BodyTuple>, std::ref(*forest), storageID, &tt, real_c(0.0), false );
}
//! [Bind Sync Call]
std::function<void(void)> syncCallWithoutTT;
if (!syncShadowOwners)
{
- syncCallWithoutTT = boost::bind( pe::syncNextNeighbors<BodyTuple>, boost::ref(*forest), storageID, static_cast<WcTimingTree*>(NULL), real_c(0.0), false );
+ syncCallWithoutTT = std::bind( pe::syncNextNeighbors<BodyTuple>, std::ref(*forest), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
} else
{
- syncCallWithoutTT = boost::bind( pe::syncShadowOwners<BodyTuple>, boost::ref(*forest), storageID, static_cast<WcTimingTree*>(NULL), real_c(0.0), false );
+ syncCallWithoutTT = std::bind( pe::syncShadowOwners<BodyTuple>, std::ref(*forest), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
}
//! [Bind Sync Call]
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** RAYTRACER ***");
+ //! [Raytracer Init]
+ std::function<ShadingParameters (const BodyID body)> customShadingFunction = [](const BodyID body) {
+ if (body->getTypeID() == Sphere::getStaticTypeID()) {
+ return processRankDependentShadingParams(body).makeGlossy();
+ }
+ return defaultBodyTypeDependentShadingParams(body);
+ };
+ Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
+ cfg->getBlock("Raytracing"),
+ customShadingFunction);
+ //! [Raytracer Init]
WALBERLA_LOG_INFO_ON_ROOT("*** VTK ***");
//! [VTK Domain Output]
@@ -182,7 +200,7 @@ int main( int argc, char ** argv )
MaterialID material = createMaterial( "granular", real_t( 1.0 ), 0, static_cof, dynamic_cof, real_t( 0.5 ), 1, 1, 0, 0 );
auto simulationDomain = forest->getDomain();
- auto generationDomain = simulationDomain; // simulationDomain.getExtended(-real_c(0.5) * spacing);
+ const auto& generationDomain = simulationDomain; // simulationDomain.getExtended(-real_c(0.5) * spacing);
createPlane(*globalBodyStorage, 0, Vec3(1,0,0), simulationDomain.minCorner(), material );
createPlane(*globalBodyStorage, 0, Vec3(-1,0,0), simulationDomain.maxCorner(), material );
createPlane(*globalBodyStorage, 0, Vec3(0,1,0), simulationDomain.minCorner(), material );
@@ -199,8 +217,8 @@ int main( int argc, char ** argv )
{
SphereID sp = pe::createSphere( *globalBodyStorage, *forest, storageID, 0, *it, radius, material);
Vec3 rndVel(math::realRandom<real_t>(-vMax, vMax), math::realRandom<real_t>(-vMax, vMax), math::realRandom<real_t>(-vMax, vMax));
- if (sp != NULL) sp->setLinearVel(rndVel);
- if (sp != NULL) ++numParticles;
+ if (sp != nullptr) sp->setLinearVel(rndVel);
+ if (sp != nullptr) ++numParticles;
}
}
mpi::reduceInplace(numParticles, mpi::SUM);
@@ -242,6 +260,9 @@ int main( int argc, char ** argv )
vtkDomainOutput->write( );
vtkSphereOutput->write( );
//! [VTK Output]
+ //! [Image Output]
+ raytracer.generateImage<BodyTuple>(size_t(i), &tt);
+ //! [Image Output]
}
}
tp["Total"].end();
@@ -274,3 +295,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/apps/tutorials/pe/02_ConfinedGasExtended.dox b/apps/tutorials/pe/02_ConfinedGasExtended.dox
index 45c6cc4c9ca90be9cf6bb29f1026ab9df8640be2..89cd4a837becfdef61bc1c66212e73cafafb65f7 100644
--- a/apps/tutorials/pe/02_ConfinedGasExtended.dox
+++ b/apps/tutorials/pe/02_ConfinedGasExtended.dox
@@ -91,6 +91,51 @@ depending on the type of information you want to store.
You can then dump the information to disc. timing::TimingPool and timing::TimingTree already have predefined save
functions so you do not have to extract all the information yourself and save it in the property array.
\snippet 02_ConfinedGasExtended.cpp SQL Save
+
+\section tutorial_pe_02_raytracing Image Output
+Using the pe::raytracing::Raytracer you can generate images of the simulation for each timestep and output them as PNG files.
+Setup the raytracer by reading a config object and optionally supply a shading and a visibility function,
+as it is done in the second pe tutorial. The shading function will be called during rendering for each body
+to apply user defined coloring to bodies, the visibility function to determine if a body should be visible or not.
+\snippet 02_ConfinedGasExtended.cpp Raytracer Init
+Alternatively it may also be setup entirely in code:
+\code
+Lighting lighting(Vec3(-12, 12, 12),
+ Color(1, 1, 1),
+ Color(1, 1, 1),
+ Color(real_t(0.4), real_t(0.4), real_t(0.4)));
+Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
+ 640, 480,
+ real_t(49.13), 2,
+ Vec3(-25, 10, 10), Vec3(-5, 10, 10), Vec3(0, 0, 1),
+ lighting,
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ radius,
+ customShadingFunction);
+\endcode
+After the configuration is done, images can be generated each timestep by calling Raytracer::generateImage<BodyTuple>()
+which will be output to the specified directory.
+\snippet 02_ConfinedGasExtended.cpp Image Output
+To hide certain bodies during rendering, the visibility function will be called with a BodyID as its sole argument
+and should return true if the object is supposed to be visible, false if not:
+\code
+// [...]
+std::function<bool (const BodyID body)> customVisibilityFunction = [](const BodyID body) {
+ if (body->getTypeID() == Plane::getStaticTypeID()) {
+ // hide all planes
+ return false;
+ }
+ return true;
+};
+Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
+ cfg->getBlock("Raytracing"),
+ customShadingFunction,
+ customVisibilityFunction);
+\endcode
+For an overview over predefined shading functions, visit the file ShadingFunctions.h.
+For further information see the documentation for the classes pe::raytracing::Raytracer, pe::raytracing::Lighting and
+pe::raytracing::Color, the pe::raytracing::ShadingParameters struct and ShadingFunctions.h file may also be useful.
+
*/
}
diff --git a/cmake/waLBerlaFunctions.cmake b/cmake/waLBerlaFunctions.cmake
index d4b9a01f587732b6dbe8dce3e55092a3913c2125..196d3f4777ad4b4efd6d688f5c99361c107ef2a6 100644
--- a/cmake/waLBerlaFunctions.cmake
+++ b/cmake/waLBerlaFunctions.cmake
@@ -1,30 +1,29 @@
-
include ( waLBerlaHelperFunctions )
include ( waLBerlaModuleDependencySystem )
set ( WALBERLA_GLOB_FILES *.cpp
- *.c
- *.h
- *.cu
+ *.c
+ *.h
+ *.cu
CACHE INTERNAL "File endings to glob for source files" )
#######################################################################################################################
#
# Creates a walberla module library
-#
+#
#
# Keywords:
# DEPENDS [required] list of modules, that this module depends on
# FILES [optional] list of all source and header files belonging to that module
# if this is not given, all source and header files in the directory are added.
# Careful: when file was added or deleted, cmake has to be run again
-# EXCLUDE [optional] Files that should not be included in the module (but are located in module directory).
+# EXCLUDE [optional] Files that should not be included in the module (but are located in module directory).
# This makes only sense if FILES was not specified, and all files have been added automatically.
# BUILD_ONLY_IF_FOUND Before building the module test if all libraries specified here are availbable.
# [optional] This is done using the ${arg}_FOUND variable.
-# Example: waLBerla_add_module( DEPENDS someModule BUILD_ONLY_IF_FOUND pe)
+# Example: waLBerla_add_module( DEPENDS someModule BUILD_ONLY_IF_FOUND pe)
# This module is only built if PE_FOUND is true.
#
#######################################################################################################################
@@ -34,11 +33,11 @@ function ( waLBerla_add_module )
set( oneValueArgs )
set( multiValueArgs DEPENDS EXCLUDE FILES BUILD_ONLY_IF_FOUND )
cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
+
# Module name is the directory relative to WALBERLA_MODULE_DIRS
get_current_module_name ( moduleName )
get_module_library_name ( moduleLibraryName ${moduleName} )
-
+
# Test if all required libraries are available
# this is detected using the _FOUND variable
foreach ( externalName ${ARG_BUILD_ONLY_IF_FOUND} )
@@ -49,7 +48,7 @@ function ( waLBerla_add_module )
endif()
endforeach()
- # Take source files either from parameter or search all source files
+ # Take source files either from parameter or search all source files
file ( GLOB_RECURSE allFiles "*" ) # Find all files
if ( ARG_FILES )
foreach( sourceFile ${ARG_FILES} )
@@ -60,7 +59,7 @@ function ( waLBerla_add_module )
file ( GLOB_RECURSE sourceFiles ${WALBERLA_GLOB_FILES} ) # Find all source files
endif()
- # Remove exclude files from the sources
+ # Remove exclude files from the sources
if ( ARG_EXCLUDE )
foreach ( fileToExclude ${ARG_EXCLUDE} )
get_filename_component( fileToExclude ${fileToExclude} ABSOLUTE )
@@ -77,17 +76,17 @@ function ( waLBerla_add_module )
endif ( )
# Dependency Check
- check_dependencies( missingDeps additionalDeps FILES ${sourceFiles} EXPECTED_DEPS ${ARG_DEPENDS} ${moduleName} )
+ check_dependencies( missingDeps additionalDeps FILES ${sourceFiles} EXPECTED_DEPS ${ARG_DEPENDS} ${moduleName} )
if ( missingDeps )
message ( WARNING "The module ${moduleName} depends on ${missingDeps} which are not listed as dependencies!" )
endif()
- set( hasSourceFiles FALSE )
- foreach ( sourceFile ${sourceFiles} )
+ set( hasSourceFiles FALSE )
+ foreach ( sourceFile ${sourceFiles} )
if ( ${sourceFile} MATCHES "\\.(c|cpp|cu)" )
- set( hasSourceFiles TRUE )
- endif( )
- endforeach( )
+ set( hasSourceFiles TRUE )
+ endif( )
+ endforeach( )
if ( hasSourceFiles )
set( generatedSourceFiles )
@@ -103,11 +102,11 @@ function ( waLBerla_add_module )
else()
add_library( ${moduleLibraryName} STATIC ${sourceFiles} ${generatedSourceFiles} ${generatorSourceFiles} ${otherFiles} )
endif( CUDA_FOUND )
-
+
set_source_files_properties( ${generatedSourceFiles} PROPERTIES GENERATED TRUE )
- else( )
- add_custom_target( ${moduleLibraryName} SOURCES ${sourceFiles} ${generatedSourceFiles} ${otherFiles} ) # dummy IDE target
- endif( )
+ else( )
+ add_custom_target( ${moduleLibraryName} SOURCES ${sourceFiles} ${generatedSourceFiles} ${otherFiles} ) # dummy IDE target
+ endif( )
waLBerla_register_dependency ( ${moduleName} ${ARG_DEPENDS} )
@@ -117,36 +116,36 @@ function ( waLBerla_add_module )
if( WALBERLA_GROUP_PROJECTS )
set_property( TARGET ${moduleLibraryName} PROPERTY FOLDER "SRC" )
endif()
-
+
# Install rule for library
get_target_property( module_type ${moduleLibraryName} TYPE )
- if( ${module_type} MATCHES LIBRARY )
+ if( ${module_type} MATCHES LIBRARY )
install ( TARGETS ${moduleLibraryName} RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib )
endif( )
-
+
# Install rule for header
- install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
- DESTINATION "walberla/${moduleName}"
+ install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
+ DESTINATION "walberla/${moduleName}"
FILES_MATCHING PATTERN "*.h"
- PATTERN "*.in.h" EXCLUDE
+ PATTERN "*.in.h" EXCLUDE
PATTERN "CMakeFiles" EXCLUDE )
-
- # Install generated headers if necessary
- if ( NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR} )
- install ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
- DESTINATION "walberla/${moduleName}"
+
+ # Install generated headers if necessary
+ if ( NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR} )
+ install ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
+ DESTINATION "walberla/${moduleName}"
FILES_MATCHING PATTERN "*.h"
- PATTERN "*.in.h" EXCLUDE
+ PATTERN "*.in.h" EXCLUDE
PATTERN "CMakeFiles" EXCLUDE )
- endif()
-
-
+ endif()
+
+
# Report module statistics - which is later on written out to a json file
# This file is used in the doxygen documentation to display a module graph
#waLBerla_module_statistics ( FILES ${sourceFiles} DEPENDS ${ARG_DEPENDS} )
-
+
endfunction ( waLBerla_add_module )
#######################################################################################################################
@@ -160,7 +159,7 @@ endfunction ( waLBerla_add_module )
# The application is linked against all waLBerla modules that are listed after DEPENDS
#
#
-# NAME [required] Name of application
+# NAME [required] Name of application
# GROUP [optional] IDE group name (e.g. VS)
# DEPENDS [required] list of modules, that this application depends on
# FILES [optional] list of all source and header files belonging to that application
@@ -178,9 +177,9 @@ function ( waLBerla_add_executable )
cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
if( NOT ARG_NAME )
- message ( FATAL_ERROR "waLBerla_add_executable called without a NAME" )
+ message ( FATAL_ERROR "waLBerla_add_executable called without a NAME" )
endif()
-
+
# Skip this app, if it depends on modules that have not been built ( because they for example depend on PE)
foreach ( depMod ${ARG_DEPENDS} )
get_module_library_name ( depModLibraryName ${depMod} )
@@ -189,8 +188,8 @@ function ( waLBerla_add_executable )
return()
endif()
endforeach()
-
- # Take source files either from parameter or search all source files
+
+ # Take source files either from parameter or search all source files
set( sourceFiles )
if ( ARG_FILES )
foreach( sourceFile ${ARG_FILES} )
@@ -218,14 +217,14 @@ function ( waLBerla_add_executable )
message(STATUS "Skipping ${ARG_NAME} since pystencils code generation is not enabled")
return()
endif()
-
+
if ( CUDA_FOUND )
cuda_add_executable( ${ARG_NAME} ${sourceFiles} ${generatedSourceFiles} ${generatorSourceFiles} )
else()
add_executable( ${ARG_NAME} ${sourceFiles} ${generatedSourceFiles} ${generatorSourceFiles} )
endif()
-
+
set_source_files_properties( ${generatedSourceFiles} PROPERTIES GENERATED TRUE )
target_link_modules ( ${ARG_NAME} ${ARG_DEPENDS} )
@@ -238,7 +237,7 @@ function ( waLBerla_add_executable )
endif()
set_property( TARGET ${ARG_NAME} PROPERTY FOLDER ${ARG_GROUP} )
endif()
-
+
endfunction ( waLBerla_add_executable )
#######################################################################################################################
@@ -257,20 +256,20 @@ function ( waLBerla_compile_test )
set( oneValueArgs NAME )
set( multiValueArgs FILES DEPENDS )
cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
+
# Module name is the directory relative to WALBERLA_MODULE_DIRS
get_current_module_name ( moduleName )
-
+
# Filename of first source file is used as name for testcase if no name was given
if( NOT ARG_NAME )
list( GET ARG_FILES 0 ARG_NAME )
get_filename_component( ARG_NAME ${ARG_NAME} NAME_WE )
endif()
-
- waLBerla_add_executable ( NAME ${ARG_NAME} GROUP "TESTS/${moduleName}"
+
+ waLBerla_add_executable ( NAME ${ARG_NAME} GROUP "TESTS/${moduleName}"
DEPENDS ${ARG_DEPENDS} ${moduleName} FILES ${ARG_FILES} )
-
-
+
+
endfunction ( waLBerla_compile_test )
#######################################################################################################################
@@ -280,9 +279,9 @@ endfunction ( waLBerla_compile_test )
#######################################################################################################################
#
# Links all files in current source dir matching a globbing expression to the build directory
-#
+#
# first parameter is glob expression
-#
+#
# Typical usage: link all parameter files in same folder as the binary was produced
# Assuming the parameter files end with prm, write this to your CMakeLists in the
# app or test folder:
@@ -293,15 +292,15 @@ endfunction ( waLBerla_compile_test )
#######################################################################################################################
function ( waLBerla_link_files_to_builddir globExpression )
-
+
# don't need links for in-source builds
if( CMAKE_CURRENT_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_BINARY_DIR}" )
return()
endif()
-
+
file( GLOB filesToLink RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${globExpression} )
-
- foreach( f ${filesToLink} )
+
+ foreach( f ${filesToLink} )
if( CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" )
configure_file( ${f} ${f} COPYONLY )
else()
@@ -309,9 +308,9 @@ function ( waLBerla_link_files_to_builddir globExpression )
${CMAKE_CURRENT_SOURCE_DIR}/${f}
${CMAKE_CURRENT_BINARY_DIR}/${f} )
endif()
-
+
endforeach()
-
+
endfunction ( waLBerla_link_files_to_builddir )
@@ -319,37 +318,37 @@ endfunction ( waLBerla_link_files_to_builddir )
#######################################################################################################################
#
-# Adds an executable to CTest.
-#
+# Adds an executable to CTest.
+#
# Wrapper around add_test, that handles test labels and parallel runs
# Adds the module name as test label, plus optional user defined labels.
#
# NAME [required] Name of test
-# PROCESSES [optional] Number of MPI processes, that are used to start this test.
+# PROCESSES [optional] Number of MPI processes, that are used to start this test.
# If walberla is built without MPI, and PROCESSES > 1, the test is not added
# Defaults to 1
# COMMAND [optional] The command that is executed. Use this to start with parameter files or other
-# command line options.
+# command line options.
# Defaults to $<TARGET_FILE:${NAME}> (for this syntax see cmake documentation of add_test )
-# LABELS [optional] Additional test labels.
+# LABELS [optional] Additional test labels.
#
#######################################################################################################################
function ( waLBerla_execute_test )
-
+
set( options NO_MODULE_LABEL )
set( oneValueArgs NAME PROCESSES )
set( multiValueArgs COMMAND LABELS CONFIGURATIONS DEPENDS_ON_TARGETS )
cmake_parse_arguments( ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
if( NOT ARG_NAME )
- message ( FATAL_ERROR "waLBerla_execute_test called without a NAME" )
+ message ( FATAL_ERROR "waLBerla_execute_test called without a NAME" )
endif()
-
+
if( NOT ARG_COMMAND AND NOT TARGET ${ARG_NAME} )
message ( STATUS "Skipping test ${ARG_NAME} since the corresponding target is not built" )
return()
- endif()
+ endif()
foreach( dependency_target ${ARG_DEPENDS_ON_TARGETS} )
if( NOT TARGET ${dependency_target} )
@@ -357,7 +356,7 @@ function ( waLBerla_execute_test )
return()
endif()
endforeach( dependency_target )
-
+
if( NOT ARG_PROCESSES )
set ( numProcesses 1 )
else()
@@ -369,27 +368,28 @@ function ( waLBerla_execute_test )
endif()
if( WALBERLA_BUILD_WITH_MPI )
- list( INSERT ARG_COMMAND 0 ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG} ${numProcesses} ${MPIEXEC_PREFLAGS} )
+ if( CMAKE_VERSION VERSION_LESS 3.10.0 )
+ set ( MPIEXEC_EXECUTABLE ${MPIEXEC} )
+ endif()
+ list( INSERT ARG_COMMAND 0 ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${numProcesses} ${MPIEXEC_PREFLAGS} )
elseif( numProcesses GREATER 1 )
return()
- endif()
-
+ endif()
+
if( ARG_CONFIGURATIONS )
add_test( NAME ${ARG_NAME} ${ARG_UNPARSED_ARGUMENTS} COMMAND ${ARG_COMMAND} CONFIGURATIONS ${ARG_CONFIGURATIONS} )
else()
add_test( NAME ${ARG_NAME} ${ARG_UNPARSED_ARGUMENTS} COMMAND ${ARG_COMMAND} )
endif()
-
+
if( ARG_NO_MODULE_LABEL )
set_tests_properties ( ${ARG_NAME} PROPERTIES LABELS "${ARG_LABELS}" )
else()
- get_current_module_name ( moduleName )
+ get_current_module_name ( moduleName )
set_tests_properties ( ${ARG_NAME} PROPERTIES LABELS "${moduleName} ${ARG_LABELS}" )
endif()
set_tests_properties ( ${ARG_NAME} PROPERTIES PROCESSORS ${numProcesses} )
-
+
endfunction ( waLBerla_execute_test )
#######################################################################################################################
-
-
diff --git a/python/waLBerla/tools/config.py b/python/waLBerla/tools/config.py
index f2997aa5a88d78350f0b159820573c1be9691f4e..7587afb38488c99b8593f3706224c3b6445b158b 100644
--- a/python/waLBerla/tools/config.py
+++ b/python/waLBerla/tools/config.py
@@ -1,8 +1,9 @@
from __future__ import print_function, absolute_import, division, unicode_literals
import numpy as np
+
def _comment_replacer(match):
- start,mid,end = match.group(1,2,3)
+ start, mid, end = match.group(1, 2, 3)
if mid is None:
# single line comment
return ''
@@ -16,68 +17,71 @@ def _comment_replacer(match):
# multi line comment without line break
return ' '
+
def _remove_comments(text):
import re
comment_re = re.compile(
r'(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
re.DOTALL | re.MULTILINE
)
- return comment_re.sub( _comment_replacer, text)
+ return comment_re.sub(_comment_replacer, text)
+
-def __parseNestedList( value, dtype = float):
+def __parse_nested_list(value, dtype=float):
from pyparsing import Word, Group, Forward, OneOrMore, Optional, alphanums, Suppress
- number = Word( alphanums + ".e-" ).setParseAction( lambda s,l,t: dtype(t[0]) )
+ number = Word(alphanums + ".e-").setParseAction(lambda s, l, t: dtype(t[0]))
arr = Forward()
element = number | arr
- arr << Group(Suppress('[') + ( OneOrMore(element + Optional(Suppress(",")) ) ) + Suppress(']') )
- return arr.parseString(value, parseAll = True).asList()[0]
+ arr << Group(Suppress('[') + (OneOrMore(element + Optional(Suppress(",")))) + Suppress(']'))
+ return arr.parseString(value, parseAll=True).asList()[0]
-def __convertValue(value):
- def tryType( thetype, value ):
+
+def __convert_value(value):
+ def try_type(thetype, value):
try:
return thetype(value)
except ValueError:
return None
- val = tryType(int, value)
+
+ val = try_type(int, value)
if val: return val
- val = tryType(float, value)
+ val = try_type(float, value)
if val: return val
if value == "True": return True
- if value == "False" : return False
+ if value == "False": return False
value = value.strip()
if value[0] == '[' and value[-1] == "]":
- return np.array( __parseNestedList(value) )
+ return np.array(__parse_nested_list(value))
if value[0] == '<' and value[-1] == ">":
- return tuple( [__convertValue(s) for s in value[1:-1].split(",") ] )
+ return tuple([__convert_value(s) for s in value[1:-1].split(",")])
return value
-def fromPrm( fileAsString ):
+
+def fromPrm(fileAsString):
"""Parses a prm file to a nested python dict """
from pyparsing import Word, Group, Forward, Dict, ZeroOrMore, Optional, alphanums, Suppress
# Grammar
- identifier = Word( alphanums +"_-" )
- value = Word( alphanums + ".e-,<>[] \n" ).setParseAction( lambda s,l,t: __convertValue(t[0]) )
- key_value_pair = Group ( identifier + Optional(value, default="") + Suppress(";") )
- block = Forward()
- block_content = Dict( ZeroOrMore( key_value_pair | block ) )
- block << Group( identifier + Suppress("{") + block_content + Suppress("}") )
-
- return block_content.parseString( _remove_comments(fileAsString) , parseAll = True ).asDict()
-
+ identifier = Word(alphanums + "_-")
+ value = Word(alphanums + ".e-,<>_[] \n").setParseAction(lambda s, l, t: __convert_value(t[0]))
+ key_value_pair = Group(identifier + Optional(value, default="") + Suppress(";"))
+ block = Forward()
+ block_content = Dict(ZeroOrMore(key_value_pair | block))
+ block << Group(identifier + Suppress("{") + block_content + Suppress("}"))
+ return block_content.parseString(_remove_comments(fileAsString), parseAll=True).asDict()
def __format(value, level, key=""):
if type(value) is float:
return "%.10g" % value
else:
- return str(value).replace("\n", "\n" + "\t"*level + " " * len(key) + " " )
+ return str(value).replace("\n", "\n" + "\t" * level + " " * len(key) + " ")
-def toPrm( configDict, level = 0 ):
+def toPrm(configDict, level=0):
"""Returns a prm string from a nested python dict - Inverse of parse"""
result = ""
for key, value in sorted(configDict.items()):
@@ -87,28 +91,26 @@ def toPrm( configDict, level = 0 ):
else:
result += "\t" * level + str(key) + "\n"
result += "\t" * level + "{\n"
- result += toPrm(value, level + 1)
+ result += toPrm(value, level + 1)
result += "\t" * level + "}\n"
- elif ( type(value) is list ) and len( value ) > 0 and type(value[0]) is dict:
+ elif (type(value) is list) and len(value) > 0 and type(value[0]) is dict:
for e in value:
result += "\t" * level + str(key) + "\n"
result += "\t" * level + "{\n"
- result += toPrm( e, level + 1)
+ result += toPrm(e, level + 1)
result += "\t" * level + "}\n"
- elif ( type(value) is tuple ) :
+ elif type(value) is tuple:
result += "\t" * level + str(key) + " "
- result += "< " + ",".join ( [ __format(v,level) for v in value ] ) + " >;\n"
- elif ( type(value) is float ):
- result += "\t" * level + str(key) + " " + __format(value,level) + ";\n"
+ result += "< " + ",".join([__format(v, level) for v in value]) + " >;\n"
+ elif type(value) is float:
+ result += "\t" * level + str(key) + " " + __format(value, level) + ";\n"
else:
- result += "\t" * level + str(key) + " " + __format(value,level,key) + ";\n"
+ result += "\t" * level + str(key) + " " + __format(value, level, key) + ";\n"
return result
-
if __name__ == "__main__":
-
test = """
blockId1 {
firstKey 5; // first key
@@ -130,8 +132,8 @@ if __name__ == "__main__":
outerKey hallo;
"""
- res = fromPrm( test )
+ res = fromPrm(test)
assert res['blockId1']['firstKey'] == 5
- assert res['blockId1']['myVector3'] == ( 1.0, 2, 3)
+ assert res['blockId1']['myVector3'] == (1.0, 2, 3)
assert res['blockId1']['keyWithoutValue'] == ''
- assert (res['blockId1']['myArray'] == np.array( [ [1,2], [3,4] ] )).all()
\ No newline at end of file
+ assert (res['blockId1']['myArray'] == np.array([[1, 2], [3, 4]])).all()
diff --git a/src/blockforest/AABBRefinementSelection.h b/src/blockforest/AABBRefinementSelection.h
index 4637f36f7c7c51adccd412b66cd98ed4aefc0f7d..fc454bedc4de777788d6b4a25ceb202bf950a373 100644
--- a/src/blockforest/AABBRefinementSelection.h
+++ b/src/blockforest/AABBRefinementSelection.h
@@ -22,6 +22,7 @@
#pragma once
#include "SetupBlockForest.h"
+#include "BlockForest.h"
#include "core/config/Config.h"
#include "core/math/AABB.h"
@@ -39,6 +40,8 @@ class AABBRefinementSelection
{
public:
+ AABBRefinementSelection(){}
+
AABBRefinementSelection( const Config::BlockHandle & configBlock )
{
if( configBlock )
@@ -79,25 +82,10 @@ public:
regions_.push_back( std::make_pair( region, level ) );
}
- std::vector< std::pair< math::AABB, uint_t > > transformRegionsToAABBs( SetupBlockForest & forest ) const
- {
- std::vector< std::pair< math::AABB, uint_t > > aabbs;
- math::AABB aabb = forest.getDomain();
- for( auto region = regions_.begin(); region != regions_.end(); ++region )
- {
- aabbs.push_back( std::make_pair( math::AABB( aabb.xMin() + region->first.xMin() * aabb.xSize(),
- aabb.yMin() + region->first.yMin() * aabb.ySize(),
- aabb.zMin() + region->first.zMin() * aabb.zSize(),
- aabb.xMin() + region->first.xMax() * aabb.xSize(),
- aabb.yMin() + region->first.yMax() * aabb.ySize(),
- aabb.zMin() + region->first.zMax() * aabb.zSize() ), region->second ) );
- }
- return aabbs;
- }
-
+ // for static refinement
void operator()( SetupBlockForest & forest )
{
- std::vector< std::pair< math::AABB, uint_t > > aabbs = transformRegionsToAABBs( forest );
+ std::vector< std::pair< math::AABB, uint_t > > aabbs = transformRegionsToAABBs( forest.getDomain() );
aabbs.insert( aabbs.end(), aabbs_.begin(), aabbs_.end() );
if( aabbs.empty() )
@@ -113,8 +101,60 @@ public:
}
}
+ // for dynamic refinement
+ void operator()(std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > &, const BlockForest & forest )
+ {
+ std::vector< std::pair< math::AABB, uint_t > > aabbs = transformRegionsToAABBs( forest.getDomain() );
+ aabbs.insert( aabbs.end(), aabbs_.begin(), aabbs_.end() );
+
+ for( auto it = minTargetLevels.begin(); it != minTargetLevels.end(); ++it )
+ {
+ uint_t currentLevelOfBlock = it->first->getLevel();
+ uint_t targetLevelOfBlock = currentLevelOfBlock;
+
+ for( auto aabb = aabbs.begin(); aabb != aabbs.end(); ++aabb )
+ {
+ if( it->first->getAABB().intersects( aabb->first ) )
+ {
+ uint_t targetLevelOfAABB = aabb->second;
+ if( currentLevelOfBlock > targetLevelOfAABB )
+ {
+ targetLevelOfBlock = currentLevelOfBlock - uint_t(1);
+ }
+ else if ( currentLevelOfBlock < targetLevelOfBlock )
+ {
+ targetLevelOfBlock = currentLevelOfBlock + uint_t(1);
+ }
+ // only the first found intersecting AABB is taken into account
+ break;
+ }
+ }
+
+ WALBERLA_CHECK_LESS_EQUAL(std::abs(int_c(targetLevelOfBlock) - int_c(currentLevelOfBlock)), uint_t(1), "Only level difference of maximum 1 allowed!");
+ it->second = targetLevelOfBlock;
+ }
+ }
+
+
private:
+ std::vector< std::pair< math::AABB, uint_t > > transformRegionsToAABBs( const math::AABB & simulationDomain ) const
+ {
+ std::vector< std::pair< math::AABB, uint_t > > aabbs;
+ for( auto region = regions_.begin(); region != regions_.end(); ++region )
+ {
+ aabbs.push_back( std::make_pair( math::AABB( simulationDomain.xMin() + region->first.xMin() * simulationDomain.xSize(),
+ simulationDomain.yMin() + region->first.yMin() * simulationDomain.ySize(),
+ simulationDomain.zMin() + region->first.zMin() * simulationDomain.zSize(),
+ simulationDomain.xMin() + region->first.xMax() * simulationDomain.xSize(),
+ simulationDomain.yMin() + region->first.yMax() * simulationDomain.ySize(),
+ simulationDomain.zMin() + region->first.zMax() * simulationDomain.zSize() ), region->second ) );
+ }
+ return aabbs;
+ }
+
+
std::vector< std::pair< math::AABB, uint_t > > aabbs_;
std::vector< std::pair< math::AABB, uint_t > > regions_;
diff --git a/src/blockforest/Block.cpp b/src/blockforest/Block.cpp
index d13ba9de7b7057dda04927ad9bb9240d98637f2b..f366f8d3d047e2a7a1c91b6b00bc5dfce07cad6f 100644
--- a/src/blockforest/Block.cpp
+++ b/src/blockforest/Block.cpp
@@ -52,7 +52,7 @@ Block::Block( BlockForest & forest, const SetupBlock * const block ) :
for( uint_t i = 0; i != block->getNeighborhoodSize(); ++i )
{
- neighborhood_.push_back( Block::NeighborBlock( forest, block->getNeighborId(i), block->getNeighborProcess(i), block->getNeighborState(i) ) );
+ neighborhood_.emplace_back( forest, block->getNeighborId(i), block->getNeighborProcess(i), block->getNeighborState(i) );
neighborhoodMapping[ block->getNeighborId(i) ] = i;
}
@@ -222,7 +222,7 @@ void Block::resetNeighborhood( const PhantomBlock & phantom )
neighborhood_.clear();
for( uint_t i = 0; i != phantom.getNeighborhoodSize(); ++i )
{
- neighborhood_.push_back( Block::NeighborBlock( forest_, phantom.getNeighborId(i), phantom.getNeighborProcess(i), phantom.getNeighborState(i) ) );
+ neighborhood_.emplace_back( forest_, phantom.getNeighborId(i), phantom.getNeighborProcess(i), phantom.getNeighborState(i) );
neighborhoodMapping[ phantom.getNeighborId(i) ] = i;
}
diff --git a/src/blockforest/BlockForest.cpp b/src/blockforest/BlockForest.cpp
index e6c19cbc1fe9341bc297f73606a926549659355a..2fee938bc7fecf5fa61b9478f515ace38dfdffb7 100644
--- a/src/blockforest/BlockForest.cpp
+++ b/src/blockforest/BlockForest.cpp
@@ -33,6 +33,7 @@
#include "core/mpi/MPIManager.h"
#include <fstream>
+#include <memory>
#include <set>
#include <stack>
#include <utility>
@@ -164,7 +165,7 @@ bool BlockForest::BlockInformation::getId( BlockID & id, const real_t x, const r
const BlockForest::BlockInformation::Node * BlockForest::BlockInformation::getNode( const BlockID & id ) const
{
if( nodes_.empty() )
- return NULL;
+ return nullptr;
const uint_t treeIdDigits = forest_.getTreeIdDigits();
@@ -185,13 +186,13 @@ const BlockForest::BlockInformation::Node * BlockForest::BlockInformation::getNo
const uint_t index = blockId.getTreeIndex();
if( index >= nodes_.size() || !(nodes_[index]) )
- return NULL;
+ return nullptr;
auto node = nodes_[index];
for( uint_t i = 0; i != levels; ++i ) {
if( node->children_.empty() )
- return NULL;
+ return nullptr;
WALBERLA_ASSERT_NOT_NULLPTR( node->children_[ branchId[i] ] );
node = node->children_[ branchId[i] ];
}
@@ -206,7 +207,7 @@ const BlockForest::BlockInformation::Node * BlockForest::BlockInformation::getNo
const AABB & domain = forest_.getDomain();
if( nodes_.empty() || !domain.contains(x,y,z) )
- return NULL;
+ return nullptr;
const real_t rootBlockXSize = forest_.getRootBlockXSize();
const real_t rootBlockYSize = forest_.getRootBlockYSize();
@@ -225,7 +226,7 @@ const BlockForest::BlockInformation::Node * BlockForest::BlockInformation::getNo
auto node = nodes_[index];
if( !node )
- return NULL;
+ return nullptr;
AABB aabb = AABB::createFromMinMaxCorner( domain.xMin() + static_cast< real_t >( xi ) * rootBlockXSize,
domain.yMin() + static_cast< real_t >( yi ) * rootBlockYSize,
@@ -296,7 +297,7 @@ BlockForest::BlockForest( const uint_t process, const SetupBlockForest& forest,
WALBERLA_ASSERT( blocks_.find( blocks[i]->getId() ) == blocks_.end() );
- blocks_[ blocks[i]->getId() ] = shared_ptr< Block >( new Block( *this, blocks[i] ) );
+ blocks_[ blocks[i]->getId() ] = std::make_shared< Block >( *this, blocks[i] );
for( uint_t j = 0; j != blocks[i]->getNeighborhoodSize(); ++j )
if( blocks[i]->getNeighbor(j)->getProcess() != process )
@@ -544,7 +545,7 @@ BlockForest::BlockForest( const uint_t process, const char* const filename, cons
state += suidMap[j];
}
- neighbors.push_back( BlockReconstruction::NeighborhoodReconstructionBlock( id, process_, state, aabbReconstruction ) );
+ neighbors.emplace_back( id, process_, state, aabbReconstruction );
}
for( uint_t i = 0; i != numberOfNeighbors; ++i ) {
@@ -566,7 +567,7 @@ BlockForest::BlockForest( const uint_t process, const char* const filename, cons
state += suidMap[k];
}
- neighbors.push_back( BlockReconstruction::NeighborhoodReconstructionBlock( id, neighborProcess, state, aabbReconstruction ) );
+ neighbors.emplace_back( id, neighborProcess, state, aabbReconstruction );
}
}
@@ -595,7 +596,7 @@ BlockForest::BlockForest( const uint_t process, const char* const filename, cons
AABB aabb;
const uint_t level = aabbReconstruction( aabb, id );
- auto block = shared_ptr< Block >( new Block( *this, id, aabb, state, level, neighborhoodReconstruction, neighbors ) );
+ auto block = std::make_shared< Block >( *this, id, aabb, state, level, neighborhoodReconstruction, neighbors );
blocks_[ id ] = block;
}
@@ -614,7 +615,7 @@ BlockForest::BlockForest( const uint_t process, const char* const filename, cons
offset = offsetBlocks[ i ] + 2 + j * ( blockIdBytes + suidBytes );
- ids.push_back( BlockID( buffer, offset, blockIdBytes ) );
+ ids.emplace_back( buffer, offset, blockIdBytes );
Set<SUID> state;
boost::dynamic_bitset< uint8_t > suidBitset = byteArrayToBitset( buffer, offset + blockIdBytes, suidBytes );
@@ -647,7 +648,7 @@ void BlockForest::getBlockID( IBlockID& id, const real_t x, const real_t y, cons
}
else {
const Block* const block = getBlock(x,y,z);
- if( block == NULL ) {
+ if( block == nullptr ) {
WALBERLA_ABORT( "Getting block ID failed: Locally, there exists no block at global location (" << x << "," << y << "," << z <<")!\n"
" (for simulation global information you have to explicitly construct the block forest to "
"contain global knowledge)");
@@ -671,7 +672,7 @@ void BlockForest::getAABB( AABB& aabb, const IBlockID& id ) const {
}
else {
const Block* const block = getBlock( id );
- if( block == NULL )
+ if( block == nullptr )
{
const BlockID& bid = *static_cast< const BlockID* >( &id );
aabb = getAABBFromBlockId( bid );
@@ -696,7 +697,7 @@ void BlockForest::getState( Set<SUID>& state, const IBlockID& id ) const {
}
else {
const Block* const block = getBlock( id );
- if( block == NULL ) {
+ if( block == nullptr ) {
WALBERLA_ABORT( "Getting block state failed: Locally, there exists no block with block ID \'" << id << "\'\n"
" (for simulation global information you have to explicitly construct "
"the block forest to contain global knowledge)" );
@@ -718,7 +719,7 @@ void BlockForest::getProcessRank( uint_t& rank, const IBlockID& id ) const {
}
else {
const Block* const block = getBlock( id );
- if( block == NULL ) {
+ if( block == nullptr ) {
WALBERLA_ABORT( "Getting block process rank failed: Locally, there exists no block with block ID \'" << id << "\'\n"
" (for simulation global information you have to explicitly construct "
"the block forest to contain global knowledge)" );
@@ -750,7 +751,7 @@ void BlockForest::getRootBlockAABB( AABB& aabb, const uint_t x, const uint_t y,
}
else {
const Block* const block = getRootBlock(x,y,z);
- if( block == NULL ) {
+ if( block == nullptr ) {
WALBERLA_ABORT( "Getting root block AABB failed: Locally, there exists no root block [" << x << "," << y << "," << z <<"]!\n"
" (for simulation global information you have to explicitly construct "
"the block forest to contain global knowledge)" );
@@ -770,7 +771,7 @@ void BlockForest::getRootBlockState( Set<SUID>& state, const uint_t x, const uin
}
else {
const Block* const block = getRootBlock(x,y,z);
- if( block == NULL ) {
+ if( block == nullptr ) {
WALBERLA_ABORT( "Getting root block state failed: Locally, there exists no root block [" << x << "," << y << "," << z <<"]!\n"
" (for simulation global information you have to explicitly construct "
"the block forest to contain global knowledge)" );
@@ -790,7 +791,7 @@ void BlockForest::getRootBlockProcessRank( uint_t& rank, const uint_t x, const u
}
else {
const Block* const block = getRootBlock(x,y,z);
- if( block == NULL ) {
+ if( block == nullptr ) {
WALBERLA_ABORT( "Getting root block process rank failed: Locally, there exists no root block [" << x << "," << y << "," << z <<"]!\n"
" (for simulation global information you have to explicitly construct "
"the block forest to contain global knowledge)" );
@@ -1195,7 +1196,7 @@ void BlockForest::restoreSnapshot( const SnapshotRestorenFunction & processMappi
const uint_t level = getAABBFromBlockId( aabb, id );
WALBERLA_ASSERT( blocks_.find( id ) == blocks_.end() );
- blocks_[ id ] = shared_ptr< Block >( new Block( *this, id, aabb, level, buffer, processMapping ) );
+ blocks_[ id ] = std::make_shared< Block >( *this, id, aabb, level, buffer, processMapping );
Block * block = blocks_[ id ].get();
for( auto dataItem = blockDataItem_.begin(); dataItem != blockDataItem_.end(); ++dataItem )
@@ -1208,7 +1209,7 @@ void BlockForest::restoreSnapshot( const SnapshotRestorenFunction & processMappi
}
else
{
- addBlockData( block, dataItem->getId(), NULL );
+ addBlockData( block, dataItem->getId(), nullptr );
}
}
}
@@ -1419,7 +1420,7 @@ void BlockForest::constructBlockInformation( const SetupBlockForest & forest )
if( index.size() == 1 ) {
node->setChild( index.top(), make_shared< BlockInformation::Node >( block->getProcess(), block->getState() ) );
}
- else if( index.top() >= node->children_.size() || node->children_[ index.top() ] == NULL ) {
+ else if( index.top() >= node->children_.size() || node->children_[ index.top() ] == nullptr ) {
node->setChild( index.top(), make_shared< BlockInformation::Node >() );
}
@@ -1475,7 +1476,7 @@ void BlockForest::constructBlockInformation( const std::vector< BlockID > & ids,
if( index.size() == 1 ) {
node->setChild( index.top(), nodes[i] );
}
- else if( index.top() >= node->children_.size() || node->children_[ index.top() ] == NULL ) {
+ else if( index.top() >= node->children_.size() || node->children_[ index.top() ] == nullptr ) {
node->setChild( index.top(), make_shared< BlockInformation::Node >() );
}
@@ -1494,7 +1495,7 @@ void BlockForest::constructBlockInformation()
std::vector< std::pair< BlockID, std::pair< uint_t, Set<SUID> > > > data;
for( auto it = blocks_.begin(); it != blocks_.end(); ++it )
{
- data.push_back( std::make_pair( it->first, std::make_pair( process_, it->second->getState() ) ) );
+ data.emplace_back( it->first, std::make_pair( process_, it->second->getState() ) );
}
mpi::SendBuffer sBuffer;
@@ -1570,7 +1571,7 @@ bool BlockForest::determineBlockTargetLevels( bool & additionalRefreshCycleRequi
{
WALBERLA_ASSERT( it->second->getTargetLevel() == it->second->getLevel() ||
( it->second->getTargetLevel() + uint_t(1) ) == it->second->getLevel() );
- minTargetLevelsCallback.push_back( std::make_pair( it->second.get(), it->second->getTargetLevel() ) );
+ minTargetLevelsCallback.emplace_back( it->second.get(), it->second->getTargetLevel() );
mapping.push_back(0);
}
}
@@ -1599,7 +1600,7 @@ bool BlockForest::determineBlockTargetLevels( bool & additionalRefreshCycleRequi
WALBERLA_CHECK( it1 != blocksAlreadyMarkedForRefinement.end() );
WALBERLA_CHECK_NOT_NULLPTR( *it1 );
WALBERLA_CHECK_EQUAL( (*it1)->getTargetLevel(), (*it1)->getLevel() + uint_t(1) );
- minTargetLevelsAllBlocks.push_back( std::make_pair( *it1, (*it1)->getTargetLevel() ) );
+ minTargetLevelsAllBlocks.emplace_back( *it1, (*it1)->getTargetLevel() );
it1++;
}
}
@@ -2164,7 +2165,7 @@ void BlockForest::update( PhantomBlockForest & phantomForest )
if( block->getTargetLevel() != block->getLevel() || targetProcesses[0] != process_ )
{
WALBERLA_ASSERT( targetProcesses.size() == uint_t(1) || targetProcesses.size() == uint_t(8) );
- blocksToPack.push_back( std::make_pair( block.get(), std::vector< mpi::SendBuffer >( targetProcesses.size() ) ) );
+ blocksToPack.emplace_back( block.get(), std::vector< mpi::SendBuffer >( targetProcesses.size() ) );
}
}
@@ -2390,7 +2391,7 @@ void BlockForest::update( PhantomBlockForest & phantomForest )
if( pBlock->getSourceLevel() != pBlock->getLevel() || pBlock->getSourceProcess()[0] != process_ )
{
WALBERLA_ASSERT( blocks_.find( pBlock->getId() ) == blocks_.end() );
- blocks_[ pBlock->getId() ] = shared_ptr< Block >( new Block( *this, *pBlock ) );
+ blocks_[ pBlock->getId() ] = std::make_shared< Block >( *this, *pBlock );
}
else // update neighborhood of existing blocks
{
@@ -2469,7 +2470,7 @@ void BlockForest::update( PhantomBlockForest & phantomForest )
WALBERLA_LOG_PROGRESS( "BlockForest refresh: - perform local data transfer" );
for( auto buffer = localBlocks.begin(); buffer != localBlocks.end(); ++buffer )
- recvLocalBlocks.push_back( mpi::RecvBuffer( **buffer ) );
+ recvLocalBlocks.emplace_back( **buffer );
////////////////////////////////////
// WAIT FOR RECV's FOR BLOCK DATA //
@@ -2545,7 +2546,7 @@ void BlockForest::update( PhantomBlockForest & phantomForest )
{
auto & bufferPtrs = blocksToUnpack[ block ];
if( bufferPtrs.empty() )
- bufferPtrs.resize( uint_t(8), std::make_pair( Set<SUID>::emptySet(), static_cast< mpi::RecvBuffer * >(NULL) ) );
+ bufferPtrs.resize( uint_t(8), std::make_pair( Set<SUID>::emptySet(), static_cast< mpi::RecvBuffer * >(nullptr) ) );
WALBERLA_ASSERT_EQUAL( sId.getUsedBits(), rId.getUsedBits() + uint_t(3) );
bufferPtrs[ sId.getBranchId() ] = std::make_pair( state, &(*buffer) );
}
@@ -2600,7 +2601,7 @@ void BlockForest::update( PhantomBlockForest & phantomForest )
std::vector< std::pair< Block *, std::vector< std::pair< Set<SUID>, mpi::RecvBuffer * > > > > dataToUnpack;
for( auto it = blocksToUnpack.begin(); it != blocksToUnpack.end(); ++it )
- dataToUnpack.push_back( std::make_pair( it->first, it->second ) );
+ dataToUnpack.emplace_back( it->first, it->second );
//#ifdef _OPENMP
//#pragma omp parallel for schedule(dynamic)
@@ -2627,7 +2628,7 @@ void BlockForest::update( PhantomBlockForest & phantomForest )
if( blockDataHandlingWrapper )
addBlockData( block, dataItem->getId(), blockDataHandlingWrapper->deserialize( block ) );
else
- addBlockData( block, dataItem->getId(), NULL );
+ addBlockData( block, dataItem->getId(), nullptr );
}
// fill with sent data
{
@@ -2664,7 +2665,7 @@ void BlockForest::update( PhantomBlockForest & phantomForest )
addBlockData( block, dataItem->getId(), downcastBlockDataHandlingWrapper->deserializeCoarseToFine( block ) );
}
else
- addBlockData( block, dataItem->getId(), NULL );
+ addBlockData( block, dataItem->getId(), nullptr );
}
// fill with sent data
{
@@ -2712,7 +2713,7 @@ void BlockForest::update( PhantomBlockForest & phantomForest )
addBlockData( block, dataItem->getId(), downcastBlockDataHandlingWrapper->deserializeFineToCoarse( block ) );
}
else
- addBlockData( block, dataItem->getId(), NULL );
+ addBlockData( block, dataItem->getId(), nullptr );
}
// fill with sent data
for( uint_t c = uint_t(0); c != uint_t(8); ++c )
diff --git a/src/blockforest/BlockForest.h b/src/blockforest/BlockForest.h
index 42d1081e1feb7d6af47aba14e398966cdf055066..5d9a28628a7e23aa9029c1707d435bb0ef82fad0 100644
--- a/src/blockforest/BlockForest.h
+++ b/src/blockforest/BlockForest.h
@@ -989,6 +989,62 @@ private:
+class CombinedMinTargetLevelDeterminationFunctions
+{
+public:
+
+ typedef blockforest::BlockForest::RefreshMinTargetLevelDeterminationFunction MinTargetLevelDeterminationFunction;
+
+ CombinedMinTargetLevelDeterminationFunctions(const std::function<uint_t(const std::vector<uint_t> &)> & targetLevelReductionFct = [](const std::vector<uint_t> & t){ return *std::max_element(t.begin(), t.end());})
+ : targetLevelReductionFct_( targetLevelReductionFct )
+ {
+
+ }
+
+ void add( const MinTargetLevelDeterminationFunction & function )
+ {
+ functions_.push_back( function );
+ }
+
+ void operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > & blocksAlreadyMarkedForRefinement,
+ const blockforest::BlockForest & forest )
+ {
+ const uint_t numberOfBlocks = minTargetLevels.size();
+
+ std::vector< std::vector< std::pair< const Block *, uint_t > > > minTargetLevelsPerFunction(functions_.size(), minTargetLevels);
+
+ // evaluate the different determination functions
+ auto iter = minTargetLevelsPerFunction.begin();
+ for( auto function = functions_.begin(); function != functions_.end(); ++function, ++iter )
+ {
+ (*function)( *iter, blocksAlreadyMarkedForRefinement, forest );
+ WALBERLA_ASSERT_EQUAL(iter->size(), numberOfBlocks, "Number of blocks has changed during min target level determination!");
+ }
+
+ // combine the outcome of the different functions into a single target level
+ std::vector<uint_t> targetLevels(functions_.size());
+ for( uint_t block = 0; block < numberOfBlocks; ++block )
+ {
+ for( uint_t fct = 0; fct < functions_.size(); ++fct)
+ {
+ WALBERLA_ASSERT_EQUAL(minTargetLevelsPerFunction[fct][block].first->getId(), minTargetLevels[block].first->getId());
+ targetLevels[fct] = minTargetLevelsPerFunction[fct][block].second;
+ }
+ minTargetLevels[block].second = targetLevelReductionFct_(targetLevels);
+ }
+
+ }
+
+private:
+
+ std::vector< MinTargetLevelDeterminationFunction > functions_;
+ std::function<uint_t(const std::vector<uint_t> &)> targetLevelReductionFct_;
+
+}; // class CombinedMinTargetLevelDeterminationFunctions
+
+
+
} // namespace blockforest
using blockforest::BlockForest;
diff --git a/src/blockforest/Initialization.cpp b/src/blockforest/Initialization.cpp
index 8704ae5f02d045a560c50f3b493f1419409147ed..acb638accd0ea043a8db2f249eb98a5ea3084e22 100644
--- a/src/blockforest/Initialization.cpp
+++ b/src/blockforest/Initialization.cpp
@@ -31,6 +31,9 @@
#include "stencil/D3Q19.h"
+#include <functional>
+#include <memory>
+
namespace walberla {
namespace blockforest {
@@ -218,7 +221,7 @@ createBlockForest( const AABB& domainAABB,
// if possible, create Cartesian MPI communicator
- std::vector< uint_t >* processIdMap = NULL;
+ std::vector< uint_t >* processIdMap = nullptr;
WALBERLA_MPI_SECTION()
{
@@ -247,11 +250,11 @@ createBlockForest( const AABB& domainAABB,
sforest.balanceLoad( blockforest::CartesianDistribution( numberOfXProcesses, numberOfYProcesses, numberOfZProcesses, processIdMap ),
numberOfXProcesses * numberOfYProcesses * numberOfZProcesses );
- if( processIdMap != NULL ) delete processIdMap;
+ if( processIdMap != nullptr ) delete processIdMap;
// create StructuredBlockForest (encapsulates a newly created BlockForest)
- return shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sforest, keepGlobalBlockInformation ) );
+ return std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), sforest, keepGlobalBlockInformation );
}
@@ -304,7 +307,7 @@ createUniformBlockGrid( const AABB& domainAABB,
zPeriodic,
keepGlobalBlockInformation);
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, numberOfXCellsPerBlock, numberOfYCellsPerBlock, numberOfZCellsPerBlock ) );
+ auto sbf = std::make_shared< StructuredBlockForest >( bf, numberOfXCellsPerBlock, numberOfYCellsPerBlock, numberOfZCellsPerBlock );
sbf->createCellBoundingBoxes();
return sbf;
@@ -500,7 +503,7 @@ createUniformBlockGrid( const AABB& domainAABB,
numeric_cast< memory_t >( maxBlocksPerProcess );
GlobalLoadBalancing::MetisConfiguration< SetupBlock > metisConfig( includeMetis, forceMetis,
- boost::bind( cellWeightedCommunicationCost,_1,_2,
+ std::bind( cellWeightedCommunicationCost, std::placeholders::_1, std::placeholders::_2,
numberOfXCellsPerBlock,
numberOfYCellsPerBlock,
numberOfZCellsPerBlock ) );
@@ -512,9 +515,9 @@ createUniformBlockGrid( const AABB& domainAABB,
// create StructuredBlockForest (encapsulates a newly created BlockForest)
- auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sforest, keepGlobalBlockInformation ) );
+ auto bf = std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), sforest, keepGlobalBlockInformation );
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, numberOfXCellsPerBlock, numberOfYCellsPerBlock, numberOfZCellsPerBlock ) );
+ auto sbf = std::make_shared< StructuredBlockForest >( bf, numberOfXCellsPerBlock, numberOfYCellsPerBlock, numberOfZCellsPerBlock );
sbf->createCellBoundingBoxes();
return sbf;
@@ -598,12 +601,12 @@ createUniformBlockGrid( const std::string& filename,
if( !MPIManager::instance()->rankValid() )
MPIManager::instance()->useWorldComm();
- auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), filename.c_str(), true, keepGlobalBlockInformation ) );
+ auto bf = std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), filename.c_str(), true, keepGlobalBlockInformation );
if( !bf->storesUniformBlockGrid() )
WALBERLA_ABORT( "The block forest loaded from file \'" << filename << "\' does not contain a uniform block grid!" );
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, numberOfXCellsPerBlock, numberOfYCellsPerBlock, numberOfZCellsPerBlock ) );
+ auto sbf = std::make_shared< StructuredBlockForest >( bf, numberOfXCellsPerBlock, numberOfYCellsPerBlock, numberOfZCellsPerBlock );
sbf->createCellBoundingBoxes();
return sbf;
diff --git a/src/blockforest/PhantomBlockForest.cpp b/src/blockforest/PhantomBlockForest.cpp
index 196ba5529e2b24b8825ea8a5903d9191cc83814f..accf55746fc00d807621103f3d244fb63a9c33e3 100644
--- a/src/blockforest/PhantomBlockForest.cpp
+++ b/src/blockforest/PhantomBlockForest.cpp
@@ -31,6 +31,7 @@
#include "core/mpi/MPIManager.h"
#include "core/mpi/Reduce.h"
+#include <memory>
#include <set>
@@ -77,8 +78,8 @@ void PhantomBlockForest::initialize( const BlockStateDeterminationFunction & fun
{
auto cstate = function ? function( std::vector< std::pair< BlockID, Set<SUID> > >( 1, std::make_pair( id, state ) ), id ) : state;
- auto phantom = shared_ptr< PhantomBlock >( new PhantomBlock( *this, id, cstate, aabb, targetLevel, level,
- std::vector< uint_t >( uint_t(1), process ), process ) );
+ auto phantom = std::make_shared< PhantomBlock >( *this, id, cstate, aabb, targetLevel, level,
+ std::vector< uint_t >( uint_t(1), process ), process );
blocks_[ phantom->getId() ] = phantom;
block->addTargetProcess( process );
@@ -106,8 +107,8 @@ void PhantomBlockForest::initialize( const BlockStateDeterminationFunction & fun
( ( c & 2 ) ? aabb.yMax() : yMid ),
( ( c & 4 ) ? aabb.zMax() : zMid ) );
- auto phantom = shared_ptr< PhantomBlock >( new PhantomBlock( *this, cid, cstate, caabb, targetLevel, level,
- std::vector< uint_t >( uint_t(1), process ), process ) );
+ auto phantom = std::make_shared< PhantomBlock >( *this, cid, cstate, caabb, targetLevel, level,
+ std::vector< uint_t >( uint_t(1), process ), process );
blocks_[ phantom->getId() ] = phantom;
block->addTargetProcess( process );
@@ -146,7 +147,7 @@ void PhantomBlockForest::initialize( const BlockStateDeterminationFunction & fun
sourceStates[3].second + sourceStates[4].second + sourceStates[5].second +
sourceStates[6].second + sourceStates[7].second );
- auto phantom = shared_ptr< PhantomBlock >( new PhantomBlock( *this, fid, cstate, faabb, targetLevel, level, sourceProcesses, process ) );
+ auto phantom = std::make_shared< PhantomBlock >( *this, fid, cstate, faabb, targetLevel, level, sourceProcesses, process );
blocks_[ phantom->getId() ] = phantom;
block->addTargetProcess( process );
@@ -237,7 +238,7 @@ void PhantomBlockForest::initialize( const BlockStateDeterminationFunction & fun
std::map< BlockID, std::pair< uint_t, Set<SUID> > > & localMap = blockNeighborhood[ process ];
for( auto it = localMap.begin(); it != localMap.end(); ++it )
- neighbors.push_back( BlockReconstruction::NeighborhoodReconstructionBlock( it->first, it->second.first, it->second.second, aabbReconstruction ) );
+ neighbors.emplace_back( it->first, it->second.first, it->second.second, aabbReconstruction );
BlockReconstruction::NeighborhoodReconstruction< PhantomBlock > neighborhoodReconstruction( blockforest_.getDomain(),
blockforest_.isXPeriodic(),
@@ -262,7 +263,7 @@ void PhantomBlockForest::assignBlockData( const PhantomBlockDataAssignmentFuncti
{
auto & block = it->second;
WALBERLA_ASSERT_NOT_NULLPTR( block.get() );
- blockData.push_back( std::make_pair( block.get(), walberla::any() ) );
+ blockData.emplace_back( block.get(), walberla::any() );
}
function( blockData, *this );
@@ -296,7 +297,7 @@ bool PhantomBlockForest::calculateMigrationInformation( const MigrationPreparati
{
auto & block = it->second;
WALBERLA_ASSERT_NOT_NULLPTR( block.get() );
- targetProcess.push_back( std::make_pair( block.get(), block->getTargetProcess() ) );
+ targetProcess.emplace_back( block.get(), block->getTargetProcess() );
}
bool runAgain = function( targetProcess, processesToRecvFrom_, *this, iteration );
@@ -465,7 +466,7 @@ void PhantomBlockForest::migrate( const PhantomBlockDataPackFunction & packBlock
++sourceLevel;
}
- auto phantom = shared_ptr< PhantomBlock >( new PhantomBlock( *this, id, state, aabb, level, sourceLevel, sp, process ) );
+ auto phantom = std::make_shared< PhantomBlock >( *this, id, state, aabb, level, sourceLevel, sp, process );
blocks_[ id ] = phantom;
phantom->clearNeighborhood();
diff --git a/src/blockforest/SetupBlockForest.cpp b/src/blockforest/SetupBlockForest.cpp
index 3c4b40652e59ffcba3e0a383a3178aff509aba8a..66201296835f62bb5c9d28f9180d060503bcbbb7 100644
--- a/src/blockforest/SetupBlockForest.cpp
+++ b/src/blockforest/SetupBlockForest.cpp
@@ -73,7 +73,7 @@ uint_t SetupBlockForest::getNumberOfBlocks( const uint_t level ) const
for( uint_t i = 0; i != forest_.size(); ++i ) {
- if( forest_[i] == NULL )
+ if( forest_[i] == nullptr )
continue;
std::stack< SetupBlock* > stack;
@@ -103,12 +103,12 @@ uint_t SetupBlockForest::getNumberOfBlocks( const uint_t level ) const
const SetupBlock* SetupBlockForest::getFirstBlock() const {
- SetupBlock* block = NULL;
- for( uint_t i = 0; i != forest_.size() && block == NULL; ++i )
+ SetupBlock* block = nullptr;
+ for( uint_t i = 0; i != forest_.size() && block == nullptr; ++i )
block = forest_[i];
- if( block == NULL )
- return NULL;
+ if( block == nullptr )
+ return nullptr;
while( block->hasChildren() )
block = block->getChild(0);
@@ -120,12 +120,12 @@ const SetupBlock* SetupBlockForest::getFirstBlock() const {
SetupBlock* SetupBlockForest::getFirstBlock() {
- SetupBlock* block = NULL;
- for( uint_t i = 0; i != forest_.size() && block == NULL; ++i )
+ SetupBlock* block = nullptr;
+ for( uint_t i = 0; i != forest_.size() && block == nullptr; ++i )
block = forest_[i];
- if( block == NULL )
- return NULL;
+ if( block == nullptr )
+ return nullptr;
while( block->hasChildren() )
block = block->getChild(0);
@@ -137,8 +137,8 @@ SetupBlock* SetupBlockForest::getFirstBlock() {
const SetupBlock* SetupBlockForest::getNextBlock( const SetupBlock* block ) const {
- if( block == NULL )
- return NULL;
+ if( block == nullptr )
+ return nullptr;
// ASCEND
@@ -162,10 +162,10 @@ const SetupBlock* SetupBlockForest::getNextBlock( const SetupBlock* block ) cons
WALBERLA_ASSERT_LESS( treeIndex-1 ,forest_.size() );
WALBERLA_ASSERT_EQUAL( block, forest_[ treeIndex-1 ] );
- while( treeIndex < forest_.size() && forest_[ treeIndex ] == NULL ) ++treeIndex;
+ while( treeIndex < forest_.size() && forest_[ treeIndex ] == nullptr ) ++treeIndex;
if( treeIndex == forest_.size() )
- return NULL;
+ return nullptr;
block = forest_[ treeIndex ];
}
@@ -184,8 +184,8 @@ const SetupBlock* SetupBlockForest::getNextBlock( const SetupBlock* block ) cons
SetupBlock* SetupBlockForest::getNextBlock( const SetupBlock* block ) {
- if( block == NULL )
- return NULL;
+ if( block == nullptr )
+ return nullptr;
// ASCEND
@@ -209,10 +209,10 @@ SetupBlock* SetupBlockForest::getNextBlock( const SetupBlock* block ) {
WALBERLA_ASSERT_LESS( treeIndex-1, forest_.size() );
WALBERLA_ASSERT_EQUAL( block, forest_[ treeIndex-1 ] );
- while( treeIndex < forest_.size() && forest_[ treeIndex ] == NULL ) ++treeIndex;
+ while( treeIndex < forest_.size() && forest_[ treeIndex ] == nullptr ) ++treeIndex;
if( treeIndex == forest_.size() )
- return NULL;
+ return nullptr;
block = forest_[ treeIndex ];
}
@@ -269,7 +269,7 @@ void SetupBlockForest::getBlocks( std::vector< const SetupBlock* >& blocks ) con
for( uint_t i = 0; i != forest_.size(); ++i ) {
- if( forest_[i] == NULL )
+ if( forest_[i] == nullptr )
continue;
// depth-first search
@@ -302,7 +302,7 @@ void SetupBlockForest::getBlocks( std::vector< SetupBlock* >& blocks ) {
for( uint_t i = 0; i != forest_.size(); ++i ) {
- if( forest_[i] == NULL )
+ if( forest_[i] == nullptr )
continue;
// depth-first search
@@ -335,7 +335,7 @@ void SetupBlockForest::getBlocks( std::vector< const SetupBlock* >& blocks, cons
for( uint_t i = 0; i != forest_.size(); ++i ) {
- if( forest_[i] == NULL )
+ if( forest_[i] == nullptr )
continue;
std::stack< SetupBlock* > stack;
@@ -367,7 +367,7 @@ void SetupBlockForest::getBlocks( std::vector< SetupBlock* >& blocks, const uint
for( uint_t i = 0; i != forest_.size(); ++i ) {
- if( forest_[i] == NULL )
+ if( forest_[i] == nullptr )
continue;
std::stack< SetupBlock* > stack;
@@ -413,7 +413,7 @@ void SetupBlockForest::getHilbertOrder( std::vector< SetupBlock* >& blocks ) {
SetupBlock* root = forest_[ z*size_[0]*size_[1] + y*size_[0] + x ];
- if( root != NULL ) {
+ if( root != nullptr ) {
std::stack< SetupBlock* > stack;
std::stack< uint_t > orientation;
@@ -486,7 +486,7 @@ void SetupBlockForest::getBlocksOverlappedByAABB( std::vector< SetupBlock* >& bl
for( uint_t y = max[1]; y-- != min[1]; ) {
for( uint_t x = max[0]; x-- != min[0]; ) {
SetupBlock* const block = forest_[ mapForestCoordinatesToTreeIndex(x,y,z) ];
- if( block != NULL && block->getAABB().intersects( aabb ) )
+ if( block != nullptr && block->getAABB().intersects( aabb ) )
stack.push( block );
}
}
@@ -524,7 +524,7 @@ void SetupBlockForest::getBlocks( std::vector< SetupBlock* >& blocks, const uint
for( uint_t y = ymax; y-- != ymin; ) {
for( uint_t x = xmax; x-- != xmin; ) {
SetupBlock* const block = forest_[ mapForestCoordinatesToTreeIndex(x,y,z) ];
- if( block != NULL ) stack.push( block );
+ if( block != nullptr ) stack.push( block );
}
}
}
@@ -596,7 +596,7 @@ void SetupBlockForest::mapAABBToBoundingForestCoordinates( const AABB& aabb, uin
// shouldn't happen, but might happen due to floating point inaccuracy?
SetupBlock* block = forest_[ mapForestCoordinatesToTreeIndex( min[0], min[1], min[2] ) ];
- if( block != NULL ) {
+ if( block != nullptr ) {
const AABB& tree = block->getAABB();
if( aabb.min(i) < tree.min(i) ) --min[i];
else if( aabb.min(i) >= tree.max(i) ) ++min[i];
@@ -611,7 +611,7 @@ void SetupBlockForest::mapAABBToBoundingForestCoordinates( const AABB& aabb, uin
// shouldn't happen, but might happen due to floating point inaccuracy?
SetupBlock* block = forest_[ mapForestCoordinatesToTreeIndex( max[0], max[1], max[2] ) ];
- if( block != NULL ) {
+ if( block != nullptr ) {
const AABB& tree = block->getAABB();
if( aabb.max(i) <= tree.min(i) ) --max[i];
else if( aabb.max(i) > tree.max(i) ) ++max[i];
@@ -673,7 +673,7 @@ void SetupBlockForest::init( const AABB& domain, const uint_t xSize, const uint_
if( !forest_.empty() ) {
for( uint_t i = 0; i != forest_.size(); ++i ) {
- if( forest_[i] != NULL ) delete forest_[i];
+ if( forest_[i] != nullptr ) delete forest_[i];
}
forest_.clear();
}
@@ -725,7 +725,7 @@ void SetupBlockForest::init( const AABB& domain, const uint_t xSize, const uint_
WALBERLA_LOG_PROGRESS( "Initializing SetupBlockForest: Allocating root blocks ..." );
- forest_.resize( size, NULL );
+ forest_.resize( size, nullptr );
numberOfRootBlocks_ = uint_c(0);
AABB aabb;
@@ -740,7 +740,7 @@ void SetupBlockForest::init( const AABB& domain, const uint_t xSize, const uint_
{
getRootBlockAABB( aabb, x, y, z );
- forest_[ treeIndex ] = new SetupBlock( NULL, BlockID( treeIndex, treeIdMarker ),
+ forest_[ treeIndex ] = new SetupBlock( nullptr, BlockID( treeIndex, treeIdMarker ),
aabb.xMin(), aabb.yMin(), aabb.zMin(), aabb.xMax(), aabb.yMax(), aabb.zMax(), 0 );
++numberOfRootBlocks_;
}
@@ -769,7 +769,7 @@ void SetupBlockForest::init( const AABB& domain, const uint_t xSize, const uint_
WALBERLA_ASSERT_LESS( treeIndex, forest_.size() );
- if( forest_[ treeIndex ] != NULL ) {
+ if( forest_[ treeIndex ] != nullptr ) {
for( uint_t w = 0; w != 3; ++w ) {
for( uint_t v = 0; v != 3; ++v ) {
@@ -797,7 +797,7 @@ void SetupBlockForest::init( const AABB& domain, const uint_t xSize, const uint_
WALBERLA_ASSERT_LESS( n, 26 );
WALBERLA_ASSERT_LESS( nIndex, forest_.size() );
- if( forest_[ nIndex ] != NULL )
+ if( forest_[ nIndex ] != nullptr )
forest_[ treeIndex ]->addNeighbor( n, forest_[ nIndex ] );
}
}
@@ -987,13 +987,13 @@ void SetupBlockForest::updateNeighborhood( std::vector< SetupBlock* >& blocks )
if( z < domain_.zMin() && periodic_[2] ) z = domain_.zMax() - domain_.zMin() + z;
if( z >= domain_.zMax() && periodic_[2] ) z = domain_.zMin() - domain_.zMax() + z;
- SetupBlock* neighbor = NULL;
+ SetupBlock* neighbor = nullptr;
- for( uint_t j = 0; j != neighborhood.size() && neighbor == NULL; ++j ) {
+ for( uint_t j = 0; j != neighborhood.size() && neighbor == nullptr; ++j ) {
if( neighborhood[j]->getAABB().contains( x, y, z ) )
neighbor = mapPointToBlock( neighborhood[j], x, y, z );
}
- if( neighbor == NULL && block->hasFather() && block->getFather()->getAABB().contains( x, y, z ) )
+ if( neighbor == nullptr && block->hasFather() && block->getFather()->getAABB().contains( x, y, z ) )
neighbor = mapPointToBlock( block->getFather(), x, y, z );
if( neighborhoodSectionBlocks.empty() || neighborhoodSectionBlocks.back() != neighbor )
@@ -1008,7 +1008,7 @@ void SetupBlockForest::updateNeighborhood( std::vector< SetupBlock* >& blocks )
#endif
block->clearNeighborhoodSection(n);
- if( neighborhoodSectionBlocks.back() != NULL ) {
+ if( neighborhoodSectionBlocks.back() != nullptr ) {
#ifndef NDEBUG
if( neighborhoodSectionBlocks.back()->getLevel() > block->getLevel() )
@@ -1082,7 +1082,7 @@ void SetupBlockForest::createNeighborhood() {
#endif
block->clearNeighborhoodSection(n);
- if( neighborhoodSectionBlocks.back() != NULL ) {
+ if( neighborhoodSectionBlocks.back() != nullptr ) {
#ifndef NDEBUG
if( neighborhoodSectionBlocks.back()->getLevel() > block->getLevel() )
@@ -1232,7 +1232,7 @@ void SetupBlockForest::calculateProcessDistribution_Default( const uint_t
const std::string& sfcMethod /* = std::string( "hilbert" ) */,
const uint_t sfcIterations /* = 10 */,
const bool sortByLevel /* = false */,
- GlobalLoadBalancing::MetisConfiguration< SetupBlock > metisConfig,
+ const GlobalLoadBalancing::MetisConfiguration< SetupBlock >& metisConfig,
const bool reorderProcessesByBFS /* = false */,
const bool insertBufferProcesses /* = false */,
const real_t bufferProcessesFraction /* = real_c(0) */ )
@@ -1248,7 +1248,7 @@ void SetupBlockForest::calculateProcessDistribution_Default( const uint_t
WALBERLA_ABORT( "Load balancing failed: You must provide a per process memory limit greater than 0!\n"
" (The memory limit you provided was \'" << memoryLimit << "\')" );
- if( sfcMethod.compare( "hilbert" ) != 0 && sfcMethod.compare( "morton" ) != 0 )
+ if( sfcMethod != "hilbert" && sfcMethod != "morton" )
WALBERLA_ABORT( "Load balancing failed: SFC method \"" << sfcMethod << "\" unavailable "
"(the only available methods are \"hilbert\" and \"morton\")" )
@@ -1262,7 +1262,7 @@ void SetupBlockForest::calculateProcessDistribution_Default( const uint_t
std::vector< SetupBlock* > blocks;
- if( sfcMethod.compare( "hilbert" ) == 0 )
+ if( sfcMethod == "hilbert" )
getHilbertOrder( blocks );
else
getMortonOrder( blocks );
diff --git a/src/blockforest/SetupBlockForest.h b/src/blockforest/SetupBlockForest.h
index dbea75a0058945ccb631e6b9689a9ec4324338ac..a9192cac2f3946d02bf79bfb2f32c0f2293fa882 100644
--- a/src/blockforest/SetupBlockForest.h
+++ b/src/blockforest/SetupBlockForest.h
@@ -290,7 +290,7 @@ public:
const std::string& sfcMethod = std::string( "hilbert" ),
const uint_t sfcIterations = 10,
const bool sortByLevel = false,
- GlobalLoadBalancing::MetisConfiguration< SetupBlock > metisConfig =
+ const GlobalLoadBalancing::MetisConfiguration< SetupBlock >& metisConfig =
GlobalLoadBalancing::MetisConfiguration< SetupBlock >(),
const bool reorderProcessesByBFS = false,
const bool insertBufferProcesses = false,
diff --git a/src/blockforest/StructuredBlockForest.cpp b/src/blockforest/StructuredBlockForest.cpp
index ca37814fd44b9245196d0c44ea0e517be7185e2c..034feb8277a32c4554c94bac90ae6a29b383c41a 100644
--- a/src/blockforest/StructuredBlockForest.cpp
+++ b/src/blockforest/StructuredBlockForest.cpp
@@ -43,7 +43,7 @@ bool StructuredBlockForest::blockExists( const Cell& cell, const uint_t level )
}
const IBlock* block = getBlock(x,y,z);
- if( block == NULL )
+ if( block == nullptr )
return false;
WALBERLA_ASSERT_EQUAL( dynamic_cast< const Block* >( block ), block );
@@ -68,7 +68,7 @@ void StructuredBlockForest::getBlockID( IBlockID& id, const Cell& cell, const ui
}
else {
const IBlock* const block = getBlock(x,y,z);
- if( block == NULL ) {
+ if( block == nullptr ) {
WALBERLA_ABORT( "Getting block ID failed: Locally, there exists no block at global cell " << cell << " on level " << level << "!\n"
" (for simulation global information you have to explicitly construct the block forest to "
"contain global knowledge)");
diff --git a/src/blockforest/StructuredBlockForest.h b/src/blockforest/StructuredBlockForest.h
index 82f4e810d1444d18ebbb1f47e9cd19a42d2ab2c2..ac021fe66acce0eb8a24fa662b625ad906170762 100644
--- a/src/blockforest/StructuredBlockForest.h
+++ b/src/blockforest/StructuredBlockForest.h
@@ -24,6 +24,7 @@
#include "BlockForest.h"
#include "domain_decomposition/StructuredBlockStorage.h"
+#include <functional>
namespace walberla {
namespace blockforest {
@@ -205,7 +206,7 @@ inline StructuredBlockForest::StructuredBlockForest( const shared_ptr< BlockFore
blockForest_( blockForest ) {
blockForest_->addRefreshCallbackFunctionBeforeBlockDataIsUnpacked(
- BlockForest::RefreshCallbackWrappper( boost::bind( resetCellDecompositionInStorage, boost::ref(*this) ) ) );
+ BlockForest::RefreshCallbackWrappper( std::bind( resetCellDecompositionInStorage, std::ref(*this) ) ) );
blockCells_[0] = blockXCells;
blockCells_[1] = blockYCells;
diff --git a/src/blockforest/communication/NonUniformBufferedScheme.h b/src/blockforest/communication/NonUniformBufferedScheme.h
index e2eca543d736d543748d115ee645f91b12323e01..3e206f36d1aa4bfca2eebf14859dd22b68da72bd 100644
--- a/src/blockforest/communication/NonUniformBufferedScheme.h
+++ b/src/blockforest/communication/NonUniformBufferedScheme.h
@@ -36,10 +36,9 @@
#include "core/selectable/IsSetSelected.h"
#include "core/uid/SUID.h"
-#include <boost/bind.hpp>
-#include <functional>
#include <map>
+#include <functional>
#include <set>
#include <vector>
@@ -110,7 +109,7 @@ public:
//@{
void startCommunication() { startCommunicateEqualLevel(); startCommunicateCoarseToFine(); startCommunicateFineToCoarse(); }
- std::function<void()> getStartCommunicateFunctor() { return boost::bind( &NonUniformBufferedScheme::startCommunication, this ); }
+ std::function<void()> getStartCommunicateFunctor() { return std::bind( &NonUniformBufferedScheme::startCommunication, this ); }
inline void startCommunicateEqualLevel();
inline void startCommunicateCoarseToFine();
@@ -121,7 +120,7 @@ public:
inline void startCommunicateFineToCoarse( const uint_t fineLevel );
void wait() { waitCommunicateEqualLevel(); waitCommunicateCoarseToFine(); waitCommunicateFineToCoarse(); }
- std::function<void() > getWaitFunctor() { return boost::bind( &NonUniformBufferedScheme::wait, this ); }
+ std::function<void() > getWaitFunctor() { return std::bind( &NonUniformBufferedScheme::wait, this ); }
inline void waitCommunicateEqualLevel();
inline void waitCommunicateCoarseToFine();
@@ -659,13 +658,13 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationEqualLevel( const uint
localBuffers.push_back( buffer );
const uint_t bufferIndex = uint_c( localBuffers.size() ) - uint_t(1);
- VoidFunction pack = boost::bind( &NonUniformBufferedScheme<Stencil>::localBufferPacking, this,
- EQUAL_LEVEL, index, bufferIndex, boost::cref( *packInfo ), block, neighbor, *dir );
+ VoidFunction pack = std::bind( &NonUniformBufferedScheme<Stencil>::localBufferPacking, this,
+ EQUAL_LEVEL, index, bufferIndex, std::cref( *packInfo ), block, neighbor, *dir );
threadsafeLocalCommunication.push_back( pack );
- VoidFunction unpack = boost::bind( &NonUniformBufferedScheme<Stencil>::localBufferUnpacking, this,
- EQUAL_LEVEL, index, bufferIndex, boost::cref( *packInfo ), neighbor, block, *dir );
+ VoidFunction unpack = std::bind( &NonUniformBufferedScheme<Stencil>::localBufferUnpacking, this,
+ EQUAL_LEVEL, index, bufferIndex, std::cref( *packInfo ), neighbor, block, *dir );
if( (*packInfo)->threadsafeReceiving() )
threadsafeLocalCommunicationUnpack.push_back( unpack );
@@ -674,7 +673,7 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationEqualLevel( const uint
}
else
{
- VoidFunction localCommunicationFunction = boost::bind( &blockforest::communication::NonUniformPackInfo::communicateLocalEqualLevel,
+ VoidFunction localCommunicationFunction = std::bind( &blockforest::communication::NonUniformPackInfo::communicateLocalEqualLevel,
*packInfo, block, neighbor, *dir );
if( (*packInfo)->threadsafeReceiving() )
threadsafeLocalCommunication.push_back( localCommunicationFunction );
@@ -688,10 +687,10 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationEqualLevel( const uint
auto nProcess = block->getNeighborProcess( neighborIdx, uint_t(0) );
if( !packInfos_.empty() )
- sendFunctions[ nProcess ].push_back( boost::bind( NonUniformBufferedScheme<Stencil>::writeHeader, _1, block->getId(), receiverId, *dir ) );
+ sendFunctions[ nProcess ].push_back( std::bind( NonUniformBufferedScheme<Stencil>::writeHeader, std::placeholders::_1, block->getId(), receiverId, *dir ) );
for( auto packInfo = packInfos_.begin(); packInfo != packInfos_.end(); ++packInfo )
- sendFunctions[ nProcess ].push_back( boost::bind( &blockforest::communication::NonUniformPackInfo::packDataEqualLevel, *packInfo, block, *dir, _1 ) );
+ sendFunctions[ nProcess ].push_back( std::bind( &blockforest::communication::NonUniformPackInfo::packDataEqualLevel, *packInfo, block, *dir, std::placeholders::_1 ) );
}
}
}
@@ -700,8 +699,8 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationEqualLevel( const uint
for( auto sender = sendFunctions.begin(); sender != sendFunctions.end(); ++sender )
{
- bufferSystem->addSendingFunction ( int_c(sender->first), boost::bind( NonUniformBufferedScheme<Stencil>::send, _1, sender->second ) );
- bufferSystem->addReceivingFunction( int_c(sender->first), boost::bind( &NonUniformBufferedScheme<Stencil>::receive, this, _1 ) );
+ bufferSystem->addSendingFunction ( int_c(sender->first), std::bind( NonUniformBufferedScheme<Stencil>::send, std::placeholders::_1, sender->second ) );
+ bufferSystem->addReceivingFunction( int_c(sender->first), std::bind( &NonUniformBufferedScheme<Stencil>::receive, this, std::placeholders::_1 ) );
}
setupBeforeNextCommunication = char(0);
@@ -785,13 +784,13 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationCoarseToFine( const ui
localBuffers.push_back( buffer );
const uint_t bufferIndex = uint_c( localBuffers.size() ) - uint_t(1);
- VoidFunction pack = boost::bind( &NonUniformBufferedScheme<Stencil>::localBufferPacking, this,
- COARSE_TO_FINE, index, bufferIndex, boost::cref( *packInfo ), block, neighbor, *dir );
+ VoidFunction pack = std::bind( &NonUniformBufferedScheme<Stencil>::localBufferPacking, this,
+ COARSE_TO_FINE, index, bufferIndex, std::cref( *packInfo ), block, neighbor, *dir );
threadsafeLocalCommunication.push_back( pack );
- VoidFunction unpack = boost::bind( &NonUniformBufferedScheme<Stencil>::localBufferUnpacking, this,
- COARSE_TO_FINE, index, bufferIndex, boost::cref( *packInfo ), neighbor, block, *dir );
+ VoidFunction unpack = std::bind( &NonUniformBufferedScheme<Stencil>::localBufferUnpacking, this,
+ COARSE_TO_FINE, index, bufferIndex, std::cref( *packInfo ), neighbor, block, *dir );
if( (*packInfo)->threadsafeReceiving() )
threadsafeLocalCommunicationUnpack.push_back( unpack );
@@ -800,7 +799,7 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationCoarseToFine( const ui
}
else
{
- VoidFunction localCommunicationFunction = boost::bind( &blockforest::communication::NonUniformPackInfo::communicateLocalCoarseToFine,
+ VoidFunction localCommunicationFunction = std::bind( &blockforest::communication::NonUniformPackInfo::communicateLocalCoarseToFine,
*packInfo, block, neighbor, *dir );
if( (*packInfo)->threadsafeReceiving() )
threadsafeLocalCommunication.push_back( localCommunicationFunction );
@@ -814,10 +813,10 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationCoarseToFine( const ui
auto nProcess = block->getNeighborProcess( neighborIdx, n );
if( !packInfos_.empty() )
- sendFunctions[ nProcess ].push_back( boost::bind( NonUniformBufferedScheme<Stencil>::writeHeader, _1, block->getId(), receiverId, *dir ) );
+ sendFunctions[ nProcess ].push_back( std::bind( NonUniformBufferedScheme<Stencil>::writeHeader, std::placeholders::_1, block->getId(), receiverId, *dir ) );
for( auto packInfo = packInfos_.begin(); packInfo != packInfos_.end(); ++packInfo )
- sendFunctions[ nProcess ].push_back( boost::bind( &blockforest::communication::NonUniformPackInfo::packDataCoarseToFine, *packInfo, block, receiverId, *dir, _1 ) );
+ sendFunctions[ nProcess ].push_back( std::bind( &blockforest::communication::NonUniformPackInfo::packDataCoarseToFine, *packInfo, block, receiverId, *dir, std::placeholders::_1 ) );
}
}
}
@@ -844,10 +843,10 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationCoarseToFine( const ui
resetBufferSystem( bufferSystem );
for( auto sender = sendFunctions.begin(); sender != sendFunctions.end(); ++sender )
- bufferSystem->addSendingFunction( int_c(sender->first), boost::bind( NonUniformBufferedScheme<Stencil>::send, _1, sender->second ) );
+ bufferSystem->addSendingFunction( int_c(sender->first), std::bind( NonUniformBufferedScheme<Stencil>::send, std::placeholders::_1, sender->second ) );
for( auto receiver = ranksToReceiveFrom.begin(); receiver != ranksToReceiveFrom.end(); ++receiver )
- bufferSystem->addReceivingFunction( int_c(*receiver), boost::bind( &NonUniformBufferedScheme<Stencil>::receive, this, _1 ) );
+ bufferSystem->addReceivingFunction( int_c(*receiver), std::bind( &NonUniformBufferedScheme<Stencil>::receive, this, std::placeholders::_1 ) );
setupBeforeNextCommunication = char(0);
}
@@ -931,13 +930,13 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationFineToCoarse( const ui
localBuffers.push_back( buffer );
const uint_t bufferIndex = uint_c( localBuffers.size() ) - uint_t(1);
- VoidFunction pack = boost::bind( &NonUniformBufferedScheme<Stencil>::localBufferPacking, this,
- FINE_TO_COARSE, index, bufferIndex, boost::cref( *packInfo ), block, neighbor, *dir );
+ VoidFunction pack = std::bind( &NonUniformBufferedScheme<Stencil>::localBufferPacking, this,
+ FINE_TO_COARSE, index, bufferIndex, std::cref( *packInfo ), block, neighbor, *dir );
threadsafeLocalCommunication.push_back( pack );
- VoidFunction unpack = boost::bind( &NonUniformBufferedScheme<Stencil>::localBufferUnpacking, this,
- FINE_TO_COARSE, index, bufferIndex, boost::cref( *packInfo ), neighbor, block, *dir );
+ VoidFunction unpack = std::bind( &NonUniformBufferedScheme<Stencil>::localBufferUnpacking, this,
+ FINE_TO_COARSE, index, bufferIndex, std::cref( *packInfo ), neighbor, block, *dir );
if( (*packInfo)->threadsafeReceiving() )
threadsafeLocalCommunicationUnpack.push_back( unpack );
@@ -946,7 +945,7 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationFineToCoarse( const ui
}
else
{
- VoidFunction localCommunicationFunction = boost::bind( &blockforest::communication::NonUniformPackInfo::communicateLocalFineToCoarse,
+ VoidFunction localCommunicationFunction = std::bind( &blockforest::communication::NonUniformPackInfo::communicateLocalFineToCoarse,
*packInfo, block, neighbor, *dir );
if( (*packInfo)->threadsafeReceiving() )
threadsafeLocalCommunication.push_back( localCommunicationFunction );
@@ -960,10 +959,10 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationFineToCoarse( const ui
auto nProcess = block->getNeighborProcess( neighborIdx, uint_t(0) );
if( !packInfos_.empty() )
- sendFunctions[ nProcess ].push_back( boost::bind( NonUniformBufferedScheme<Stencil>::writeHeader, _1, block->getId(), receiverId, *dir ) );
+ sendFunctions[ nProcess ].push_back( std::bind( NonUniformBufferedScheme<Stencil>::writeHeader, std::placeholders::_1, block->getId(), receiverId, *dir ) );
for( auto packInfo = packInfos_.begin(); packInfo != packInfos_.end(); ++packInfo )
- sendFunctions[ nProcess ].push_back( boost::bind( &blockforest::communication::NonUniformPackInfo::packDataFineToCoarse, *packInfo, block, receiverId, *dir, _1 ) );
+ sendFunctions[ nProcess ].push_back( std::bind( &blockforest::communication::NonUniformPackInfo::packDataFineToCoarse, *packInfo, block, receiverId, *dir, std::placeholders::_1 ) );
}
}
}
@@ -989,10 +988,10 @@ void NonUniformBufferedScheme<Stencil>::startCommunicationFineToCoarse( const ui
resetBufferSystem( bufferSystem );
for( auto sender = sendFunctions.begin(); sender != sendFunctions.end(); ++sender )
- bufferSystem->addSendingFunction( int_c(sender->first), boost::bind( NonUniformBufferedScheme<Stencil>::send, _1, sender->second ) );
+ bufferSystem->addSendingFunction( int_c(sender->first), std::bind( NonUniformBufferedScheme<Stencil>::send, std::placeholders::_1, sender->second ) );
for( auto receiver = ranksToReceiveFrom.begin(); receiver != ranksToReceiveFrom.end(); ++receiver )
- bufferSystem->addReceivingFunction( int_c(*receiver), boost::bind( &NonUniformBufferedScheme<Stencil>::receive, this, _1 ) );
+ bufferSystem->addReceivingFunction( int_c(*receiver), std::bind( &NonUniformBufferedScheme<Stencil>::receive, this, std::placeholders::_1 ) );
setupBeforeNextCommunication = char(0);
}
diff --git a/src/blockforest/communication/UniformBufferedScheme.h b/src/blockforest/communication/UniformBufferedScheme.h
index 393301f6c78039790a97c6f752798e344c1c07a0..1abd5a95592d12247a944137679446bf788e9c43 100644
--- a/src/blockforest/communication/UniformBufferedScheme.h
+++ b/src/blockforest/communication/UniformBufferedScheme.h
@@ -38,9 +38,7 @@
#include "core/selectable/IsSetSelected.h"
#include "core/uid/SUID.h"
-#include <boost/bind.hpp>
#include <functional>
-
#include <map>
#include <vector>
@@ -321,13 +319,13 @@ void UniformBufferedScheme<Stencil>::startCommunication()
localBuffers_.push_back( buffer );
const uint_t index = uint_c( localBuffers_.size() ) - uint_t(1);
- VoidFunction pack = boost::bind( &UniformBufferedScheme<Stencil>::localBufferPacking, this,
- index, boost::cref( *packInfo ), block, *dir );
+ VoidFunction pack = std::bind( &UniformBufferedScheme<Stencil>::localBufferPacking, this,
+ index, std::cref( *packInfo ), block, *dir );
threadsafeLocalCommunication_.push_back( pack );
- VoidFunction unpack = boost::bind( &UniformBufferedScheme<Stencil>::localBufferUnpacking, this,
- index, boost::cref( *packInfo ), neighbor, *dir );
+ VoidFunction unpack = std::bind( &UniformBufferedScheme<Stencil>::localBufferUnpacking, this,
+ index, std::cref( *packInfo ), neighbor, *dir );
if( (*packInfo)->threadsafeReceiving() )
threadsafeLocalCommunicationUnpack_.push_back( unpack );
@@ -336,7 +334,7 @@ void UniformBufferedScheme<Stencil>::startCommunication()
}
else
{
- VoidFunction localCommunicationFunction = boost::bind( &walberla::communication::UniformPackInfo::communicateLocal,
+ VoidFunction localCommunicationFunction = std::bind( &walberla::communication::UniformPackInfo::communicateLocal,
*packInfo, block, neighbor, *dir );
if( (*packInfo)->threadsafeReceiving() )
threadsafeLocalCommunication_.push_back( localCommunicationFunction );
@@ -350,11 +348,11 @@ void UniformBufferedScheme<Stencil>::startCommunication()
auto nProcess = block->getNeighborProcess( neighborIdx, uint_t(0) );
if( !packInfos_.empty() )
- sendFunctions[ nProcess ].push_back( boost::bind( UniformBufferedScheme<Stencil>::writeHeader, _1, nBlockId, *dir ) );
+ sendFunctions[ nProcess ].push_back( std::bind( UniformBufferedScheme<Stencil>::writeHeader, std::placeholders::_1, nBlockId, *dir ) );
for( auto packInfo = packInfos_.begin(); packInfo != packInfos_.end(); ++packInfo )
- sendFunctions[ nProcess ].push_back( boost::bind( &walberla::communication::UniformPackInfo::packData,
- *packInfo, block, *dir, _1 ) );
+ sendFunctions[ nProcess ].push_back( std::bind( &walberla::communication::UniformPackInfo::packData,
+ *packInfo, block, *dir, std::placeholders::_1 ) );
}
}
}
@@ -368,8 +366,8 @@ void UniformBufferedScheme<Stencil>::startCommunication()
for( auto sender = sendFunctions.begin(); sender != sendFunctions.end(); ++sender )
{
- bufferSystem_.addSendingFunction ( int_c(sender->first), boost::bind( UniformBufferedScheme<Stencil>::send, _1, sender->second ) );
- bufferSystem_.addReceivingFunction( int_c(sender->first), boost::bind( &UniformBufferedScheme<Stencil>::receive, this, _1 ) );
+ bufferSystem_.addSendingFunction ( int_c(sender->first), std::bind( UniformBufferedScheme<Stencil>::send, std::placeholders::_1, sender->second ) );
+ bufferSystem_.addReceivingFunction( int_c(sender->first), std::bind( &UniformBufferedScheme<Stencil>::receive, this, std::placeholders::_1 ) );
}
setupBeforeNextCommunication_ = false;
@@ -539,13 +537,13 @@ void UniformBufferedScheme<Stencil>::localBufferUnpacking( const uint_t index, c
template< typename Stencil >
std::function<void()> UniformBufferedScheme<Stencil>::getStartCommunicateFunctor()
{
- return boost::bind( &UniformBufferedScheme::startCommunication, this );
+ return std::bind( &UniformBufferedScheme::startCommunication, this );
}
template< typename Stencil >
std::function<void()> UniformBufferedScheme<Stencil>::getWaitFunctor()
{
- return boost::bind( &UniformBufferedScheme::wait, this );
+ return std::bind( &UniformBufferedScheme::wait, this );
}
diff --git a/src/blockforest/communication/UniformDirectScheme.h b/src/blockforest/communication/UniformDirectScheme.h
index 16d6e9fdda939275ba60ce3ef22aa98b5db9f143..86393089342eb96c0134148a3518647b0cb2d7d0 100644
--- a/src/blockforest/communication/UniformDirectScheme.h
+++ b/src/blockforest/communication/UniformDirectScheme.h
@@ -32,6 +32,8 @@
#include <vector>
#include <map>
+#include <functional>
+
#include "communication/UniformMPIDatatypeInfo.h"
namespace walberla {
@@ -112,8 +114,8 @@ public:
void startCommunication();
void wait();
- std::function<void()> getStartCommunicateFunctor() { return boost::bind( &UniformDirectScheme::startCommunication, this ); }
- std::function<void()> getWaitFunctor() { return boost::bind( &UniformDirectScheme::wait, this ); }
+ std::function<void()> getStartCommunicateFunctor() { return std::bind( &UniformDirectScheme::startCommunication, this ); }
+ std::function<void()> getWaitFunctor() { return std::bind( &UniformDirectScheme::wait, this ); }
//@}
//*******************************************************************************************************************
diff --git a/src/blockforest/loadbalancing/Cartesian.cpp b/src/blockforest/loadbalancing/Cartesian.cpp
index 780461adfc81872ed1bcac10d72390e9da59ccfc..13dbf50b7dba2147d7988683f58a0f45088b9fd4 100644
--- a/src/blockforest/loadbalancing/Cartesian.cpp
+++ b/src/blockforest/loadbalancing/Cartesian.cpp
@@ -48,7 +48,7 @@ uint_t CartesianDistribution::operator()( SetupBlockForest & forest, const uint_
WALBERLA_ABORT( "Load balancing failed: \'Number of processes in z-direction\' must be in (0," << forest.getZSize() << "]. "
"You specified \'" << numberOfZProcesses_ << "\'." );
- if( processIdMap_ != NULL )
+ if( processIdMap_ != nullptr )
WALBERLA_CHECK_EQUAL( processIdMap_->size(), numberOfProcesses );
uint_t partitions[3];
@@ -84,7 +84,7 @@ uint_t CartesianDistribution::operator()( SetupBlockForest & forest, const uint_
{
const uint_t index = z * partitions[0] * partitions[1] + y * partitions[0] + x;
- (*block)->assignTargetProcess( ( processIdMap_ != NULL ) ? (*processIdMap_)[ index ] : index );
+ (*block)->assignTargetProcess( ( processIdMap_ != nullptr ) ? (*processIdMap_)[ index ] : index );
}
}
}
diff --git a/src/blockforest/loadbalancing/DynamicCurve.h b/src/blockforest/loadbalancing/DynamicCurve.h
index d72b60726f0b1dab41e8e5708051b1bc7b238a22..9bd79b5364a39a6edeb6e86329db7156ebe6af57 100644
--- a/src/blockforest/loadbalancing/DynamicCurve.h
+++ b/src/blockforest/loadbalancing/DynamicCurve.h
@@ -719,7 +719,7 @@ void DynamicCurveBalance< PhantomData_T >::mortonOrderWeighted( const std::vecto
}
}
-#ifdef _OPENMP
+#if defined(_OPENMP) && ((__INTEL_COMPILER < 1800) || (__INTEL_COMPILER > 1900)) // Disable OpenMP for Intel 2018/2019 due to a bug
#pragma omp parallel for schedule(static)
#endif
for( int i = 0; i < int_c( blocksPerLevel.size() ); ++i )
diff --git a/src/blockforest/loadbalancing/DynamicParMetis.cpp b/src/blockforest/loadbalancing/DynamicParMetis.cpp
index 0e215b6f92bc7b8bd835d165b2b76b7892e9c06b..59d43a364ef725d985c97c96ea021a69a4124280 100644
--- a/src/blockforest/loadbalancing/DynamicParMetis.cpp
+++ b/src/blockforest/loadbalancing/DynamicParMetis.cpp
@@ -70,7 +70,7 @@ std::map< blockforest::BlockID, uint_t > getBlockIdToSequenceMapping( const Phan
mapping.insert( std::make_pair( it->first->getId(), sequenceId++ ) );
WALBERLA_ASSERT_EQUAL( sequenceId, blockSequenceRange.second );
- const std::vector<uint_t> neighborProcesses = phantomForest.getNeighboringProcesses();
+ const std::vector<uint_t>& neighborProcesses = phantomForest.getNeighboringProcesses();
mpi::BufferSystem bs( comm );
@@ -101,19 +101,6 @@ std::map< blockforest::BlockID, uint_t > getBlockIdToSequenceMapping( const Phan
return mapping;
}
-template< typename T >
-T * ptr( std::vector<T> & v )
-{
- if( v.empty() )
- return NULL;
- else
- return &( v.front() );
-}
-
-typedef uint_t idx_t;
-
-
-
bool DynamicParMetis::operator()( std::vector< std::pair< const PhantomBlock *, uint_t > > & targetProcess,
std::set< uint_t > & processesToRecvFrom,
const PhantomBlockForest & phantomForest,
@@ -163,6 +150,7 @@ bool DynamicParMetis::operator()( std::vector< std::pair< const PhantomBlock *,
std::vector<double> xyz;
uint_t blockIndex = 0;
+ int64_t ncon = int64_c(ncon_);
for( auto it = targetProcess.begin(); it != targetProcess.end(); ++it, ++blockIndex )
{
WALBERLA_CHECK_EQUAL(blockIndex, mapping.find(it->first->getId())->second - blockSequenceRange.first);
@@ -181,7 +169,7 @@ bool DynamicParMetis::operator()( std::vector< std::pair< const PhantomBlock *,
WALBERLA_CHECK_LESS( mapIt->second, vtxdist.back() );
adjncy.push_back( int64_c( mapIt->second ) );
auto edgeWeightIt = bi.getEdgeWeights().find( nit->getId() );
- //WALBERLA_CHECK_UNEQUAL( edgeWeightIt->second, 0 ); // perhaps WARNING
+ WALBERLA_CHECK_GREATER_EQUAL( edgeWeightIt->second, 0 );
adjwgt.push_back( edgeWeightIt == bi.getEdgeWeights().end() ? int64_t( 1 ) : edgeWeightIt->second );
}
break;
@@ -193,14 +181,22 @@ bool DynamicParMetis::operator()( std::vector< std::pair< const PhantomBlock *,
WALBERLA_CHECK_GREATER_EQUAL( mapIt->second, 0 );
WALBERLA_CHECK_LESS( mapIt->second, vtxdist.back() );
adjncy.push_back( int64_c( mapIt->second ) );
- //WALBERLA_CHECK_UNEQUAL( edgeIt->second, 0 ); // perhaps WARNING
+ WALBERLA_CHECK_GREATER_EQUAL( edgeIt->second, 0 );
adjwgt.push_back( edgeIt->second );
}
break;
}
- WALBERLA_CHECK_UNEQUAL( bi.getVertexWeight(), 0 );
- vwgt.push_back( bi.getVertexWeight() );
+
+ WALBERLA_CHECK_EQUAL(ncon, int64_c(bi.getNcon()), "Number of constraints on block does not fit to specified number of constraints in ParMetis setup!");
+
+ for( uint_t con = uint_t(0); con < bi.getNcon(); ++con )
+ {
+ WALBERLA_CHECK_GREATER_EQUAL( bi.getVertexWeight(con), 0 );
+ vwgt.push_back( bi.getVertexWeight(con) );
+ }
+
vsize.push_back( bi.getVertexSize() );
+
xyz.push_back( bi.getVertexCoords()[0] );
xyz.push_back( bi.getVertexCoords()[1] );
xyz.push_back( bi.getVertexCoords()[2] );
@@ -215,20 +211,19 @@ bool DynamicParMetis::operator()( std::vector< std::pair< const PhantomBlock *,
{
WALBERLA_ASSERT_LESS( xadj[i-1], xadj[i] );
}
- WALBERLA_CHECK_EQUAL( vwgt.size(), targetProcess.size() );
+ WALBERLA_CHECK_EQUAL( int64_c(vwgt.size()), int64_c(targetProcess.size()) * ncon);
WALBERLA_CHECK_EQUAL( vsize.size(), targetProcess.size() );
WALBERLA_CHECK_EQUAL( xyz.size(), targetProcess.size() * 3 );
WALBERLA_CHECK_EQUAL( adjncy.size(), adjwgt.size() );
WALBERLA_CHECK_EQUAL( adjwgt.size(), xadj.back() );
- int64_t wgtflag = weightsToUse_;
- int64_t numflag = 0; // C-style ordering
- int64_t ncon = 1; // Number of constraints
- int64_t ndims = 3; // Number of dimensions
- std::vector<double> ubvec( uint_c(ncon), double_c( 1.05 ) ); // imbalance tolerance
- int64_t nparts = int64_c( MPIManager::instance()->numProcesses() ); // number of subdomains
- double ipc2redist = double_c(ipc2redist_);
- MPI_Comm comm = subComm; //MPIManager::instance()->comm();
+ int64_t wgtflag = weightsToUse_;
+ int64_t numflag = 0; // C-style ordering
+ int64_t ndims = 3; // Number of dimensions
+ std::vector<double> ubvec = ubvec_; // imbalance tolerance
+ int64_t nparts = int64_c( MPIManager::instance()->numProcesses() ); // number of subdomains
+ double ipc2redist = double_c(ipc2redist_);
+ MPI_Comm comm = subComm; //MPIManager::instance()->comm();
std::vector<double> tpwgts( uint_c(nparts * ncon), 1.0 / double_c( nparts ) ); // vertex weight fraction that is stored in a subdomain
std::vector<int64_t> options = { int64_t( 1 ), int64_t( 0 ), int64_t( 23 ), int64_t( 1 ) };
@@ -237,34 +232,36 @@ bool DynamicParMetis::operator()( std::vector< std::pair< const PhantomBlock *,
switch( algorithm_ )
{
case PARMETIS_PART_GEOM:
+ WALBERLA_ASSERT_EQUAL(ncon, int64_t(1), "Chosen algorithm can only work with single constraints!");
parmetisTimer.start();
- metisResult = core::ParMETIS_V3_PartGeom( ptr( vtxdist ), &ndims, ptr( xyz ), ptr( part ), &comm );
+ metisResult = core::ParMETIS_V3_PartGeom( vtxdist.data(), &ndims, xyz.data(), part.data(), &comm );
parmetisTimer.end();
break;
case PARMETIS_PART_GEOM_KWAY:
parmetisTimer.start();
- metisResult = core::ParMETIS_V3_PartGeomKway( ptr( vtxdist ), ptr( xadj ), ptr( adjncy ), ptr( vwgt ), ptr( adjwgt ), &wgtflag, &numflag, &ndims, ptr( xyz ), &ncon, &nparts, ptr( tpwgts ), ptr( ubvec ), ptr( options ), &edgecut, ptr( part ), &comm );
+ metisResult = core::ParMETIS_V3_PartGeomKway( vtxdist.data(), xadj.data(), adjncy.data(), vwgt.data(), adjwgt.data(), &wgtflag, &numflag, &ndims, xyz.data(), &ncon, &nparts, tpwgts.data(), ubvec.data(), options.data(), &edgecut, part.data(), &comm );
parmetisTimer.end();
break;
case PARMETIS_PART_KWAY:
parmetisTimer.start();
- metisResult = core::ParMETIS_V3_PartKway( ptr( vtxdist ), ptr( xadj ), ptr( adjncy ), ptr( vwgt ), ptr( adjwgt ), &wgtflag, &numflag, &ncon, &nparts, ptr( tpwgts ), ptr(ubvec), ptr(options), &edgecut, ptr( part ), &comm );
+ metisResult = core::ParMETIS_V3_PartKway( vtxdist.data(), xadj.data(), adjncy.data(), vwgt.data(), adjwgt.data(), &wgtflag, &numflag, &ncon, &nparts, tpwgts.data(), ubvec.data(), options.data(), &edgecut, part.data(), &comm );
parmetisTimer.end();
break;
case PARMETIS_ADAPTIVE_REPART:
parmetisTimer.start();
- metisResult = core::ParMETIS_V3_AdaptiveRepart( ptr( vtxdist ), ptr( xadj ), ptr( adjncy ), ptr( vwgt ), ptr( vsize ), ptr( adjwgt ), &wgtflag, &numflag, &ncon, &nparts, ptr( tpwgts ), ptr(ubvec), &ipc2redist, ptr(options), &edgecut, ptr( part ), &comm );
+ metisResult = core::ParMETIS_V3_AdaptiveRepart( vtxdist.data(), xadj.data(), adjncy.data(), vwgt.data(), vsize.data(), adjwgt.data(), &wgtflag, &numflag, &ncon, &nparts, tpwgts.data(), ubvec.data(), &ipc2redist, options.data(), &edgecut, part.data(), &comm );
parmetisTimer.end();
break;
case PARMETIS_REFINE_KWAY:
parmetisTimer.start();
- metisResult = core::ParMETIS_V3_RefineKway( ptr( vtxdist ), ptr( xadj ), ptr( adjncy ), ptr( vwgt ), ptr( adjwgt ), &wgtflag, &numflag, &ncon, &nparts, ptr( tpwgts ), ptr(ubvec), ptr(options), &edgecut, ptr( part ), &comm );
+ metisResult = core::ParMETIS_V3_RefineKway( vtxdist.data(), xadj.data(), adjncy.data(), vwgt.data(), adjwgt.data(), &wgtflag, &numflag, &ncon, &nparts, tpwgts.data(), ubvec.data(), options.data(), &edgecut, part.data(), &comm );
parmetisTimer.end();
break;
}
if( metisResult != core::METIS_OK )
WALBERLA_ABORT("ParMetis failed!");
+
}
// Determine which processes will receive a block from this process
@@ -278,7 +275,7 @@ bool DynamicParMetis::operator()( std::vector< std::pair< const PhantomBlock *,
isSendingBlockToProcess[uint_c(MPIManager::instance()->rank())] = uint8_t( 0 );
std::vector<uint8_t> isReceivingBlockFromProcess( uint_c(MPIManager::instance()->numProcesses()), uint8_t( 0 ) );
- MPI_Alltoall( ptr( isSendingBlockToProcess ), 1, MPITrait<uint8_t>::type(), ptr( isReceivingBlockFromProcess ), 1, MPITrait<uint8_t>::type(), MPIManager::instance()->comm() );
+ MPI_Alltoall( isSendingBlockToProcess.data(), 1, MPITrait<uint8_t>::type(), isReceivingBlockFromProcess.data(), 1, MPITrait<uint8_t>::type(), MPIManager::instance()->comm() );
for( uint_t i = 0; i < isReceivingBlockFromProcess.size(); ++i )
if( isReceivingBlockFromProcess[i] == uint8_t( 1 ) )
processesToRecvFrom.insert( i );
@@ -317,12 +314,12 @@ DynamicParMetis::Algorithm DynamicParMetis::stringToAlgorithm( std::string s )
return PARMETIS_PART_GEOM;
else if( s == "PART_KWAY" )
return PARMETIS_PART_KWAY;
- else if( s == "PART_ADAPTIVE_REPART" )
+ else if( s == "ADAPTIVE_REPART" )
return PARMETIS_ADAPTIVE_REPART;
else if( s == "REFINE_KWAY" )
return PARMETIS_REFINE_KWAY;
else
- WALBERLA_ABORT( "Illegal ParMetis algorithm specified (" << s << ")! Valid choices are: \"PART_GEOM_KWAY\", \"PART_KWAY\", \"PART_ADAPTIVE_REPART\", or \"REFINE_KWAY\"." );
+ WALBERLA_ABORT( "Illegal ParMetis algorithm specified (" << s << ")! Valid choices are: \"PART_GEOM_KWAY\", \"PART_GEOM\", \"PART_KWAY\", \"ADAPTIVE_REPART\", or \"REFINE_KWAY\"." );
}
@@ -369,7 +366,7 @@ std::string DynamicParMetis::algorithmToString( ) const
case walberla::blockforest::DynamicParMetis::PARMETIS_PART_KWAY:
return "PART_KWAY";
case walberla::blockforest::DynamicParMetis::PARMETIS_ADAPTIVE_REPART:
- return "PART_ADAPTIVE_REPART";
+ return "ADAPTIVE_REPART";
case walberla::blockforest::DynamicParMetis::PARMETIS_REFINE_KWAY:
return "PARMETIS_REFINE_KWAY";
}
diff --git a/src/blockforest/loadbalancing/DynamicParMetis.h b/src/blockforest/loadbalancing/DynamicParMetis.h
index d1b3acd1f877c755279f8a4b3f0d2a2586549cd7..fa5663db5961e89cb57f4150cca10902706379d3 100644
--- a/src/blockforest/loadbalancing/DynamicParMetis.h
+++ b/src/blockforest/loadbalancing/DynamicParMetis.h
@@ -30,6 +30,7 @@
#include <cmath>
#include <map>
+#include <vector>
namespace walberla {
namespace blockforest {
@@ -48,8 +49,9 @@ public:
DynamicParMetis( const Algorithm algorithm = PARMETIS_PART_GEOM_KWAY,
const WeightsToUse weightsToUse = PARMETIS_BOTH_WEIGHTS,
- const EdgeSource edgeSource = PARMETIS_EDGES_FROM_EDGE_WEIGHTS )
- : algorithm_( algorithm ), weightsToUse_( weightsToUse ), edgeSource_( edgeSource ) {}
+ const EdgeSource edgeSource = PARMETIS_EDGES_FROM_EDGE_WEIGHTS,
+ const uint_t ncon = uint_t(1))
+ : algorithm_( algorithm ), weightsToUse_( weightsToUse ), edgeSource_( edgeSource ), ncon_( ncon ), ubvec_( ncon, real_t(1.05) ) {}
bool operator()( std::vector< std::pair< const PhantomBlock *, uint_t > > & targetProcess,
std::set< uint_t > & processesToRecvFrom,
@@ -60,6 +62,10 @@ public:
void setipc2redist(double val) {ipc2redist_ = val;}
double getipc2redist() const {return ipc2redist_;}
+ void setImbalanceTolerances(const std::vector<double> & tolerances){ WALBERLA_ASSERT_EQUAL(tolerances.size(), ncon_-uint_t(1)); ubvec_ = tolerances; }
+ void setImbalanceTolerance(double tolerance, const uint_t con = 0){ WALBERLA_ASSERT_LESS(con, ncon_); ubvec_[con] = tolerance; }
+ double getImbalanceTolerance(const uint_t con = 0) const { WALBERLA_ASSERT_LESS(con, ncon_); return ubvec_[con]; }
+
bool edgeWeightsUsed() const { return ( weightsToUse_ == PARMETIS_EDGE_WEIGHTS ) || ( weightsToUse_ == PARMETIS_BOTH_WEIGHTS ); }
bool vertexWeightsUsed() const { return ( weightsToUse_ == PARMETIS_VERTEX_WEIGHTS ) || ( weightsToUse_ == PARMETIS_BOTH_WEIGHTS ); }
bool vertexSizeUsed() const { return algorithm_ == PARMETIS_ADAPTIVE_REPART; }
@@ -77,6 +83,8 @@ protected:
WeightsToUse weightsToUse_;
EdgeSource edgeSource_;
+ uint_t ncon_ = uint_t(1); ///< number of constraints
+ std::vector<double> ubvec_; ///< imbalance tolerance for each constraint, value between 1 (perfect balance) and number of subdomains (= number of processes, perfect imbalance)
double ipc2redist_ = real_t( 1000.0 ); ///< compute repartitioning with low edge cut (set lower (down to 0.000001) to get minimal repartitioning )
};
@@ -87,8 +95,8 @@ public:
typedef int64_t weight_t;
typedef int64_t vsize_t;
- DynamicParMetisBlockInfo( const weight_t vertexWeight )
- : vertexWeight_(vertexWeight), vertexSize_(1)
+ DynamicParMetisBlockInfo( const weight_t vertexWeight, const uint_t ncon = 1 )
+ : vertexWeight_(ncon, vertexWeight), vertexSize_(1)
{ }
DynamicParMetisBlockInfo( mpi::RecvBuffer & buffer )
@@ -96,13 +104,35 @@ public:
buffer >> vertexWeight_ >> vertexSize_ >> vertexCoords_ >> edgeWeights_;
}
- weight_t getVertexWeight() const { return vertexWeight_; }
- void setVertexWeight( const weight_t vertexWeight ) { vertexWeight_ = vertexWeight; }
+ DynamicParMetisBlockInfo( const std::vector<weight_t> & vertexWeight )
+ : vertexWeight_(vertexWeight), vertexSize_(1)
+ { }
+
+ // get number of constraints ( = number of vertex weights), default: 1, > 1 for multi physics problems
+ uint_t getNcon() const
+ {
+ return vertexWeight_.size();
+ }
+
+ weight_t getVertexWeight( const uint_t con = 0 ) const
+ {
+ WALBERLA_ASSERT_LESS(con, getNcon());
+ return vertexWeight_[con];
+ }
+ void setVertexWeight( const weight_t vertexWeight, const uint_t con = 0 )
+ {
+ WALBERLA_ASSERT_LESS(con, getNcon());
+ vertexWeight_[con] = vertexWeight;
+ }
- vsize_t getVertexSize() const { return vertexSize_; }
- void setVertexSize( const vsize_t size ) { vertexSize_ = size; }
+ vsize_t getVertexSize( ) const { return vertexSize_; }
+ void setVertexSize( const vsize_t size) { vertexSize_ = size; }
- const Vector3<double> & getVertexCoords() const { WALBERLA_ASSERT( !std::isnan(vertexCoords_[0]) && !std::isnan(vertexCoords_[1]) && !std::isnan(vertexCoords_[2]) ); return vertexCoords_; }
+ const Vector3<double> & getVertexCoords() const
+ {
+ WALBERLA_ASSERT( !std::isnan(vertexCoords_[0]) && !std::isnan(vertexCoords_[1]) && !std::isnan(vertexCoords_[2]) );
+ return vertexCoords_;
+ }
void setVertexCoords( const Vector3<double> & p ) { vertexCoords_ = p; }
void setEdgeWeight( const blockforest::BlockID & blockId, const weight_t edgeWeight ) { edgeWeights_[blockId] = edgeWeight; }
@@ -117,8 +147,8 @@ public:
private:
- weight_t vertexWeight_; /// Defines the weight of a block
- vsize_t vertexSize_; /// Defines the cost of rebalancing a block
+ std::vector<weight_t> vertexWeight_; /// Defines the ncon weights of a block
+ vsize_t vertexSize_; /// Defines the cost of rebalancing a block. Needed by some ParMetis algorithms
Vector3<double> vertexCoords_ = Vector3<double>(std::numeric_limits<double>::signaling_NaN()); /// Defines where the block is located in space. Needed by some ParMetis algorithms
std::map< blockforest::BlockID, weight_t > edgeWeights_; /// Defines the cost of communication with other blocks
};
diff --git a/src/blockforest/loadbalancing/StaticParMetis.cpp b/src/blockforest/loadbalancing/StaticParMetis.cpp
index 0ab96201356cddb08a39907f90b87ff3b20e963d..5853cdf1ee62f3eefaff557847f2aea4095ebd83 100644
--- a/src/blockforest/loadbalancing/StaticParMetis.cpp
+++ b/src/blockforest/loadbalancing/StaticParMetis.cpp
@@ -43,12 +43,12 @@ template< typename T >
T * ptr( std::vector<T> & v )
{
if( v.empty() )
- return NULL;
+ return nullptr;
else
return &( v.front() );
}
-typedef uint_t idx_t;
+using idx_t = uint_t;
uint_t StaticLevelwiseParMetis::operator()( SetupBlockForest & forest, const uint_t numberOfProcesses, const memory_t /*perProcessMemoryLimit*/ ) const
@@ -114,7 +114,7 @@ uint_t StaticLevelwiseParMetis::operator()( SetupBlockForest & forest, const uin
if(weightsToUse_ == PARMETIS_EDGE_WEIGHTS || weightsToUse_ == PARMETIS_BOTH_WEIGHTS)
{
- blockPairs.push_back( BlockPair( blocks[i], *nit ) );
+ blockPairs.emplace_back( blocks[i], *nit );
}
}
diff --git a/src/blockforest/loadbalancing/all.h b/src/blockforest/loadbalancing/all.h
index a4a2cb31b899f0da423196d5203db0327d275894..b3c956f8b13ac1efc0c3a3de4369c04239a1cfb8 100644
--- a/src/blockforest/loadbalancing/all.h
+++ b/src/blockforest/loadbalancing/all.h
@@ -25,5 +25,8 @@
#include "Cartesian.h"
#include "DynamicCurve.h"
#include "DynamicDiffusive.h"
+#include "DynamicParMetis.h"
#include "NoPhantomData.h"
+#include "PODPhantomData.h"
#include "StaticCurve.h"
+#include "StaticParMetis.h"
diff --git a/src/blockforest/python/CommunicationExport.impl.h b/src/blockforest/python/CommunicationExport.impl.h
index 934058546dff76d23f794f89a63880b42fc7192d..09041944f0ba0cf342c4a80fcf42e9e23abd207f 100644
--- a/src/blockforest/python/CommunicationExport.impl.h
+++ b/src/blockforest/python/CommunicationExport.impl.h
@@ -106,7 +106,7 @@ namespace internal
const int tag )
{
UniformBufferedSchemeCreator creator( bf, stencil, tag );
- python_coupling::for_each_noncopyable_type< Stencils > ( boost::ref(creator) );
+ python_coupling::for_each_noncopyable_type< Stencils > ( std::ref(creator) );
if ( creator.getResult() == boost::python::object() )
{
@@ -185,7 +185,7 @@ namespace internal
const std::string & stencil, const int tag )
{
UniformDirectSchemeCreator creator( bf, stencil, tag );
- python_coupling::for_each_noncopyable_type< Stencils > ( boost::ref(creator) );
+ python_coupling::for_each_noncopyable_type< Stencils > ( std::ref(creator) );
if ( creator.getResult() == boost::python::object() )
{
diff --git a/src/core/Conversion.cpp b/src/core/Conversion.cpp
index 9e83f098d27a3f4ea28288c6d376faa1c0e9c8fb..515e573fa6dddc1fd51c6370862b0511e6f2baca 100644
--- a/src/core/Conversion.cpp
+++ b/src/core/Conversion.cpp
@@ -47,7 +47,7 @@ void convert(const std::vector<bool> & from, std::vector<uint8_t> & to)
void convert(const std::vector<uint8_t> & from, std::vector<bool> & to)
{
to.clear();
- to.resize(from.size() * sizeof(8));
+ to.resize(from.size() * sizeof(uint8_t) * 8);
auto unpackIt = from.begin();
auto it = to.begin();
diff --git a/src/core/DataTypes.h b/src/core/DataTypes.h
index b0442f52466f8fcbe13ef68656a9b99ad449cbb2..4c348dfe7f6e934fb9fb5403abfd5761e256a9ae 100644
--- a/src/core/DataTypes.h
+++ b/src/core/DataTypes.h
@@ -42,7 +42,6 @@ namespace walberla {
template <typename> struct never_true : std::false_type {};
-
// shared ptr
using std::shared_ptr;
@@ -50,9 +49,6 @@ using std::weak_ptr;
using std::make_shared;
using std::dynamic_pointer_cast;
-// functions, use this when "function" namespace is no longer needed
-//using std::function;
-//using std::bind;
// numeric cast (performs range checks in debug mode)
diff --git a/src/core/Environment.cpp b/src/core/Environment.cpp
index 6e69586542c142abe99a9a05eafdb1e6bf47eb6f..b39a0b304c58ebe65356a587ec4264c7fe3c2754 100644
--- a/src/core/Environment.cpp
+++ b/src/core/Environment.cpp
@@ -31,10 +31,9 @@
#include "core/uid/SUID.h"
#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
#include <algorithm>
+#include <functional>
#include <sstream>
#include <string>
@@ -85,7 +84,7 @@ void configureGlobalState( const shared_ptr<Config> & config ) {
std::vector< std::string > states;
boost::split( states, suids, boost::is_any_of(", \t") );
- states.erase( std::remove_if( states.begin(), states.end(), boost::bind( &std::string::empty, _1 ) ), states.end() );
+ states.erase( std::remove_if( states.begin(), states.end(), std::bind( &std::string::empty, std::placeholders::_1 ) ), states.end() );
Set<SUID> state;
for( auto it = states.begin(); it != states.end(); ++it )
diff --git a/src/core/Macros.h b/src/core/Macros.h
index 743ad91c37982e200dfdf948afb7100e4526e3d6..ac12f1b7e4994704be60f3fdf902785d689dc3af 100644
--- a/src/core/Macros.h
+++ b/src/core/Macros.h
@@ -31,6 +31,18 @@
#define WALBERLA_RESTRICT
#endif
+// forced inline for different compilers
+#if defined(__INTEL_COMPILER)
+# define WALBERLA_FORCE_INLINE(func) __forceinline func
+#elif defined(_MSC_VER)
+# define WALBERLA_FORCE_INLINE(func) __forceinline func
+#elif defined(__GNUC__)
+# define WALBERLA_FORCE_INLINE(func) inline func __attribute__ ((always_inline))
+#else
+# pragma message("WARNING: You need to implement WALBERLA_FORCE_INLINE for this compiler!")
+# define WALBERLA_FORCE_INLINE(func) inline func
+#endif
+
// pragma in macros (-> https://stackoverflow.com/a/3030312)
#ifdef WALBERLA_CXX_COMPILER_IS_MSVC
diff --git a/src/core/cell/CellInterval.cpp b/src/core/cell/CellInterval.cpp
index 78f4501f0e1b6fb6db813b81b7ab4cf132f1091b..83ab0e33df531b98fc0505d05213e31ed3066457 100644
--- a/src/core/cell/CellInterval.cpp
+++ b/src/core/cell/CellInterval.cpp
@@ -23,8 +23,6 @@
#include "CellSet.h"
#include "CellVector.h"
-#include <boost/foreach.hpp>
-
namespace walberla {
namespace cell {
@@ -51,7 +49,7 @@ bool CellInterval::overlaps( const CellVector& cellVector ) const
if( empty() )
return false;
- BOOST_FOREACH( const Cell & cell, cellVector )
+ for( const Cell & cell : cellVector )
{
if( this->contains( cell ) )
return true;
diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp
index 48277f3bc6336d225909ff0172e98da0a76233bf..ee6e03f058ea651b23bd2ce4785a91d1fae1d6de 100644
--- a/src/core/config/Config.cpp
+++ b/src/core/config/Config.cpp
@@ -64,7 +64,7 @@ Config::Config()
// \brief Destructor for the Config class.
*/
Config::~Config()
-{}
+= default;
//**********************************************************************************************************************
@@ -273,7 +273,7 @@ void Config::parseFromFile( const char* filename, Block& block, unsigned int lev
{
input.ignore( 1 );
while( (value.find("$(") != value.npos) && (value.find(')') != value.npos) ) {
- size_t s = value.find("$("); size_t e = value.find(")");
+ size_t s = value.find("$("); size_t e = value.find(')');
ValueReplacementMap::iterator mkey = valueReplacements_.find( value.substr( s+2, e-s+1-3 ) );
if(mkey != valueReplacements_.end()) {
value.replace( s,e-s+1, mkey->second );
@@ -315,7 +315,7 @@ void Config::parseFromString( const std::string & str, Block& block, unsigned in
while (!input.empty()) {
std::string::size_type f=input.find_first_of(" {");
if (input[f]==' ') {
- std::string::size_type posSemicolon = input.substr(f+1).find(";");
+ std::string::size_type posSemicolon = input.substr(f+1).find(';');
block.addParameter(input.substr(0,f),input.substr(f+1,posSemicolon));
input = input.substr(f+1+posSemicolon+1);
} else {
@@ -406,7 +406,7 @@ void Config::extractBlock( const char* filename, std::stringstream& input, Block
{
input.ignore( 1 );
while( (value.find("$(") != value.npos) && (value.find(')') != value.npos) ) {
- size_t s = value.find("$("); size_t e = value.find(")");
+ size_t s = value.find("$("); size_t e = value.find(')');
ValueReplacementMap::iterator mkey = valueReplacements_.find( value.substr( s+2, e-s+1-3 ) );
if(mkey != valueReplacements_.end()) {
value.replace( s,e-s+1, mkey->second );
@@ -473,16 +473,6 @@ Config::Block::Block( const std::string& key )
//**********************************************************************************************************************
-//**********************************************************************************************************************
-/*!\fn Config::Block::Block( const Block& b )
-// \brief The copy constructor for the Block class.
- */
-Config::Block::Block( const Block& b )
- :key_(b.key_),blocks_(b.blocks_),params_(b.params_)
-{}
-//**********************************************************************************************************************
-
-
//**********************************************************************************************************************
/*!\fn Config::Block& Config::Block::operator=( const Block& b )
// \brief The copy assignment operator for the Block class.
@@ -508,7 +498,7 @@ Config::Block& Config::Block::operator=( const Block& b )
// \brief Default destructor of the Block class.
*/
Config::Block::~Block()
-{}
+= default;
//**********************************************************************************************************************
@@ -682,7 +672,7 @@ bool Config::Block::addParameter( std::string key, const std::string& value )
// \param key The key of the new block.
// \return Reference to the new block.
*/
-Config::Block& Config::Block::createBlock( std::string key )
+Config::Block& Config::Block::createBlock( const std::string& key )
{
blocks_.push_back( Block( key ) );
return *blocks_.rbegin();
diff --git a/src/core/config/Config.h b/src/core/config/Config.h
index 9ed1ce81984b627e25cb4c4b7ef014a9e786dacc..e36d57830a396976b7411917f0eb9d3dcdedade0 100644
--- a/src/core/config/Config.h
+++ b/src/core/config/Config.h
@@ -172,7 +172,7 @@ public:
public:
//**Constructors**************************************************************************************************
Block( const std::string& key="" );
- Block( const Block& b );
+ Block( const Block& b ) = default;
//****************************************************************************************************************
//**Destructor****************************************************************************************************
@@ -230,7 +230,7 @@ public:
//@}
//****************************************************************************************************************
- Block& createBlock( std::string key );
+ Block& createBlock( const std::string& key );
private:
//**Utility functions*********************************************************************************************
diff --git a/src/core/config/ConfigToBoostPropertyTree.cpp b/src/core/config/ConfigToBoostPropertyTree.cpp
index 7fcc13247d9a7770e386469e69dc290aa9411a41..e3b5e6b40bc0ead8cd49fce3aba4c432f407d710 100644
--- a/src/core/config/ConfigToBoostPropertyTree.cpp
+++ b/src/core/config/ConfigToBoostPropertyTree.cpp
@@ -21,7 +21,6 @@
#include "ConfigToBoostPropertyTree.h"
-#include <boost/foreach.hpp>
#include <boost/property_tree/ptree.hpp>
@@ -39,7 +38,7 @@ boost::property_tree::iptree configBlockHandleToBoostPropertyTree( const Config:
Config::Blocks blocks;
blockHandle.getBlocks(blocks);
- BOOST_FOREACH( const Config::BlockHandle & handle, blocks )
+ for( const Config::BlockHandle & handle : blocks )
propTree.add_child( handle.getKey(), configBlockHandleToBoostPropertyTree( handle ) );
return propTree;
diff --git a/src/core/config/Create.cpp b/src/core/config/Create.cpp
index 1886a5be4ffde22a6084544a2093e6ef26f49b50..8e90173e7c480fe8538b664020494d21e32e235e 100644
--- a/src/core/config/Create.cpp
+++ b/src/core/config/Create.cpp
@@ -154,7 +154,7 @@ namespace config {
if ( blockName.empty() )
{
- currentBlock = NULL;
+ currentBlock = nullptr;
WALBERLA_LOG_WARNING("Ignoring Parameter '" << *param << "' empty block name");
break;
}
@@ -162,7 +162,7 @@ namespace config {
currentBlock->getWritableBlocks( blockName, possibleBlocks );
if ( possibleBlocks.size() > 1 )
{
- currentBlock = NULL;
+ currentBlock = nullptr;
WALBERLA_LOG_WARNING("Ignoring Parameter '" << *param << "' since block is ambiguous: " << blockName );
break;
}
@@ -205,7 +205,7 @@ namespace config {
public:
SingleConfigGenerator( const shared_ptr<Config> & config ): config_ ( config ) {}
- virtual shared_ptr<Config> next()
+ shared_ptr<Config> next() override
{
auto res = config_;
config_.reset();
@@ -223,7 +223,7 @@ namespace config {
MultipleConfigGenerator( const std::string & baseName, const std::string & extension, int numberOfDigits )
: baseName_( baseName ), extension_( extension ), numberOfDigits_( numberOfDigits), counter_(-1) {}
- virtual shared_ptr<Config> next()
+ shared_ptr<Config> next() override
{
++counter_;
std::stringstream ss;
@@ -261,7 +261,7 @@ namespace config {
throw std::runtime_error( usageString(argv[0]) );
- auto dotPosition = filename.find_last_of(".");
+ auto dotPosition = filename.find_last_of('.');
int numberOfZeros=0;
if ( dotPosition != std::string::npos )
diff --git a/src/core/debug/Debug.h b/src/core/debug/Debug.h
index 3ea4bcd054c16039fb2adedfaf4e8043ed38ff5c..b29d2824e157033614e5cbf09ae4a6a076c70edd 100644
--- a/src/core/debug/Debug.h
+++ b/src/core/debug/Debug.h
@@ -26,8 +26,8 @@
#ifndef NDEBUG
# include "CheckFunctions.h"
# include <functional>
-# include <boost/bind.hpp>
# include <string>
+# include "core/Macros.h"
#endif
@@ -265,7 +265,7 @@ private:
/// \endcond
#define WALBERLA_ASSERT_SECTION(condition) if(true)\
- if(const walberla::debug::ConditionalExec COND_EXEC = walberla::debug::ConditionalExec(!(condition),boost::bind(walberla::debug::myAssert,__FILE__,__LINE__)))
+ if(const walberla::debug::ConditionalExec COND_EXEC = walberla::debug::ConditionalExec(!(condition),std::bind(walberla::debug::myAssert,__FILE__,__LINE__)))
#else
diff --git a/src/core/debug/PrintStacktrace.cpp b/src/core/debug/PrintStacktrace.cpp
index 22b216b5548e6a6c9cb7e15c50cbafe91514f1cb..b4a8e6888c86784861f9985a358345011a5c300b 100644
--- a/src/core/debug/PrintStacktrace.cpp
+++ b/src/core/debug/PrintStacktrace.cpp
@@ -39,7 +39,7 @@ void printStacktrace()
#if defined(WALBERLA_CXX_COMPILER_IS_GNU) || defined(WALBERLA_CXX_COMPILER_IS_INTEL) || defined( WALBERLA_CXX_COMPILER_IS_CLANG)
#include <execinfo.h>
-#include <stdlib.h>
+#include <cstdlib>
#include <string>
namespace walberla {
diff --git a/src/core/extern/json.hpp b/src/core/extern/json.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..6b6655af8a76bbadecbe9d85b7508ed75c75924d
--- /dev/null
+++ b/src/core/extern/json.hpp
@@ -0,0 +1,17300 @@
+/*
+ __ _____ _____ _____
+ __| | __| | | | JSON for Modern C++
+| | |__ | | | | | | version 3.1.2
+|_____|_____|_____|_|___| https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#ifndef NLOHMANN_JSON_HPP
+#define NLOHMANN_JSON_HPP
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3
+#define NLOHMANN_JSON_VERSION_MINOR 1
+#define NLOHMANN_JSON_VERSION_PATCH 2
+
+#include <algorithm> // all_of, find, for_each
+#include <cassert> // assert
+#include <ciso646> // and, not, or
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#include <iosfwd> // istream, ostream
+#include <iterator> // iterator_traits, random_access_iterator_tag
+#include <numeric> // accumulate
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+
+// #include <nlohmann/json_fwd.hpp>
+#ifndef NLOHMANN_JSON_FWD_HPP
+#define NLOHMANN_JSON_FWD_HPP
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](http://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename = void, typename = void>
+struct adl_serializer;
+
+template<template<typename U, typename V, typename... Args> class ObjectType =
+ std::map,
+ template<typename U, typename... Args> class ArrayType = std::vector,
+ class StringType = std::string, class BooleanType = bool,
+ class NumberIntegerType = std::int64_t,
+ class NumberUnsignedType = std::uint64_t,
+ class NumberFloatType = double,
+ template<typename U> class AllocatorType = std::allocator,
+ template<typename T, typename SFINAE = void> class JSONSerializer =
+ adl_serializer>
+class basic_json;
+
+/*!
+@brief JSON Pointer
+
+A JSON pointer defines a string syntax for identifying a specific value
+within a JSON document. It can be used with functions `at` and
+`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
+
+@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
+
+@since version 2.0.0
+*/
+template<typename BasicJsonType>
+class json_pointer;
+
+/*!
+@brief default JSON class
+
+This type is the default specialization of the @ref basic_json class which
+uses the standard template types.
+
+@since version 1.0.0
+*/
+using json = basic_json<>;
+}
+
+#endif
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+// This file contains all internal macro definitions
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// exclude unsupported compilers
+#if defined(__clang__)
+ #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+ #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+ #endif
+#elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+ #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
+ #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+ #endif
+#endif
+
+// disable float-equal warnings on GCC/clang
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdocumentation"
+#endif
+
+// allow for portable deprecation warnings
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+ #define JSON_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+ #define JSON_DEPRECATED __declspec(deprecated)
+#else
+ #define JSON_DEPRECATED
+#endif
+
+// allow to disable exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+ #define JSON_THROW(exception) throw exception
+ #define JSON_TRY try
+ #define JSON_CATCH(exception) catch(exception)
+#else
+ #define JSON_THROW(exception) std::abort()
+ #define JSON_TRY if(true)
+ #define JSON_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+ #undef JSON_THROW
+ #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+ #undef JSON_TRY
+ #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+ #undef JSON_CATCH
+ #define JSON_CATCH JSON_CATCH_USER
+#endif
+
+// manual branch prediction
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+ #define JSON_LIKELY(x) __builtin_expect(!!(x), 1)
+ #define JSON_UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+ #define JSON_LIKELY(x) x
+ #define JSON_UNLIKELY(x) x
+#endif
+
+// C++ language standard detection
+#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+ #define JSON_HAS_CPP_17
+ #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+ #define JSON_HAS_CPP_14
+#endif
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION \
+ template<template<typename, typename, typename...> class ObjectType, \
+ template<typename, typename...> class ArrayType, \
+ class StringType, class BooleanType, class NumberIntegerType, \
+ class NumberUnsignedType, class NumberFloatType, \
+ template<typename> class AllocatorType, \
+ template<typename, typename = void> class JSONSerializer>
+
+#define NLOHMANN_BASIC_JSON_TPL \
+ basic_json<ObjectType, ArrayType, StringType, BooleanType, \
+ NumberIntegerType, NumberUnsignedType, NumberFloatType, \
+ AllocatorType, JSONSerializer>
+
+/*!
+@brief Helper to determine whether there's a key_type for T.
+
+This helper is used to tell associative containers apart from other containers
+such as sequence containers. For instance, `std::map` passes the test as it
+contains a `mapped_type`, whereas `std::vector` fails the test.
+
+@sa http://stackoverflow.com/a/7728728/266378
+@since version 1.0.0, overworked in version 2.0.6
+*/
+#define NLOHMANN_JSON_HAS_HELPER(type) \
+ template<typename T> struct has_##type { \
+ private: \
+ template<typename U, typename = typename U::type> \
+ static int detect(U &&); \
+ static void detect(...); \
+ public: \
+ static constexpr bool value = \
+ std::is_integral<decltype(detect(std::declval<T>()))>::value; \
+ }
+
+// #include <nlohmann/detail/meta.hpp>
+
+
+#include <ciso646> // not
+#include <cstddef> // size_t
+#include <limits> // numeric_limits
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+#include <utility> // declval
+
+// #include <nlohmann/json_fwd.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+/////////////
+// helpers //
+/////////////
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+// implementation of C++14 index_sequence and affiliates
+// source: https://stackoverflow.com/a/32223343
+template<std::size_t... Ints>
+struct index_sequence
+{
+ using type = index_sequence;
+ using value_type = std::size_t;
+ static constexpr std::size_t size() noexcept
+ {
+ return sizeof...(Ints);
+ }
+};
+
+template<class Sequence1, class Sequence2>
+struct merge_and_renumber;
+
+template<std::size_t... I1, std::size_t... I2>
+struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
+ : index_sequence < I1..., (sizeof...(I1) + I2)... > {};
+
+template<std::size_t N>
+struct make_index_sequence
+ : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
+ typename make_index_sequence < N - N / 2 >::type > {};
+
+template<> struct make_index_sequence<0> : index_sequence<> {};
+template<> struct make_index_sequence<1> : index_sequence<0> {};
+
+template<typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+/*
+Implementation of two C++17 constructs: conjunction, negation. This is needed
+to avoid evaluating all the traits in a condition
+
+For example: not std::is_same<void, T>::value and has_value_type<T>::value
+will not compile when T = void (on MSVC at least). Whereas
+conjunction<negation<std::is_same<void, T>>, has_value_type<T>>::value will
+stop evaluating if negation<...>::value == false
+
+Please note that those constructs must be used with caution, since symbols can
+become very long quickly (which can slow down compilation and cause MSVC
+internal compiler errors). Only use it when you have to (see example ahead).
+*/
+template<class...> struct conjunction : std::true_type {};
+template<class B1> struct conjunction<B1> : B1 {};
+template<class B1, class... Bn>
+struct conjunction<B1, Bn...> : std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+
+template<class B> struct negation : std::integral_constant<bool, not B::value> {};
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+////////////////////////
+// has_/is_ functions //
+////////////////////////
+
+// source: https://stackoverflow.com/a/37193089/4116453
+
+template <typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template <typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+NLOHMANN_JSON_HAS_HELPER(mapped_type);
+NLOHMANN_JSON_HAS_HELPER(key_type);
+NLOHMANN_JSON_HAS_HELPER(value_type);
+NLOHMANN_JSON_HAS_HELPER(iterator);
+
+template<bool B, class RealType, class CompatibleObjectType>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template<class RealType, class CompatibleObjectType>
+struct is_compatible_object_type_impl<true, RealType, CompatibleObjectType>
+{
+ static constexpr auto value =
+ std::is_constructible<typename RealType::key_type, typename CompatibleObjectType::key_type>::value and
+ std::is_constructible<typename RealType::mapped_type, typename CompatibleObjectType::mapped_type>::value;
+};
+
+template<class BasicJsonType, class CompatibleObjectType>
+struct is_compatible_object_type
+{
+ static auto constexpr value = is_compatible_object_type_impl <
+ conjunction<negation<std::is_same<void, CompatibleObjectType>>,
+ has_mapped_type<CompatibleObjectType>,
+ has_key_type<CompatibleObjectType>>::value,
+ typename BasicJsonType::object_t, CompatibleObjectType >::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct is_basic_json_nested_type
+{
+ static auto constexpr value = std::is_same<T, typename BasicJsonType::iterator>::value or
+ std::is_same<T, typename BasicJsonType::const_iterator>::value or
+ std::is_same<T, typename BasicJsonType::reverse_iterator>::value or
+ std::is_same<T, typename BasicJsonType::const_reverse_iterator>::value;
+};
+
+template<class BasicJsonType, class CompatibleArrayType>
+struct is_compatible_array_type
+{
+ static auto constexpr value =
+ conjunction<negation<std::is_same<void, CompatibleArrayType>>,
+ negation<is_compatible_object_type<
+ BasicJsonType, CompatibleArrayType>>,
+ negation<std::is_constructible<typename BasicJsonType::string_t,
+ CompatibleArrayType>>,
+ negation<is_basic_json_nested_type<BasicJsonType, CompatibleArrayType>>,
+ has_value_type<CompatibleArrayType>,
+ has_iterator<CompatibleArrayType>>::value;
+};
+
+template<bool, typename, typename>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl<true, RealIntegerType, CompatibleNumberIntegerType>
+{
+ // is there an assert somewhere on overflows?
+ using RealLimits = std::numeric_limits<RealIntegerType>;
+ using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+ static constexpr auto value =
+ std::is_constructible<RealIntegerType, CompatibleNumberIntegerType>::value and
+ CompatibleLimits::is_integer and
+ RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+{
+ static constexpr auto value =
+ is_compatible_integer_type_impl <
+ std::is_integral<CompatibleNumberIntegerType>::value and
+ not std::is_same<bool, CompatibleNumberIntegerType>::value,
+ RealIntegerType, CompatibleNumberIntegerType > ::value;
+};
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template<typename BasicJsonType, typename T>
+struct has_from_json
+{
+ private:
+ // also check the return type of from_json
+ template<typename U, typename = enable_if_t<std::is_same<void, decltype(uncvref_t<U>::from_json(
+ std::declval<BasicJsonType>(), std::declval<T&>()))>::value>>
+ static int detect(U&&);
+ static void detect(...);
+
+ public:
+ static constexpr bool value = std::is_integral<decltype(
+ detect(std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json
+{
+ private:
+ template <
+ typename U,
+ typename = enable_if_t<std::is_same<
+ T, decltype(uncvref_t<U>::from_json(std::declval<BasicJsonType>()))>::value >>
+ static int detect(U&&);
+ static void detect(...);
+
+ public:
+ static constexpr bool value = std::is_integral<decltype(detect(
+ std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+template<typename BasicJsonType, typename T>
+struct has_to_json
+{
+ private:
+ template<typename U, typename = decltype(uncvref_t<U>::to_json(
+ std::declval<BasicJsonType&>(), std::declval<T>()))>
+ static int detect(U&&);
+ static void detect(...);
+
+ public:
+ static constexpr bool value = std::is_integral<decltype(detect(
+ std::declval<typename BasicJsonType::template json_serializer<T, void>>()))>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleCompleteType>
+struct is_compatible_complete_type
+{
+ static constexpr bool value =
+ not std::is_base_of<std::istream, CompatibleCompleteType>::value and
+ not is_basic_json<CompatibleCompleteType>::value and
+ not is_basic_json_nested_type<BasicJsonType, CompatibleCompleteType>::value and
+ has_to_json<BasicJsonType, CompatibleCompleteType>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+ : conjunction<is_complete_type<CompatibleType>,
+ is_compatible_complete_type<BasicJsonType, CompatibleType>>
+{
+};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+ static constexpr T value{};
+};
+
+template<typename T>
+constexpr T static_const<T>::value;
+}
+}
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+
+#include <exception> // exception
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////////
+// exceptions //
+////////////////
+
+/*!
+@brief general exception of the @ref basic_json class
+
+This class is an extension of `std::exception` objects with a member @a id for
+exception ids. It is used as the base class for all exceptions thrown by the
+@ref basic_json class. This class can hence be used as "wildcard" to catch
+exceptions.
+
+Subclasses:
+- @ref parse_error for exceptions indicating a parse error
+- @ref invalid_iterator for exceptions indicating errors with iterators
+- @ref type_error for exceptions indicating executing a member function with
+ a wrong type
+- @ref out_of_range for exceptions indicating access out of the defined range
+- @ref other_error for exceptions indicating other library errors
+
+@internal
+@note To have nothrow-copy-constructible exceptions, we internally use
+ `std::runtime_error` which can cope with arbitrary-length error messages.
+ Intermediate strings are built with static functions and then passed to
+ the actual constructor.
+@endinternal
+
+@liveexample{The following code shows how arbitrary library exceptions can be
+caught.,exception}
+
+@since version 3.0.0
+*/
+class exception : public std::exception
+{
+ public:
+ /// returns the explanatory string
+ const char* what() const noexcept override
+ {
+ return m.what();
+ }
+
+ /// the id of the exception
+ const int id;
+
+ protected:
+ exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
+
+ static std::string name(const std::string& ename, int id_)
+ {
+ return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
+ }
+
+ private:
+ /// an exception object as storage for error messages
+ std::runtime_error m;
+};
+
+/*!
+@brief exception indicating a parse error
+
+This exception is thrown by the library when a parse error occurs. Parse errors
+can occur during the deserialization of JSON text, CBOR, MessagePack, as well
+as when using JSON Patch.
+
+Member @a byte holds the byte index of the last read character in the input
+file.
+
+Exceptions have ids 1xx.
+
+name / id | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
+json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
+json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
+json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
+json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
+json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
+json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
+json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
+json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
+json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
+json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
+json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
+
+@note For an input with n bytes, 1 is the index of the first character and n+1
+ is the index of the terminating null byte or the end of file. This also
+ holds true when reading a byte vector (CBOR or MessagePack).
+
+@liveexample{The following code shows how a `parse_error` exception can be
+caught.,parse_error}
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref invalid_iterator for exceptions indicating errors with iterators
+@sa @ref type_error for exceptions indicating executing a member function with
+ a wrong type
+@sa @ref out_of_range for exceptions indicating access out of the defined range
+@sa @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class parse_error : public exception
+{
+ public:
+ /*!
+ @brief create a parse error exception
+ @param[in] id_ the id of the exception
+ @param[in] byte_ the byte index where the error occurred (or 0 if the
+ position cannot be determined)
+ @param[in] what_arg the explanatory string
+ @return parse_error object
+ */
+ static parse_error create(int id_, std::size_t byte_, const std::string& what_arg)
+ {
+ std::string w = exception::name("parse_error", id_) + "parse error" +
+ (byte_ != 0 ? (" at " + std::to_string(byte_)) : "") +
+ ": " + what_arg;
+ return parse_error(id_, byte_, w.c_str());
+ }
+
+ /*!
+ @brief byte index of the parse error
+
+ The byte index of the last read character in the input file.
+
+ @note For an input with n bytes, 1 is the index of the first character and
+ n+1 is the index of the terminating null byte or the end of file.
+ This also holds true when reading a byte vector (CBOR or MessagePack).
+ */
+ const std::size_t byte;
+
+ private:
+ parse_error(int id_, std::size_t byte_, const char* what_arg)
+ : exception(id_, what_arg), byte(byte_) {}
+};
+
+/*!
+@brief exception indicating errors with iterators
+
+This exception is thrown if iterators passed to a library function do not match
+the expected semantics.
+
+Exceptions have ids 2xx.
+
+name / id | example message | description
+----------------------------------- | --------------- | -------------------------
+json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
+json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
+json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
+json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
+json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
+json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
+json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
+json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
+json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
+json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
+
+@liveexample{The following code shows how an `invalid_iterator` exception can be
+caught.,invalid_iterator}
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref parse_error for exceptions indicating a parse error
+@sa @ref type_error for exceptions indicating executing a member function with
+ a wrong type
+@sa @ref out_of_range for exceptions indicating access out of the defined range
+@sa @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class invalid_iterator : public exception
+{
+ public:
+ static invalid_iterator create(int id_, const std::string& what_arg)
+ {
+ std::string w = exception::name("invalid_iterator", id_) + what_arg;
+ return invalid_iterator(id_, w.c_str());
+ }
+
+ private:
+ invalid_iterator(int id_, const char* what_arg)
+ : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating executing a member function with a wrong type
+
+This exception is thrown in case of a type error; that is, a library function is
+executed on a JSON value whose type does not match the expected semantics.
+
+Exceptions have ids 3xx.
+
+name / id | example message | description
+----------------------------- | --------------- | -------------------------
+json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
+json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
+json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t&.
+json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
+json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
+json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
+json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
+json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
+json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
+json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
+json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
+json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
+json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
+json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
+json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
+json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
+
+@liveexample{The following code shows how a `type_error` exception can be
+caught.,type_error}
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref parse_error for exceptions indicating a parse error
+@sa @ref invalid_iterator for exceptions indicating errors with iterators
+@sa @ref out_of_range for exceptions indicating access out of the defined range
+@sa @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class type_error : public exception
+{
+ public:
+ static type_error create(int id_, const std::string& what_arg)
+ {
+ std::string w = exception::name("type_error", id_) + what_arg;
+ return type_error(id_, w.c_str());
+ }
+
+ private:
+ type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating access out of the defined range
+
+This exception is thrown in case a library function is called on an input
+parameter that exceeds the expected range, for instance in case of array
+indices or nonexisting object keys.
+
+Exceptions have ids 4xx.
+
+name / id | example message | description
+------------------------------- | --------------- | -------------------------
+json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
+json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
+json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
+json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
+json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
+json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
+json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON only supports integers numbers up to 9223372036854775807. |
+json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
+
+@liveexample{The following code shows how an `out_of_range` exception can be
+caught.,out_of_range}
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref parse_error for exceptions indicating a parse error
+@sa @ref invalid_iterator for exceptions indicating errors with iterators
+@sa @ref type_error for exceptions indicating executing a member function with
+ a wrong type
+@sa @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class out_of_range : public exception
+{
+ public:
+ static out_of_range create(int id_, const std::string& what_arg)
+ {
+ std::string w = exception::name("out_of_range", id_) + what_arg;
+ return out_of_range(id_, w.c_str());
+ }
+
+ private:
+ out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating other library errors
+
+This exception is thrown in case of errors that cannot be classified with the
+other exception types.
+
+Exceptions have ids 5xx.
+
+name / id | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
+
+@sa @ref exception for the base class of the library exceptions
+@sa @ref parse_error for exceptions indicating a parse error
+@sa @ref invalid_iterator for exceptions indicating errors with iterators
+@sa @ref type_error for exceptions indicating executing a member function with
+ a wrong type
+@sa @ref out_of_range for exceptions indicating access out of the defined range
+
+@liveexample{The following code shows how an `other_error` exception can be
+caught.,other_error}
+
+@since version 3.0.0
+*/
+class other_error : public exception
+{
+ public:
+ static other_error create(int id_, const std::string& what_arg)
+ {
+ std::string w = exception::name("other_error", id_) + what_arg;
+ return other_error(id_, w.c_str());
+ }
+
+ private:
+ other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+}
+}
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+#include <array> // array
+#include <ciso646> // and
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+ null, ///< null value
+ object, ///< object (unordered set of name/value pairs)
+ array, ///< array (ordered collection of values)
+ string, ///< string value
+ boolean, ///< boolean value
+ number_integer, ///< number value (signed integer)
+ number_unsigned, ///< number value (unsigned integer)
+ number_float, ///< number value (floating-point)
+ discarded ///< discarded by the the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+
+@since version 1.0.0
+*/
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+ static constexpr std::array<std::uint8_t, 8> order = {{
+ 0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+ 1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */
+ }
+ };
+
+ const auto l_index = static_cast<std::size_t>(lhs);
+ const auto r_index = static_cast<std::size_t>(rhs);
+ return l_index < order.size() and r_index < order.size() and order[l_index] < order[r_index];
+}
+}
+}
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <ciso646> // and, not
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+// overloads for basic_json template parameters
+template<typename BasicJsonType, typename ArithmeticType,
+ enable_if_t<std::is_arithmetic<ArithmeticType>::value and
+ not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+ int> = 0>
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+ switch (static_cast<value_t>(j))
+ {
+ case value_t::number_unsigned:
+ {
+ val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+ break;
+ }
+ case value_t::number_integer:
+ {
+ val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+ break;
+ }
+ case value_t::number_float:
+ {
+ val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+ break;
+ }
+
+ default:
+ JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+ }
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+ if (JSON_UNLIKELY(not j.is_boolean()))
+ {
+ JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name())));
+ }
+ b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+ if (JSON_UNLIKELY(not j.is_string()))
+ {
+ JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+ }
+ s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+ get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+ get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+ get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType, typename EnumType,
+ enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void from_json(const BasicJsonType& j, EnumType& e)
+{
+ typename std::underlying_type<EnumType>::type val;
+ get_arithmetic_value(j, val);
+ e = static_cast<EnumType>(val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::array_t& arr)
+{
+ if (JSON_UNLIKELY(not j.is_array()))
+ {
+ JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+ }
+ arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+ enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+ if (JSON_UNLIKELY(not j.is_array()))
+ {
+ JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+ }
+ std::transform(j.rbegin(), j.rend(),
+ std::front_inserter(l), [](const BasicJsonType & i)
+ {
+ return i.template get<T>();
+ });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+ enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+ if (JSON_UNLIKELY(not j.is_array()))
+ {
+ JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+ }
+ l.resize(j.size());
+ std::copy(j.m_value.array->begin(), j.m_value.array->end(), std::begin(l));
+}
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+void from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<0> /*unused*/)
+{
+ using std::end;
+
+ std::transform(j.begin(), j.end(),
+ std::inserter(arr, end(arr)), [](const BasicJsonType & i)
+ {
+ // get<BasicJsonType>() returns *this, this won't call a from_json
+ // method when value_type is BasicJsonType
+ return i.template get<typename CompatibleArrayType::value_type>();
+ });
+}
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+auto from_json_array_impl(const BasicJsonType& j, CompatibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+ arr.reserve(std::declval<typename CompatibleArrayType::size_type>()),
+ void())
+{
+ using std::end;
+
+ arr.reserve(j.size());
+ std::transform(j.begin(), j.end(),
+ std::inserter(arr, end(arr)), [](const BasicJsonType & i)
+ {
+ // get<BasicJsonType>() returns *this, this won't call a from_json
+ // method when value_type is BasicJsonType
+ return i.template get<typename CompatibleArrayType::value_type>();
+ });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+void from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr, priority_tag<2> /*unused*/)
+{
+ for (std::size_t i = 0; i < N; ++i)
+ {
+ arr[i] = j.at(i).template get<T>();
+ }
+}
+
+template <
+ typename BasicJsonType, typename CompatibleArrayType,
+ enable_if_t <
+ is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value and
+ not std::is_same<typename BasicJsonType::array_t,
+ CompatibleArrayType>::value and
+ std::is_constructible <
+ BasicJsonType, typename CompatibleArrayType::value_type >::value,
+ int > = 0 >
+void from_json(const BasicJsonType& j, CompatibleArrayType& arr)
+{
+ if (JSON_UNLIKELY(not j.is_array()))
+ {
+ JSON_THROW(type_error::create(302, "type must be array, but is " +
+ std::string(j.type_name())));
+ }
+
+ from_json_array_impl(j, arr, priority_tag<2> {});
+}
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+ enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value, int> = 0>
+void from_json(const BasicJsonType& j, CompatibleObjectType& obj)
+{
+ if (JSON_UNLIKELY(not j.is_object()))
+ {
+ JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name())));
+ }
+
+ auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+ using value_type = typename CompatibleObjectType::value_type;
+ std::transform(
+ inner_object->begin(), inner_object->end(),
+ std::inserter(obj, obj.begin()),
+ [](typename BasicJsonType::object_t::value_type const & p)
+ {
+ return value_type(p.first, p.second.template get<typename CompatibleObjectType::mapped_type>());
+ });
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template<typename BasicJsonType, typename ArithmeticType,
+ enable_if_t <
+ std::is_arithmetic<ArithmeticType>::value and
+ not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
+ not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
+ not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
+ not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+ int> = 0>
+void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+ switch (static_cast<value_t>(j))
+ {
+ case value_t::number_unsigned:
+ {
+ val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+ break;
+ }
+ case value_t::number_integer:
+ {
+ val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+ break;
+ }
+ case value_t::number_float:
+ {
+ val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+ break;
+ }
+ case value_t::boolean:
+ {
+ val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+ break;
+ }
+
+ default:
+ JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+ }
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
+{
+ p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...>)
+{
+ t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
+}
+
+template<typename BasicJsonType, typename... Args>
+void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
+{
+ from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+}
+
+struct from_json_fn
+{
+ private:
+ template<typename BasicJsonType, typename T>
+ auto call(const BasicJsonType& j, T& val, priority_tag<1> /*unused*/) const
+ noexcept(noexcept(from_json(j, val)))
+ -> decltype(from_json(j, val), void())
+ {
+ return from_json(j, val);
+ }
+
+ template<typename BasicJsonType, typename T>
+ void call(const BasicJsonType& /*unused*/, T& /*unused*/, priority_tag<0> /*unused*/) const noexcept
+ {
+ static_assert(sizeof(BasicJsonType) == 0,
+ "could not find from_json() method in T's namespace");
+#ifdef _MSC_VER
+ // MSVC does not show a stacktrace for the above assert
+ using decayed = uncvref_t<T>;
+ static_assert(sizeof(typename decayed::force_msvc_stacktrace) == 0,
+ "forcing MSVC stacktrace to show which T we're talking about.");
+#endif
+ }
+
+ public:
+ template<typename BasicJsonType, typename T>
+ void operator()(const BasicJsonType& j, T& val) const
+ noexcept(noexcept(std::declval<from_json_fn>().call(j, val, priority_tag<1> {})))
+ {
+ return call(j, val, priority_tag<1> {});
+ }
+};
+}
+
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace
+{
+constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
+}
+}
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+
+#include <ciso646> // or, and, not
+#include <iterator> // begin, end
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/meta.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////
+// constructors //
+//////////////////
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+ {
+ j.m_type = value_t::boolean;
+ j.m_value = b;
+ j.assert_invariant();
+ }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+ {
+ j.m_type = value_t::string;
+ j.m_value = s;
+ j.assert_invariant();
+ }
+
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+ {
+ j.m_type = value_t::string;
+ j.m_value = std::move(s);
+ j.assert_invariant();
+ }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+ {
+ j.m_type = value_t::number_float;
+ j.m_value = val;
+ j.assert_invariant();
+ }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+ {
+ j.m_type = value_t::number_unsigned;
+ j.m_value = val;
+ j.assert_invariant();
+ }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+ {
+ j.m_type = value_t::number_integer;
+ j.m_value = val;
+ j.assert_invariant();
+ }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+ {
+ j.m_type = value_t::array;
+ j.m_value = arr;
+ j.assert_invariant();
+ }
+
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+ {
+ j.m_type = value_t::array;
+ j.m_value = std::move(arr);
+ j.assert_invariant();
+ }
+
+ template<typename BasicJsonType, typename CompatibleArrayType,
+ enable_if_t<not std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+ int> = 0>
+ static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+ {
+ using std::begin;
+ using std::end;
+ j.m_type = value_t::array;
+ j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+ j.assert_invariant();
+ }
+
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+ {
+ j.m_type = value_t::array;
+ j.m_value = value_t::array;
+ j.m_value.array->reserve(arr.size());
+ for (const bool x : arr)
+ {
+ j.m_value.array->push_back(x);
+ }
+ j.assert_invariant();
+ }
+
+ template<typename BasicJsonType, typename T,
+ enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+ static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+ {
+ j.m_type = value_t::array;
+ j.m_value = value_t::array;
+ j.m_value.array->resize(arr.size());
+ std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+ j.assert_invariant();
+ }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+ {
+ j.m_type = value_t::object;
+ j.m_value = obj;
+ j.assert_invariant();
+ }
+
+ template<typename BasicJsonType>
+ static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+ {
+ j.m_type = value_t::object;
+ j.m_value = std::move(obj);
+ j.assert_invariant();
+ }
+
+ template<typename BasicJsonType, typename CompatibleObjectType,
+ enable_if_t<not std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int> = 0>
+ static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+ {
+ using std::begin;
+ using std::end;
+
+ j.m_type = value_t::object;
+ j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+ j.assert_invariant();
+ }
+};
+
+/////////////
+// to_json //
+/////////////
+
+template<typename BasicJsonType, typename T,
+ enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+void to_json(BasicJsonType& j, T b) noexcept
+{
+ external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+ enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+ external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+ external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+ enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+ external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+ enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+ external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+ enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+ external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+template<typename BasicJsonType, typename EnumType,
+ enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+ using underlying_type = typename std::underlying_type<EnumType>::type;
+ external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+ external_constructor<value_t::array>::construct(j, e);
+}
+
+template<typename BasicJsonType, typename CompatibleArrayType,
+ enable_if_t<is_compatible_array_type<BasicJsonType, CompatibleArrayType>::value or
+ std::is_same<typename BasicJsonType::array_t, CompatibleArrayType>::value,
+ int> = 0>
+void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+ external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType, typename T,
+ enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+void to_json(BasicJsonType& j, std::valarray<T> arr)
+{
+ external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+ external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+ enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+ external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+ external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template<typename BasicJsonType, typename T, std::size_t N,
+ enable_if_t<not std::is_constructible<typename BasicJsonType::string_t, T (&)[N]>::value, int> = 0>
+void to_json(BasicJsonType& j, T (&arr)[N])
+{
+ external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType, typename... Args>
+void to_json(BasicJsonType& j, const std::pair<Args...>& p)
+{
+ j = {p.first, p.second};
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...>)
+{
+ j = {std::get<Idx>(t)...};
+}
+
+template<typename BasicJsonType, typename... Args>
+void to_json(BasicJsonType& j, const std::tuple<Args...>& t)
+{
+ to_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+}
+
+struct to_json_fn
+{
+ private:
+ template<typename BasicJsonType, typename T>
+ auto call(BasicJsonType& j, T&& val, priority_tag<1> /*unused*/) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+ -> decltype(to_json(j, std::forward<T>(val)), void())
+ {
+ return to_json(j, std::forward<T>(val));
+ }
+
+ template<typename BasicJsonType, typename T>
+ void call(BasicJsonType& /*unused*/, T&& /*unused*/, priority_tag<0> /*unused*/) const noexcept
+ {
+ static_assert(sizeof(BasicJsonType) == 0,
+ "could not find to_json() method in T's namespace");
+
+#ifdef _MSC_VER
+ // MSVC does not show a stacktrace for the above assert
+ using decayed = uncvref_t<T>;
+ static_assert(sizeof(typename decayed::force_msvc_stacktrace) == 0,
+ "forcing MSVC stacktrace to show which T we're talking about.");
+#endif
+ }
+
+ public:
+ template<typename BasicJsonType, typename T>
+ void operator()(BasicJsonType& j, T&& val) const
+ noexcept(noexcept(std::declval<to_json_fn>().call(j, std::forward<T>(val), priority_tag<1> {})))
+ {
+ return call(j, std::forward<T>(val), priority_tag<1> {});
+ }
+};
+}
+
+/// namespace to hold default `to_json` function
+namespace
+{
+constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
+}
+}
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+
+#include <algorithm> // min
+#include <array> // array
+#include <cassert> // assert
+#include <cstddef> // size_t
+#include <cstring> // strlen
+#include <ios> // streamsize, streamoff, streampos
+#include <istream> // istream
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////////////
+// input adapters //
+////////////////////
+
+/*!
+@brief abstract input adapter interface
+
+Produces a stream of std::char_traits<char>::int_type characters from a
+std::istream, a buffer, or some other input type. Accepts the return of exactly
+one non-EOF character for future input. The int_type characters returned
+consist of all valid char values as positive values (typically unsigned char),
+plus an EOF value outside that range, specified by the value of the function
+std::char_traits<char>::eof(). This value is typically -1, but could be any
+arbitrary value which is not a valid char value.
+*/
+struct input_adapter_protocol
+{
+ /// get a character [0,255] or std::char_traits<char>::eof().
+ virtual std::char_traits<char>::int_type get_character() = 0;
+ /// restore the last non-eof() character to input
+ virtual void unget_character() = 0;
+ virtual ~input_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+using input_adapter_t = std::shared_ptr<input_adapter_protocol>;
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input. Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter : public input_adapter_protocol
+{
+ public:
+ ~input_stream_adapter() override
+ {
+ // clear stream flags; we use underlying streambuf I/O, do not
+ // maintain ifstream flags
+ is.clear();
+ }
+
+ explicit input_stream_adapter(std::istream& i)
+ : is(i), sb(*i.rdbuf())
+ {
+ // skip byte order mark
+ std::char_traits<char>::int_type c;
+ if ((c = get_character()) == 0xEF)
+ {
+ if ((c = get_character()) == 0xBB)
+ {
+ if ((c = get_character()) == 0xBF)
+ {
+ return; // Ignore BOM
+ }
+ else if (c != std::char_traits<char>::eof())
+ {
+ is.unget();
+ }
+ is.putback('\xBB');
+ }
+ else if (c != std::char_traits<char>::eof())
+ {
+ is.unget();
+ }
+ is.putback('\xEF');
+ }
+ else if (c != std::char_traits<char>::eof())
+ {
+ is.unget(); // no byte order mark; process as usual
+ }
+ }
+
+ // delete because of pointer members
+ input_stream_adapter(const input_stream_adapter&) = delete;
+ input_stream_adapter& operator=(input_stream_adapter&) = delete;
+
+ // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+ // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+ // end up as the same value, eg. 0xFFFFFFFF.
+ std::char_traits<char>::int_type get_character() override
+ {
+ return sb.sbumpc();
+ }
+
+ void unget_character() override
+ {
+ sb.sungetc(); // is.unget() avoided for performance
+ }
+
+ private:
+ /// the associated input stream
+ std::istream& is;
+ std::streambuf& sb;
+};
+
+/// input adapter for buffer input
+class input_buffer_adapter : public input_adapter_protocol
+{
+ public:
+ input_buffer_adapter(const char* b, const std::size_t l)
+ : cursor(b), limit(b + l), start(b)
+ {
+ // skip byte order mark
+ if (l >= 3 and b[0] == '\xEF' and b[1] == '\xBB' and b[2] == '\xBF')
+ {
+ cursor += 3;
+ }
+ }
+
+ // delete because of pointer members
+ input_buffer_adapter(const input_buffer_adapter&) = delete;
+ input_buffer_adapter& operator=(input_buffer_adapter&) = delete;
+
+ std::char_traits<char>::int_type get_character() noexcept override
+ {
+ if (JSON_LIKELY(cursor < limit))
+ {
+ return std::char_traits<char>::to_int_type(*(cursor++));
+ }
+
+ return std::char_traits<char>::eof();
+ }
+
+ void unget_character() noexcept override
+ {
+ if (JSON_LIKELY(cursor > start))
+ {
+ --cursor;
+ }
+ }
+
+ private:
+ /// pointer to the current character
+ const char* cursor;
+ /// pointer past the last character
+ const char* limit;
+ /// pointer to the first character
+ const char* start;
+};
+
+class input_adapter
+{
+ public:
+ // native support
+
+ /// input adapter for input stream
+ input_adapter(std::istream& i)
+ : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+ /// input adapter for input stream
+ input_adapter(std::istream&& i)
+ : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+ /// input adapter for buffer
+ template<typename CharT,
+ typename std::enable_if<
+ std::is_pointer<CharT>::value and
+ std::is_integral<typename std::remove_pointer<CharT>::type>::value and
+ sizeof(typename std::remove_pointer<CharT>::type) == 1,
+ int>::type = 0>
+ input_adapter(CharT b, std::size_t l)
+ : ia(std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(b), l)) {}
+
+ // derived support
+
+ /// input adapter for string literal
+ template<typename CharT,
+ typename std::enable_if<
+ std::is_pointer<CharT>::value and
+ std::is_integral<typename std::remove_pointer<CharT>::type>::value and
+ sizeof(typename std::remove_pointer<CharT>::type) == 1,
+ int>::type = 0>
+ input_adapter(CharT b)
+ : input_adapter(reinterpret_cast<const char*>(b),
+ std::strlen(reinterpret_cast<const char*>(b))) {}
+
+ /// input adapter for iterator range with contiguous storage
+ template<class IteratorType,
+ typename std::enable_if<
+ std::is_same<typename std::iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+ int>::type = 0>
+ input_adapter(IteratorType first, IteratorType last)
+ {
+ // assertion to check that the iterator range is indeed contiguous,
+ // see http://stackoverflow.com/a/35008842/266378 for more discussion
+ assert(std::accumulate(
+ first, last, std::pair<bool, int>(true, 0),
+ [&first](std::pair<bool, int> res, decltype(*first) val)
+ {
+ res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
+ return res;
+ }).first);
+
+ // assertion to check that each element is 1 byte long
+ static_assert(
+ sizeof(typename std::iterator_traits<IteratorType>::value_type) == 1,
+ "each element in the iterator range must have the size of 1 byte");
+
+ const auto len = static_cast<size_t>(std::distance(first, last));
+ if (JSON_LIKELY(len > 0))
+ {
+ // there is at least one element: use the address of first
+ ia = std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(&(*first)), len);
+ }
+ else
+ {
+ // the address of first cannot be used: use nullptr
+ ia = std::make_shared<input_buffer_adapter>(nullptr, len);
+ }
+ }
+
+ /// input adapter for array
+ template<class T, std::size_t N>
+ input_adapter(T (&array)[N])
+ : input_adapter(std::begin(array), std::end(array)) {}
+
+ /// input adapter for contiguous container
+ template<class ContiguousContainer, typename
+ std::enable_if<not std::is_pointer<ContiguousContainer>::value and
+ std::is_base_of<std::random_access_iterator_tag, typename std::iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value,
+ int>::type = 0>
+ input_adapter(const ContiguousContainer& c)
+ : input_adapter(std::begin(c), std::end(c)) {}
+
+ operator input_adapter_t()
+ {
+ return ia;
+ }
+
+ private:
+ /// the actual adapter
+ input_adapter_t ia = nullptr;
+};
+}
+}
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <ios> // hex, uppercase
+#include <iomanip> // setw, setfill
+#include <sstream> // stringstream
+#include <string> // char_traits, string
+#include <vector> // vector
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////
+// lexer //
+///////////
+
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType>
+class lexer
+{
+ using number_integer_t = typename BasicJsonType::number_integer_t;
+ using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+ using number_float_t = typename BasicJsonType::number_float_t;
+ using string_t = typename BasicJsonType::string_t;
+
+ public:
+ /// token types for the parser
+ enum class token_type
+ {
+ uninitialized, ///< indicating the scanner is uninitialized
+ literal_true, ///< the `true` literal
+ literal_false, ///< the `false` literal
+ literal_null, ///< the `null` literal
+ value_string, ///< a string -- use get_string() for actual value
+ value_unsigned, ///< an unsigned integer -- use get_number_unsigned() for actual value
+ value_integer, ///< a signed integer -- use get_number_integer() for actual value
+ value_float, ///< an floating point number -- use get_number_float() for actual value
+ begin_array, ///< the character for array begin `[`
+ begin_object, ///< the character for object begin `{`
+ end_array, ///< the character for array end `]`
+ end_object, ///< the character for object end `}`
+ name_separator, ///< the name separator `:`
+ value_separator, ///< the value separator `,`
+ parse_error, ///< indicating a parse error
+ end_of_input, ///< indicating the end of the input buffer
+ literal_or_value ///< a literal or the begin of a value (only for diagnostics)
+ };
+
+ /// return name of values of type token_type (only used for errors)
+ static const char* token_type_name(const token_type t) noexcept
+ {
+ switch (t)
+ {
+ case token_type::uninitialized:
+ return "<uninitialized>";
+ case token_type::literal_true:
+ return "true literal";
+ case token_type::literal_false:
+ return "false literal";
+ case token_type::literal_null:
+ return "null literal";
+ case token_type::value_string:
+ return "string literal";
+ case lexer::token_type::value_unsigned:
+ case lexer::token_type::value_integer:
+ case lexer::token_type::value_float:
+ return "number literal";
+ case token_type::begin_array:
+ return "'['";
+ case token_type::begin_object:
+ return "'{'";
+ case token_type::end_array:
+ return "']'";
+ case token_type::end_object:
+ return "'}'";
+ case token_type::name_separator:
+ return "':'";
+ case token_type::value_separator:
+ return "','";
+ case token_type::parse_error:
+ return "<parse error>";
+ case token_type::end_of_input:
+ return "end of input";
+ case token_type::literal_or_value:
+ return "'[', '{', or a literal";
+ default: // catch non-enum values
+ return "unknown token"; // LCOV_EXCL_LINE
+ }
+ }
+
+ explicit lexer(detail::input_adapter_t adapter)
+ : ia(std::move(adapter)), decimal_point_char(get_decimal_point()) {}
+
+ // delete because of pointer members
+ lexer(const lexer&) = delete;
+ lexer& operator=(lexer&) = delete;
+
+ private:
+ /////////////////////
+ // locales
+ /////////////////////
+
+ /// return the locale-dependent decimal point
+ static char get_decimal_point() noexcept
+ {
+ const auto loc = localeconv();
+ assert(loc != nullptr);
+ return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+ }
+
+ /////////////////////
+ // scan functions
+ /////////////////////
+
+ /*!
+ @brief get codepoint from 4 hex characters following `\u`
+
+ For input "\u c1 c2 c3 c4" the codepoint is:
+ (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+ = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+ Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+ must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+ conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+ between the ASCII value of the character and the desired integer value.
+
+ @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+ non-hex character)
+ */
+ int get_codepoint()
+ {
+ // this function only makes sense after reading `\u`
+ assert(current == 'u');
+ int codepoint = 0;
+
+ const auto factors = { 12, 8, 4, 0 };
+ for (const auto factor : factors)
+ {
+ get();
+
+ if (current >= '0' and current <= '9')
+ {
+ codepoint += ((current - 0x30) << factor);
+ }
+ else if (current >= 'A' and current <= 'F')
+ {
+ codepoint += ((current - 0x37) << factor);
+ }
+ else if (current >= 'a' and current <= 'f')
+ {
+ codepoint += ((current - 0x57) << factor);
+ }
+ else
+ {
+ return -1;
+ }
+ }
+
+ assert(0x0000 <= codepoint and codepoint <= 0xFFFF);
+ return codepoint;
+ }
+
+ /*!
+ @brief check if the next byte(s) are inside a given range
+
+ Adds the current byte and, for each passed range, reads a new byte and
+ checks if it is inside the range. If a violation was detected, set up an
+ error message and return false. Otherwise, return true.
+
+ @param[in] ranges list of integers; interpreted as list of pairs of
+ inclusive lower and upper bound, respectively
+
+ @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+ 1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+ @return true if and only if no range violation was detected
+ */
+ bool next_byte_in_range(std::initializer_list<int> ranges)
+ {
+ assert(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6);
+ add(current);
+
+ for (auto range = ranges.begin(); range != ranges.end(); ++range)
+ {
+ get();
+ if (JSON_LIKELY(*range <= current and current <= *(++range)))
+ {
+ add(current);
+ }
+ else
+ {
+ error_message = "invalid string: ill-formed UTF-8 byte";
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /*!
+ @brief scan a string literal
+
+ This function scans a string according to Sect. 7 of RFC 7159. While
+ scanning, bytes are escaped and copied into buffer token_buffer. Then the
+ function returns successfully, token_buffer is *not* null-terminated (as it
+ may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+ string.
+
+ @return token_type::value_string if string could be successfully scanned,
+ token_type::parse_error otherwise
+
+ @note In case of errors, variable error_message contains a textual
+ description.
+ */
+ token_type scan_string()
+ {
+ // reset token_buffer (ignore opening quote)
+ reset();
+
+ // we entered the function by reading an open quote
+ assert(current == '\"');
+
+ while (true)
+ {
+ // get next character
+ switch (get())
+ {
+ // end of file while parsing string
+ case std::char_traits<char>::eof():
+ {
+ error_message = "invalid string: missing closing quote";
+ return token_type::parse_error;
+ }
+
+ // closing quote
+ case '\"':
+ {
+ return token_type::value_string;
+ }
+
+ // escapes
+ case '\\':
+ {
+ switch (get())
+ {
+ // quotation mark
+ case '\"':
+ add('\"');
+ break;
+ // reverse solidus
+ case '\\':
+ add('\\');
+ break;
+ // solidus
+ case '/':
+ add('/');
+ break;
+ // backspace
+ case 'b':
+ add('\b');
+ break;
+ // form feed
+ case 'f':
+ add('\f');
+ break;
+ // line feed
+ case 'n':
+ add('\n');
+ break;
+ // carriage return
+ case 'r':
+ add('\r');
+ break;
+ // tab
+ case 't':
+ add('\t');
+ break;
+
+ // unicode escapes
+ case 'u':
+ {
+ const int codepoint1 = get_codepoint();
+ int codepoint = codepoint1; // start with codepoint1
+
+ if (JSON_UNLIKELY(codepoint1 == -1))
+ {
+ error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+ return token_type::parse_error;
+ }
+
+ // check if code point is a high surrogate
+ if (0xD800 <= codepoint1 and codepoint1 <= 0xDBFF)
+ {
+ // expect next \uxxxx entry
+ if (JSON_LIKELY(get() == '\\' and get() == 'u'))
+ {
+ const int codepoint2 = get_codepoint();
+
+ if (JSON_UNLIKELY(codepoint2 == -1))
+ {
+ error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+ return token_type::parse_error;
+ }
+
+ // check if codepoint2 is a low surrogate
+ if (JSON_LIKELY(0xDC00 <= codepoint2 and codepoint2 <= 0xDFFF))
+ {
+ // overwrite codepoint
+ codepoint =
+ // high surrogate occupies the most significant 22 bits
+ (codepoint1 << 10)
+ // low surrogate occupies the least significant 15 bits
+ + codepoint2
+ // there is still the 0xD800, 0xDC00 and 0x10000 noise
+ // in the result so we have to subtract with:
+ // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+ - 0x35FDC00;
+ }
+ else
+ {
+ error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+ return token_type::parse_error;
+ }
+ }
+ else
+ {
+ error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+ return token_type::parse_error;
+ }
+ }
+ else
+ {
+ if (JSON_UNLIKELY(0xDC00 <= codepoint1 and codepoint1 <= 0xDFFF))
+ {
+ error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+ return token_type::parse_error;
+ }
+ }
+
+ // result of the above calculation yields a proper codepoint
+ assert(0x00 <= codepoint and codepoint <= 0x10FFFF);
+
+ // translate codepoint into bytes
+ if (codepoint < 0x80)
+ {
+ // 1-byte characters: 0xxxxxxx (ASCII)
+ add(codepoint);
+ }
+ else if (codepoint <= 0x7FF)
+ {
+ // 2-byte characters: 110xxxxx 10xxxxxx
+ add(0xC0 | (codepoint >> 6));
+ add(0x80 | (codepoint & 0x3F));
+ }
+ else if (codepoint <= 0xFFFF)
+ {
+ // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+ add(0xE0 | (codepoint >> 12));
+ add(0x80 | ((codepoint >> 6) & 0x3F));
+ add(0x80 | (codepoint & 0x3F));
+ }
+ else
+ {
+ // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+ add(0xF0 | (codepoint >> 18));
+ add(0x80 | ((codepoint >> 12) & 0x3F));
+ add(0x80 | ((codepoint >> 6) & 0x3F));
+ add(0x80 | (codepoint & 0x3F));
+ }
+
+ break;
+ }
+
+ // other characters after escape
+ default:
+ error_message = "invalid string: forbidden character after backslash";
+ return token_type::parse_error;
+ }
+
+ break;
+ }
+
+ // invalid control characters
+ case 0x00:
+ case 0x01:
+ case 0x02:
+ case 0x03:
+ case 0x04:
+ case 0x05:
+ case 0x06:
+ case 0x07:
+ case 0x08:
+ case 0x09:
+ case 0x0A:
+ case 0x0B:
+ case 0x0C:
+ case 0x0D:
+ case 0x0E:
+ case 0x0F:
+ case 0x10:
+ case 0x11:
+ case 0x12:
+ case 0x13:
+ case 0x14:
+ case 0x15:
+ case 0x16:
+ case 0x17:
+ case 0x18:
+ case 0x19:
+ case 0x1A:
+ case 0x1B:
+ case 0x1C:
+ case 0x1D:
+ case 0x1E:
+ case 0x1F:
+ {
+ error_message = "invalid string: control character must be escaped";
+ return token_type::parse_error;
+ }
+
+ // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+ case 0x20:
+ case 0x21:
+ case 0x23:
+ case 0x24:
+ case 0x25:
+ case 0x26:
+ case 0x27:
+ case 0x28:
+ case 0x29:
+ case 0x2A:
+ case 0x2B:
+ case 0x2C:
+ case 0x2D:
+ case 0x2E:
+ case 0x2F:
+ case 0x30:
+ case 0x31:
+ case 0x32:
+ case 0x33:
+ case 0x34:
+ case 0x35:
+ case 0x36:
+ case 0x37:
+ case 0x38:
+ case 0x39:
+ case 0x3A:
+ case 0x3B:
+ case 0x3C:
+ case 0x3D:
+ case 0x3E:
+ case 0x3F:
+ case 0x40:
+ case 0x41:
+ case 0x42:
+ case 0x43:
+ case 0x44:
+ case 0x45:
+ case 0x46:
+ case 0x47:
+ case 0x48:
+ case 0x49:
+ case 0x4A:
+ case 0x4B:
+ case 0x4C:
+ case 0x4D:
+ case 0x4E:
+ case 0x4F:
+ case 0x50:
+ case 0x51:
+ case 0x52:
+ case 0x53:
+ case 0x54:
+ case 0x55:
+ case 0x56:
+ case 0x57:
+ case 0x58:
+ case 0x59:
+ case 0x5A:
+ case 0x5B:
+ case 0x5D:
+ case 0x5E:
+ case 0x5F:
+ case 0x60:
+ case 0x61:
+ case 0x62:
+ case 0x63:
+ case 0x64:
+ case 0x65:
+ case 0x66:
+ case 0x67:
+ case 0x68:
+ case 0x69:
+ case 0x6A:
+ case 0x6B:
+ case 0x6C:
+ case 0x6D:
+ case 0x6E:
+ case 0x6F:
+ case 0x70:
+ case 0x71:
+ case 0x72:
+ case 0x73:
+ case 0x74:
+ case 0x75:
+ case 0x76:
+ case 0x77:
+ case 0x78:
+ case 0x79:
+ case 0x7A:
+ case 0x7B:
+ case 0x7C:
+ case 0x7D:
+ case 0x7E:
+ case 0x7F:
+ {
+ add(current);
+ break;
+ }
+
+ // U+0080..U+07FF: bytes C2..DF 80..BF
+ case 0xC2:
+ case 0xC3:
+ case 0xC4:
+ case 0xC5:
+ case 0xC6:
+ case 0xC7:
+ case 0xC8:
+ case 0xC9:
+ case 0xCA:
+ case 0xCB:
+ case 0xCC:
+ case 0xCD:
+ case 0xCE:
+ case 0xCF:
+ case 0xD0:
+ case 0xD1:
+ case 0xD2:
+ case 0xD3:
+ case 0xD4:
+ case 0xD5:
+ case 0xD6:
+ case 0xD7:
+ case 0xD8:
+ case 0xD9:
+ case 0xDA:
+ case 0xDB:
+ case 0xDC:
+ case 0xDD:
+ case 0xDE:
+ case 0xDF:
+ {
+ if (JSON_UNLIKELY(not next_byte_in_range({0x80, 0xBF})))
+ {
+ return token_type::parse_error;
+ }
+ break;
+ }
+
+ // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+ case 0xE0:
+ {
+ if (JSON_UNLIKELY(not (next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+ {
+ return token_type::parse_error;
+ }
+ break;
+ }
+
+ // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+ // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+ case 0xE1:
+ case 0xE2:
+ case 0xE3:
+ case 0xE4:
+ case 0xE5:
+ case 0xE6:
+ case 0xE7:
+ case 0xE8:
+ case 0xE9:
+ case 0xEA:
+ case 0xEB:
+ case 0xEC:
+ case 0xEE:
+ case 0xEF:
+ {
+ if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+ {
+ return token_type::parse_error;
+ }
+ break;
+ }
+
+ // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+ case 0xED:
+ {
+ if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+ {
+ return token_type::parse_error;
+ }
+ break;
+ }
+
+ // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+ case 0xF0:
+ {
+ if (JSON_UNLIKELY(not (next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+ {
+ return token_type::parse_error;
+ }
+ break;
+ }
+
+ // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+ case 0xF1:
+ case 0xF2:
+ case 0xF3:
+ {
+ if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+ {
+ return token_type::parse_error;
+ }
+ break;
+ }
+
+ // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+ case 0xF4:
+ {
+ if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+ {
+ return token_type::parse_error;
+ }
+ break;
+ }
+
+ // remaining bytes (80..C1 and F5..FF) are ill-formed
+ default:
+ {
+ error_message = "invalid string: ill-formed UTF-8 byte";
+ return token_type::parse_error;
+ }
+ }
+ }
+ }
+
+ static void strtof(float& f, const char* str, char** endptr) noexcept
+ {
+ f = std::strtof(str, endptr);
+ }
+
+ static void strtof(double& f, const char* str, char** endptr) noexcept
+ {
+ f = std::strtod(str, endptr);
+ }
+
+ static void strtof(long double& f, const char* str, char** endptr) noexcept
+ {
+ f = std::strtold(str, endptr);
+ }
+
+ /*!
+ @brief scan a number literal
+
+ This function scans a string according to Sect. 6 of RFC 7159.
+
+ The function is realized with a deterministic finite state machine derived
+ from the grammar described in RFC 7159. Starting in state "init", the
+ input is read and used to determined the next state. Only state "done"
+ accepts the number. State "error" is a trap state to model errors. In the
+ table below, "anything" means any character but the ones listed before.
+
+ state | 0 | 1-9 | e E | + | - | . | anything
+ ---------|----------|----------|----------|---------|---------|----------|-----------
+ init | zero | any1 | [error] | [error] | minus | [error] | [error]
+ minus | zero | any1 | [error] | [error] | [error] | [error] | [error]
+ zero | done | done | exponent | done | done | decimal1 | done
+ any1 | any1 | any1 | exponent | done | done | decimal1 | done
+ decimal1 | decimal2 | [error] | [error] | [error] | [error] | [error] | [error]
+ decimal2 | decimal2 | decimal2 | exponent | done | done | done | done
+ exponent | any2 | any2 | [error] | sign | sign | [error] | [error]
+ sign | any2 | any2 | [error] | [error] | [error] | [error] | [error]
+ any2 | any2 | any2 | done | done | done | done | done
+
+ The state machine is realized with one label per state (prefixed with
+ "scan_number_") and `goto` statements between them. The state machine
+ contains cycles, but any cycle can be left when EOF is read. Therefore,
+ the function is guaranteed to terminate.
+
+ During scanning, the read bytes are stored in token_buffer. This string is
+ then converted to a signed integer, an unsigned integer, or a
+ floating-point number.
+
+ @return token_type::value_unsigned, token_type::value_integer, or
+ token_type::value_float if number could be successfully scanned,
+ token_type::parse_error otherwise
+
+ @note The scanner is independent of the current locale. Internally, the
+ locale's decimal point is used instead of `.` to work with the
+ locale-dependent converters.
+ */
+ token_type scan_number()
+ {
+ // reset token_buffer to store the number's bytes
+ reset();
+
+ // the type of the parsed number; initially set to unsigned; will be
+ // changed if minus sign, decimal point or exponent is read
+ token_type number_type = token_type::value_unsigned;
+
+ // state (init): we just found out we need to scan a number
+ switch (current)
+ {
+ case '-':
+ {
+ add(current);
+ goto scan_number_minus;
+ }
+
+ case '0':
+ {
+ add(current);
+ goto scan_number_zero;
+ }
+
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ {
+ add(current);
+ goto scan_number_any1;
+ }
+
+ default:
+ {
+ // all other characters are rejected outside scan_number()
+ assert(false); // LCOV_EXCL_LINE
+ }
+ }
+
+scan_number_minus:
+ // state: we just parsed a leading minus sign
+ number_type = token_type::value_integer;
+ switch (get())
+ {
+ case '0':
+ {
+ add(current);
+ goto scan_number_zero;
+ }
+
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ {
+ add(current);
+ goto scan_number_any1;
+ }
+
+ default:
+ {
+ error_message = "invalid number; expected digit after '-'";
+ return token_type::parse_error;
+ }
+ }
+
+scan_number_zero:
+ // state: we just parse a zero (maybe with a leading minus sign)
+ switch (get())
+ {
+ case '.':
+ {
+ add(decimal_point_char);
+ goto scan_number_decimal1;
+ }
+
+ case 'e':
+ case 'E':
+ {
+ add(current);
+ goto scan_number_exponent;
+ }
+
+ default:
+ goto scan_number_done;
+ }
+
+scan_number_any1:
+ // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+ switch (get())
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ {
+ add(current);
+ goto scan_number_any1;
+ }
+
+ case '.':
+ {
+ add(decimal_point_char);
+ goto scan_number_decimal1;
+ }
+
+ case 'e':
+ case 'E':
+ {
+ add(current);
+ goto scan_number_exponent;
+ }
+
+ default:
+ goto scan_number_done;
+ }
+
+scan_number_decimal1:
+ // state: we just parsed a decimal point
+ number_type = token_type::value_float;
+ switch (get())
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ {
+ add(current);
+ goto scan_number_decimal2;
+ }
+
+ default:
+ {
+ error_message = "invalid number; expected digit after '.'";
+ return token_type::parse_error;
+ }
+ }
+
+scan_number_decimal2:
+ // we just parsed at least one number after a decimal point
+ switch (get())
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ {
+ add(current);
+ goto scan_number_decimal2;
+ }
+
+ case 'e':
+ case 'E':
+ {
+ add(current);
+ goto scan_number_exponent;
+ }
+
+ default:
+ goto scan_number_done;
+ }
+
+scan_number_exponent:
+ // we just parsed an exponent
+ number_type = token_type::value_float;
+ switch (get())
+ {
+ case '+':
+ case '-':
+ {
+ add(current);
+ goto scan_number_sign;
+ }
+
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ {
+ add(current);
+ goto scan_number_any2;
+ }
+
+ default:
+ {
+ error_message =
+ "invalid number; expected '+', '-', or digit after exponent";
+ return token_type::parse_error;
+ }
+ }
+
+scan_number_sign:
+ // we just parsed an exponent sign
+ switch (get())
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ {
+ add(current);
+ goto scan_number_any2;
+ }
+
+ default:
+ {
+ error_message = "invalid number; expected digit after exponent sign";
+ return token_type::parse_error;
+ }
+ }
+
+scan_number_any2:
+ // we just parsed a number after the exponent or exponent sign
+ switch (get())
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ {
+ add(current);
+ goto scan_number_any2;
+ }
+
+ default:
+ goto scan_number_done;
+ }
+
+scan_number_done:
+ // unget the character after the number (we only read it to know that
+ // we are done scanning a number)
+ unget();
+
+ char* endptr = nullptr;
+ errno = 0;
+
+ // try to parse integers first and fall back to floats
+ if (number_type == token_type::value_unsigned)
+ {
+ const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+ // we checked the number format before
+ assert(endptr == token_buffer.data() + token_buffer.size());
+
+ if (errno == 0)
+ {
+ value_unsigned = static_cast<number_unsigned_t>(x);
+ if (value_unsigned == x)
+ {
+ return token_type::value_unsigned;
+ }
+ }
+ }
+ else if (number_type == token_type::value_integer)
+ {
+ const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+ // we checked the number format before
+ assert(endptr == token_buffer.data() + token_buffer.size());
+
+ if (errno == 0)
+ {
+ value_integer = static_cast<number_integer_t>(x);
+ if (value_integer == x)
+ {
+ return token_type::value_integer;
+ }
+ }
+ }
+
+ // this code is reached if we parse a floating-point number or if an
+ // integer conversion above failed
+ strtof(value_float, token_buffer.data(), &endptr);
+
+ // we checked the number format before
+ assert(endptr == token_buffer.data() + token_buffer.size());
+
+ return token_type::value_float;
+ }
+
+ /*!
+ @param[in] literal_text the literal text to expect
+ @param[in] length the length of the passed literal text
+ @param[in] return_type the token type to return on success
+ */
+ token_type scan_literal(const char* literal_text, const std::size_t length,
+ token_type return_type)
+ {
+ assert(current == literal_text[0]);
+ for (std::size_t i = 1; i < length; ++i)
+ {
+ if (JSON_UNLIKELY(get() != literal_text[i]))
+ {
+ error_message = "invalid literal";
+ return token_type::parse_error;
+ }
+ }
+ return return_type;
+ }
+
+ /////////////////////
+ // input management
+ /////////////////////
+
+ /// reset token_buffer; current character is beginning of token
+ void reset() noexcept
+ {
+ token_buffer.clear();
+ token_string.clear();
+ token_string.push_back(std::char_traits<char>::to_char_type(current));
+ }
+
+ /*
+ @brief get next character from the input
+
+ This function provides the interface to the used input adapter. It does
+ not throw in case the input reached EOF, but returns a
+ `std::char_traits<char>::eof()` in that case. Stores the scanned characters
+ for use in error messages.
+
+ @return character read from the input
+ */
+ std::char_traits<char>::int_type get()
+ {
+ ++chars_read;
+ current = ia->get_character();
+ if (JSON_LIKELY(current != std::char_traits<char>::eof()))
+ {
+ token_string.push_back(std::char_traits<char>::to_char_type(current));
+ }
+ return current;
+ }
+
+ /// unget current character (return it again on next get)
+ void unget()
+ {
+ --chars_read;
+ if (JSON_LIKELY(current != std::char_traits<char>::eof()))
+ {
+ ia->unget_character();
+ assert(token_string.size() != 0);
+ token_string.pop_back();
+ }
+ }
+
+ /// add a character to token_buffer
+ void add(int c)
+ {
+ token_buffer.push_back(std::char_traits<char>::to_char_type(c));
+ }
+
+ public:
+ /////////////////////
+ // value getters
+ /////////////////////
+
+ /// return integer value
+ constexpr number_integer_t get_number_integer() const noexcept
+ {
+ return value_integer;
+ }
+
+ /// return unsigned integer value
+ constexpr number_unsigned_t get_number_unsigned() const noexcept
+ {
+ return value_unsigned;
+ }
+
+ /// return floating-point value
+ constexpr number_float_t get_number_float() const noexcept
+ {
+ return value_float;
+ }
+
+ /// return current string value (implicitly resets the token; useful only once)
+ string_t&& move_string()
+ {
+ return std::move(token_buffer);
+ }
+
+ /////////////////////
+ // diagnostics
+ /////////////////////
+
+ /// return position of last read token
+ constexpr std::size_t get_position() const noexcept
+ {
+ return chars_read;
+ }
+
+ /// return the last read token (for errors only). Will never contain EOF
+ /// (an arbitrary value that is not a valid char value, often -1), because
+ /// 255 may legitimately occur. May contain NUL, which should be escaped.
+ std::string get_token_string() const
+ {
+ // escape control characters
+ std::string result;
+ for (const auto c : token_string)
+ {
+ if ('\x00' <= c and c <= '\x1F')
+ {
+ // escape control characters
+ std::stringstream ss;
+ ss << "<U+" << std::setw(4) << std::uppercase << std::setfill('0')
+ << std::hex << static_cast<int>(c) << ">";
+ result += ss.str();
+ }
+ else
+ {
+ // add character as is
+ result.push_back(c);
+ }
+ }
+
+ return result;
+ }
+
+ /// return syntax error message
+ constexpr const char* get_error_message() const noexcept
+ {
+ return error_message;
+ }
+
+ /////////////////////
+ // actual scanner
+ /////////////////////
+
+ token_type scan()
+ {
+ // read next character and ignore whitespace
+ do
+ {
+ get();
+ }
+ while (current == ' ' or current == '\t' or current == '\n' or current == '\r');
+
+ switch (current)
+ {
+ // structural characters
+ case '[':
+ return token_type::begin_array;
+ case ']':
+ return token_type::end_array;
+ case '{':
+ return token_type::begin_object;
+ case '}':
+ return token_type::end_object;
+ case ':':
+ return token_type::name_separator;
+ case ',':
+ return token_type::value_separator;
+
+ // literals
+ case 't':
+ return scan_literal("true", 4, token_type::literal_true);
+ case 'f':
+ return scan_literal("false", 5, token_type::literal_false);
+ case 'n':
+ return scan_literal("null", 4, token_type::literal_null);
+
+ // string
+ case '\"':
+ return scan_string();
+
+ // number
+ case '-':
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ return scan_number();
+
+ // end of input (the null byte is needed when parsing from
+ // string literals)
+ case '\0':
+ case std::char_traits<char>::eof():
+ return token_type::end_of_input;
+
+ // error
+ default:
+ error_message = "invalid literal";
+ return token_type::parse_error;
+ }
+ }
+
+ private:
+ /// input adapter
+ detail::input_adapter_t ia = nullptr;
+
+ /// the current character
+ std::char_traits<char>::int_type current = std::char_traits<char>::eof();
+
+ /// the number of characters read
+ std::size_t chars_read = 0;
+
+ /// raw input token string (for error messages)
+ std::vector<char> token_string {};
+
+ /// buffer for variable-length tokens (numbers, strings)
+ string_t token_buffer {};
+
+ /// a description of occurred lexer errors
+ const char* error_message = "";
+
+ // number values
+ number_integer_t value_integer = 0;
+ number_unsigned_t value_unsigned = 0;
+ number_float_t value_float = 0;
+
+ /// the decimal point
+ const char decimal_point_char = '.';
+};
+}
+}
+
+// #include <nlohmann/detail/input/parser.hpp>
+
+
+#include <cassert> // assert
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive decent parser.
+*/
+template<typename BasicJsonType>
+class parser
+{
+ using number_integer_t = typename BasicJsonType::number_integer_t;
+ using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+ using number_float_t = typename BasicJsonType::number_float_t;
+ using string_t = typename BasicJsonType::string_t;
+ using lexer_t = lexer<BasicJsonType>;
+ using token_type = typename lexer_t::token_type;
+
+ public:
+ enum class parse_event_t : uint8_t
+ {
+ /// the parser read `{` and started to process a JSON object
+ object_start,
+ /// the parser read `}` and finished processing a JSON object
+ object_end,
+ /// the parser read `[` and started to process a JSON array
+ array_start,
+ /// the parser read `]` and finished processing a JSON array
+ array_end,
+ /// the parser read a key of a value in an object
+ key,
+ /// the parser finished reading a JSON value
+ value
+ };
+
+ using parser_callback_t =
+ std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+
+ /// a parser reading from an input adapter
+ explicit parser(detail::input_adapter_t adapter,
+ const parser_callback_t cb = nullptr,
+ const bool allow_exceptions_ = true)
+ : callback(cb), m_lexer(adapter), allow_exceptions(allow_exceptions_)
+ {}
+
+ /*!
+ @brief public parser interface
+
+ @param[in] strict whether to expect the last token to be EOF
+ @param[in,out] result parsed JSON value
+
+ @throw parse_error.101 in case of an unexpected token
+ @throw parse_error.102 if to_unicode fails or surrogate error
+ @throw parse_error.103 if to_unicode fails
+ */
+ void parse(const bool strict, BasicJsonType& result)
+ {
+ // read first token
+ get_token();
+
+ parse_internal(true, result);
+ result.assert_invariant();
+
+ // in strict mode, input must be completely read
+ if (strict)
+ {
+ get_token();
+ expect(token_type::end_of_input);
+ }
+
+ // in case of an error, return discarded value
+ if (errored)
+ {
+ result = value_t::discarded;
+ return;
+ }
+
+ // set top-level value to null if it was discarded by the callback
+ // function
+ if (result.is_discarded())
+ {
+ result = nullptr;
+ }
+ }
+
+ /*!
+ @brief public accept interface
+
+ @param[in] strict whether to expect the last token to be EOF
+ @return whether the input is a proper JSON text
+ */
+ bool accept(const bool strict = true)
+ {
+ // read first token
+ get_token();
+
+ if (not accept_internal())
+ {
+ return false;
+ }
+
+ // strict => last token must be EOF
+ return not strict or (get_token() == token_type::end_of_input);
+ }
+
+ private:
+ /*!
+ @brief the actual parser
+ @throw parse_error.101 in case of an unexpected token
+ @throw parse_error.102 if to_unicode fails or surrogate error
+ @throw parse_error.103 if to_unicode fails
+ */
+ void parse_internal(bool keep, BasicJsonType& result)
+ {
+ // never parse after a parse error was detected
+ assert(not errored);
+
+ // start with a discarded value
+ if (not result.is_discarded())
+ {
+ result.m_value.destroy(result.m_type);
+ result.m_type = value_t::discarded;
+ }
+
+ switch (last_token)
+ {
+ case token_type::begin_object:
+ {
+ if (keep)
+ {
+ if (callback)
+ {
+ keep = callback(depth++, parse_event_t::object_start, result);
+ }
+
+ if (not callback or keep)
+ {
+ // explicitly set result to object to cope with {}
+ result.m_type = value_t::object;
+ result.m_value = value_t::object;
+ }
+ }
+
+ // read next token
+ get_token();
+
+ // closing } -> we are done
+ if (last_token == token_type::end_object)
+ {
+ if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
+ {
+ result.m_value.destroy(result.m_type);
+ result.m_type = value_t::discarded;
+ }
+ break;
+ }
+
+ // parse values
+ string_t key;
+ BasicJsonType value;
+ while (true)
+ {
+ // store key
+ if (not expect(token_type::value_string))
+ {
+ return;
+ }
+ key = m_lexer.move_string();
+
+ bool keep_tag = false;
+ if (keep)
+ {
+ if (callback)
+ {
+ BasicJsonType k(key);
+ keep_tag = callback(depth, parse_event_t::key, k);
+ }
+ else
+ {
+ keep_tag = true;
+ }
+ }
+
+ // parse separator (:)
+ get_token();
+ if (not expect(token_type::name_separator))
+ {
+ return;
+ }
+
+ // parse and add value
+ get_token();
+ value.m_value.destroy(value.m_type);
+ value.m_type = value_t::discarded;
+ parse_internal(keep, value);
+
+ if (JSON_UNLIKELY(errored))
+ {
+ return;
+ }
+
+ if (keep and keep_tag and not value.is_discarded())
+ {
+ result.m_value.object->emplace(std::move(key), std::move(value));
+ }
+
+ // comma -> next value
+ get_token();
+ if (last_token == token_type::value_separator)
+ {
+ get_token();
+ continue;
+ }
+
+ // closing }
+ if (not expect(token_type::end_object))
+ {
+ return;
+ }
+ break;
+ }
+
+ if (keep and callback and not callback(--depth, parse_event_t::object_end, result))
+ {
+ result.m_value.destroy(result.m_type);
+ result.m_type = value_t::discarded;
+ }
+ break;
+ }
+
+ case token_type::begin_array:
+ {
+ if (keep)
+ {
+ if (callback)
+ {
+ keep = callback(depth++, parse_event_t::array_start, result);
+ }
+
+ if (not callback or keep)
+ {
+ // explicitly set result to array to cope with []
+ result.m_type = value_t::array;
+ result.m_value = value_t::array;
+ }
+ }
+
+ // read next token
+ get_token();
+
+ // closing ] -> we are done
+ if (last_token == token_type::end_array)
+ {
+ if (callback and not callback(--depth, parse_event_t::array_end, result))
+ {
+ result.m_value.destroy(result.m_type);
+ result.m_type = value_t::discarded;
+ }
+ break;
+ }
+
+ // parse values
+ BasicJsonType value;
+ while (true)
+ {
+ // parse value
+ value.m_value.destroy(value.m_type);
+ value.m_type = value_t::discarded;
+ parse_internal(keep, value);
+
+ if (JSON_UNLIKELY(errored))
+ {
+ return;
+ }
+
+ if (keep and not value.is_discarded())
+ {
+ result.m_value.array->push_back(std::move(value));
+ }
+
+ // comma -> next value
+ get_token();
+ if (last_token == token_type::value_separator)
+ {
+ get_token();
+ continue;
+ }
+
+ // closing ]
+ if (not expect(token_type::end_array))
+ {
+ return;
+ }
+ break;
+ }
+
+ if (keep and callback and not callback(--depth, parse_event_t::array_end, result))
+ {
+ result.m_value.destroy(result.m_type);
+ result.m_type = value_t::discarded;
+ }
+ break;
+ }
+
+ case token_type::literal_null:
+ {
+ result.m_type = value_t::null;
+ break;
+ }
+
+ case token_type::value_string:
+ {
+ result.m_type = value_t::string;
+ result.m_value = m_lexer.move_string();
+ break;
+ }
+
+ case token_type::literal_true:
+ {
+ result.m_type = value_t::boolean;
+ result.m_value = true;
+ break;
+ }
+
+ case token_type::literal_false:
+ {
+ result.m_type = value_t::boolean;
+ result.m_value = false;
+ break;
+ }
+
+ case token_type::value_unsigned:
+ {
+ result.m_type = value_t::number_unsigned;
+ result.m_value = m_lexer.get_number_unsigned();
+ break;
+ }
+
+ case token_type::value_integer:
+ {
+ result.m_type = value_t::number_integer;
+ result.m_value = m_lexer.get_number_integer();
+ break;
+ }
+
+ case token_type::value_float:
+ {
+ result.m_type = value_t::number_float;
+ result.m_value = m_lexer.get_number_float();
+
+ // throw in case of infinity or NAN
+ if (JSON_UNLIKELY(not std::isfinite(result.m_value.number_float)))
+ {
+ if (allow_exceptions)
+ {
+ JSON_THROW(out_of_range::create(406, "number overflow parsing '" +
+ m_lexer.get_token_string() + "'"));
+ }
+ expect(token_type::uninitialized);
+ }
+ break;
+ }
+
+ case token_type::parse_error:
+ {
+ // using "uninitialized" to avoid "expected" message
+ if (not expect(token_type::uninitialized))
+ {
+ return;
+ }
+ break; // LCOV_EXCL_LINE
+ }
+
+ default:
+ {
+ // the last token was unexpected; we expected a value
+ if (not expect(token_type::literal_or_value))
+ {
+ return;
+ }
+ break; // LCOV_EXCL_LINE
+ }
+ }
+
+ if (keep and callback and not callback(depth, parse_event_t::value, result))
+ {
+ result.m_value.destroy(result.m_type);
+ result.m_type = value_t::discarded;
+ }
+ }
+
+ /*!
+ @brief the actual acceptor
+
+ @invariant 1. The last token is not yet processed. Therefore, the caller
+ of this function must make sure a token has been read.
+ 2. When this function returns, the last token is processed.
+ That is, the last read character was already considered.
+
+ This invariant makes sure that no token needs to be "unput".
+ */
+ bool accept_internal()
+ {
+ switch (last_token)
+ {
+ case token_type::begin_object:
+ {
+ // read next token
+ get_token();
+
+ // closing } -> we are done
+ if (last_token == token_type::end_object)
+ {
+ return true;
+ }
+
+ // parse values
+ while (true)
+ {
+ // parse key
+ if (last_token != token_type::value_string)
+ {
+ return false;
+ }
+
+ // parse separator (:)
+ get_token();
+ if (last_token != token_type::name_separator)
+ {
+ return false;
+ }
+
+ // parse value
+ get_token();
+ if (not accept_internal())
+ {
+ return false;
+ }
+
+ // comma -> next value
+ get_token();
+ if (last_token == token_type::value_separator)
+ {
+ get_token();
+ continue;
+ }
+
+ // closing }
+ return (last_token == token_type::end_object);
+ }
+ }
+
+ case token_type::begin_array:
+ {
+ // read next token
+ get_token();
+
+ // closing ] -> we are done
+ if (last_token == token_type::end_array)
+ {
+ return true;
+ }
+
+ // parse values
+ while (true)
+ {
+ // parse value
+ if (not accept_internal())
+ {
+ return false;
+ }
+
+ // comma -> next value
+ get_token();
+ if (last_token == token_type::value_separator)
+ {
+ get_token();
+ continue;
+ }
+
+ // closing ]
+ return (last_token == token_type::end_array);
+ }
+ }
+
+ case token_type::value_float:
+ {
+ // reject infinity or NAN
+ return std::isfinite(m_lexer.get_number_float());
+ }
+
+ case token_type::literal_false:
+ case token_type::literal_null:
+ case token_type::literal_true:
+ case token_type::value_integer:
+ case token_type::value_string:
+ case token_type::value_unsigned:
+ return true;
+
+ default: // the last token was unexpected
+ return false;
+ }
+ }
+
+ /// get next token from lexer
+ token_type get_token()
+ {
+ return (last_token = m_lexer.scan());
+ }
+
+ /*!
+ @throw parse_error.101 if expected token did not occur
+ */
+ bool expect(token_type t)
+ {
+ if (JSON_UNLIKELY(t != last_token))
+ {
+ errored = true;
+ expected = t;
+ if (allow_exceptions)
+ {
+ throw_exception();
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ [[noreturn]] void throw_exception() const
+ {
+ std::string error_msg = "syntax error - ";
+ if (last_token == token_type::parse_error)
+ {
+ error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
+ m_lexer.get_token_string() + "'";
+ }
+ else
+ {
+ error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+ }
+
+ if (expected != token_type::uninitialized)
+ {
+ error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+ }
+
+ JSON_THROW(parse_error::create(101, m_lexer.get_position(), error_msg));
+ }
+
+ private:
+ /// current level of recursion
+ int depth = 0;
+ /// callback function
+ const parser_callback_t callback = nullptr;
+ /// the type of the last read token
+ token_type last_token = token_type::uninitialized;
+ /// the lexer
+ lexer_t m_lexer;
+ /// whether a syntax error occurred
+ bool errored = false;
+ /// possible reason for the syntax error
+ token_type expected = token_type::uninitialized;
+ /// whether to throw exceptions in case of errors
+ const bool allow_exceptions = true;
+};
+}
+}
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits> // numeric_limits
+
+namespace nlohmann
+{
+namespace detail
+{
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+ private:
+ using difference_type = std::ptrdiff_t;
+ static constexpr difference_type begin_value = 0;
+ static constexpr difference_type end_value = begin_value + 1;
+
+ /// iterator as signed integer type
+ difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+ public:
+ constexpr difference_type get_value() const noexcept
+ {
+ return m_it;
+ }
+
+ /// set iterator to a defined beginning
+ void set_begin() noexcept
+ {
+ m_it = begin_value;
+ }
+
+ /// set iterator to a defined past the end
+ void set_end() noexcept
+ {
+ m_it = end_value;
+ }
+
+ /// return whether the iterator can be dereferenced
+ constexpr bool is_begin() const noexcept
+ {
+ return m_it == begin_value;
+ }
+
+ /// return whether the iterator is at end
+ constexpr bool is_end() const noexcept
+ {
+ return m_it == end_value;
+ }
+
+ friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+ {
+ return lhs.m_it == rhs.m_it;
+ }
+
+ friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+ {
+ return lhs.m_it < rhs.m_it;
+ }
+
+ primitive_iterator_t operator+(difference_type n) noexcept
+ {
+ auto result = *this;
+ result += n;
+ return result;
+ }
+
+ friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+ {
+ return lhs.m_it - rhs.m_it;
+ }
+
+ primitive_iterator_t& operator++() noexcept
+ {
+ ++m_it;
+ return *this;
+ }
+
+ primitive_iterator_t const operator++(int) noexcept
+ {
+ auto result = *this;
+ m_it++;
+ return result;
+ }
+
+ primitive_iterator_t& operator--() noexcept
+ {
+ --m_it;
+ return *this;
+ }
+
+ primitive_iterator_t const operator--(int) noexcept
+ {
+ auto result = *this;
+ m_it--;
+ return result;
+ }
+
+ primitive_iterator_t& operator+=(difference_type n) noexcept
+ {
+ m_it += n;
+ return *this;
+ }
+
+ primitive_iterator_t& operator-=(difference_type n) noexcept
+ {
+ m_it -= n;
+ return *this;
+ }
+};
+}
+}
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+ /// iterator for JSON objects
+ typename BasicJsonType::object_t::iterator object_iterator {};
+ /// iterator for JSON arrays
+ typename BasicJsonType::array_t::iterator array_iterator {};
+ /// generic iterator for all other types
+ primitive_iterator_t primitive_iterator {};
+};
+}
+}
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+
+
+#include <ciso646> // not
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+
+@note An iterator is called *initialized* when a pointer to a JSON value has
+ been set (e.g., by a constructor or a copy assignment). If the iterator is
+ default-constructed, it is *uninitialized* and most methods are undefined.
+ **The library uses assertions to detect calls on uninitialized iterators.**
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](http://en.cppreference.com/w/cpp/concept/BidirectionalIterator):
+ The iterator that can be moved can be moved in both directions (i.e.
+ incremented and decremented).
+
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+ iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl
+{
+ /// allow basic_json to access private members
+ friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+ friend BasicJsonType;
+ friend iteration_proxy<iter_impl>;
+
+ using object_t = typename BasicJsonType::object_t;
+ using array_t = typename BasicJsonType::array_t;
+ // make sure BasicJsonType is basic_json or const basic_json
+ static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+ "iter_impl only accepts (const) basic_json");
+
+ public:
+
+ /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+ /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+ /// A user-defined iterator should provide publicly accessible typedefs named
+ /// iterator_category, value_type, difference_type, pointer, and reference.
+ /// Note that value_type is required to be non-const, even for constant iterators.
+ using iterator_category = std::bidirectional_iterator_tag;
+
+ /// the type of the values when the iterator is dereferenced
+ using value_type = typename BasicJsonType::value_type;
+ /// a type to represent differences between iterators
+ using difference_type = typename BasicJsonType::difference_type;
+ /// defines a pointer to the type iterated over (value_type)
+ using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+ typename BasicJsonType::const_pointer,
+ typename BasicJsonType::pointer>::type;
+ /// defines a reference to the type iterated over (value_type)
+ using reference =
+ typename std::conditional<std::is_const<BasicJsonType>::value,
+ typename BasicJsonType::const_reference,
+ typename BasicJsonType::reference>::type;
+
+ /// default constructor
+ iter_impl() = default;
+
+ /*!
+ @brief constructor for a given JSON instance
+ @param[in] object pointer to a JSON object for this iterator
+ @pre object != nullptr
+ @post The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ explicit iter_impl(pointer object) noexcept : m_object(object)
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ {
+ m_it.object_iterator = typename object_t::iterator();
+ break;
+ }
+
+ case value_t::array:
+ {
+ m_it.array_iterator = typename array_t::iterator();
+ break;
+ }
+
+ default:
+ {
+ m_it.primitive_iterator = primitive_iterator_t();
+ break;
+ }
+ }
+ }
+
+ /*!
+ @note The conventional copy constructor and copy assignment are implicitly
+ defined. Combined with the following converting constructor and
+ assignment, they support: (1) copy from iterator to iterator, (2)
+ copy from const iterator to const iterator, and (3) conversion from
+ iterator to const iterator. However conversion from const iterator
+ to iterator is not defined.
+ */
+
+ /*!
+ @brief converting constructor
+ @param[in] other non-const iterator to copy from
+ @note It is not checked whether @a other is initialized.
+ */
+ iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+ : m_object(other.m_object), m_it(other.m_it) {}
+
+ /*!
+ @brief converting assignment
+ @param[in,out] other non-const iterator to copy from
+ @return const/non-const iterator
+ @note It is not checked whether @a other is initialized.
+ */
+ iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+ {
+ m_object = other.m_object;
+ m_it = other.m_it;
+ return *this;
+ }
+
+ private:
+ /*!
+ @brief set the iterator to the first value
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ void set_begin() noexcept
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ {
+ m_it.object_iterator = m_object->m_value.object->begin();
+ break;
+ }
+
+ case value_t::array:
+ {
+ m_it.array_iterator = m_object->m_value.array->begin();
+ break;
+ }
+
+ case value_t::null:
+ {
+ // set to end so begin()==end() is true: null is empty
+ m_it.primitive_iterator.set_end();
+ break;
+ }
+
+ default:
+ {
+ m_it.primitive_iterator.set_begin();
+ break;
+ }
+ }
+ }
+
+ /*!
+ @brief set the iterator past the last value
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ void set_end() noexcept
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ {
+ m_it.object_iterator = m_object->m_value.object->end();
+ break;
+ }
+
+ case value_t::array:
+ {
+ m_it.array_iterator = m_object->m_value.array->end();
+ break;
+ }
+
+ default:
+ {
+ m_it.primitive_iterator.set_end();
+ break;
+ }
+ }
+ }
+
+ public:
+ /*!
+ @brief return a reference to the value pointed to by the iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ reference operator*() const
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ {
+ assert(m_it.object_iterator != m_object->m_value.object->end());
+ return m_it.object_iterator->second;
+ }
+
+ case value_t::array:
+ {
+ assert(m_it.array_iterator != m_object->m_value.array->end());
+ return *m_it.array_iterator;
+ }
+
+ case value_t::null:
+ JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+ default:
+ {
+ if (JSON_LIKELY(m_it.primitive_iterator.is_begin()))
+ {
+ return *m_object;
+ }
+
+ JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+ }
+ }
+ }
+
+ /*!
+ @brief dereference the iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ pointer operator->() const
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ {
+ assert(m_it.object_iterator != m_object->m_value.object->end());
+ return &(m_it.object_iterator->second);
+ }
+
+ case value_t::array:
+ {
+ assert(m_it.array_iterator != m_object->m_value.array->end());
+ return &*m_it.array_iterator;
+ }
+
+ default:
+ {
+ if (JSON_LIKELY(m_it.primitive_iterator.is_begin()))
+ {
+ return m_object;
+ }
+
+ JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+ }
+ }
+ }
+
+ /*!
+ @brief post-increment (it++)
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ iter_impl const operator++(int)
+ {
+ auto result = *this;
+ ++(*this);
+ return result;
+ }
+
+ /*!
+ @brief pre-increment (++it)
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ iter_impl& operator++()
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ {
+ std::advance(m_it.object_iterator, 1);
+ break;
+ }
+
+ case value_t::array:
+ {
+ std::advance(m_it.array_iterator, 1);
+ break;
+ }
+
+ default:
+ {
+ ++m_it.primitive_iterator;
+ break;
+ }
+ }
+
+ return *this;
+ }
+
+ /*!
+ @brief post-decrement (it--)
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ iter_impl const operator--(int)
+ {
+ auto result = *this;
+ --(*this);
+ return result;
+ }
+
+ /*!
+ @brief pre-decrement (--it)
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ iter_impl& operator--()
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ {
+ std::advance(m_it.object_iterator, -1);
+ break;
+ }
+
+ case value_t::array:
+ {
+ std::advance(m_it.array_iterator, -1);
+ break;
+ }
+
+ default:
+ {
+ --m_it.primitive_iterator;
+ break;
+ }
+ }
+
+ return *this;
+ }
+
+ /*!
+ @brief comparison: equal
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ bool operator==(const iter_impl& other) const
+ {
+ // if objects are not the same, the comparison is undefined
+ if (JSON_UNLIKELY(m_object != other.m_object))
+ {
+ JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+ }
+
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ return (m_it.object_iterator == other.m_it.object_iterator);
+
+ case value_t::array:
+ return (m_it.array_iterator == other.m_it.array_iterator);
+
+ default:
+ return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+ }
+ }
+
+ /*!
+ @brief comparison: not equal
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ bool operator!=(const iter_impl& other) const
+ {
+ return not operator==(other);
+ }
+
+ /*!
+ @brief comparison: smaller
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ bool operator<(const iter_impl& other) const
+ {
+ // if objects are not the same, the comparison is undefined
+ if (JSON_UNLIKELY(m_object != other.m_object))
+ {
+ JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+ }
+
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators"));
+
+ case value_t::array:
+ return (m_it.array_iterator < other.m_it.array_iterator);
+
+ default:
+ return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+ }
+ }
+
+ /*!
+ @brief comparison: less than or equal
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ bool operator<=(const iter_impl& other) const
+ {
+ return not other.operator < (*this);
+ }
+
+ /*!
+ @brief comparison: greater than
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ bool operator>(const iter_impl& other) const
+ {
+ return not operator<=(other);
+ }
+
+ /*!
+ @brief comparison: greater than or equal
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ bool operator>=(const iter_impl& other) const
+ {
+ return not operator<(other);
+ }
+
+ /*!
+ @brief add to iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ iter_impl& operator+=(difference_type i)
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+ case value_t::array:
+ {
+ std::advance(m_it.array_iterator, i);
+ break;
+ }
+
+ default:
+ {
+ m_it.primitive_iterator += i;
+ break;
+ }
+ }
+
+ return *this;
+ }
+
+ /*!
+ @brief subtract from iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ iter_impl& operator-=(difference_type i)
+ {
+ return operator+=(-i);
+ }
+
+ /*!
+ @brief add to iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ iter_impl operator+(difference_type i) const
+ {
+ auto result = *this;
+ result += i;
+ return result;
+ }
+
+ /*!
+ @brief addition of distance and iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ friend iter_impl operator+(difference_type i, const iter_impl& it)
+ {
+ auto result = it;
+ result += i;
+ return result;
+ }
+
+ /*!
+ @brief subtract from iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ iter_impl operator-(difference_type i) const
+ {
+ auto result = *this;
+ result -= i;
+ return result;
+ }
+
+ /*!
+ @brief return difference
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ difference_type operator-(const iter_impl& other) const
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+ case value_t::array:
+ return m_it.array_iterator - other.m_it.array_iterator;
+
+ default:
+ return m_it.primitive_iterator - other.m_it.primitive_iterator;
+ }
+ }
+
+ /*!
+ @brief access to successor
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ reference operator[](difference_type n) const
+ {
+ assert(m_object != nullptr);
+
+ switch (m_object->m_type)
+ {
+ case value_t::object:
+ JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
+
+ case value_t::array:
+ return *std::next(m_it.array_iterator, n);
+
+ case value_t::null:
+ JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+ default:
+ {
+ if (JSON_LIKELY(m_it.primitive_iterator.get_value() == -n))
+ {
+ return *m_object;
+ }
+
+ JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+ }
+ }
+ }
+
+ /*!
+ @brief return the key of an object iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ typename object_t::key_type key() const
+ {
+ assert(m_object != nullptr);
+
+ if (JSON_LIKELY(m_object->is_object()))
+ {
+ return m_it.object_iterator->first;
+ }
+
+ JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
+ }
+
+ /*!
+ @brief return the value of an iterator
+ @pre The iterator is initialized; i.e. `m_object != nullptr`.
+ */
+ reference value() const
+ {
+ return operator*();
+ }
+
+ private:
+ /// associated JSON instance
+ pointer m_object = nullptr;
+ /// the actual iterator of the associated instance
+ internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it;
+};
+}
+}
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+
+#include <cstddef> // size_t
+#include <string> // string, to_string
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+ private:
+ /// helper class for iteration
+ class iteration_proxy_internal
+ {
+ private:
+ /// the iterator
+ IteratorType anchor;
+ /// an index for arrays (used to create key names)
+ std::size_t array_index = 0;
+
+ public:
+ explicit iteration_proxy_internal(IteratorType it) noexcept : anchor(it) {}
+
+ /// dereference operator (needed for range-based for)
+ iteration_proxy_internal& operator*()
+ {
+ return *this;
+ }
+
+ /// increment operator (needed for range-based for)
+ iteration_proxy_internal& operator++()
+ {
+ ++anchor;
+ ++array_index;
+
+ return *this;
+ }
+
+ /// inequality operator (needed for range-based for)
+ bool operator!=(const iteration_proxy_internal& o) const noexcept
+ {
+ return anchor != o.anchor;
+ }
+
+ /// return key of the iterator
+ std::string key() const
+ {
+ assert(anchor.m_object != nullptr);
+
+ switch (anchor.m_object->type())
+ {
+ // use integer array index as key
+ case value_t::array:
+ return std::to_string(array_index);
+
+ // use key from the object
+ case value_t::object:
+ return anchor.key();
+
+ // use an empty key for all primitive types
+ default:
+ return "";
+ }
+ }
+
+ /// return value of the iterator
+ typename IteratorType::reference value() const
+ {
+ return anchor.value();
+ }
+ };
+
+ /// the container to iterate
+ typename IteratorType::reference container;
+
+ public:
+ /// construct iteration proxy from a container
+ explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+ : container(cont) {}
+
+ /// return iterator begin (needed for range-based for)
+ iteration_proxy_internal begin() noexcept
+ {
+ return iteration_proxy_internal(container.begin());
+ }
+
+ /// return iterator end (needed for range-based for)
+ iteration_proxy_internal end() noexcept
+ {
+ return iteration_proxy_internal(container.end());
+ }
+};
+}
+}
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](http://en.cppreference.com/w/cpp/concept/BidirectionalIterator):
+ The iterator that can be moved can be moved in both directions (i.e.
+ incremented and decremented).
+- [OutputIterator](http://en.cppreference.com/w/cpp/concept/OutputIterator):
+ It is possible to write to the pointed-to element (only if @a Base is
+ @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+ public:
+ using difference_type = std::ptrdiff_t;
+ /// shortcut to the reverse iterator adapter
+ using base_iterator = std::reverse_iterator<Base>;
+ /// the reference type for the pointed-to element
+ using reference = typename Base::reference;
+
+ /// create reverse iterator from iterator
+ json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+ : base_iterator(it) {}
+
+ /// create reverse iterator from base class
+ json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+ /// post-increment (it++)
+ json_reverse_iterator const operator++(int)
+ {
+ return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+ }
+
+ /// pre-increment (++it)
+ json_reverse_iterator& operator++()
+ {
+ return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+ }
+
+ /// post-decrement (it--)
+ json_reverse_iterator const operator--(int)
+ {
+ return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+ }
+
+ /// pre-decrement (--it)
+ json_reverse_iterator& operator--()
+ {
+ return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+ }
+
+ /// add to iterator
+ json_reverse_iterator& operator+=(difference_type i)
+ {
+ return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+ }
+
+ /// add to iterator
+ json_reverse_iterator operator+(difference_type i) const
+ {
+ return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+ }
+
+ /// subtract from iterator
+ json_reverse_iterator operator-(difference_type i) const
+ {
+ return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+ }
+
+ /// return difference
+ difference_type operator-(const json_reverse_iterator& other) const
+ {
+ return base_iterator(*this) - base_iterator(other);
+ }
+
+ /// access to successor
+ reference operator[](difference_type n) const
+ {
+ return *(this->operator+(n));
+ }
+
+ /// return the key of an object iterator
+ auto key() const -> decltype(std::declval<Base>().key())
+ {
+ auto it = --this->base();
+ return it.key();
+ }
+
+ /// return the value of an iterator
+ reference value() const
+ {
+ auto it = --this->base();
+ return it.operator * ();
+ }
+};
+}
+}
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <ios> // streamsize
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <ostream> // basic_ostream
+#include <string> // basic_string
+#include <vector> // vector
+
+namespace nlohmann
+{
+namespace detail
+{
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+ virtual void write_character(CharType c) = 0;
+ virtual void write_characters(const CharType* s, std::size_t length) = 0;
+ virtual ~output_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+ public:
+ explicit output_vector_adapter(std::vector<CharType>& vec) : v(vec) {}
+
+ void write_character(CharType c) override
+ {
+ v.push_back(c);
+ }
+
+ void write_characters(const CharType* s, std::size_t length) override
+ {
+ std::copy(s, s + length, std::back_inserter(v));
+ }
+
+ private:
+ std::vector<CharType>& v;
+};
+
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+ public:
+ explicit output_stream_adapter(std::basic_ostream<CharType>& s) : stream(s) {}
+
+ void write_character(CharType c) override
+ {
+ stream.put(c);
+ }
+
+ void write_characters(const CharType* s, std::size_t length) override
+ {
+ stream.write(s, static_cast<std::streamsize>(length));
+ }
+
+ private:
+ std::basic_ostream<CharType>& stream;
+};
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+ public:
+ explicit output_string_adapter(StringType& s) : str(s) {}
+
+ void write_character(CharType c) override
+ {
+ str.push_back(c);
+ }
+
+ void write_characters(const CharType* s, std::size_t length) override
+ {
+ str.append(s, length);
+ }
+
+ private:
+ StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+ public:
+ output_adapter(std::vector<CharType>& vec)
+ : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
+
+ output_adapter(std::basic_ostream<CharType>& s)
+ : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+
+ output_adapter(StringType& s)
+ : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+ operator output_adapter_t<CharType>()
+ {
+ return oa;
+ }
+
+ private:
+ output_adapter_t<CharType> oa = nullptr;
+};
+}
+}
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cassert> // assert
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <iomanip> // setw, setfill
+#include <ios> // hex
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <sstream> // stringstream
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR and MessagePack values
+*/
+template<typename BasicJsonType>
+class binary_reader
+{
+ using number_integer_t = typename BasicJsonType::number_integer_t;
+ using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+ using string_t = typename BasicJsonType::string_t;
+
+ public:
+ /*!
+ @brief create a binary reader
+
+ @param[in] adapter input adapter to read from
+ */
+ explicit binary_reader(input_adapter_t adapter) : ia(std::move(adapter))
+ {
+ assert(ia);
+ }
+
+ /*!
+ @brief create a JSON value from CBOR input
+
+ @param[in] strict whether to expect the input to be consumed completed
+ @return JSON value created from CBOR input
+
+ @throw parse_error.110 if input ended unexpectedly or the end of file was
+ not reached when @a strict was set to true
+ @throw parse_error.112 if unsupported byte was read
+ */
+ BasicJsonType parse_cbor(const bool strict)
+ {
+ const auto res = parse_cbor_internal();
+ if (strict)
+ {
+ get();
+ expect_eof();
+ }
+ return res;
+ }
+
+ /*!
+ @brief create a JSON value from MessagePack input
+
+ @param[in] strict whether to expect the input to be consumed completed
+ @return JSON value created from MessagePack input
+
+ @throw parse_error.110 if input ended unexpectedly or the end of file was
+ not reached when @a strict was set to true
+ @throw parse_error.112 if unsupported byte was read
+ */
+ BasicJsonType parse_msgpack(const bool strict)
+ {
+ const auto res = parse_msgpack_internal();
+ if (strict)
+ {
+ get();
+ expect_eof();
+ }
+ return res;
+ }
+
+ /*!
+ @brief create a JSON value from UBJSON input
+
+ @param[in] strict whether to expect the input to be consumed completed
+ @return JSON value created from UBJSON input
+
+ @throw parse_error.110 if input ended unexpectedly or the end of file was
+ not reached when @a strict was set to true
+ @throw parse_error.112 if unsupported byte was read
+ */
+ BasicJsonType parse_ubjson(const bool strict)
+ {
+ const auto res = parse_ubjson_internal();
+ if (strict)
+ {
+ get_ignore_noop();
+ expect_eof();
+ }
+ return res;
+ }
+
+ /*!
+ @brief determine system byte order
+
+ @return true if and only if system's byte order is little endian
+
+ @note from http://stackoverflow.com/a/1001328/266378
+ */
+ static constexpr bool little_endianess(int num = 1) noexcept
+ {
+ return (*reinterpret_cast<char*>(&num) == 1);
+ }
+
+ private:
+ /*!
+ @param[in] get_char whether a new character should be retrieved from the
+ input (true, default) or whether the last read
+ character should be considered instead
+ */
+ BasicJsonType parse_cbor_internal(const bool get_char = true)
+ {
+ switch (get_char ? get() : current)
+ {
+ // EOF
+ case std::char_traits<char>::eof():
+ JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
+
+ // Integer 0x00..0x17 (0..23)
+ case 0x00:
+ case 0x01:
+ case 0x02:
+ case 0x03:
+ case 0x04:
+ case 0x05:
+ case 0x06:
+ case 0x07:
+ case 0x08:
+ case 0x09:
+ case 0x0A:
+ case 0x0B:
+ case 0x0C:
+ case 0x0D:
+ case 0x0E:
+ case 0x0F:
+ case 0x10:
+ case 0x11:
+ case 0x12:
+ case 0x13:
+ case 0x14:
+ case 0x15:
+ case 0x16:
+ case 0x17:
+ return static_cast<number_unsigned_t>(current);
+
+ case 0x18: // Unsigned integer (one-byte uint8_t follows)
+ return get_number<uint8_t>();
+
+ case 0x19: // Unsigned integer (two-byte uint16_t follows)
+ return get_number<uint16_t>();
+
+ case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+ return get_number<uint32_t>();
+
+ case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+ return get_number<uint64_t>();
+
+ // Negative integer -1-0x00..-1-0x17 (-1..-24)
+ case 0x20:
+ case 0x21:
+ case 0x22:
+ case 0x23:
+ case 0x24:
+ case 0x25:
+ case 0x26:
+ case 0x27:
+ case 0x28:
+ case 0x29:
+ case 0x2A:
+ case 0x2B:
+ case 0x2C:
+ case 0x2D:
+ case 0x2E:
+ case 0x2F:
+ case 0x30:
+ case 0x31:
+ case 0x32:
+ case 0x33:
+ case 0x34:
+ case 0x35:
+ case 0x36:
+ case 0x37:
+ return static_cast<int8_t>(0x20 - 1 - current);
+
+ case 0x38: // Negative integer (one-byte uint8_t follows)
+ {
+ return static_cast<number_integer_t>(-1) - get_number<uint8_t>();
+ }
+
+ case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+ {
+ return static_cast<number_integer_t>(-1) - get_number<uint16_t>();
+ }
+
+ case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+ {
+ return static_cast<number_integer_t>(-1) - get_number<uint32_t>();
+ }
+
+ case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+ {
+ return static_cast<number_integer_t>(-1) -
+ static_cast<number_integer_t>(get_number<uint64_t>());
+ }
+
+ // UTF-8 string (0x00..0x17 bytes follow)
+ case 0x60:
+ case 0x61:
+ case 0x62:
+ case 0x63:
+ case 0x64:
+ case 0x65:
+ case 0x66:
+ case 0x67:
+ case 0x68:
+ case 0x69:
+ case 0x6A:
+ case 0x6B:
+ case 0x6C:
+ case 0x6D:
+ case 0x6E:
+ case 0x6F:
+ case 0x70:
+ case 0x71:
+ case 0x72:
+ case 0x73:
+ case 0x74:
+ case 0x75:
+ case 0x76:
+ case 0x77:
+ case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+ case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+ case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+ case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+ case 0x7F: // UTF-8 string (indefinite length)
+ {
+ return get_cbor_string();
+ }
+
+ // array (0x00..0x17 data items follow)
+ case 0x80:
+ case 0x81:
+ case 0x82:
+ case 0x83:
+ case 0x84:
+ case 0x85:
+ case 0x86:
+ case 0x87:
+ case 0x88:
+ case 0x89:
+ case 0x8A:
+ case 0x8B:
+ case 0x8C:
+ case 0x8D:
+ case 0x8E:
+ case 0x8F:
+ case 0x90:
+ case 0x91:
+ case 0x92:
+ case 0x93:
+ case 0x94:
+ case 0x95:
+ case 0x96:
+ case 0x97:
+ {
+ return get_cbor_array(current & 0x1F);
+ }
+
+ case 0x98: // array (one-byte uint8_t for n follows)
+ {
+ return get_cbor_array(get_number<uint8_t>());
+ }
+
+ case 0x99: // array (two-byte uint16_t for n follow)
+ {
+ return get_cbor_array(get_number<uint16_t>());
+ }
+
+ case 0x9A: // array (four-byte uint32_t for n follow)
+ {
+ return get_cbor_array(get_number<uint32_t>());
+ }
+
+ case 0x9B: // array (eight-byte uint64_t for n follow)
+ {
+ return get_cbor_array(get_number<uint64_t>());
+ }
+
+ case 0x9F: // array (indefinite length)
+ {
+ BasicJsonType result = value_t::array;
+ while (get() != 0xFF)
+ {
+ result.push_back(parse_cbor_internal(false));
+ }
+ return result;
+ }
+
+ // map (0x00..0x17 pairs of data items follow)
+ case 0xA0:
+ case 0xA1:
+ case 0xA2:
+ case 0xA3:
+ case 0xA4:
+ case 0xA5:
+ case 0xA6:
+ case 0xA7:
+ case 0xA8:
+ case 0xA9:
+ case 0xAA:
+ case 0xAB:
+ case 0xAC:
+ case 0xAD:
+ case 0xAE:
+ case 0xAF:
+ case 0xB0:
+ case 0xB1:
+ case 0xB2:
+ case 0xB3:
+ case 0xB4:
+ case 0xB5:
+ case 0xB6:
+ case 0xB7:
+ {
+ return get_cbor_object(current & 0x1F);
+ }
+
+ case 0xB8: // map (one-byte uint8_t for n follows)
+ {
+ return get_cbor_object(get_number<uint8_t>());
+ }
+
+ case 0xB9: // map (two-byte uint16_t for n follow)
+ {
+ return get_cbor_object(get_number<uint16_t>());
+ }
+
+ case 0xBA: // map (four-byte uint32_t for n follow)
+ {
+ return get_cbor_object(get_number<uint32_t>());
+ }
+
+ case 0xBB: // map (eight-byte uint64_t for n follow)
+ {
+ return get_cbor_object(get_number<uint64_t>());
+ }
+
+ case 0xBF: // map (indefinite length)
+ {
+ BasicJsonType result = value_t::object;
+ while (get() != 0xFF)
+ {
+ auto key = get_cbor_string();
+ result[key] = parse_cbor_internal();
+ }
+ return result;
+ }
+
+ case 0xF4: // false
+ {
+ return false;
+ }
+
+ case 0xF5: // true
+ {
+ return true;
+ }
+
+ case 0xF6: // null
+ {
+ return value_t::null;
+ }
+
+ case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+ {
+ const int byte1 = get();
+ unexpect_eof();
+ const int byte2 = get();
+ unexpect_eof();
+
+ // code from RFC 7049, Appendix D, Figure 3:
+ // As half-precision floating-point numbers were only added
+ // to IEEE 754 in 2008, today's programming platforms often
+ // still only have limited support for them. It is very
+ // easy to include at least decoding support for them even
+ // without such support. An example of a small decoder for
+ // half-precision floating-point numbers in the C language
+ // is shown in Fig. 3.
+ const int half = (byte1 << 8) + byte2;
+ const int exp = (half >> 10) & 0x1F;
+ const int mant = half & 0x3FF;
+ double val;
+ if (exp == 0)
+ {
+ val = std::ldexp(mant, -24);
+ }
+ else if (exp != 31)
+ {
+ val = std::ldexp(mant + 1024, exp - 25);
+ }
+ else
+ {
+ val = (mant == 0) ? std::numeric_limits<double>::infinity()
+ : std::numeric_limits<double>::quiet_NaN();
+ }
+ return (half & 0x8000) != 0 ? -val : val;
+ }
+
+ case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+ {
+ return get_number<float>();
+ }
+
+ case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+ {
+ return get_number<double>();
+ }
+
+ default: // anything else (0xFF is handled inside the other types)
+ {
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+ JSON_THROW(parse_error::create(112, chars_read, "error reading CBOR; last byte: 0x" + ss.str()));
+ }
+ }
+ }
+
+ BasicJsonType parse_msgpack_internal()
+ {
+ switch (get())
+ {
+ // EOF
+ case std::char_traits<char>::eof():
+ JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
+
+ // positive fixint
+ case 0x00:
+ case 0x01:
+ case 0x02:
+ case 0x03:
+ case 0x04:
+ case 0x05:
+ case 0x06:
+ case 0x07:
+ case 0x08:
+ case 0x09:
+ case 0x0A:
+ case 0x0B:
+ case 0x0C:
+ case 0x0D:
+ case 0x0E:
+ case 0x0F:
+ case 0x10:
+ case 0x11:
+ case 0x12:
+ case 0x13:
+ case 0x14:
+ case 0x15:
+ case 0x16:
+ case 0x17:
+ case 0x18:
+ case 0x19:
+ case 0x1A:
+ case 0x1B:
+ case 0x1C:
+ case 0x1D:
+ case 0x1E:
+ case 0x1F:
+ case 0x20:
+ case 0x21:
+ case 0x22:
+ case 0x23:
+ case 0x24:
+ case 0x25:
+ case 0x26:
+ case 0x27:
+ case 0x28:
+ case 0x29:
+ case 0x2A:
+ case 0x2B:
+ case 0x2C:
+ case 0x2D:
+ case 0x2E:
+ case 0x2F:
+ case 0x30:
+ case 0x31:
+ case 0x32:
+ case 0x33:
+ case 0x34:
+ case 0x35:
+ case 0x36:
+ case 0x37:
+ case 0x38:
+ case 0x39:
+ case 0x3A:
+ case 0x3B:
+ case 0x3C:
+ case 0x3D:
+ case 0x3E:
+ case 0x3F:
+ case 0x40:
+ case 0x41:
+ case 0x42:
+ case 0x43:
+ case 0x44:
+ case 0x45:
+ case 0x46:
+ case 0x47:
+ case 0x48:
+ case 0x49:
+ case 0x4A:
+ case 0x4B:
+ case 0x4C:
+ case 0x4D:
+ case 0x4E:
+ case 0x4F:
+ case 0x50:
+ case 0x51:
+ case 0x52:
+ case 0x53:
+ case 0x54:
+ case 0x55:
+ case 0x56:
+ case 0x57:
+ case 0x58:
+ case 0x59:
+ case 0x5A:
+ case 0x5B:
+ case 0x5C:
+ case 0x5D:
+ case 0x5E:
+ case 0x5F:
+ case 0x60:
+ case 0x61:
+ case 0x62:
+ case 0x63:
+ case 0x64:
+ case 0x65:
+ case 0x66:
+ case 0x67:
+ case 0x68:
+ case 0x69:
+ case 0x6A:
+ case 0x6B:
+ case 0x6C:
+ case 0x6D:
+ case 0x6E:
+ case 0x6F:
+ case 0x70:
+ case 0x71:
+ case 0x72:
+ case 0x73:
+ case 0x74:
+ case 0x75:
+ case 0x76:
+ case 0x77:
+ case 0x78:
+ case 0x79:
+ case 0x7A:
+ case 0x7B:
+ case 0x7C:
+ case 0x7D:
+ case 0x7E:
+ case 0x7F:
+ return static_cast<number_unsigned_t>(current);
+
+ // fixmap
+ case 0x80:
+ case 0x81:
+ case 0x82:
+ case 0x83:
+ case 0x84:
+ case 0x85:
+ case 0x86:
+ case 0x87:
+ case 0x88:
+ case 0x89:
+ case 0x8A:
+ case 0x8B:
+ case 0x8C:
+ case 0x8D:
+ case 0x8E:
+ case 0x8F:
+ {
+ return get_msgpack_object(current & 0x0F);
+ }
+
+ // fixarray
+ case 0x90:
+ case 0x91:
+ case 0x92:
+ case 0x93:
+ case 0x94:
+ case 0x95:
+ case 0x96:
+ case 0x97:
+ case 0x98:
+ case 0x99:
+ case 0x9A:
+ case 0x9B:
+ case 0x9C:
+ case 0x9D:
+ case 0x9E:
+ case 0x9F:
+ {
+ return get_msgpack_array(current & 0x0F);
+ }
+
+ // fixstr
+ case 0xA0:
+ case 0xA1:
+ case 0xA2:
+ case 0xA3:
+ case 0xA4:
+ case 0xA5:
+ case 0xA6:
+ case 0xA7:
+ case 0xA8:
+ case 0xA9:
+ case 0xAA:
+ case 0xAB:
+ case 0xAC:
+ case 0xAD:
+ case 0xAE:
+ case 0xAF:
+ case 0xB0:
+ case 0xB1:
+ case 0xB2:
+ case 0xB3:
+ case 0xB4:
+ case 0xB5:
+ case 0xB6:
+ case 0xB7:
+ case 0xB8:
+ case 0xB9:
+ case 0xBA:
+ case 0xBB:
+ case 0xBC:
+ case 0xBD:
+ case 0xBE:
+ case 0xBF:
+ return get_msgpack_string();
+
+ case 0xC0: // nil
+ return value_t::null;
+
+ case 0xC2: // false
+ return false;
+
+ case 0xC3: // true
+ return true;
+
+ case 0xCA: // float 32
+ return get_number<float>();
+
+ case 0xCB: // float 64
+ return get_number<double>();
+
+ case 0xCC: // uint 8
+ return get_number<uint8_t>();
+
+ case 0xCD: // uint 16
+ return get_number<uint16_t>();
+
+ case 0xCE: // uint 32
+ return get_number<uint32_t>();
+
+ case 0xCF: // uint 64
+ return get_number<uint64_t>();
+
+ case 0xD0: // int 8
+ return get_number<int8_t>();
+
+ case 0xD1: // int 16
+ return get_number<int16_t>();
+
+ case 0xD2: // int 32
+ return get_number<int32_t>();
+
+ case 0xD3: // int 64
+ return get_number<int64_t>();
+
+ case 0xD9: // str 8
+ case 0xDA: // str 16
+ case 0xDB: // str 32
+ return get_msgpack_string();
+
+ case 0xDC: // array 16
+ {
+ return get_msgpack_array(get_number<uint16_t>());
+ }
+
+ case 0xDD: // array 32
+ {
+ return get_msgpack_array(get_number<uint32_t>());
+ }
+
+ case 0xDE: // map 16
+ {
+ return get_msgpack_object(get_number<uint16_t>());
+ }
+
+ case 0xDF: // map 32
+ {
+ return get_msgpack_object(get_number<uint32_t>());
+ }
+
+ // positive fixint
+ case 0xE0:
+ case 0xE1:
+ case 0xE2:
+ case 0xE3:
+ case 0xE4:
+ case 0xE5:
+ case 0xE6:
+ case 0xE7:
+ case 0xE8:
+ case 0xE9:
+ case 0xEA:
+ case 0xEB:
+ case 0xEC:
+ case 0xED:
+ case 0xEE:
+ case 0xEF:
+ case 0xF0:
+ case 0xF1:
+ case 0xF2:
+ case 0xF3:
+ case 0xF4:
+ case 0xF5:
+ case 0xF6:
+ case 0xF7:
+ case 0xF8:
+ case 0xF9:
+ case 0xFA:
+ case 0xFB:
+ case 0xFC:
+ case 0xFD:
+ case 0xFE:
+ case 0xFF:
+ return static_cast<int8_t>(current);
+
+ default: // anything else
+ {
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+ JSON_THROW(parse_error::create(112, chars_read,
+ "error reading MessagePack; last byte: 0x" + ss.str()));
+ }
+ }
+ }
+
+ /*!
+ @param[in] get_char whether a new character should be retrieved from the
+ input (true, default) or whether the last read
+ character should be considered instead
+ */
+ BasicJsonType parse_ubjson_internal(const bool get_char = true)
+ {
+ return get_ubjson_value(get_char ? get_ignore_noop() : current);
+ }
+
+ /*!
+ @brief get next character from the input
+
+ This function provides the interface to the used input adapter. It does
+ not throw in case the input reached EOF, but returns a -'ve valued
+ `std::char_traits<char>::eof()` in that case.
+
+ @return character read from the input
+ */
+ int get()
+ {
+ ++chars_read;
+ return (current = ia->get_character());
+ }
+
+ /*!
+ @return character read from the input after ignoring all 'N' entries
+ */
+ int get_ignore_noop()
+ {
+ do
+ {
+ get();
+ }
+ while (current == 'N');
+
+ return current;
+ }
+
+ /*
+ @brief read a number from the input
+
+ @tparam NumberType the type of the number
+
+ @return number of type @a NumberType
+
+ @note This function needs to respect the system's endianess, because
+ bytes in CBOR and MessagePack are stored in network order (big
+ endian) and therefore need reordering on little endian systems.
+
+ @throw parse_error.110 if input has less than `sizeof(NumberType)` bytes
+ */
+ template<typename NumberType> NumberType get_number()
+ {
+ // step 1: read input into array with system's byte order
+ std::array<uint8_t, sizeof(NumberType)> vec;
+ for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+ {
+ get();
+ unexpect_eof();
+
+ // reverse byte order prior to conversion if necessary
+ if (is_little_endian)
+ {
+ vec[sizeof(NumberType) - i - 1] = static_cast<uint8_t>(current);
+ }
+ else
+ {
+ vec[i] = static_cast<uint8_t>(current); // LCOV_EXCL_LINE
+ }
+ }
+
+ // step 2: convert array into number of type T and return
+ NumberType result;
+ std::memcpy(&result, vec.data(), sizeof(NumberType));
+ return result;
+ }
+
+ /*!
+ @brief create a string by reading characters from the input
+
+ @param[in] len number of bytes to read
+
+ @note We can not reserve @a len bytes for the result, because @a len
+ may be too large. Usually, @ref unexpect_eof() detects the end of
+ the input before we run out of string memory.
+
+ @return string created by reading @a len bytes
+
+ @throw parse_error.110 if input has less than @a len bytes
+ */
+ template<typename NumberType>
+ string_t get_string(const NumberType len)
+ {
+ string_t result;
+ std::generate_n(std::back_inserter(result), len, [this]()
+ {
+ get();
+ unexpect_eof();
+ return static_cast<char>(current);
+ });
+ return result;
+ }
+
+ /*!
+ @brief reads a CBOR string
+
+ This function first reads starting bytes to determine the expected
+ string length and then copies this number of bytes into a string.
+ Additionally, CBOR's strings with indefinite lengths are supported.
+
+ @return string
+
+ @throw parse_error.110 if input ended
+ @throw parse_error.113 if an unexpected byte is read
+ */
+ string_t get_cbor_string()
+ {
+ unexpect_eof();
+
+ switch (current)
+ {
+ // UTF-8 string (0x00..0x17 bytes follow)
+ case 0x60:
+ case 0x61:
+ case 0x62:
+ case 0x63:
+ case 0x64:
+ case 0x65:
+ case 0x66:
+ case 0x67:
+ case 0x68:
+ case 0x69:
+ case 0x6A:
+ case 0x6B:
+ case 0x6C:
+ case 0x6D:
+ case 0x6E:
+ case 0x6F:
+ case 0x70:
+ case 0x71:
+ case 0x72:
+ case 0x73:
+ case 0x74:
+ case 0x75:
+ case 0x76:
+ case 0x77:
+ {
+ return get_string(current & 0x1F);
+ }
+
+ case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+ {
+ return get_string(get_number<uint8_t>());
+ }
+
+ case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+ {
+ return get_string(get_number<uint16_t>());
+ }
+
+ case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+ {
+ return get_string(get_number<uint32_t>());
+ }
+
+ case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+ {
+ return get_string(get_number<uint64_t>());
+ }
+
+ case 0x7F: // UTF-8 string (indefinite length)
+ {
+ string_t result;
+ while (get() != 0xFF)
+ {
+ result.append(get_cbor_string());
+ }
+ return result;
+ }
+
+ default:
+ {
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+ JSON_THROW(parse_error::create(113, chars_read, "expected a CBOR string; last byte: 0x" + ss.str()));
+ }
+ }
+ }
+
+ template<typename NumberType>
+ BasicJsonType get_cbor_array(const NumberType len)
+ {
+ BasicJsonType result = value_t::array;
+ std::generate_n(std::back_inserter(*result.m_value.array), len, [this]()
+ {
+ return parse_cbor_internal();
+ });
+ return result;
+ }
+
+ template<typename NumberType>
+ BasicJsonType get_cbor_object(const NumberType len)
+ {
+ BasicJsonType result = value_t::object;
+ std::generate_n(std::inserter(*result.m_value.object,
+ result.m_value.object->end()),
+ len, [this]()
+ {
+ get();
+ auto key = get_cbor_string();
+ auto val = parse_cbor_internal();
+ return std::make_pair(std::move(key), std::move(val));
+ });
+ return result;
+ }
+
+ /*!
+ @brief reads a MessagePack string
+
+ This function first reads starting bytes to determine the expected
+ string length and then copies this number of bytes into a string.
+
+ @return string
+
+ @throw parse_error.110 if input ended
+ @throw parse_error.113 if an unexpected byte is read
+ */
+ string_t get_msgpack_string()
+ {
+ unexpect_eof();
+
+ switch (current)
+ {
+ // fixstr
+ case 0xA0:
+ case 0xA1:
+ case 0xA2:
+ case 0xA3:
+ case 0xA4:
+ case 0xA5:
+ case 0xA6:
+ case 0xA7:
+ case 0xA8:
+ case 0xA9:
+ case 0xAA:
+ case 0xAB:
+ case 0xAC:
+ case 0xAD:
+ case 0xAE:
+ case 0xAF:
+ case 0xB0:
+ case 0xB1:
+ case 0xB2:
+ case 0xB3:
+ case 0xB4:
+ case 0xB5:
+ case 0xB6:
+ case 0xB7:
+ case 0xB8:
+ case 0xB9:
+ case 0xBA:
+ case 0xBB:
+ case 0xBC:
+ case 0xBD:
+ case 0xBE:
+ case 0xBF:
+ {
+ return get_string(current & 0x1F);
+ }
+
+ case 0xD9: // str 8
+ {
+ return get_string(get_number<uint8_t>());
+ }
+
+ case 0xDA: // str 16
+ {
+ return get_string(get_number<uint16_t>());
+ }
+
+ case 0xDB: // str 32
+ {
+ return get_string(get_number<uint32_t>());
+ }
+
+ default:
+ {
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+ JSON_THROW(parse_error::create(113, chars_read,
+ "expected a MessagePack string; last byte: 0x" + ss.str()));
+ }
+ }
+ }
+
+ template<typename NumberType>
+ BasicJsonType get_msgpack_array(const NumberType len)
+ {
+ BasicJsonType result = value_t::array;
+ std::generate_n(std::back_inserter(*result.m_value.array), len, [this]()
+ {
+ return parse_msgpack_internal();
+ });
+ return result;
+ }
+
+ template<typename NumberType>
+ BasicJsonType get_msgpack_object(const NumberType len)
+ {
+ BasicJsonType result = value_t::object;
+ std::generate_n(std::inserter(*result.m_value.object,
+ result.m_value.object->end()),
+ len, [this]()
+ {
+ get();
+ auto key = get_msgpack_string();
+ auto val = parse_msgpack_internal();
+ return std::make_pair(std::move(key), std::move(val));
+ });
+ return result;
+ }
+
+ /*!
+ @brief reads a UBJSON string
+
+ This function is either called after reading the 'S' byte explicitly
+ indicating a string, or in case of an object key where the 'S' byte can be
+ left out.
+
+ @param[in] get_char whether a new character should be retrieved from the
+ input (true, default) or whether the last read
+ character should be considered instead
+
+ @return string
+
+ @throw parse_error.110 if input ended
+ @throw parse_error.113 if an unexpected byte is read
+ */
+ string_t get_ubjson_string(const bool get_char = true)
+ {
+ if (get_char)
+ {
+ get(); // TODO: may we ignore N here?
+ }
+
+ unexpect_eof();
+
+ switch (current)
+ {
+ case 'U':
+ return get_string(get_number<uint8_t>());
+ case 'i':
+ return get_string(get_number<int8_t>());
+ case 'I':
+ return get_string(get_number<int16_t>());
+ case 'l':
+ return get_string(get_number<int32_t>());
+ case 'L':
+ return get_string(get_number<int64_t>());
+ default:
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+ JSON_THROW(parse_error::create(113, chars_read,
+ "expected a UBJSON string; last byte: 0x" + ss.str()));
+ }
+ }
+
+ /*!
+ @brief determine the type and size for a container
+
+ In the optimized UBJSON format, a type and a size can be provided to allow
+ for a more compact representation.
+
+ @return pair of the size and the type
+ */
+ std::pair<std::size_t, int> get_ubjson_size_type()
+ {
+ std::size_t sz = string_t::npos;
+ int tc = 0;
+
+ get_ignore_noop();
+
+ if (current == '$')
+ {
+ tc = get(); // must not ignore 'N', because 'N' maybe the type
+ unexpect_eof();
+
+ get_ignore_noop();
+ if (current != '#')
+ {
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+ JSON_THROW(parse_error::create(112, chars_read,
+ "expected '#' after UBJSON type information; last byte: 0x" + ss.str()));
+ }
+ sz = parse_ubjson_internal();
+ }
+ else if (current == '#')
+ {
+ sz = parse_ubjson_internal();
+ }
+
+ return std::make_pair(sz, tc);
+ }
+
+ BasicJsonType get_ubjson_value(const int prefix)
+ {
+ switch (prefix)
+ {
+ case std::char_traits<char>::eof(): // EOF
+ JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
+
+ case 'T': // true
+ return true;
+ case 'F': // false
+ return false;
+
+ case 'Z': // null
+ return nullptr;
+
+ case 'U':
+ return get_number<uint8_t>();
+ case 'i':
+ return get_number<int8_t>();
+ case 'I':
+ return get_number<int16_t>();
+ case 'l':
+ return get_number<int32_t>();
+ case 'L':
+ return get_number<int64_t>();
+ case 'd':
+ return get_number<float>();
+ case 'D':
+ return get_number<double>();
+
+ case 'C': // char
+ {
+ get();
+ unexpect_eof();
+ if (JSON_UNLIKELY(current > 127))
+ {
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+ JSON_THROW(parse_error::create(113, chars_read,
+ "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + ss.str()));
+ }
+ return string_t(1, static_cast<char>(current));
+ }
+
+ case 'S': // string
+ return get_ubjson_string();
+
+ case '[': // array
+ return get_ubjson_array();
+
+ case '{': // object
+ return get_ubjson_object();
+
+ default: // anything else
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << current;
+ JSON_THROW(parse_error::create(112, chars_read,
+ "error reading UBJSON; last byte: 0x" + ss.str()));
+ }
+ }
+
+ BasicJsonType get_ubjson_array()
+ {
+ BasicJsonType result = value_t::array;
+ const auto size_and_type = get_ubjson_size_type();
+
+ if (size_and_type.first != string_t::npos)
+ {
+ if (JSON_UNLIKELY(size_and_type.first > result.max_size()))
+ {
+ JSON_THROW(out_of_range::create(408,
+ "excessive array size: " + std::to_string(size_and_type.first)));
+ }
+
+ if (size_and_type.second != 0)
+ {
+ if (size_and_type.second != 'N')
+ {
+ std::generate_n(std::back_inserter(*result.m_value.array),
+ size_and_type.first, [this, size_and_type]()
+ {
+ return get_ubjson_value(size_and_type.second);
+ });
+ }
+ }
+ else
+ {
+ std::generate_n(std::back_inserter(*result.m_value.array),
+ size_and_type.first, [this]()
+ {
+ return parse_ubjson_internal();
+ });
+ }
+ }
+ else
+ {
+ while (current != ']')
+ {
+ result.push_back(parse_ubjson_internal(false));
+ get_ignore_noop();
+ }
+ }
+
+ return result;
+ }
+
+ BasicJsonType get_ubjson_object()
+ {
+ BasicJsonType result = value_t::object;
+ const auto size_and_type = get_ubjson_size_type();
+
+ if (size_and_type.first != string_t::npos)
+ {
+ if (JSON_UNLIKELY(size_and_type.first > result.max_size()))
+ {
+ JSON_THROW(out_of_range::create(408,
+ "excessive object size: " + std::to_string(size_and_type.first)));
+ }
+
+ if (size_and_type.second != 0)
+ {
+ std::generate_n(std::inserter(*result.m_value.object,
+ result.m_value.object->end()),
+ size_and_type.first, [this, size_and_type]()
+ {
+ auto key = get_ubjson_string();
+ auto val = get_ubjson_value(size_and_type.second);
+ return std::make_pair(std::move(key), std::move(val));
+ });
+ }
+ else
+ {
+ std::generate_n(std::inserter(*result.m_value.object,
+ result.m_value.object->end()),
+ size_and_type.first, [this]()
+ {
+ auto key = get_ubjson_string();
+ auto val = parse_ubjson_internal();
+ return std::make_pair(std::move(key), std::move(val));
+ });
+ }
+ }
+ else
+ {
+ while (current != '}')
+ {
+ auto key = get_ubjson_string(false);
+ result[std::move(key)] = parse_ubjson_internal();
+ get_ignore_noop();
+ }
+ }
+
+ return result;
+ }
+
+ /*!
+ @brief throw if end of input is not reached
+ @throw parse_error.110 if input not ended
+ */
+ void expect_eof() const
+ {
+ if (JSON_UNLIKELY(current != std::char_traits<char>::eof()))
+ {
+ JSON_THROW(parse_error::create(110, chars_read, "expected end of input"));
+ }
+ }
+
+ /*!
+ @briefthrow if end of input is reached
+ @throw parse_error.110 if input ended
+ */
+ void unexpect_eof() const
+ {
+ if (JSON_UNLIKELY(current == std::char_traits<char>::eof()))
+ {
+ JSON_THROW(parse_error::create(110, chars_read, "unexpected end of input"));
+ }
+ }
+
+ private:
+ /// input adapter
+ input_adapter_t ia = nullptr;
+
+ /// the current character
+ int current = std::char_traits<char>::eof();
+
+ /// the number of characters read
+ std::size_t chars_read = 0;
+
+ /// whether we can assume little endianess
+ const bool is_little_endian = little_endianess();
+};
+}
+}
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+ public:
+ /*!
+ @brief create a binary writer
+
+ @param[in] adapter output adapter to write to
+ */
+ explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
+ {
+ assert(oa);
+ }
+
+ /*!
+ @brief[in] j JSON value to serialize
+ */
+ void write_cbor(const BasicJsonType& j)
+ {
+ switch (j.type())
+ {
+ case value_t::null:
+ {
+ oa->write_character(static_cast<CharType>(0xF6));
+ break;
+ }
+
+ case value_t::boolean:
+ {
+ oa->write_character(j.m_value.boolean
+ ? static_cast<CharType>(0xF5)
+ : static_cast<CharType>(0xF4));
+ break;
+ }
+
+ case value_t::number_integer:
+ {
+ if (j.m_value.number_integer >= 0)
+ {
+ // CBOR does not differentiate between positive signed
+ // integers and unsigned integers. Therefore, we used the
+ // code from the value_t::number_unsigned case here.
+ if (j.m_value.number_integer <= 0x17)
+ {
+ write_number(static_cast<uint8_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_integer <= (std::numeric_limits<uint8_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x18));
+ write_number(static_cast<uint8_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_integer <= (std::numeric_limits<uint16_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x19));
+ write_number(static_cast<uint16_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_integer <= (std::numeric_limits<uint32_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x1A));
+ write_number(static_cast<uint32_t>(j.m_value.number_integer));
+ }
+ else
+ {
+ oa->write_character(static_cast<CharType>(0x1B));
+ write_number(static_cast<uint64_t>(j.m_value.number_integer));
+ }
+ }
+ else
+ {
+ // The conversions below encode the sign in the first
+ // byte, and the value is converted to a positive number.
+ const auto positive_number = -1 - j.m_value.number_integer;
+ if (j.m_value.number_integer >= -24)
+ {
+ write_number(static_cast<uint8_t>(0x20 + positive_number));
+ }
+ else if (positive_number <= (std::numeric_limits<uint8_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x38));
+ write_number(static_cast<uint8_t>(positive_number));
+ }
+ else if (positive_number <= (std::numeric_limits<uint16_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x39));
+ write_number(static_cast<uint16_t>(positive_number));
+ }
+ else if (positive_number <= (std::numeric_limits<uint32_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x3A));
+ write_number(static_cast<uint32_t>(positive_number));
+ }
+ else
+ {
+ oa->write_character(static_cast<CharType>(0x3B));
+ write_number(static_cast<uint64_t>(positive_number));
+ }
+ }
+ break;
+ }
+
+ case value_t::number_unsigned:
+ {
+ if (j.m_value.number_unsigned <= 0x17)
+ {
+ write_number(static_cast<uint8_t>(j.m_value.number_unsigned));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x18));
+ write_number(static_cast<uint8_t>(j.m_value.number_unsigned));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint16_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x19));
+ write_number(static_cast<uint16_t>(j.m_value.number_unsigned));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint32_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x1A));
+ write_number(static_cast<uint32_t>(j.m_value.number_unsigned));
+ }
+ else
+ {
+ oa->write_character(static_cast<CharType>(0x1B));
+ write_number(static_cast<uint64_t>(j.m_value.number_unsigned));
+ }
+ break;
+ }
+
+ case value_t::number_float: // Double-Precision Float
+ {
+ oa->write_character(static_cast<CharType>(0xFB));
+ write_number(j.m_value.number_float);
+ break;
+ }
+
+ case value_t::string:
+ {
+ // step 1: write control byte and the string length
+ const auto N = j.m_value.string->size();
+ if (N <= 0x17)
+ {
+ write_number(static_cast<uint8_t>(0x60 + N));
+ }
+ else if (N <= (std::numeric_limits<uint8_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x78));
+ write_number(static_cast<uint8_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint16_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x79));
+ write_number(static_cast<uint16_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint32_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x7A));
+ write_number(static_cast<uint32_t>(N));
+ }
+ // LCOV_EXCL_START
+ else if (N <= (std::numeric_limits<uint64_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x7B));
+ write_number(static_cast<uint64_t>(N));
+ }
+ // LCOV_EXCL_STOP
+
+ // step 2: write the string
+ oa->write_characters(
+ reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+ j.m_value.string->size());
+ break;
+ }
+
+ case value_t::array:
+ {
+ // step 1: write control byte and the array size
+ const auto N = j.m_value.array->size();
+ if (N <= 0x17)
+ {
+ write_number(static_cast<uint8_t>(0x80 + N));
+ }
+ else if (N <= (std::numeric_limits<uint8_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x98));
+ write_number(static_cast<uint8_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint16_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x99));
+ write_number(static_cast<uint16_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint32_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x9A));
+ write_number(static_cast<uint32_t>(N));
+ }
+ // LCOV_EXCL_START
+ else if (N <= (std::numeric_limits<uint64_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0x9B));
+ write_number(static_cast<uint64_t>(N));
+ }
+ // LCOV_EXCL_STOP
+
+ // step 2: write each element
+ for (const auto& el : *j.m_value.array)
+ {
+ write_cbor(el);
+ }
+ break;
+ }
+
+ case value_t::object:
+ {
+ // step 1: write control byte and the object size
+ const auto N = j.m_value.object->size();
+ if (N <= 0x17)
+ {
+ write_number(static_cast<uint8_t>(0xA0 + N));
+ }
+ else if (N <= (std::numeric_limits<uint8_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0xB8));
+ write_number(static_cast<uint8_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint16_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0xB9));
+ write_number(static_cast<uint16_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint32_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0xBA));
+ write_number(static_cast<uint32_t>(N));
+ }
+ // LCOV_EXCL_START
+ else if (N <= (std::numeric_limits<uint64_t>::max)())
+ {
+ oa->write_character(static_cast<CharType>(0xBB));
+ write_number(static_cast<uint64_t>(N));
+ }
+ // LCOV_EXCL_STOP
+
+ // step 2: write each element
+ for (const auto& el : *j.m_value.object)
+ {
+ write_cbor(el.first);
+ write_cbor(el.second);
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+ }
+
+ /*!
+ @brief[in] j JSON value to serialize
+ */
+ void write_msgpack(const BasicJsonType& j)
+ {
+ switch (j.type())
+ {
+ case value_t::null: // nil
+ {
+ oa->write_character(static_cast<CharType>(0xC0));
+ break;
+ }
+
+ case value_t::boolean: // true and false
+ {
+ oa->write_character(j.m_value.boolean
+ ? static_cast<CharType>(0xC3)
+ : static_cast<CharType>(0xC2));
+ break;
+ }
+
+ case value_t::number_integer:
+ {
+ if (j.m_value.number_integer >= 0)
+ {
+ // MessagePack does not differentiate between positive
+ // signed integers and unsigned integers. Therefore, we used
+ // the code from the value_t::number_unsigned case here.
+ if (j.m_value.number_unsigned < 128)
+ {
+ // positive fixnum
+ write_number(static_cast<uint8_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
+ {
+ // uint 8
+ oa->write_character(static_cast<CharType>(0xCC));
+ write_number(static_cast<uint8_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint16_t>::max)())
+ {
+ // uint 16
+ oa->write_character(static_cast<CharType>(0xCD));
+ write_number(static_cast<uint16_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint32_t>::max)())
+ {
+ // uint 32
+ oa->write_character(static_cast<CharType>(0xCE));
+ write_number(static_cast<uint32_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint64_t>::max)())
+ {
+ // uint 64
+ oa->write_character(static_cast<CharType>(0xCF));
+ write_number(static_cast<uint64_t>(j.m_value.number_integer));
+ }
+ }
+ else
+ {
+ if (j.m_value.number_integer >= -32)
+ {
+ // negative fixnum
+ write_number(static_cast<int8_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_integer >= (std::numeric_limits<int8_t>::min)() and
+ j.m_value.number_integer <= (std::numeric_limits<int8_t>::max)())
+ {
+ // int 8
+ oa->write_character(static_cast<CharType>(0xD0));
+ write_number(static_cast<int8_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_integer >= (std::numeric_limits<int16_t>::min)() and
+ j.m_value.number_integer <= (std::numeric_limits<int16_t>::max)())
+ {
+ // int 16
+ oa->write_character(static_cast<CharType>(0xD1));
+ write_number(static_cast<int16_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_integer >= (std::numeric_limits<int32_t>::min)() and
+ j.m_value.number_integer <= (std::numeric_limits<int32_t>::max)())
+ {
+ // int 32
+ oa->write_character(static_cast<CharType>(0xD2));
+ write_number(static_cast<int32_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_integer >= (std::numeric_limits<int64_t>::min)() and
+ j.m_value.number_integer <= (std::numeric_limits<int64_t>::max)())
+ {
+ // int 64
+ oa->write_character(static_cast<CharType>(0xD3));
+ write_number(static_cast<int64_t>(j.m_value.number_integer));
+ }
+ }
+ break;
+ }
+
+ case value_t::number_unsigned:
+ {
+ if (j.m_value.number_unsigned < 128)
+ {
+ // positive fixnum
+ write_number(static_cast<uint8_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
+ {
+ // uint 8
+ oa->write_character(static_cast<CharType>(0xCC));
+ write_number(static_cast<uint8_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint16_t>::max)())
+ {
+ // uint 16
+ oa->write_character(static_cast<CharType>(0xCD));
+ write_number(static_cast<uint16_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint32_t>::max)())
+ {
+ // uint 32
+ oa->write_character(static_cast<CharType>(0xCE));
+ write_number(static_cast<uint32_t>(j.m_value.number_integer));
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint64_t>::max)())
+ {
+ // uint 64
+ oa->write_character(static_cast<CharType>(0xCF));
+ write_number(static_cast<uint64_t>(j.m_value.number_integer));
+ }
+ break;
+ }
+
+ case value_t::number_float: // float 64
+ {
+ oa->write_character(static_cast<CharType>(0xCB));
+ write_number(j.m_value.number_float);
+ break;
+ }
+
+ case value_t::string:
+ {
+ // step 1: write control byte and the string length
+ const auto N = j.m_value.string->size();
+ if (N <= 31)
+ {
+ // fixstr
+ write_number(static_cast<uint8_t>(0xA0 | N));
+ }
+ else if (N <= (std::numeric_limits<uint8_t>::max)())
+ {
+ // str 8
+ oa->write_character(static_cast<CharType>(0xD9));
+ write_number(static_cast<uint8_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint16_t>::max)())
+ {
+ // str 16
+ oa->write_character(static_cast<CharType>(0xDA));
+ write_number(static_cast<uint16_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint32_t>::max)())
+ {
+ // str 32
+ oa->write_character(static_cast<CharType>(0xDB));
+ write_number(static_cast<uint32_t>(N));
+ }
+
+ // step 2: write the string
+ oa->write_characters(
+ reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+ j.m_value.string->size());
+ break;
+ }
+
+ case value_t::array:
+ {
+ // step 1: write control byte and the array size
+ const auto N = j.m_value.array->size();
+ if (N <= 15)
+ {
+ // fixarray
+ write_number(static_cast<uint8_t>(0x90 | N));
+ }
+ else if (N <= (std::numeric_limits<uint16_t>::max)())
+ {
+ // array 16
+ oa->write_character(static_cast<CharType>(0xDC));
+ write_number(static_cast<uint16_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint32_t>::max)())
+ {
+ // array 32
+ oa->write_character(static_cast<CharType>(0xDD));
+ write_number(static_cast<uint32_t>(N));
+ }
+
+ // step 2: write each element
+ for (const auto& el : *j.m_value.array)
+ {
+ write_msgpack(el);
+ }
+ break;
+ }
+
+ case value_t::object:
+ {
+ // step 1: write control byte and the object size
+ const auto N = j.m_value.object->size();
+ if (N <= 15)
+ {
+ // fixmap
+ write_number(static_cast<uint8_t>(0x80 | (N & 0xF)));
+ }
+ else if (N <= (std::numeric_limits<uint16_t>::max)())
+ {
+ // map 16
+ oa->write_character(static_cast<CharType>(0xDE));
+ write_number(static_cast<uint16_t>(N));
+ }
+ else if (N <= (std::numeric_limits<uint32_t>::max)())
+ {
+ // map 32
+ oa->write_character(static_cast<CharType>(0xDF));
+ write_number(static_cast<uint32_t>(N));
+ }
+
+ // step 2: write each element
+ for (const auto& el : *j.m_value.object)
+ {
+ write_msgpack(el.first);
+ write_msgpack(el.second);
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+ }
+
+ /*!
+ @param[in] j JSON value to serialize
+ @param[in] use_count whether to use '#' prefixes (optimized format)
+ @param[in] use_type whether to use '$' prefixes (optimized format)
+ @param[in] add_prefix whether prefixes need to be used for this value
+ */
+ void write_ubjson(const BasicJsonType& j, const bool use_count,
+ const bool use_type, const bool add_prefix = true)
+ {
+ switch (j.type())
+ {
+ case value_t::null:
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('Z'));
+ }
+ break;
+ }
+
+ case value_t::boolean:
+ {
+ if (add_prefix)
+ oa->write_character(j.m_value.boolean
+ ? static_cast<CharType>('T')
+ : static_cast<CharType>('F'));
+ break;
+ }
+
+ case value_t::number_integer:
+ {
+ write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
+ break;
+ }
+
+ case value_t::number_unsigned:
+ {
+ write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
+ break;
+ }
+
+ case value_t::number_float:
+ {
+ write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
+ break;
+ }
+
+ case value_t::string:
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('S'));
+ }
+ write_number_with_ubjson_prefix(j.m_value.string->size(), true);
+ oa->write_characters(
+ reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+ j.m_value.string->size());
+ break;
+ }
+
+ case value_t::array:
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('['));
+ }
+
+ bool prefix_required = true;
+ if (use_type and not j.m_value.array->empty())
+ {
+ assert(use_count);
+ const char first_prefix = ubjson_prefix(j.front());
+ const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+ [this, first_prefix](const BasicJsonType & v)
+ {
+ return ubjson_prefix(v) == first_prefix;
+ });
+
+ if (same_prefix)
+ {
+ prefix_required = false;
+ oa->write_character(static_cast<CharType>('$'));
+ oa->write_character(static_cast<CharType>(first_prefix));
+ }
+ }
+
+ if (use_count)
+ {
+ oa->write_character(static_cast<CharType>('#'));
+ write_number_with_ubjson_prefix(j.m_value.array->size(), true);
+ }
+
+ for (const auto& el : *j.m_value.array)
+ {
+ write_ubjson(el, use_count, use_type, prefix_required);
+ }
+
+ if (not use_count)
+ {
+ oa->write_character(static_cast<CharType>(']'));
+ }
+
+ break;
+ }
+
+ case value_t::object:
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('{'));
+ }
+
+ bool prefix_required = true;
+ if (use_type and not j.m_value.object->empty())
+ {
+ assert(use_count);
+ const char first_prefix = ubjson_prefix(j.front());
+ const bool same_prefix = std::all_of(j.begin(), j.end(),
+ [this, first_prefix](const BasicJsonType & v)
+ {
+ return ubjson_prefix(v) == first_prefix;
+ });
+
+ if (same_prefix)
+ {
+ prefix_required = false;
+ oa->write_character(static_cast<CharType>('$'));
+ oa->write_character(static_cast<CharType>(first_prefix));
+ }
+ }
+
+ if (use_count)
+ {
+ oa->write_character(static_cast<CharType>('#'));
+ write_number_with_ubjson_prefix(j.m_value.object->size(), true);
+ }
+
+ for (const auto& el : *j.m_value.object)
+ {
+ write_number_with_ubjson_prefix(el.first.size(), true);
+ oa->write_characters(
+ reinterpret_cast<const CharType*>(el.first.c_str()),
+ el.first.size());
+ write_ubjson(el.second, use_count, use_type, prefix_required);
+ }
+
+ if (not use_count)
+ {
+ oa->write_character(static_cast<CharType>('}'));
+ }
+
+ break;
+ }
+
+ default:
+ break;
+ }
+ }
+
+ private:
+ /*
+ @brief write a number to output input
+
+ @param[in] n number of type @a NumberType
+ @tparam NumberType the type of the number
+
+ @note This function needs to respect the system's endianess, because bytes
+ in CBOR, MessagePack, and UBJSON are stored in network order (big
+ endian) and therefore need reordering on little endian systems.
+ */
+ template<typename NumberType>
+ void write_number(const NumberType n)
+ {
+ // step 1: write number to array of length NumberType
+ std::array<CharType, sizeof(NumberType)> vec;
+ std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+ // step 2: write array to output (with possible reordering)
+ if (is_little_endian)
+ {
+ // reverse byte order prior to conversion if necessary
+ std::reverse(vec.begin(), vec.end());
+ }
+
+ oa->write_characters(vec.data(), sizeof(NumberType));
+ }
+
+ // UBJSON: write number (floating point)
+ template<typename NumberType, typename std::enable_if<
+ std::is_floating_point<NumberType>::value, int>::type = 0>
+ void write_number_with_ubjson_prefix(const NumberType n,
+ const bool add_prefix)
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('D')); // float64
+ }
+ write_number(n);
+ }
+
+ // UBJSON: write number (unsigned integer)
+ template<typename NumberType, typename std::enable_if<
+ std::is_unsigned<NumberType>::value, int>::type = 0>
+ void write_number_with_ubjson_prefix(const NumberType n,
+ const bool add_prefix)
+ {
+ if (n <= static_cast<uint64_t>((std::numeric_limits<int8_t>::max)()))
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('i')); // int8
+ }
+ write_number(static_cast<uint8_t>(n));
+ }
+ else if (n <= (std::numeric_limits<uint8_t>::max)())
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('U')); // uint8
+ }
+ write_number(static_cast<uint8_t>(n));
+ }
+ else if (n <= static_cast<uint64_t>((std::numeric_limits<int16_t>::max)()))
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('I')); // int16
+ }
+ write_number(static_cast<int16_t>(n));
+ }
+ else if (n <= static_cast<uint64_t>((std::numeric_limits<int32_t>::max)()))
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('l')); // int32
+ }
+ write_number(static_cast<int32_t>(n));
+ }
+ else if (n <= static_cast<uint64_t>((std::numeric_limits<int64_t>::max)()))
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('L')); // int64
+ }
+ write_number(static_cast<int64_t>(n));
+ }
+ else
+ {
+ JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(n)));
+ }
+ }
+
+ // UBJSON: write number (signed integer)
+ template<typename NumberType, typename std::enable_if<
+ std::is_signed<NumberType>::value and
+ not std::is_floating_point<NumberType>::value, int>::type = 0>
+ void write_number_with_ubjson_prefix(const NumberType n,
+ const bool add_prefix)
+ {
+ if ((std::numeric_limits<int8_t>::min)() <= n and n <= (std::numeric_limits<int8_t>::max)())
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('i')); // int8
+ }
+ write_number(static_cast<int8_t>(n));
+ }
+ else if (static_cast<int64_t>((std::numeric_limits<uint8_t>::min)()) <= n and n <= static_cast<int64_t>((std::numeric_limits<uint8_t>::max)()))
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('U')); // uint8
+ }
+ write_number(static_cast<uint8_t>(n));
+ }
+ else if ((std::numeric_limits<int16_t>::min)() <= n and n <= (std::numeric_limits<int16_t>::max)())
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('I')); // int16
+ }
+ write_number(static_cast<int16_t>(n));
+ }
+ else if ((std::numeric_limits<int32_t>::min)() <= n and n <= (std::numeric_limits<int32_t>::max)())
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('l')); // int32
+ }
+ write_number(static_cast<int32_t>(n));
+ }
+ else if ((std::numeric_limits<int64_t>::min)() <= n and n <= (std::numeric_limits<int64_t>::max)())
+ {
+ if (add_prefix)
+ {
+ oa->write_character(static_cast<CharType>('L')); // int64
+ }
+ write_number(static_cast<int64_t>(n));
+ }
+ // LCOV_EXCL_START
+ else
+ {
+ JSON_THROW(out_of_range::create(407, "number overflow serializing " + std::to_string(n)));
+ }
+ // LCOV_EXCL_STOP
+ }
+
+ /*!
+ @brief determine the type prefix of container values
+
+ @note This function does not need to be 100% accurate when it comes to
+ integer limits. In case a number exceeds the limits of int64_t,
+ this will be detected by a later call to function
+ write_number_with_ubjson_prefix. Therefore, we return 'L' for any
+ value that does not fit the previous limits.
+ */
+ char ubjson_prefix(const BasicJsonType& j) const noexcept
+ {
+ switch (j.type())
+ {
+ case value_t::null:
+ return 'Z';
+
+ case value_t::boolean:
+ return j.m_value.boolean ? 'T' : 'F';
+
+ case value_t::number_integer:
+ {
+ if ((std::numeric_limits<int8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int8_t>::max)())
+ {
+ return 'i';
+ }
+ else if ((std::numeric_limits<uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<uint8_t>::max)())
+ {
+ return 'U';
+ }
+ else if ((std::numeric_limits<int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int16_t>::max)())
+ {
+ return 'I';
+ }
+ else if ((std::numeric_limits<int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<int32_t>::max)())
+ {
+ return 'l';
+ }
+ else // no check and assume int64_t (see note above)
+ {
+ return 'L';
+ }
+ }
+
+ case value_t::number_unsigned:
+ {
+ if (j.m_value.number_unsigned <= (std::numeric_limits<int8_t>::max)())
+ {
+ return 'i';
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<uint8_t>::max)())
+ {
+ return 'U';
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<int16_t>::max)())
+ {
+ return 'I';
+ }
+ else if (j.m_value.number_unsigned <= (std::numeric_limits<int32_t>::max)())
+ {
+ return 'l';
+ }
+ else // no check and assume int64_t (see note above)
+ {
+ return 'L';
+ }
+ }
+
+ case value_t::number_float:
+ return 'D';
+
+ case value_t::string:
+ return 'S';
+
+ case value_t::array:
+ return '[';
+
+ case value_t::object:
+ return '{';
+
+ default: // discarded values
+ return 'N';
+ }
+ }
+
+ private:
+ /// whether we can assume little endianess
+ const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
+
+ /// the output
+ output_adapter_t<CharType> oa = nullptr;
+};
+}
+}
+
+// #include <nlohmann/detail/output/serializer.hpp>
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <cassert> // assert
+#include <ciso646> // and, or
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <iomanip> // setfill
+#include <iterator> // next
+#include <limits> // numeric_limits
+#include <string> // string
+#include <sstream> // stringstream
+#include <type_traits> // is_same
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+
+
+#include <cassert> // assert
+#include <ciso646> // or, and, not
+#include <cmath> // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+ Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+ Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+ Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+ Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template <typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+ static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+ Target target;
+ std::memcpy(&target, &source, sizeof(Source));
+ return target;
+}
+
+struct diyfp // f * 2^e
+{
+ static constexpr int kPrecision = 64; // = q
+
+ uint64_t f;
+ int e;
+
+ constexpr diyfp() noexcept : f(0), e(0) {}
+ constexpr diyfp(uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+ /*!
+ @brief returns x - y
+ @pre x.e == y.e and x.f >= y.f
+ */
+ static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+ {
+ assert(x.e == y.e);
+ assert(x.f >= y.f);
+
+ return diyfp(x.f - y.f, x.e);
+ }
+
+ /*!
+ @brief returns x * y
+ @note The result is rounded. (Only the upper q bits are returned.)
+ */
+ static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+ {
+ static_assert(kPrecision == 64, "internal error");
+
+ // Computes:
+ // f = round((x.f * y.f) / 2^q)
+ // e = x.e + y.e + q
+
+ // Emulate the 64-bit * 64-bit multiplication:
+ //
+ // p = u * v
+ // = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+ // = (u_lo v_lo ) + 2^32 ((u_lo v_hi ) + (u_hi v_lo )) + 2^64 (u_hi v_hi )
+ // = (p0 ) + 2^32 ((p1 ) + (p2 )) + 2^64 (p3 )
+ // = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3 )
+ // = (p0_lo ) + 2^32 (p0_hi + p1_lo + p2_lo ) + 2^64 (p1_hi + p2_hi + p3)
+ // = (p0_lo ) + 2^32 (Q ) + 2^64 (H )
+ // = (p0_lo ) + 2^32 (Q_lo + 2^32 Q_hi ) + 2^64 (H )
+ //
+ // (Since Q might be larger than 2^32 - 1)
+ //
+ // = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+ //
+ // (Q_hi + H does not overflow a 64-bit int)
+ //
+ // = p_lo + 2^64 p_hi
+
+ const uint64_t u_lo = x.f & 0xFFFFFFFF;
+ const uint64_t u_hi = x.f >> 32;
+ const uint64_t v_lo = y.f & 0xFFFFFFFF;
+ const uint64_t v_hi = y.f >> 32;
+
+ const uint64_t p0 = u_lo * v_lo;
+ const uint64_t p1 = u_lo * v_hi;
+ const uint64_t p2 = u_hi * v_lo;
+ const uint64_t p3 = u_hi * v_hi;
+
+ const uint64_t p0_hi = p0 >> 32;
+ const uint64_t p1_lo = p1 & 0xFFFFFFFF;
+ const uint64_t p1_hi = p1 >> 32;
+ const uint64_t p2_lo = p2 & 0xFFFFFFFF;
+ const uint64_t p2_hi = p2 >> 32;
+
+ uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+ // The full product might now be computed as
+ //
+ // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+ // p_lo = p0_lo + (Q << 32)
+ //
+ // But in this particular case here, the full p_lo is not required.
+ // Effectively we only need to add the highest bit in p_lo to p_hi (and
+ // Q_hi + 1 does not overflow).
+
+ Q += uint64_t{1} << (64 - 32 - 1); // round, ties up
+
+ const uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32);
+
+ return diyfp(h, x.e + y.e + 64);
+ }
+
+ /*!
+ @brief normalize x such that the significand is >= 2^(q-1)
+ @pre x.f != 0
+ */
+ static diyfp normalize(diyfp x) noexcept
+ {
+ assert(x.f != 0);
+
+ while ((x.f >> 63) == 0)
+ {
+ x.f <<= 1;
+ x.e--;
+ }
+
+ return x;
+ }
+
+ /*!
+ @brief normalize x such that the result has the exponent E
+ @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+ */
+ static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+ {
+ const int delta = x.e - target_exponent;
+
+ assert(delta >= 0);
+ assert(((x.f << delta) >> delta) == x.f);
+
+ return diyfp(x.f << delta, target_exponent);
+ }
+};
+
+struct boundaries
+{
+ diyfp w;
+ diyfp minus;
+ diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template <typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+ assert(std::isfinite(value));
+ assert(value > 0);
+
+ // Convert the IEEE representation into a diyfp.
+ //
+ // If v is denormal:
+ // value = 0.F * 2^(1 - bias) = ( F) * 2^(1 - bias - (p-1))
+ // If v is normalized:
+ // value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+ static_assert(std::numeric_limits<FloatType>::is_iec559,
+ "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+ constexpr int kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+ constexpr int kBias = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+ constexpr int kMinExp = 1 - kBias;
+ constexpr uint64_t kHiddenBit = uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+ using bits_type = typename std::conditional< kPrecision == 24, uint32_t, uint64_t >::type;
+
+ const uint64_t bits = reinterpret_bits<bits_type>(value);
+ const uint64_t E = bits >> (kPrecision - 1);
+ const uint64_t F = bits & (kHiddenBit - 1);
+
+ const bool is_denormal = (E == 0);
+ const diyfp v = is_denormal
+ ? diyfp(F, kMinExp)
+ : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+ // Compute the boundaries m- and m+ of the floating-point value
+ // v = f * 2^e.
+ //
+ // Determine v- and v+, the floating-point predecessor and successor if v,
+ // respectively.
+ //
+ // v- = v - 2^e if f != 2^(p-1) or e == e_min (A)
+ // = v - 2^(e-1) if f == 2^(p-1) and e > e_min (B)
+ //
+ // v+ = v + 2^e
+ //
+ // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+ // between m- and m+ round to v, regardless of how the input rounding
+ // algorithm breaks ties.
+ //
+ // ---+-------------+-------------+-------------+-------------+--- (A)
+ // v- m- v m+ v+
+ //
+ // -----------------+------+------+-------------+-------------+--- (B)
+ // v- m- v m+ v+
+
+ const bool lower_boundary_is_closer = (F == 0 and E > 1);
+ const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
+ const diyfp m_minus = lower_boundary_is_closer
+ ? diyfp(4 * v.f - 1, v.e - 2) // (B)
+ : diyfp(2 * v.f - 1, v.e - 1); // (A)
+
+ // Determine the normalized w+ = m+.
+ const diyfp w_plus = diyfp::normalize(m_plus);
+
+ // Determine w- = m- such that e_(w-) = e_(w+).
+ const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+ return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+// alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+// f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+// <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+// 2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+// 2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+// f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+// = (f div 2^-e) + (f mod 2^-e) * 2^e
+// = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+// -e >= 32 or e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+// p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+// (10 * p2) div 2^-e = d[-1]
+// (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+// 10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+// -e <= 60 or e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+ uint64_t f;
+ int e;
+ int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+ alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+ // Now
+ //
+ // alpha <= e_c + e + q <= gamma (1)
+ // ==> f_c * 2^alpha <= c * 2^e * 2^q
+ //
+ // and since the c's are normalized, 2^(q-1) <= f_c,
+ //
+ // ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+ // ==> 2^(alpha - e - 1) <= c
+ //
+ // If c were an exakt power of ten, i.e. c = 10^k, one may determine k as
+ //
+ // k = ceil( log_10( 2^(alpha - e - 1) ) )
+ // = ceil( (alpha - e - 1) * log_10(2) )
+ //
+ // From the paper:
+ // "In theory the result of the procedure could be wrong since c is rounded,
+ // and the computation itself is approximated [...]. In practice, however,
+ // this simple function is sufficient."
+ //
+ // For IEEE double precision floating-point numbers converted into
+ // normalized diyfp's w = f * 2^e, with q = 64,
+ //
+ // e >= -1022 (min IEEE exponent)
+ // -52 (p - 1)
+ // -52 (p - 1, possibly normalize denormal IEEE numbers)
+ // -11 (normalize the diyfp)
+ // = -1137
+ //
+ // and
+ //
+ // e <= +1023 (max IEEE exponent)
+ // -52 (p - 1)
+ // -11 (normalize the diyfp)
+ // = 960
+ //
+ // This binary exponent range [-1137,960] results in a decimal exponent
+ // range [-307,324]. One does not need to store a cached power for each
+ // k in this range. For each such k it suffices to find a cached power
+ // such that the exponent of the product lies in [alpha,gamma].
+ // This implies that the difference of the decimal exponents of adjacent
+ // table entries must be less than or equal to
+ //
+ // floor( (gamma - alpha) * log_10(2) ) = 8.
+ //
+ // (A smaller distance gamma-alpha would require a larger table.)
+
+ // NB:
+ // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+ constexpr int kCachedPowersSize = 79;
+ constexpr int kCachedPowersMinDecExp = -300;
+ constexpr int kCachedPowersDecStep = 8;
+
+ static constexpr cached_power kCachedPowers[] =
+ {
+ { 0xAB70FE17C79AC6CA, -1060, -300 },
+ { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+ { 0xBE5691EF416BD60C, -1007, -284 },
+ { 0x8DD01FAD907FFC3C, -980, -276 },
+ { 0xD3515C2831559A83, -954, -268 },
+ { 0x9D71AC8FADA6C9B5, -927, -260 },
+ { 0xEA9C227723EE8BCB, -901, -252 },
+ { 0xAECC49914078536D, -874, -244 },
+ { 0x823C12795DB6CE57, -847, -236 },
+ { 0xC21094364DFB5637, -821, -228 },
+ { 0x9096EA6F3848984F, -794, -220 },
+ { 0xD77485CB25823AC7, -768, -212 },
+ { 0xA086CFCD97BF97F4, -741, -204 },
+ { 0xEF340A98172AACE5, -715, -196 },
+ { 0xB23867FB2A35B28E, -688, -188 },
+ { 0x84C8D4DFD2C63F3B, -661, -180 },
+ { 0xC5DD44271AD3CDBA, -635, -172 },
+ { 0x936B9FCEBB25C996, -608, -164 },
+ { 0xDBAC6C247D62A584, -582, -156 },
+ { 0xA3AB66580D5FDAF6, -555, -148 },
+ { 0xF3E2F893DEC3F126, -529, -140 },
+ { 0xB5B5ADA8AAFF80B8, -502, -132 },
+ { 0x87625F056C7C4A8B, -475, -124 },
+ { 0xC9BCFF6034C13053, -449, -116 },
+ { 0x964E858C91BA2655, -422, -108 },
+ { 0xDFF9772470297EBD, -396, -100 },
+ { 0xA6DFBD9FB8E5B88F, -369, -92 },
+ { 0xF8A95FCF88747D94, -343, -84 },
+ { 0xB94470938FA89BCF, -316, -76 },
+ { 0x8A08F0F8BF0F156B, -289, -68 },
+ { 0xCDB02555653131B6, -263, -60 },
+ { 0x993FE2C6D07B7FAC, -236, -52 },
+ { 0xE45C10C42A2B3B06, -210, -44 },
+ { 0xAA242499697392D3, -183, -36 },
+ { 0xFD87B5F28300CA0E, -157, -28 },
+ { 0xBCE5086492111AEB, -130, -20 },
+ { 0x8CBCCC096F5088CC, -103, -12 },
+ { 0xD1B71758E219652C, -77, -4 },
+ { 0x9C40000000000000, -50, 4 },
+ { 0xE8D4A51000000000, -24, 12 },
+ { 0xAD78EBC5AC620000, 3, 20 },
+ { 0x813F3978F8940984, 30, 28 },
+ { 0xC097CE7BC90715B3, 56, 36 },
+ { 0x8F7E32CE7BEA5C70, 83, 44 },
+ { 0xD5D238A4ABE98068, 109, 52 },
+ { 0x9F4F2726179A2245, 136, 60 },
+ { 0xED63A231D4C4FB27, 162, 68 },
+ { 0xB0DE65388CC8ADA8, 189, 76 },
+ { 0x83C7088E1AAB65DB, 216, 84 },
+ { 0xC45D1DF942711D9A, 242, 92 },
+ { 0x924D692CA61BE758, 269, 100 },
+ { 0xDA01EE641A708DEA, 295, 108 },
+ { 0xA26DA3999AEF774A, 322, 116 },
+ { 0xF209787BB47D6B85, 348, 124 },
+ { 0xB454E4A179DD1877, 375, 132 },
+ { 0x865B86925B9BC5C2, 402, 140 },
+ { 0xC83553C5C8965D3D, 428, 148 },
+ { 0x952AB45CFA97A0B3, 455, 156 },
+ { 0xDE469FBD99A05FE3, 481, 164 },
+ { 0xA59BC234DB398C25, 508, 172 },
+ { 0xF6C69A72A3989F5C, 534, 180 },
+ { 0xB7DCBF5354E9BECE, 561, 188 },
+ { 0x88FCF317F22241E2, 588, 196 },
+ { 0xCC20CE9BD35C78A5, 614, 204 },
+ { 0x98165AF37B2153DF, 641, 212 },
+ { 0xE2A0B5DC971F303A, 667, 220 },
+ { 0xA8D9D1535CE3B396, 694, 228 },
+ { 0xFB9B7CD9A4A7443C, 720, 236 },
+ { 0xBB764C4CA7A44410, 747, 244 },
+ { 0x8BAB8EEFB6409C1A, 774, 252 },
+ { 0xD01FEF10A657842C, 800, 260 },
+ { 0x9B10A4E5E9913129, 827, 268 },
+ { 0xE7109BFBA19C0C9D, 853, 276 },
+ { 0xAC2820D9623BF429, 880, 284 },
+ { 0x80444B5E7AA7CF85, 907, 292 },
+ { 0xBF21E44003ACDD2D, 933, 300 },
+ { 0x8E679C2F5E44FF8F, 960, 308 },
+ { 0xD433179D9C8CB841, 986, 316 },
+ { 0x9E19DB92B4E31BA9, 1013, 324 },
+ };
+
+ // This computation gives exactly the same results for k as
+ // k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+ // for |e| <= 1500, but doesn't require floating-point operations.
+ // NB: log_10(2) ~= 78913 / 2^18
+ assert(e >= -1500);
+ assert(e <= 1500);
+ const int f = kAlpha - e - 1;
+ const int k = (f * 78913) / (1 << 18) + (f > 0);
+
+ const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+ assert(index >= 0);
+ assert(index < kCachedPowersSize);
+ static_cast<void>(kCachedPowersSize); // Fix warning.
+
+ const cached_power cached = kCachedPowers[index];
+ assert(kAlpha <= cached.e + e + 64);
+ assert(kGamma >= cached.e + e + 64);
+
+ return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const uint32_t n, uint32_t& pow10)
+{
+ // LCOV_EXCL_START
+ if (n >= 1000000000)
+ {
+ pow10 = 1000000000;
+ return 10;
+ }
+ // LCOV_EXCL_STOP
+ else if (n >= 100000000)
+ {
+ pow10 = 100000000;
+ return 9;
+ }
+ else if (n >= 10000000)
+ {
+ pow10 = 10000000;
+ return 8;
+ }
+ else if (n >= 1000000)
+ {
+ pow10 = 1000000;
+ return 7;
+ }
+ else if (n >= 100000)
+ {
+ pow10 = 100000;
+ return 6;
+ }
+ else if (n >= 10000)
+ {
+ pow10 = 10000;
+ return 5;
+ }
+ else if (n >= 1000)
+ {
+ pow10 = 1000;
+ return 4;
+ }
+ else if (n >= 100)
+ {
+ pow10 = 100;
+ return 3;
+ }
+ else if (n >= 10)
+ {
+ pow10 = 10;
+ return 2;
+ }
+ else
+ {
+ pow10 = 1;
+ return 1;
+ }
+}
+
+inline void grisu2_round(char* buf, int len, uint64_t dist, uint64_t delta,
+ uint64_t rest, uint64_t ten_k)
+{
+ assert(len >= 1);
+ assert(dist <= delta);
+ assert(rest <= delta);
+ assert(ten_k > 0);
+
+ // <--------------------------- delta ---->
+ // <---- dist --------->
+ // --------------[------------------+-------------------]--------------
+ // M- w M+
+ //
+ // ten_k
+ // <------>
+ // <---- rest ---->
+ // --------------[------------------+----+--------------]--------------
+ // w V
+ // = buf * 10^k
+ //
+ // ten_k represents a unit-in-the-last-place in the decimal representation
+ // stored in buf.
+ // Decrement buf by ten_k while this takes buf closer to w.
+
+ // The tests are written in this order to avoid overflow in unsigned
+ // integer arithmetic.
+
+ while (rest < dist
+ and delta - rest >= ten_k
+ and (rest + ten_k < dist or dist - rest > rest + ten_k - dist))
+ {
+ assert(buf[len - 1] != '0');
+ buf[len - 1]--;
+ rest += ten_k;
+ }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+ diyfp M_minus, diyfp w, diyfp M_plus)
+{
+ static_assert(kAlpha >= -60, "internal error");
+ static_assert(kGamma <= -32, "internal error");
+
+ // Generates the digits (and the exponent) of a decimal floating-point
+ // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+ // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+ //
+ // <--------------------------- delta ---->
+ // <---- dist --------->
+ // --------------[------------------+-------------------]--------------
+ // M- w M+
+ //
+ // Grisu2 generates the digits of M+ from left to right and stops as soon as
+ // V is in [M-,M+].
+
+ assert(M_plus.e >= kAlpha);
+ assert(M_plus.e <= kGamma);
+
+ uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+ uint64_t dist = diyfp::sub(M_plus, w ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+ // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+ //
+ // M+ = f * 2^e
+ // = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+ // = ((p1 ) * 2^-e + (p2 )) * 2^e
+ // = p1 + p2 * 2^e
+
+ const diyfp one(uint64_t{1} << -M_plus.e, M_plus.e);
+
+ uint32_t p1 = static_cast<uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+ uint64_t p2 = M_plus.f & (one.f - 1); // p2 = f mod 2^-e
+
+ // 1)
+ //
+ // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+ assert(p1 > 0);
+
+ uint32_t pow10;
+ const int k = find_largest_pow10(p1, pow10);
+
+ // 10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+ //
+ // p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+ // = (d[k-1] ) * 10^(k-1) + (p1 mod 10^(k-1))
+ //
+ // M+ = p1 + p2 * 2^e
+ // = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1)) + p2 * 2^e
+ // = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+ // = d[k-1] * 10^(k-1) + ( rest) * 2^e
+ //
+ // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+ //
+ // p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+ //
+ // but stop as soon as
+ //
+ // rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+ int n = k;
+ while (n > 0)
+ {
+ // Invariants:
+ // M+ = buffer * 10^n + (p1 + p2 * 2^e) (buffer = 0 for n = k)
+ // pow10 = 10^(n-1) <= p1 < 10^n
+ //
+ const uint32_t d = p1 / pow10; // d = p1 div 10^(n-1)
+ const uint32_t r = p1 % pow10; // r = p1 mod 10^(n-1)
+ //
+ // M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+ // = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+ //
+ assert(d <= 9);
+ buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+ //
+ // M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+ //
+ p1 = r;
+ n--;
+ //
+ // M+ = buffer * 10^n + (p1 + p2 * 2^e)
+ // pow10 = 10^n
+ //
+
+ // Now check if enough digits have been generated.
+ // Compute
+ //
+ // p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+ //
+ // Note:
+ // Since rest and delta share the same exponent e, it suffices to
+ // compare the significands.
+ const uint64_t rest = (uint64_t{p1} << -one.e) + p2;
+ if (rest <= delta)
+ {
+ // V = buffer * 10^n, with M- <= V <= M+.
+
+ decimal_exponent += n;
+
+ // We may now just stop. But instead look if the buffer could be
+ // decremented to bring V closer to w.
+ //
+ // pow10 = 10^n is now 1 ulp in the decimal representation V.
+ // The rounding procedure works with diyfp's with an implicit
+ // exponent of e.
+ //
+ // 10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+ //
+ const uint64_t ten_n = uint64_t{pow10} << -one.e;
+ grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+ return;
+ }
+
+ pow10 /= 10;
+ //
+ // pow10 = 10^(n-1) <= p1 < 10^n
+ // Invariants restored.
+ }
+
+ // 2)
+ //
+ // The digits of the integral part have been generated:
+ //
+ // M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+ // = buffer + p2 * 2^e
+ //
+ // Now generate the digits of the fractional part p2 * 2^e.
+ //
+ // Note:
+ // No decimal point is generated: the exponent is adjusted instead.
+ //
+ // p2 actually represents the fraction
+ //
+ // p2 * 2^e
+ // = p2 / 2^-e
+ // = d[-1] / 10^1 + d[-2] / 10^2 + ...
+ //
+ // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+ //
+ // p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+ // + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+ //
+ // using
+ //
+ // 10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+ // = ( d) * 2^-e + ( r)
+ //
+ // or
+ // 10^m * p2 * 2^e = d + r * 2^e
+ //
+ // i.e.
+ //
+ // M+ = buffer + p2 * 2^e
+ // = buffer + 10^-m * (d + r * 2^e)
+ // = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+ //
+ // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+ assert(p2 > delta);
+
+ int m = 0;
+ for (;;)
+ {
+ // Invariant:
+ // M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+ // = buffer * 10^-m + 10^-m * (p2 ) * 2^e
+ // = buffer * 10^-m + 10^-m * (1/10 * (10 * p2) ) * 2^e
+ // = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+ //
+ assert(p2 <= UINT64_MAX / 10);
+ p2 *= 10;
+ const uint64_t d = p2 >> -one.e; // d = (10 * p2) div 2^-e
+ const uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+ //
+ // M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+ // = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+ // = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+ //
+ assert(d <= 9);
+ buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+ //
+ // M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+ //
+ p2 = r;
+ m++;
+ //
+ // M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+ // Invariant restored.
+
+ // Check if enough digits have been generated.
+ //
+ // 10^-m * p2 * 2^e <= delta * 2^e
+ // p2 * 2^e <= 10^m * delta * 2^e
+ // p2 <= 10^m * delta
+ delta *= 10;
+ dist *= 10;
+ if (p2 <= delta)
+ {
+ break;
+ }
+ }
+
+ // V = buffer * 10^-m, with M- <= V <= M+.
+
+ decimal_exponent -= m;
+
+ // 1 ulp in the decimal representation is now 10^-m.
+ // Since delta and dist are now scaled by 10^m, we need to do the
+ // same with ulp in order to keep the units in sync.
+ //
+ // 10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+ //
+ const uint64_t ten_m = one.f;
+ grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+ // By construction this algorithm generates the shortest possible decimal
+ // number (Loitsch, Theorem 6.2) which rounds back to w.
+ // For an input number of precision p, at least
+ //
+ // N = 1 + ceil(p * log_10(2))
+ //
+ // decimal digits are sufficient to identify all binary floating-point
+ // numbers (Matula, "In-and-Out conversions").
+ // This implies that the algorithm does not produce more than N decimal
+ // digits.
+ //
+ // N = 17 for p = 53 (IEEE double precision)
+ // N = 9 for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+ diyfp m_minus, diyfp v, diyfp m_plus)
+{
+ assert(m_plus.e == m_minus.e);
+ assert(m_plus.e == v.e);
+
+ // --------(-----------------------+-----------------------)-------- (A)
+ // m- v m+
+ //
+ // --------------------(-----------+-----------------------)-------- (B)
+ // m- v m+
+ //
+ // First scale v (and m- and m+) such that the exponent is in the range
+ // [alpha, gamma].
+
+ const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+ const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+ // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+ const diyfp w = diyfp::mul(v, c_minus_k);
+ const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+ const diyfp w_plus = diyfp::mul(m_plus, c_minus_k);
+
+ // ----(---+---)---------------(---+---)---------------(---+---)----
+ // w- w w+
+ // = c*m- = c*v = c*m+
+ //
+ // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+ // w+ are now off by a small amount.
+ // In fact:
+ //
+ // w - v * 10^k < 1 ulp
+ //
+ // To account for this inaccuracy, add resp. subtract 1 ulp.
+ //
+ // --------+---[---------------(---+---)---------------]---+--------
+ // w- M- w M+ w+
+ //
+ // Now any number in [M-, M+] (bounds included) will round to w when input,
+ // regardless of how the input rounding algorithm breaks ties.
+ //
+ // And digit_gen generates the shortest possible such number in [M-, M+].
+ // Note that this does not mean that Grisu2 always generates the shortest
+ // possible number in the interval (m-, m+).
+ const diyfp M_minus(w_minus.f + 1, w_minus.e);
+ const diyfp M_plus (w_plus.f - 1, w_plus.e );
+
+ decimal_exponent = -cached.k; // = -(-k) = k
+
+ grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template <typename FloatType>
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+ static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+ "internal error: not enough precision");
+
+ assert(std::isfinite(value));
+ assert(value > 0);
+
+ // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+ // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+ // decimal representations are not exactly "short".
+ //
+ // The documentation for 'std::to_chars' (http://en.cppreference.com/w/cpp/utility/to_chars)
+ // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+ // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
+ // does.
+ // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+ // representation using the corresponding std::from_chars function recovers value exactly". That
+ // indicates that single precision floating-point numbers should be recovered using
+ // 'std::strtof'.
+ //
+ // NB: If the neighbors are computed for single-precision numbers, there is a single float
+ // (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+ // value is off by 1 ulp.
+#if 0
+ const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+ const boundaries w = compute_boundaries(value);
+#endif
+
+ grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+inline char* append_exponent(char* buf, int e)
+{
+ assert(e > -1000);
+ assert(e < 1000);
+
+ if (e < 0)
+ {
+ e = -e;
+ *buf++ = '-';
+ }
+ else
+ {
+ *buf++ = '+';
+ }
+
+ uint32_t k = static_cast<uint32_t>(e);
+ if (k < 10)
+ {
+ // Always print at least two digits in the exponent.
+ // This is for compatibility with printf("%g").
+ *buf++ = '0';
+ *buf++ = static_cast<char>('0' + k);
+ }
+ else if (k < 100)
+ {
+ *buf++ = static_cast<char>('0' + k / 10);
+ k %= 10;
+ *buf++ = static_cast<char>('0' + k);
+ }
+ else
+ {
+ *buf++ = static_cast<char>('0' + k / 100);
+ k %= 100;
+ *buf++ = static_cast<char>('0' + k / 10);
+ k %= 10;
+ *buf++ = static_cast<char>('0' + k);
+ }
+
+ return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+ int min_exp, int max_exp)
+{
+ assert(min_exp < 0);
+ assert(max_exp > 0);
+
+ const int k = len;
+ const int n = len + decimal_exponent;
+
+ // v = buf * 10^(n-k)
+ // k is the length of the buffer (number of decimal digits)
+ // n is the position of the decimal point relative to the start of the buffer.
+
+ if (k <= n and n <= max_exp)
+ {
+ // digits[000]
+ // len <= max_exp + 2
+
+ std::memset(buf + k, '0', static_cast<size_t>(n - k));
+ // Make it look like a floating-point number (#362, #378)
+ buf[n + 0] = '.';
+ buf[n + 1] = '0';
+ return buf + (n + 2);
+ }
+
+ if (0 < n and n <= max_exp)
+ {
+ // dig.its
+ // len <= max_digits10 + 1
+
+ assert(k > n);
+
+ std::memmove(buf + (n + 1), buf + n, static_cast<size_t>(k - n));
+ buf[n] = '.';
+ return buf + (k + 1);
+ }
+
+ if (min_exp < n and n <= 0)
+ {
+ // 0.[000]digits
+ // len <= 2 + (-min_exp - 1) + max_digits10
+
+ std::memmove(buf + (2 + -n), buf, static_cast<size_t>(k));
+ buf[0] = '0';
+ buf[1] = '.';
+ std::memset(buf + 2, '0', static_cast<size_t>(-n));
+ return buf + (2 + (-n) + k);
+ }
+
+ if (k == 1)
+ {
+ // dE+123
+ // len <= 1 + 5
+
+ buf += 1;
+ }
+ else
+ {
+ // d.igitsE+123
+ // len <= max_digits10 + 1 + 5
+
+ std::memmove(buf + 2, buf + 1, static_cast<size_t>(k - 1));
+ buf[1] = '.';
+ buf += 1 + k;
+ }
+
+ *buf++ = 'e';
+ return append_exponent(buf, n - 1);
+}
+
+} // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template <typename FloatType>
+char* to_chars(char* first, char* last, FloatType value)
+{
+ static_cast<void>(last); // maybe unused - fix warning
+ assert(std::isfinite(value));
+
+ // Use signbit(value) instead of (value < 0) since signbit works for -0.
+ if (std::signbit(value))
+ {
+ value = -value;
+ *first++ = '-';
+ }
+
+ if (value == 0) // +-0
+ {
+ *first++ = '0';
+ // Make it look like a floating-point number (#362, #378)
+ *first++ = '.';
+ *first++ = '0';
+ return first;
+ }
+
+ assert(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+ // Compute v = buffer * 10^decimal_exponent.
+ // The decimal digits are stored in the buffer, which needs to be interpreted
+ // as an unsigned decimal integer.
+ // len is the length of the buffer, i.e. the number of decimal digits.
+ int len = 0;
+ int decimal_exponent = 0;
+ dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+ assert(len <= std::numeric_limits<FloatType>::max_digits10);
+
+ // Format the buffer like printf("%.*g", prec, value)
+ constexpr int kMinExp = -4;
+ // Use digits10 here to increase compatibility with version 2.
+ constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+ assert(last - first >= kMaxExp + 2);
+ assert(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+ assert(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+ return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// serialization //
+///////////////////
+
+template<typename BasicJsonType>
+class serializer
+{
+ using string_t = typename BasicJsonType::string_t;
+ using number_float_t = typename BasicJsonType::number_float_t;
+ using number_integer_t = typename BasicJsonType::number_integer_t;
+ using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+ static constexpr uint8_t UTF8_ACCEPT = 0;
+ static constexpr uint8_t UTF8_REJECT = 1;
+
+ public:
+ /*!
+ @param[in] s output stream to serialize to
+ @param[in] ichar indentation character to use
+ */
+ serializer(output_adapter_t<char> s, const char ichar)
+ : o(std::move(s)), loc(std::localeconv()),
+ thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep)),
+ decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point)),
+ indent_char(ichar), indent_string(512, indent_char)
+ {}
+
+ // delete because of pointer members
+ serializer(const serializer&) = delete;
+ serializer& operator=(const serializer&) = delete;
+
+ /*!
+ @brief internal implementation of the serialization function
+
+ This function is called by the public member function dump and organizes
+ the serialization internally. The indentation level is propagated as
+ additional parameter. In case of arrays and objects, the function is
+ called recursively.
+
+ - strings and object keys are escaped using `escape_string()`
+ - integer numbers are converted implicitly via `operator<<`
+ - floating-point numbers are converted to a string using `"%g"` format
+
+ @param[in] val value to serialize
+ @param[in] pretty_print whether the output shall be pretty-printed
+ @param[in] indent_step the indent level
+ @param[in] current_indent the current indent level (only used internally)
+ */
+ void dump(const BasicJsonType& val, const bool pretty_print,
+ const bool ensure_ascii,
+ const unsigned int indent_step,
+ const unsigned int current_indent = 0)
+ {
+ switch (val.m_type)
+ {
+ case value_t::object:
+ {
+ if (val.m_value.object->empty())
+ {
+ o->write_characters("{}", 2);
+ return;
+ }
+
+ if (pretty_print)
+ {
+ o->write_characters("{\n", 2);
+
+ // variable to hold indentation for recursive calls
+ const auto new_indent = current_indent + indent_step;
+ if (JSON_UNLIKELY(indent_string.size() < new_indent))
+ {
+ indent_string.resize(indent_string.size() * 2, ' ');
+ }
+
+ // first n-1 elements
+ auto i = val.m_value.object->cbegin();
+ for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+ {
+ o->write_characters(indent_string.c_str(), new_indent);
+ o->write_character('\"');
+ dump_escaped(i->first, ensure_ascii);
+ o->write_characters("\": ", 3);
+ dump(i->second, true, ensure_ascii, indent_step, new_indent);
+ o->write_characters(",\n", 2);
+ }
+
+ // last element
+ assert(i != val.m_value.object->cend());
+ assert(std::next(i) == val.m_value.object->cend());
+ o->write_characters(indent_string.c_str(), new_indent);
+ o->write_character('\"');
+ dump_escaped(i->first, ensure_ascii);
+ o->write_characters("\": ", 3);
+ dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+ o->write_character('\n');
+ o->write_characters(indent_string.c_str(), current_indent);
+ o->write_character('}');
+ }
+ else
+ {
+ o->write_character('{');
+
+ // first n-1 elements
+ auto i = val.m_value.object->cbegin();
+ for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+ {
+ o->write_character('\"');
+ dump_escaped(i->first, ensure_ascii);
+ o->write_characters("\":", 2);
+ dump(i->second, false, ensure_ascii, indent_step, current_indent);
+ o->write_character(',');
+ }
+
+ // last element
+ assert(i != val.m_value.object->cend());
+ assert(std::next(i) == val.m_value.object->cend());
+ o->write_character('\"');
+ dump_escaped(i->first, ensure_ascii);
+ o->write_characters("\":", 2);
+ dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+ o->write_character('}');
+ }
+
+ return;
+ }
+
+ case value_t::array:
+ {
+ if (val.m_value.array->empty())
+ {
+ o->write_characters("[]", 2);
+ return;
+ }
+
+ if (pretty_print)
+ {
+ o->write_characters("[\n", 2);
+
+ // variable to hold indentation for recursive calls
+ const auto new_indent = current_indent + indent_step;
+ if (JSON_UNLIKELY(indent_string.size() < new_indent))
+ {
+ indent_string.resize(indent_string.size() * 2, ' ');
+ }
+
+ // first n-1 elements
+ for (auto i = val.m_value.array->cbegin();
+ i != val.m_value.array->cend() - 1; ++i)
+ {
+ o->write_characters(indent_string.c_str(), new_indent);
+ dump(*i, true, ensure_ascii, indent_step, new_indent);
+ o->write_characters(",\n", 2);
+ }
+
+ // last element
+ assert(not val.m_value.array->empty());
+ o->write_characters(indent_string.c_str(), new_indent);
+ dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+ o->write_character('\n');
+ o->write_characters(indent_string.c_str(), current_indent);
+ o->write_character(']');
+ }
+ else
+ {
+ o->write_character('[');
+
+ // first n-1 elements
+ for (auto i = val.m_value.array->cbegin();
+ i != val.m_value.array->cend() - 1; ++i)
+ {
+ dump(*i, false, ensure_ascii, indent_step, current_indent);
+ o->write_character(',');
+ }
+
+ // last element
+ assert(not val.m_value.array->empty());
+ dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+ o->write_character(']');
+ }
+
+ return;
+ }
+
+ case value_t::string:
+ {
+ o->write_character('\"');
+ dump_escaped(*val.m_value.string, ensure_ascii);
+ o->write_character('\"');
+ return;
+ }
+
+ case value_t::boolean:
+ {
+ if (val.m_value.boolean)
+ {
+ o->write_characters("true", 4);
+ }
+ else
+ {
+ o->write_characters("false", 5);
+ }
+ return;
+ }
+
+ case value_t::number_integer:
+ {
+ dump_integer(val.m_value.number_integer);
+ return;
+ }
+
+ case value_t::number_unsigned:
+ {
+ dump_integer(val.m_value.number_unsigned);
+ return;
+ }
+
+ case value_t::number_float:
+ {
+ dump_float(val.m_value.number_float);
+ return;
+ }
+
+ case value_t::discarded:
+ {
+ o->write_characters("<discarded>", 11);
+ return;
+ }
+
+ case value_t::null:
+ {
+ o->write_characters("null", 4);
+ return;
+ }
+ }
+ }
+
+ private:
+ /*!
+ @brief dump escaped string
+
+ Escape a string by replacing certain special characters by a sequence of an
+ escape character (backslash) and another character and other control
+ characters by a sequence of "\u" followed by a four-digit hex
+ representation. The escaped string is written to output stream @a o.
+
+ @param[in] s the string to escape
+ @param[in] ensure_ascii whether to escape non-ASCII characters with
+ \uXXXX sequences
+
+ @complexity Linear in the length of string @a s.
+ */
+ void dump_escaped(const string_t& s, const bool ensure_ascii)
+ {
+ uint32_t codepoint;
+ uint8_t state = UTF8_ACCEPT;
+ std::size_t bytes = 0; // number of bytes written to string_buffer
+
+ for (std::size_t i = 0; i < s.size(); ++i)
+ {
+ const auto byte = static_cast<uint8_t>(s[i]);
+
+ switch (decode(state, codepoint, byte))
+ {
+ case UTF8_ACCEPT: // decode found a new code point
+ {
+ switch (codepoint)
+ {
+ case 0x08: // backspace
+ {
+ string_buffer[bytes++] = '\\';
+ string_buffer[bytes++] = 'b';
+ break;
+ }
+
+ case 0x09: // horizontal tab
+ {
+ string_buffer[bytes++] = '\\';
+ string_buffer[bytes++] = 't';
+ break;
+ }
+
+ case 0x0A: // newline
+ {
+ string_buffer[bytes++] = '\\';
+ string_buffer[bytes++] = 'n';
+ break;
+ }
+
+ case 0x0C: // formfeed
+ {
+ string_buffer[bytes++] = '\\';
+ string_buffer[bytes++] = 'f';
+ break;
+ }
+
+ case 0x0D: // carriage return
+ {
+ string_buffer[bytes++] = '\\';
+ string_buffer[bytes++] = 'r';
+ break;
+ }
+
+ case 0x22: // quotation mark
+ {
+ string_buffer[bytes++] = '\\';
+ string_buffer[bytes++] = '\"';
+ break;
+ }
+
+ case 0x5C: // reverse solidus
+ {
+ string_buffer[bytes++] = '\\';
+ string_buffer[bytes++] = '\\';
+ break;
+ }
+
+ default:
+ {
+ // escape control characters (0x00..0x1F) or, if
+ // ensure_ascii parameter is used, non-ASCII characters
+ if ((codepoint <= 0x1F) or (ensure_ascii and (codepoint >= 0x7F)))
+ {
+ if (codepoint <= 0xFFFF)
+ {
+ std::snprintf(string_buffer.data() + bytes, 7, "\\u%04x",
+ static_cast<uint16_t>(codepoint));
+ bytes += 6;
+ }
+ else
+ {
+ std::snprintf(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+ static_cast<uint16_t>(0xD7C0 + (codepoint >> 10)),
+ static_cast<uint16_t>(0xDC00 + (codepoint & 0x3FF)));
+ bytes += 12;
+ }
+ }
+ else
+ {
+ // copy byte to buffer (all previous bytes
+ // been copied have in default case above)
+ string_buffer[bytes++] = s[i];
+ }
+ break;
+ }
+ }
+
+ // write buffer and reset index; there must be 13 bytes
+ // left, as this is the maximal number of bytes to be
+ // written ("\uxxxx\uxxxx\0") for one code point
+ if (string_buffer.size() - bytes < 13)
+ {
+ o->write_characters(string_buffer.data(), bytes);
+ bytes = 0;
+ }
+ break;
+ }
+
+ case UTF8_REJECT: // decode found invalid UTF-8 byte
+ {
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << static_cast<int>(byte);
+ JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + ss.str()));
+ }
+
+ default: // decode found yet incomplete multi-byte code point
+ {
+ if (not ensure_ascii)
+ {
+ // code point will not be escaped - copy byte to buffer
+ string_buffer[bytes++] = s[i];
+ }
+ break;
+ }
+ }
+ }
+
+ if (JSON_LIKELY(state == UTF8_ACCEPT))
+ {
+ // write buffer
+ if (bytes > 0)
+ {
+ o->write_characters(string_buffer.data(), bytes);
+ }
+ }
+ else
+ {
+ // we finish reading, but do not accept: string was incomplete
+ std::stringstream ss;
+ ss << std::setw(2) << std::uppercase << std::setfill('0') << std::hex << static_cast<int>(static_cast<uint8_t>(s.back()));
+ JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + ss.str()));
+ }
+ }
+
+ /*!
+ @brief dump an integer
+
+ Dump a given integer to output stream @a o. Works internally with
+ @a number_buffer.
+
+ @param[in] x integer number (signed or unsigned) to dump
+ @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+ */
+ template<typename NumberType, detail::enable_if_t<
+ std::is_same<NumberType, number_unsigned_t>::value or
+ std::is_same<NumberType, number_integer_t>::value,
+ int> = 0>
+ void dump_integer(NumberType x)
+ {
+ // special case for "0"
+ if (x == 0)
+ {
+ o->write_character('0');
+ return;
+ }
+
+ const bool is_negative = (x <= 0) and (x != 0); // see issue #755
+ std::size_t i = 0;
+
+ while (x != 0)
+ {
+ // spare 1 byte for '\0'
+ assert(i < number_buffer.size() - 1);
+
+ const auto digit = std::labs(static_cast<long>(x % 10));
+ number_buffer[i++] = static_cast<char>('0' + digit);
+ x /= 10;
+ }
+
+ if (is_negative)
+ {
+ // make sure there is capacity for the '-'
+ assert(i < number_buffer.size() - 2);
+ number_buffer[i++] = '-';
+ }
+
+ std::reverse(number_buffer.begin(), number_buffer.begin() + i);
+ o->write_characters(number_buffer.data(), i);
+ }
+
+ /*!
+ @brief dump a floating-point number
+
+ Dump a given floating-point number to output stream @a o. Works internally
+ with @a number_buffer.
+
+ @param[in] x floating-point number to dump
+ */
+ void dump_float(number_float_t x)
+ {
+ // NaN / inf
+ if (not std::isfinite(x))
+ {
+ o->write_characters("null", 4);
+ return;
+ }
+
+ // If number_float_t is an IEEE-754 single or double precision number,
+ // use the Grisu2 algorithm to produce short numbers which are
+ // guaranteed to round-trip, using strtof and strtod, resp.
+ //
+ // NB: The test below works if <long double> == <double>.
+ static constexpr bool is_ieee_single_or_double
+ = (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 24 and std::numeric_limits<number_float_t>::max_exponent == 128) or
+ (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 53 and std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+ dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+ }
+
+ void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+ {
+ char* begin = number_buffer.data();
+ char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+ o->write_characters(begin, static_cast<size_t>(end - begin));
+ }
+
+ void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+ {
+ // get number of digits for a float -> text -> float round-trip
+ static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+ // the actual conversion
+ std::ptrdiff_t len = snprintf(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+ // negative value indicates an error
+ assert(len > 0);
+ // check if buffer was large enough
+ assert(static_cast<std::size_t>(len) < number_buffer.size());
+
+ // erase thousands separator
+ if (thousands_sep != '\0')
+ {
+ const auto end = std::remove(number_buffer.begin(),
+ number_buffer.begin() + len, thousands_sep);
+ std::fill(end, number_buffer.end(), '\0');
+ assert((end - number_buffer.begin()) <= len);
+ len = (end - number_buffer.begin());
+ }
+
+ // convert decimal point to '.'
+ if (decimal_point != '\0' and decimal_point != '.')
+ {
+ const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+ if (dec_pos != number_buffer.end())
+ {
+ *dec_pos = '.';
+ }
+ }
+
+ o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+ // determine if need to append ".0"
+ const bool value_is_int_like =
+ std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+ [](char c)
+ {
+ return (c == '.' or c == 'e');
+ });
+
+ if (value_is_int_like)
+ {
+ o->write_characters(".0", 2);
+ }
+ }
+
+ /*!
+ @brief check whether a string is UTF-8 encoded
+
+ The function checks each byte of a string whether it is UTF-8 encoded. The
+ result of the check is stored in the @a state parameter. The function must
+ be called initially with state 0 (accept). State 1 means the string must
+ be rejected, because the current byte is not allowed. If the string is
+ completely processed, but the state is non-zero, the string ended
+ prematurely; that is, the last byte indicated more bytes should have
+ followed.
+
+ @param[in,out] state the state of the decoding
+ @param[in,out] codep codepoint (valid only if resulting state is UTF8_ACCEPT)
+ @param[in] byte next byte to decode
+ @return new state
+
+ @note The function has been edited: a std::array is used.
+
+ @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+ @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+ */
+ static uint8_t decode(uint8_t& state, uint32_t& codep, const uint8_t byte) noexcept
+ {
+ static const std::array<uint8_t, 400> utf8d =
+ {
+ {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+ 8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+ 0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+ 0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+ 0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+ 1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+ 1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+ 1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+ }
+ };
+
+ const uint8_t type = utf8d[byte];
+
+ codep = (state != UTF8_ACCEPT)
+ ? (byte & 0x3fu) | (codep << 6)
+ : static_cast<uint32_t>(0xff >> type) & (byte);
+
+ state = utf8d[256u + state * 16u + type];
+ return state;
+ }
+
+ private:
+ /// the output of the serializer
+ output_adapter_t<char> o = nullptr;
+
+ /// a (hopefully) large enough character buffer
+ std::array<char, 64> number_buffer{{}};
+
+ /// the locale
+ const std::lconv* loc = nullptr;
+ /// the locale's thousand separator character
+ const char thousands_sep = '\0';
+ /// the locale's decimal point character
+ const char decimal_point = '\0';
+
+ /// string buffer
+ std::array<char, 512> string_buffer{{}};
+
+ /// the indentation character
+ const char indent_char;
+ /// the indentation string
+ string_t indent_string;
+};
+}
+}
+
+// #include <nlohmann/detail/json_ref.hpp>
+
+
+#include <initializer_list>
+#include <utility>
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+class json_ref
+{
+ public:
+ using value_type = BasicJsonType;
+
+ json_ref(value_type&& value)
+ : owned_value(std::move(value)), value_ref(&owned_value), is_rvalue(true)
+ {}
+
+ json_ref(const value_type& value)
+ : value_ref(const_cast<value_type*>(&value)), is_rvalue(false)
+ {}
+
+ json_ref(std::initializer_list<json_ref> init)
+ : owned_value(init), value_ref(&owned_value), is_rvalue(true)
+ {}
+
+ template<class... Args>
+ json_ref(Args&& ... args)
+ : owned_value(std::forward<Args>(args)...), value_ref(&owned_value), is_rvalue(true)
+ {}
+
+ // class should be movable only
+ json_ref(json_ref&&) = default;
+ json_ref(const json_ref&) = delete;
+ json_ref& operator=(const json_ref&) = delete;
+
+ value_type moved_or_copied() const
+ {
+ if (is_rvalue)
+ {
+ return std::move(*value_ref);
+ }
+ return *value_ref;
+ }
+
+ value_type const& operator*() const
+ {
+ return *static_cast<value_type const*>(value_ref);
+ }
+
+ value_type const* operator->() const
+ {
+ return static_cast<value_type const*>(value_ref);
+ }
+
+ private:
+ mutable value_type owned_value = nullptr;
+ value_type* value_ref = nullptr;
+ const bool is_rvalue;
+};
+}
+}
+
+// #include <nlohmann/detail/json_pointer.hpp>
+
+
+#include <cassert> // assert
+#include <numeric> // accumulate
+#include <string> // string
+#include <vector> // vector
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+template<typename BasicJsonType>
+class json_pointer
+{
+ // allow basic_json to access private members
+ NLOHMANN_BASIC_JSON_TPL_DECLARATION
+ friend class basic_json;
+
+ public:
+ /*!
+ @brief create JSON pointer
+
+ Create a JSON pointer according to the syntax described in
+ [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
+
+ @param[in] s string representing the JSON pointer; if omitted, the empty
+ string is assumed which references the whole JSON value
+
+ @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
+ not begin with a slash (`/`); see example below
+
+ @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
+ not followed by `0` (representing `~`) or `1` (representing `/`); see
+ example below
+
+ @liveexample{The example shows the construction several valid JSON pointers
+ as well as the exceptional behavior.,json_pointer}
+
+ @since version 2.0.0
+ */
+ explicit json_pointer(const std::string& s = "")
+ : reference_tokens(split(s))
+ {}
+
+ /*!
+ @brief return a string representation of the JSON pointer
+
+ @invariant For each JSON pointer `ptr`, it holds:
+ @code {.cpp}
+ ptr == json_pointer(ptr.to_string());
+ @endcode
+
+ @return a string representation of the JSON pointer
+
+ @liveexample{The example shows the result of `to_string`.,
+ json_pointer__to_string}
+
+ @since version 2.0.0
+ */
+ std::string to_string() const noexcept
+ {
+ return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+ std::string{},
+ [](const std::string & a, const std::string & b)
+ {
+ return a + "/" + escape(b);
+ });
+ }
+
+ /// @copydoc to_string()
+ operator std::string() const
+ {
+ return to_string();
+ }
+
+ /*!
+ @param[in] s reference token to be converted into an array index
+
+ @return integer representation of @a s
+
+ @throw out_of_range.404 if string @a s could not be converted to an integer
+ */
+ static int array_index(const std::string& s)
+ {
+ std::size_t processed_chars = 0;
+ const int res = std::stoi(s, &processed_chars);
+
+ // check if the string was completely read
+ if (JSON_UNLIKELY(processed_chars != s.size()))
+ {
+ JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
+ }
+
+ return res;
+ }
+
+ private:
+ /*!
+ @brief remove and return last reference pointer
+ @throw out_of_range.405 if JSON pointer has no parent
+ */
+ std::string pop_back()
+ {
+ if (JSON_UNLIKELY(is_root()))
+ {
+ JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+ }
+
+ auto last = reference_tokens.back();
+ reference_tokens.pop_back();
+ return last;
+ }
+
+ /// return whether pointer points to the root document
+ bool is_root() const
+ {
+ return reference_tokens.empty();
+ }
+
+ json_pointer top() const
+ {
+ if (JSON_UNLIKELY(is_root()))
+ {
+ JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+ }
+
+ json_pointer result = *this;
+ result.reference_tokens = {reference_tokens[0]};
+ return result;
+ }
+
+ /*!
+ @brief create and return a reference to the pointed to value
+
+ @complexity Linear in the number of reference tokens.
+
+ @throw parse_error.109 if array index is not a number
+ @throw type_error.313 if value cannot be unflattened
+ */
+ BasicJsonType& get_and_create(BasicJsonType& j) const
+ {
+ using size_type = typename BasicJsonType::size_type;
+ auto result = &j;
+
+ // in case no reference tokens exist, return a reference to the JSON value
+ // j which will be overwritten by a primitive value
+ for (const auto& reference_token : reference_tokens)
+ {
+ switch (result->m_type)
+ {
+ case detail::value_t::null:
+ {
+ if (reference_token == "0")
+ {
+ // start a new array if reference token is 0
+ result = &result->operator[](0);
+ }
+ else
+ {
+ // start a new object otherwise
+ result = &result->operator[](reference_token);
+ }
+ break;
+ }
+
+ case detail::value_t::object:
+ {
+ // create an entry in the object
+ result = &result->operator[](reference_token);
+ break;
+ }
+
+ case detail::value_t::array:
+ {
+ // create an entry in the array
+ JSON_TRY
+ {
+ result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
+ }
+ JSON_CATCH(std::invalid_argument&)
+ {
+ JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+ }
+ break;
+ }
+
+ /*
+ The following code is only reached if there exists a reference
+ token _and_ the current value is primitive. In this case, we have
+ an error situation, because primitive values may only occur as
+ single value; that is, with an empty list of reference tokens.
+ */
+ default:
+ JSON_THROW(detail::type_error::create(313, "invalid value to unflatten"));
+ }
+ }
+
+ return *result;
+ }
+
+ /*!
+ @brief return a reference to the pointed to value
+
+ @note This version does not throw if a value is not present, but tries to
+ create nested values instead. For instance, calling this function
+ with pointer `"/this/that"` on a null value is equivalent to calling
+ `operator[]("this").operator[]("that")` on that value, effectively
+ changing the null value to an object.
+
+ @param[in] ptr a JSON value
+
+ @return reference to the JSON value pointed to by the JSON pointer
+
+ @complexity Linear in the length of the JSON pointer.
+
+ @throw parse_error.106 if an array index begins with '0'
+ @throw parse_error.109 if an array index was not a number
+ @throw out_of_range.404 if the JSON pointer can not be resolved
+ */
+ BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+ {
+ using size_type = typename BasicJsonType::size_type;
+ for (const auto& reference_token : reference_tokens)
+ {
+ // convert null values to arrays or objects before continuing
+ if (ptr->m_type == detail::value_t::null)
+ {
+ // check if reference token is a number
+ const bool nums =
+ std::all_of(reference_token.begin(), reference_token.end(),
+ [](const char x)
+ {
+ return (x >= '0' and x <= '9');
+ });
+
+ // change value to array for numbers or "-" or to object otherwise
+ *ptr = (nums or reference_token == "-")
+ ? detail::value_t::array
+ : detail::value_t::object;
+ }
+
+ switch (ptr->m_type)
+ {
+ case detail::value_t::object:
+ {
+ // use unchecked object access
+ ptr = &ptr->operator[](reference_token);
+ break;
+ }
+
+ case detail::value_t::array:
+ {
+ // error condition (cf. RFC 6901, Sect. 4)
+ if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+ {
+ JSON_THROW(detail::parse_error::create(106, 0,
+ "array index '" + reference_token +
+ "' must not begin with '0'"));
+ }
+
+ if (reference_token == "-")
+ {
+ // explicitly treat "-" as index beyond the end
+ ptr = &ptr->operator[](ptr->m_value.array->size());
+ }
+ else
+ {
+ // convert array index to number; unchecked access
+ JSON_TRY
+ {
+ ptr = &ptr->operator[](
+ static_cast<size_type>(array_index(reference_token)));
+ }
+ JSON_CATCH(std::invalid_argument&)
+ {
+ JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+ }
+ }
+ break;
+ }
+
+ default:
+ JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+ }
+ }
+
+ return *ptr;
+ }
+
+ /*!
+ @throw parse_error.106 if an array index begins with '0'
+ @throw parse_error.109 if an array index was not a number
+ @throw out_of_range.402 if the array index '-' is used
+ @throw out_of_range.404 if the JSON pointer can not be resolved
+ */
+ BasicJsonType& get_checked(BasicJsonType* ptr) const
+ {
+ using size_type = typename BasicJsonType::size_type;
+ for (const auto& reference_token : reference_tokens)
+ {
+ switch (ptr->m_type)
+ {
+ case detail::value_t::object:
+ {
+ // note: at performs range check
+ ptr = &ptr->at(reference_token);
+ break;
+ }
+
+ case detail::value_t::array:
+ {
+ if (JSON_UNLIKELY(reference_token == "-"))
+ {
+ // "-" always fails the range check
+ JSON_THROW(detail::out_of_range::create(402,
+ "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+ ") is out of range"));
+ }
+
+ // error condition (cf. RFC 6901, Sect. 4)
+ if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+ {
+ JSON_THROW(detail::parse_error::create(106, 0,
+ "array index '" + reference_token +
+ "' must not begin with '0'"));
+ }
+
+ // note: at performs range check
+ JSON_TRY
+ {
+ ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
+ }
+ JSON_CATCH(std::invalid_argument&)
+ {
+ JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+ }
+ break;
+ }
+
+ default:
+ JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+ }
+ }
+
+ return *ptr;
+ }
+
+ /*!
+ @brief return a const reference to the pointed to value
+
+ @param[in] ptr a JSON value
+
+ @return const reference to the JSON value pointed to by the JSON
+ pointer
+
+ @throw parse_error.106 if an array index begins with '0'
+ @throw parse_error.109 if an array index was not a number
+ @throw out_of_range.402 if the array index '-' is used
+ @throw out_of_range.404 if the JSON pointer can not be resolved
+ */
+ const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+ {
+ using size_type = typename BasicJsonType::size_type;
+ for (const auto& reference_token : reference_tokens)
+ {
+ switch (ptr->m_type)
+ {
+ case detail::value_t::object:
+ {
+ // use unchecked object access
+ ptr = &ptr->operator[](reference_token);
+ break;
+ }
+
+ case detail::value_t::array:
+ {
+ if (JSON_UNLIKELY(reference_token == "-"))
+ {
+ // "-" cannot be used for const access
+ JSON_THROW(detail::out_of_range::create(402,
+ "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+ ") is out of range"));
+ }
+
+ // error condition (cf. RFC 6901, Sect. 4)
+ if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+ {
+ JSON_THROW(detail::parse_error::create(106, 0,
+ "array index '" + reference_token +
+ "' must not begin with '0'"));
+ }
+
+ // use unchecked array access
+ JSON_TRY
+ {
+ ptr = &ptr->operator[](
+ static_cast<size_type>(array_index(reference_token)));
+ }
+ JSON_CATCH(std::invalid_argument&)
+ {
+ JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+ }
+ break;
+ }
+
+ default:
+ JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+ }
+ }
+
+ return *ptr;
+ }
+
+ /*!
+ @throw parse_error.106 if an array index begins with '0'
+ @throw parse_error.109 if an array index was not a number
+ @throw out_of_range.402 if the array index '-' is used
+ @throw out_of_range.404 if the JSON pointer can not be resolved
+ */
+ const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+ {
+ using size_type = typename BasicJsonType::size_type;
+ for (const auto& reference_token : reference_tokens)
+ {
+ switch (ptr->m_type)
+ {
+ case detail::value_t::object:
+ {
+ // note: at performs range check
+ ptr = &ptr->at(reference_token);
+ break;
+ }
+
+ case detail::value_t::array:
+ {
+ if (JSON_UNLIKELY(reference_token == "-"))
+ {
+ // "-" always fails the range check
+ JSON_THROW(detail::out_of_range::create(402,
+ "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+ ") is out of range"));
+ }
+
+ // error condition (cf. RFC 6901, Sect. 4)
+ if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+ {
+ JSON_THROW(detail::parse_error::create(106, 0,
+ "array index '" + reference_token +
+ "' must not begin with '0'"));
+ }
+
+ // note: at performs range check
+ JSON_TRY
+ {
+ ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
+ }
+ JSON_CATCH(std::invalid_argument&)
+ {
+ JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+ }
+ break;
+ }
+
+ default:
+ JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+ }
+ }
+
+ return *ptr;
+ }
+
+ /*!
+ @brief split the string input to reference tokens
+
+ @note This function is only called by the json_pointer constructor.
+ All exceptions below are documented there.
+
+ @throw parse_error.107 if the pointer is not empty or begins with '/'
+ @throw parse_error.108 if character '~' is not followed by '0' or '1'
+ */
+ static std::vector<std::string> split(const std::string& reference_string)
+ {
+ std::vector<std::string> result;
+
+ // special case: empty reference string -> no reference tokens
+ if (reference_string.empty())
+ {
+ return result;
+ }
+
+ // check if nonempty reference string begins with slash
+ if (JSON_UNLIKELY(reference_string[0] != '/'))
+ {
+ JSON_THROW(detail::parse_error::create(107, 1,
+ "JSON pointer must be empty or begin with '/' - was: '" +
+ reference_string + "'"));
+ }
+
+ // extract the reference tokens:
+ // - slash: position of the last read slash (or end of string)
+ // - start: position after the previous slash
+ for (
+ // search for the first slash after the first character
+ std::size_t slash = reference_string.find_first_of('/', 1),
+ // set the beginning of the first reference token
+ start = 1;
+ // we can stop if start == string::npos+1 = 0
+ start != 0;
+ // set the beginning of the next reference token
+ // (will eventually be 0 if slash == std::string::npos)
+ start = slash + 1,
+ // find next slash
+ slash = reference_string.find_first_of('/', start))
+ {
+ // use the text between the beginning of the reference token
+ // (start) and the last slash (slash).
+ auto reference_token = reference_string.substr(start, slash - start);
+
+ // check reference tokens are properly escaped
+ for (std::size_t pos = reference_token.find_first_of('~');
+ pos != std::string::npos;
+ pos = reference_token.find_first_of('~', pos + 1))
+ {
+ assert(reference_token[pos] == '~');
+
+ // ~ must be followed by 0 or 1
+ if (JSON_UNLIKELY(pos == reference_token.size() - 1 or
+ (reference_token[pos + 1] != '0' and
+ reference_token[pos + 1] != '1')))
+ {
+ JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'"));
+ }
+ }
+
+ // finally, store the reference token
+ unescape(reference_token);
+ result.push_back(reference_token);
+ }
+
+ return result;
+ }
+
+ /*!
+ @brief replace all occurrences of a substring by another string
+
+ @param[in,out] s the string to manipulate; changed so that all
+ occurrences of @a f are replaced with @a t
+ @param[in] f the substring to replace with @a t
+ @param[in] t the string to replace @a f
+
+ @pre The search string @a f must not be empty. **This precondition is
+ enforced with an assertion.**
+
+ @since version 2.0.0
+ */
+ static void replace_substring(std::string& s, const std::string& f,
+ const std::string& t)
+ {
+ assert(not f.empty());
+ for (auto pos = s.find(f); // find first occurrence of f
+ pos != std::string::npos; // make sure f was found
+ s.replace(pos, f.size(), t), // replace with t, and
+ pos = s.find(f, pos + t.size())) // find next occurrence of f
+ {}
+ }
+
+ /// escape "~"" to "~0" and "/" to "~1"
+ static std::string escape(std::string s)
+ {
+ replace_substring(s, "~", "~0");
+ replace_substring(s, "/", "~1");
+ return s;
+ }
+
+ /// unescape "~1" to tilde and "~0" to slash (order is important!)
+ static void unescape(std::string& s)
+ {
+ replace_substring(s, "~1", "/");
+ replace_substring(s, "~0", "~");
+ }
+
+ /*!
+ @param[in] reference_string the reference string to the current value
+ @param[in] value the value to consider
+ @param[in,out] result the result object to insert values to
+
+ @note Empty objects or arrays are flattened to `null`.
+ */
+ static void flatten(const std::string& reference_string,
+ const BasicJsonType& value,
+ BasicJsonType& result)
+ {
+ switch (value.m_type)
+ {
+ case detail::value_t::array:
+ {
+ if (value.m_value.array->empty())
+ {
+ // flatten empty array as null
+ result[reference_string] = nullptr;
+ }
+ else
+ {
+ // iterate array and use index as reference string
+ for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+ {
+ flatten(reference_string + "/" + std::to_string(i),
+ value.m_value.array->operator[](i), result);
+ }
+ }
+ break;
+ }
+
+ case detail::value_t::object:
+ {
+ if (value.m_value.object->empty())
+ {
+ // flatten empty object as null
+ result[reference_string] = nullptr;
+ }
+ else
+ {
+ // iterate object and use keys as reference string
+ for (const auto& element : *value.m_value.object)
+ {
+ flatten(reference_string + "/" + escape(element.first), element.second, result);
+ }
+ }
+ break;
+ }
+
+ default:
+ {
+ // add primitive value with its reference string
+ result[reference_string] = value;
+ break;
+ }
+ }
+ }
+
+ /*!
+ @param[in] value flattened JSON
+
+ @return unflattened JSON
+
+ @throw parse_error.109 if array index is not a number
+ @throw type_error.314 if value is not an object
+ @throw type_error.315 if object values are not primitive
+ @throw type_error.313 if value cannot be unflattened
+ */
+ static BasicJsonType
+ unflatten(const BasicJsonType& value)
+ {
+ if (JSON_UNLIKELY(not value.is_object()))
+ {
+ JSON_THROW(detail::type_error::create(314, "only objects can be unflattened"));
+ }
+
+ BasicJsonType result;
+
+ // iterate the JSON object values
+ for (const auto& element : *value.m_value.object)
+ {
+ if (JSON_UNLIKELY(not element.second.is_primitive()))
+ {
+ JSON_THROW(detail::type_error::create(315, "values in object must be primitive"));
+ }
+
+ // assign value to reference pointed to by JSON pointer; Note that if
+ // the JSON pointer is "" (i.e., points to the whole value), function
+ // get_and_create returns a reference to result itself. An assignment
+ // will then create a primitive value.
+ json_pointer(element.first).get_and_create(result) = element.second;
+ }
+
+ return result;
+ }
+
+ friend bool operator==(json_pointer const& lhs,
+ json_pointer const& rhs) noexcept
+ {
+ return (lhs.reference_tokens == rhs.reference_tokens);
+ }
+
+ friend bool operator!=(json_pointer const& lhs,
+ json_pointer const& rhs) noexcept
+ {
+ return not (lhs == rhs);
+ }
+
+ /// the reference tokens
+ std::vector<std::string> reference_tokens;
+};
+}
+
+// #include <nlohmann/adl_serializer.hpp>
+
+
+#include <utility>
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+
+namespace nlohmann
+{
+template<typename, typename>
+struct adl_serializer
+{
+ /*!
+ @brief convert a JSON value to any value type
+
+ This function is usually called by the `get()` function of the
+ @ref basic_json class (either explicit or via conversion operators).
+
+ @param[in] j JSON value to read from
+ @param[in,out] val value to write to
+ */
+ template<typename BasicJsonType, typename ValueType>
+ static void from_json(BasicJsonType&& j, ValueType& val) noexcept(
+ noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+ {
+ ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+ }
+
+ /*!
+ @brief convert any value type to a JSON value
+
+ This function is usually called by the constructors of the @ref basic_json
+ class.
+
+ @param[in,out] j JSON value to write to
+ @param[in] val value to read from
+ */
+ template<typename BasicJsonType, typename ValueType>
+ static void to_json(BasicJsonType& j, ValueType&& val) noexcept(
+ noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
+ {
+ ::nlohmann::to_json(j, std::forward<ValueType>(val));
+ }
+};
+}
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+
+/*!
+@brief a class to store JSON values
+
+@tparam ObjectType type for JSON objects (`std::map` by default; will be used
+in @ref object_t)
+@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
+in @ref array_t)
+@tparam StringType type for JSON strings and object keys (`std::string` by
+default; will be used in @ref string_t)
+@tparam BooleanType type for JSON booleans (`bool` by default; will be used
+in @ref boolean_t)
+@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
+default; will be used in @ref number_integer_t)
+@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
+`uint64_t` by default; will be used in @ref number_unsigned_t)
+@tparam NumberFloatType type for JSON floating-point numbers (`double` by
+default; will be used in @ref number_float_t)
+@tparam AllocatorType type of the allocator to use (`std::allocator` by
+default)
+@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
+and `from_json()` (@ref adl_serializer by default)
+
+@requirement The class satisfies the following concept requirements:
+- Basic
+ - [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible):
+ JSON values can be default constructed. The result will be a JSON null
+ value.
+ - [MoveConstructible](http://en.cppreference.com/w/cpp/concept/MoveConstructible):
+ A JSON value can be constructed from an rvalue argument.
+ - [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible):
+ A JSON value can be copy-constructed from an lvalue expression.
+ - [MoveAssignable](http://en.cppreference.com/w/cpp/concept/MoveAssignable):
+ A JSON value van be assigned from an rvalue argument.
+ - [CopyAssignable](http://en.cppreference.com/w/cpp/concept/CopyAssignable):
+ A JSON value can be copy-assigned from an lvalue expression.
+ - [Destructible](http://en.cppreference.com/w/cpp/concept/Destructible):
+ JSON values can be destructed.
+- Layout
+ - [StandardLayoutType](http://en.cppreference.com/w/cpp/concept/StandardLayoutType):
+ JSON values have
+ [standard layout](http://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
+ All non-static data members are private and standard layout types, the
+ class has no virtual functions or (virtual) base classes.
+- Library-wide
+ - [EqualityComparable](http://en.cppreference.com/w/cpp/concept/EqualityComparable):
+ JSON values can be compared with `==`, see @ref
+ operator==(const_reference,const_reference).
+ - [LessThanComparable](http://en.cppreference.com/w/cpp/concept/LessThanComparable):
+ JSON values can be compared with `<`, see @ref
+ operator<(const_reference,const_reference).
+ - [Swappable](http://en.cppreference.com/w/cpp/concept/Swappable):
+ Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
+ other compatible types, using unqualified function call @ref swap().
+ - [NullablePointer](http://en.cppreference.com/w/cpp/concept/NullablePointer):
+ JSON values can be compared against `std::nullptr_t` objects which are used
+ to model the `null` value.
+- Container
+ - [Container](http://en.cppreference.com/w/cpp/concept/Container):
+ JSON values can be used like STL containers and provide iterator access.
+ - [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer);
+ JSON values can be used like STL containers and provide reverse iterator
+ access.
+
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@internal
+@note ObjectType trick from http://stackoverflow.com/a/9860911
+@endinternal
+
+@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
+Format](http://rfc7159.net/rfc7159)
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json
+{
+ private:
+ template<detail::value_t> friend struct detail::external_constructor;
+ friend ::nlohmann::json_pointer<basic_json>;
+ friend ::nlohmann::detail::parser<basic_json>;
+ friend ::nlohmann::detail::serializer<basic_json>;
+ template<typename BasicJsonType>
+ friend class ::nlohmann::detail::iter_impl;
+ template<typename BasicJsonType, typename CharType>
+ friend class ::nlohmann::detail::binary_writer;
+ template<typename BasicJsonType>
+ friend class ::nlohmann::detail::binary_reader;
+
+ /// workaround type for MSVC
+ using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+
+ // convenience aliases for types residing in namespace detail;
+ using lexer = ::nlohmann::detail::lexer<basic_json>;
+ using parser = ::nlohmann::detail::parser<basic_json>;
+
+ using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+ template<typename BasicJsonType>
+ using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+ template<typename BasicJsonType>
+ using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+ template<typename Iterator>
+ using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+ template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+ template<typename CharType>
+ using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+ using binary_reader = ::nlohmann::detail::binary_reader<basic_json>;
+ template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+ using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+ public:
+ using value_t = detail::value_t;
+ /// @copydoc nlohmann::json_pointer
+ using json_pointer = ::nlohmann::json_pointer<basic_json>;
+ template<typename T, typename SFINAE>
+ using json_serializer = JSONSerializer<T, SFINAE>;
+ /// helper type for initializer lists of basic_json values
+ using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+ ////////////////
+ // exceptions //
+ ////////////////
+
+ /// @name exceptions
+ /// Classes to implement user-defined exceptions.
+ /// @{
+
+ /// @copydoc detail::exception
+ using exception = detail::exception;
+ /// @copydoc detail::parse_error
+ using parse_error = detail::parse_error;
+ /// @copydoc detail::invalid_iterator
+ using invalid_iterator = detail::invalid_iterator;
+ /// @copydoc detail::type_error
+ using type_error = detail::type_error;
+ /// @copydoc detail::out_of_range
+ using out_of_range = detail::out_of_range;
+ /// @copydoc detail::other_error
+ using other_error = detail::other_error;
+
+ /// @}
+
+
+ /////////////////////
+ // container types //
+ /////////////////////
+
+ /// @name container types
+ /// The canonic container types to use @ref basic_json like any other STL
+ /// container.
+ /// @{
+
+ /// the type of elements in a basic_json container
+ using value_type = basic_json;
+
+ /// the type of an element reference
+ using reference = value_type&;
+ /// the type of an element const reference
+ using const_reference = const value_type&;
+
+ /// a type to represent differences between iterators
+ using difference_type = std::ptrdiff_t;
+ /// a type to represent container sizes
+ using size_type = std::size_t;
+
+ /// the allocator type
+ using allocator_type = AllocatorType<basic_json>;
+
+ /// the type of an element pointer
+ using pointer = typename std::allocator_traits<allocator_type>::pointer;
+ /// the type of an element const pointer
+ using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+ /// an iterator for a basic_json container
+ using iterator = iter_impl<basic_json>;
+ /// a const iterator for a basic_json container
+ using const_iterator = iter_impl<const basic_json>;
+ /// a reverse iterator for a basic_json container
+ using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+ /// a const reverse iterator for a basic_json container
+ using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+ /// @}
+
+
+ /*!
+ @brief returns the allocator associated with the container
+ */
+ static allocator_type get_allocator()
+ {
+ return allocator_type();
+ }
+
+ /*!
+ @brief returns version information on the library
+
+ This function returns a JSON object with information about the library,
+ including the version number and information on the platform and compiler.
+
+ @return JSON object holding version information
+ key | description
+ ----------- | ---------------
+ `compiler` | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
+ `copyright` | The copyright line for the library as string.
+ `name` | The name of the library as string.
+ `platform` | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
+ `url` | The URL of the project as string.
+ `version` | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
+
+ @liveexample{The following code shows an example output of the `meta()`
+ function.,meta}
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes to any JSON value.
+
+ @complexity Constant.
+
+ @since 2.1.0
+ */
+ static basic_json meta()
+ {
+ basic_json result;
+
+ result["copyright"] = "(C) 2013-2017 Niels Lohmann";
+ result["name"] = "JSON for Modern C++";
+ result["url"] = "https://github.com/nlohmann/json";
+ result["version"]["string"] =
+ std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
+ std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
+ std::to_string(NLOHMANN_JSON_VERSION_PATCH);
+ result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+ result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+ result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+ result["platform"] = "win32";
+#elif defined __linux__
+ result["platform"] = "linux";
+#elif defined __APPLE__
+ result["platform"] = "apple";
+#elif defined __unix__
+ result["platform"] = "unix";
+#else
+ result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+ result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+ result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+ result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
+#elif defined(__HP_cc) || defined(__HP_aCC)
+ result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+ result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+ result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+ result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+ result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+ result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#ifdef __cplusplus
+ result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+ result["compiler"]["c++"] = "unknown";
+#endif
+ return result;
+ }
+
+
+ ///////////////////////////
+ // JSON value data types //
+ ///////////////////////////
+
+ /// @name JSON value data types
+ /// The data types to store a JSON value. These types are derived from
+ /// the template arguments passed to class @ref basic_json.
+ /// @{
+
+#if defined(JSON_HAS_CPP_14)
+ // Use transparent comparator if possible, combined with perfect forwarding
+ // on find() and count() calls prevents unnecessary string construction.
+ using object_comparator_t = std::less<>;
+#else
+ using object_comparator_t = std::less<StringType>;
+#endif
+
+ /*!
+ @brief a type for an object
+
+ [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
+ > An object is an unordered collection of zero or more name/value pairs,
+ > where a name is a string and a value is a string, number, boolean, null,
+ > object, or array.
+
+ To store objects in C++, a type is defined by the template parameters
+ described below.
+
+ @tparam ObjectType the container to store objects (e.g., `std::map` or
+ `std::unordered_map`)
+ @tparam StringType the type of the keys or names (e.g., `std::string`).
+ The comparison function `std::less<StringType>` is used to order elements
+ inside the container.
+ @tparam AllocatorType the allocator to use for objects (e.g.,
+ `std::allocator`)
+
+ #### Default type
+
+ With the default values for @a ObjectType (`std::map`), @a StringType
+ (`std::string`), and @a AllocatorType (`std::allocator`), the default
+ value for @a object_t is:
+
+ @code {.cpp}
+ std::map<
+ std::string, // key_type
+ basic_json, // value_type
+ std::less<std::string>, // key_compare
+ std::allocator<std::pair<const std::string, basic_json>> // allocator_type
+ >
+ @endcode
+
+ #### Behavior
+
+ The choice of @a object_t influences the behavior of the JSON class. With
+ the default type, objects have the following behavior:
+
+ - When all names are unique, objects will be interoperable in the sense
+ that all software implementations receiving that object will agree on
+ the name-value mappings.
+ - When the names within an object are not unique, it is unspecified which
+ one of the values for a given key will be chosen. For instance,
+ `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
+ `{"key": 2}`.
+ - Internally, name/value pairs are stored in lexicographical order of the
+ names. Objects will also be serialized (see @ref dump) in this order.
+ For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
+ and serialized as `{"a": 2, "b": 1}`.
+ - When comparing objects, the order of the name/value pairs is irrelevant.
+ This makes objects interoperable in the sense that they will not be
+ affected by these differences. For instance, `{"b": 1, "a": 2}` and
+ `{"a": 2, "b": 1}` will be treated as equal.
+
+ #### Limits
+
+ [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+ > An implementation may set limits on the maximum depth of nesting.
+
+ In this class, the object's limit of nesting is not explicitly constrained.
+ However, a maximum depth of nesting may be introduced by the compiler or
+ runtime environment. A theoretical limit can be queried by calling the
+ @ref max_size function of a JSON object.
+
+ #### Storage
+
+ Objects are stored as pointers in a @ref basic_json type. That is, for any
+ access to object values, a pointer of type `object_t*` must be
+ dereferenced.
+
+ @sa @ref array_t -- type for an array value
+
+ @since version 1.0.0
+
+ @note The order name/value pairs are added to the object is *not*
+ preserved by the library. Therefore, iterating an object may return
+ name/value pairs in a different order than they were originally stored. In
+ fact, keys will be traversed in alphabetical order as `std::map` with
+ `std::less` is used by default. Please note this behavior conforms to [RFC
+ 7159](http://rfc7159.net/rfc7159), because any order implements the
+ specified "unordered" nature of JSON objects.
+ */
+ using object_t = ObjectType<StringType,
+ basic_json,
+ object_comparator_t,
+ AllocatorType<std::pair<const StringType,
+ basic_json>>>;
+
+ /*!
+ @brief a type for an array
+
+ [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
+ > An array is an ordered sequence of zero or more values.
+
+ To store objects in C++, a type is defined by the template parameters
+ explained below.
+
+ @tparam ArrayType container type to store arrays (e.g., `std::vector` or
+ `std::list`)
+ @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
+
+ #### Default type
+
+ With the default values for @a ArrayType (`std::vector`) and @a
+ AllocatorType (`std::allocator`), the default value for @a array_t is:
+
+ @code {.cpp}
+ std::vector<
+ basic_json, // value_type
+ std::allocator<basic_json> // allocator_type
+ >
+ @endcode
+
+ #### Limits
+
+ [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+ > An implementation may set limits on the maximum depth of nesting.
+
+ In this class, the array's limit of nesting is not explicitly constrained.
+ However, a maximum depth of nesting may be introduced by the compiler or
+ runtime environment. A theoretical limit can be queried by calling the
+ @ref max_size function of a JSON array.
+
+ #### Storage
+
+ Arrays are stored as pointers in a @ref basic_json type. That is, for any
+ access to array values, a pointer of type `array_t*` must be dereferenced.
+
+ @sa @ref object_t -- type for an object value
+
+ @since version 1.0.0
+ */
+ using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+ /*!
+ @brief a type for a string
+
+ [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
+ > A string is a sequence of zero or more Unicode characters.
+
+ To store objects in C++, a type is defined by the template parameter
+ described below. Unicode values are split by the JSON class into
+ byte-sized characters during deserialization.
+
+ @tparam StringType the container to store strings (e.g., `std::string`).
+ Note this container is used for keys/names in objects, see @ref object_t.
+
+ #### Default type
+
+ With the default values for @a StringType (`std::string`), the default
+ value for @a string_t is:
+
+ @code {.cpp}
+ std::string
+ @endcode
+
+ #### Encoding
+
+ Strings are stored in UTF-8 encoding. Therefore, functions like
+ `std::string::size()` or `std::string::length()` return the number of
+ bytes in the string rather than the number of characters or glyphs.
+
+ #### String comparison
+
+ [RFC 7159](http://rfc7159.net/rfc7159) states:
+ > Software implementations are typically required to test names of object
+ > members for equality. Implementations that transform the textual
+ > representation into sequences of Unicode code units and then perform the
+ > comparison numerically, code unit by code unit, are interoperable in the
+ > sense that implementations will agree in all cases on equality or
+ > inequality of two strings. For example, implementations that compare
+ > strings with escaped characters unconverted may incorrectly find that
+ > `"a\\b"` and `"a\u005Cb"` are not equal.
+
+ This implementation is interoperable as it does compare strings code unit
+ by code unit.
+
+ #### Storage
+
+ String values are stored as pointers in a @ref basic_json type. That is,
+ for any access to string values, a pointer of type `string_t*` must be
+ dereferenced.
+
+ @since version 1.0.0
+ */
+ using string_t = StringType;
+
+ /*!
+ @brief a type for a boolean
+
+ [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
+ type which differentiates the two literals `true` and `false`.
+
+ To store objects in C++, a type is defined by the template parameter @a
+ BooleanType which chooses the type to use.
+
+ #### Default type
+
+ With the default values for @a BooleanType (`bool`), the default value for
+ @a boolean_t is:
+
+ @code {.cpp}
+ bool
+ @endcode
+
+ #### Storage
+
+ Boolean values are stored directly inside a @ref basic_json type.
+
+ @since version 1.0.0
+ */
+ using boolean_t = BooleanType;
+
+ /*!
+ @brief a type for a number (integer)
+
+ [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+ > The representation of numbers is similar to that used in most
+ > programming languages. A number is represented in base 10 using decimal
+ > digits. It contains an integer component that may be prefixed with an
+ > optional minus sign, which may be followed by a fraction part and/or an
+ > exponent part. Leading zeros are not allowed. (...) Numeric values that
+ > cannot be represented in the grammar below (such as Infinity and NaN)
+ > are not permitted.
+
+ This description includes both integer and floating-point numbers.
+ However, C++ allows more precise storage if it is known whether the number
+ is a signed integer, an unsigned integer or a floating-point number.
+ Therefore, three different types, @ref number_integer_t, @ref
+ number_unsigned_t and @ref number_float_t are used.
+
+ To store integer numbers in C++, a type is defined by the template
+ parameter @a NumberIntegerType which chooses the type to use.
+
+ #### Default type
+
+ With the default values for @a NumberIntegerType (`int64_t`), the default
+ value for @a number_integer_t is:
+
+ @code {.cpp}
+ int64_t
+ @endcode
+
+ #### Default behavior
+
+ - The restrictions about leading zeros is not enforced in C++. Instead,
+ leading zeros in integer literals lead to an interpretation as octal
+ number. Internally, the value will be stored as decimal number. For
+ instance, the C++ integer literal `010` will be serialized to `8`.
+ During deserialization, leading zeros yield an error.
+ - Not-a-number (NaN) values will be serialized to `null`.
+
+ #### Limits
+
+ [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+ > An implementation may set limits on the range and precision of numbers.
+
+ When the default type is used, the maximal integer number that can be
+ stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
+ that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
+ that are out of range will yield over/underflow when used in a
+ constructor. During deserialization, too large or small integer numbers
+ will be automatically be stored as @ref number_unsigned_t or @ref
+ number_float_t.
+
+ [RFC 7159](http://rfc7159.net/rfc7159) further states:
+ > Note that when such software is used, numbers that are integers and are
+ > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+ > that implementations will agree exactly on their numeric values.
+
+ As this range is a subrange of the exactly supported range [INT64_MIN,
+ INT64_MAX], this class's integer type is interoperable.
+
+ #### Storage
+
+ Integer number values are stored directly inside a @ref basic_json type.
+
+ @sa @ref number_float_t -- type for number values (floating-point)
+
+ @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+ @since version 1.0.0
+ */
+ using number_integer_t = NumberIntegerType;
+
+ /*!
+ @brief a type for a number (unsigned)
+
+ [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+ > The representation of numbers is similar to that used in most
+ > programming languages. A number is represented in base 10 using decimal
+ > digits. It contains an integer component that may be prefixed with an
+ > optional minus sign, which may be followed by a fraction part and/or an
+ > exponent part. Leading zeros are not allowed. (...) Numeric values that
+ > cannot be represented in the grammar below (such as Infinity and NaN)
+ > are not permitted.
+
+ This description includes both integer and floating-point numbers.
+ However, C++ allows more precise storage if it is known whether the number
+ is a signed integer, an unsigned integer or a floating-point number.
+ Therefore, three different types, @ref number_integer_t, @ref
+ number_unsigned_t and @ref number_float_t are used.
+
+ To store unsigned integer numbers in C++, a type is defined by the
+ template parameter @a NumberUnsignedType which chooses the type to use.
+
+ #### Default type
+
+ With the default values for @a NumberUnsignedType (`uint64_t`), the
+ default value for @a number_unsigned_t is:
+
+ @code {.cpp}
+ uint64_t
+ @endcode
+
+ #### Default behavior
+
+ - The restrictions about leading zeros is not enforced in C++. Instead,
+ leading zeros in integer literals lead to an interpretation as octal
+ number. Internally, the value will be stored as decimal number. For
+ instance, the C++ integer literal `010` will be serialized to `8`.
+ During deserialization, leading zeros yield an error.
+ - Not-a-number (NaN) values will be serialized to `null`.
+
+ #### Limits
+
+ [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+ > An implementation may set limits on the range and precision of numbers.
+
+ When the default type is used, the maximal integer number that can be
+ stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
+ number that can be stored is `0`. Integer numbers that are out of range
+ will yield over/underflow when used in a constructor. During
+ deserialization, too large or small integer numbers will be automatically
+ be stored as @ref number_integer_t or @ref number_float_t.
+
+ [RFC 7159](http://rfc7159.net/rfc7159) further states:
+ > Note that when such software is used, numbers that are integers and are
+ > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+ > that implementations will agree exactly on their numeric values.
+
+ As this range is a subrange (when considered in conjunction with the
+ number_integer_t type) of the exactly supported range [0, UINT64_MAX],
+ this class's integer type is interoperable.
+
+ #### Storage
+
+ Integer number values are stored directly inside a @ref basic_json type.
+
+ @sa @ref number_float_t -- type for number values (floating-point)
+ @sa @ref number_integer_t -- type for number values (integer)
+
+ @since version 2.0.0
+ */
+ using number_unsigned_t = NumberUnsignedType;
+
+ /*!
+ @brief a type for a number (floating-point)
+
+ [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+ > The representation of numbers is similar to that used in most
+ > programming languages. A number is represented in base 10 using decimal
+ > digits. It contains an integer component that may be prefixed with an
+ > optional minus sign, which may be followed by a fraction part and/or an
+ > exponent part. Leading zeros are not allowed. (...) Numeric values that
+ > cannot be represented in the grammar below (such as Infinity and NaN)
+ > are not permitted.
+
+ This description includes both integer and floating-point numbers.
+ However, C++ allows more precise storage if it is known whether the number
+ is a signed integer, an unsigned integer or a floating-point number.
+ Therefore, three different types, @ref number_integer_t, @ref
+ number_unsigned_t and @ref number_float_t are used.
+
+ To store floating-point numbers in C++, a type is defined by the template
+ parameter @a NumberFloatType which chooses the type to use.
+
+ #### Default type
+
+ With the default values for @a NumberFloatType (`double`), the default
+ value for @a number_float_t is:
+
+ @code {.cpp}
+ double
+ @endcode
+
+ #### Default behavior
+
+ - The restrictions about leading zeros is not enforced in C++. Instead,
+ leading zeros in floating-point literals will be ignored. Internally,
+ the value will be stored as decimal number. For instance, the C++
+ floating-point literal `01.2` will be serialized to `1.2`. During
+ deserialization, leading zeros yield an error.
+ - Not-a-number (NaN) values will be serialized to `null`.
+
+ #### Limits
+
+ [RFC 7159](http://rfc7159.net/rfc7159) states:
+ > This specification allows implementations to set limits on the range and
+ > precision of numbers accepted. Since software that implements IEEE
+ > 754-2008 binary64 (double precision) numbers is generally available and
+ > widely used, good interoperability can be achieved by implementations
+ > that expect no more precision or range than these provide, in the sense
+ > that implementations will approximate JSON numbers within the expected
+ > precision.
+
+ This implementation does exactly follow this approach, as it uses double
+ precision floating-point numbers. Note values smaller than
+ `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
+ will be stored as NaN internally and be serialized to `null`.
+
+ #### Storage
+
+ Floating-point number values are stored directly inside a @ref basic_json
+ type.
+
+ @sa @ref number_integer_t -- type for number values (integer)
+
+ @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+ @since version 1.0.0
+ */
+ using number_float_t = NumberFloatType;
+
+ /// @}
+
+ private:
+
+ /// helper for exception-safe object creation
+ template<typename T, typename... Args>
+ static T* create(Args&& ... args)
+ {
+ AllocatorType<T> alloc;
+ using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+ auto deleter = [&](T * object)
+ {
+ AllocatorTraits::deallocate(alloc, object, 1);
+ };
+ std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
+ AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
+ assert(object != nullptr);
+ return object.release();
+ }
+
+ ////////////////////////
+ // JSON value storage //
+ ////////////////////////
+
+ /*!
+ @brief a JSON value
+
+ The actual storage for a JSON value of the @ref basic_json class. This
+ union combines the different storage types for the JSON value types
+ defined in @ref value_t.
+
+ JSON type | value_t type | used type
+ --------- | --------------- | ------------------------
+ object | object | pointer to @ref object_t
+ array | array | pointer to @ref array_t
+ string | string | pointer to @ref string_t
+ boolean | boolean | @ref boolean_t
+ number | number_integer | @ref number_integer_t
+ number | number_unsigned | @ref number_unsigned_t
+ number | number_float | @ref number_float_t
+ null | null | *no value is stored*
+
+ @note Variable-length types (objects, arrays, and strings) are stored as
+ pointers. The size of the union should not exceed 64 bits if the default
+ value types are used.
+
+ @since version 1.0.0
+ */
+ union json_value
+ {
+ /// object (stored with pointer to save storage)
+ object_t* object;
+ /// array (stored with pointer to save storage)
+ array_t* array;
+ /// string (stored with pointer to save storage)
+ string_t* string;
+ /// boolean
+ boolean_t boolean;
+ /// number (integer)
+ number_integer_t number_integer;
+ /// number (unsigned integer)
+ number_unsigned_t number_unsigned;
+ /// number (floating-point)
+ number_float_t number_float;
+
+ /// default constructor (for null values)
+ json_value() = default;
+ /// constructor for booleans
+ json_value(boolean_t v) noexcept : boolean(v) {}
+ /// constructor for numbers (integer)
+ json_value(number_integer_t v) noexcept : number_integer(v) {}
+ /// constructor for numbers (unsigned)
+ json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+ /// constructor for numbers (floating-point)
+ json_value(number_float_t v) noexcept : number_float(v) {}
+ /// constructor for empty values of a given type
+ json_value(value_t t)
+ {
+ switch (t)
+ {
+ case value_t::object:
+ {
+ object = create<object_t>();
+ break;
+ }
+
+ case value_t::array:
+ {
+ array = create<array_t>();
+ break;
+ }
+
+ case value_t::string:
+ {
+ string = create<string_t>("");
+ break;
+ }
+
+ case value_t::boolean:
+ {
+ boolean = boolean_t(false);
+ break;
+ }
+
+ case value_t::number_integer:
+ {
+ number_integer = number_integer_t(0);
+ break;
+ }
+
+ case value_t::number_unsigned:
+ {
+ number_unsigned = number_unsigned_t(0);
+ break;
+ }
+
+ case value_t::number_float:
+ {
+ number_float = number_float_t(0.0);
+ break;
+ }
+
+ case value_t::null:
+ {
+ object = nullptr; // silence warning, see #821
+ break;
+ }
+
+ default:
+ {
+ object = nullptr; // silence warning, see #821
+ if (JSON_UNLIKELY(t == value_t::null))
+ {
+ JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.1.2")); // LCOV_EXCL_LINE
+ }
+ break;
+ }
+ }
+ }
+
+ /// constructor for strings
+ json_value(const string_t& value)
+ {
+ string = create<string_t>(value);
+ }
+
+ /// constructor for rvalue strings
+ json_value(string_t&& value)
+ {
+ string = create<string_t>(std::move(value));
+ }
+
+ /// constructor for objects
+ json_value(const object_t& value)
+ {
+ object = create<object_t>(value);
+ }
+
+ /// constructor for rvalue objects
+ json_value(object_t&& value)
+ {
+ object = create<object_t>(std::move(value));
+ }
+
+ /// constructor for arrays
+ json_value(const array_t& value)
+ {
+ array = create<array_t>(value);
+ }
+
+ /// constructor for rvalue arrays
+ json_value(array_t&& value)
+ {
+ array = create<array_t>(std::move(value));
+ }
+
+ void destroy(value_t t) noexcept
+ {
+ switch (t)
+ {
+ case value_t::object:
+ {
+ AllocatorType<object_t> alloc;
+ std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+ std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+ break;
+ }
+
+ case value_t::array:
+ {
+ AllocatorType<array_t> alloc;
+ std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+ std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+ break;
+ }
+
+ case value_t::string:
+ {
+ AllocatorType<string_t> alloc;
+ std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+ std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+ break;
+ }
+
+ default:
+ {
+ break;
+ }
+ }
+ }
+ };
+
+ /*!
+ @brief checks the class invariants
+
+ This function asserts the class invariants. It needs to be called at the
+ end of every constructor to make sure that created objects respect the
+ invariant. Furthermore, it has to be called each time the type of a JSON
+ value is changed, because the invariant expresses a relationship between
+ @a m_type and @a m_value.
+ */
+ void assert_invariant() const noexcept
+ {
+ assert(m_type != value_t::object or m_value.object != nullptr);
+ assert(m_type != value_t::array or m_value.array != nullptr);
+ assert(m_type != value_t::string or m_value.string != nullptr);
+ }
+
+ public:
+ //////////////////////////
+ // JSON parser callback //
+ //////////////////////////
+
+ /*!
+ @brief parser event types
+
+ The parser callback distinguishes the following events:
+ - `object_start`: the parser read `{` and started to process a JSON object
+ - `key`: the parser read a key of a value in an object
+ - `object_end`: the parser read `}` and finished processing a JSON object
+ - `array_start`: the parser read `[` and started to process a JSON array
+ - `array_end`: the parser read `]` and finished processing a JSON array
+ - `value`: the parser finished reading a JSON value
+
+ @image html callback_events.png "Example when certain parse events are triggered"
+
+ @sa @ref parser_callback_t for more information and examples
+ */
+ using parse_event_t = typename parser::parse_event_t;
+
+ /*!
+ @brief per-element parser callback type
+
+ With a parser callback function, the result of parsing a JSON text can be
+ influenced. When passed to @ref parse, it is called on certain events
+ (passed as @ref parse_event_t via parameter @a event) with a set recursion
+ depth @a depth and context JSON value @a parsed. The return value of the
+ callback function is a boolean indicating whether the element that emitted
+ the callback shall be kept or not.
+
+ We distinguish six scenarios (determined by the event type) in which the
+ callback function can be called. The following table describes the values
+ of the parameters @a depth, @a event, and @a parsed.
+
+ parameter @a event | description | parameter @a depth | parameter @a parsed
+ ------------------ | ----------- | ------------------ | -------------------
+ parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
+ parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
+ parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
+ parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
+ parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
+ parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
+
+ @image html callback_events.png "Example when certain parse events are triggered"
+
+ Discarding a value (i.e., returning `false`) has different effects
+ depending on the context in which function was called:
+
+ - Discarded values in structured types are skipped. That is, the parser
+ will behave as if the discarded value was never read.
+ - In case a value outside a structured type is skipped, it is replaced
+ with `null`. This case happens if the top-level element is skipped.
+
+ @param[in] depth the depth of the recursion during parsing
+
+ @param[in] event an event of type parse_event_t indicating the context in
+ the callback function has been called
+
+ @param[in,out] parsed the current intermediate parse result; note that
+ writing to this value has no effect for parse_event_t::key events
+
+ @return Whether the JSON value which called the function during parsing
+ should be kept (`true`) or not (`false`). In the latter case, it is either
+ skipped completely or replaced by an empty discarded object.
+
+ @sa @ref parse for examples
+
+ @since version 1.0.0
+ */
+ using parser_callback_t = typename parser::parser_callback_t;
+
+
+ //////////////////
+ // constructors //
+ //////////////////
+
+ /// @name constructors and destructors
+ /// Constructors of class @ref basic_json, copy/move constructor, copy
+ /// assignment, static functions creating objects, and the destructor.
+ /// @{
+
+ /*!
+ @brief create an empty value with a given type
+
+ Create an empty JSON value with a given type. The value will be default
+ initialized with an empty value which depends on the type:
+
+ Value type | initial value
+ ----------- | -------------
+ null | `null`
+ boolean | `false`
+ string | `""`
+ number | `0`
+ object | `{}`
+ array | `[]`
+
+ @param[in] v the type of the value to create
+
+ @complexity Constant.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes to any JSON value.
+
+ @liveexample{The following code shows the constructor for different @ref
+ value_t values,basic_json__value_t}
+
+ @sa @ref clear() -- restores the postcondition of this constructor
+
+ @since version 1.0.0
+ */
+ basic_json(const value_t v)
+ : m_type(v), m_value(v)
+ {
+ assert_invariant();
+ }
+
+ /*!
+ @brief create a null object
+
+ Create a `null` JSON value. It either takes a null pointer as parameter
+ (explicitly creating `null`) or no parameter (implicitly creating `null`).
+ The passed null pointer itself is not read -- it is only used to choose
+ the right constructor.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this constructor never throws
+ exceptions.
+
+ @liveexample{The following code shows the constructor with and without a
+ null pointer parameter.,basic_json__nullptr_t}
+
+ @since version 1.0.0
+ */
+ basic_json(std::nullptr_t = nullptr) noexcept
+ : basic_json(value_t::null)
+ {
+ assert_invariant();
+ }
+
+ /*!
+ @brief create a JSON value
+
+ This is a "catch all" constructor for all compatible JSON types; that is,
+ types for which a `to_json()` method exists. The constructor forwards the
+ parameter @a val to that method (to `json_serializer<U>::to_json` method
+ with `U = uncvref_t<CompatibleType>`, to be exact).
+
+ Template type @a CompatibleType includes, but is not limited to, the
+ following types:
+ - **arrays**: @ref array_t and all kinds of compatible containers such as
+ `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
+ `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
+ `std::multiset`, and `std::unordered_multiset` with a `value_type` from
+ which a @ref basic_json value can be constructed.
+ - **objects**: @ref object_t and all kinds of compatible associative
+ containers such as `std::map`, `std::unordered_map`, `std::multimap`,
+ and `std::unordered_multimap` with a `key_type` compatible to
+ @ref string_t and a `value_type` from which a @ref basic_json value can
+ be constructed.
+ - **strings**: @ref string_t, string literals, and all compatible string
+ containers can be used.
+ - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
+ @ref number_float_t, and all convertible number types such as `int`,
+ `size_t`, `int64_t`, `float` or `double` can be used.
+ - **boolean**: @ref boolean_t / `bool` can be used.
+
+ See the examples below.
+
+ @tparam CompatibleType a type such that:
+ - @a CompatibleType is not derived from `std::istream`,
+ - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
+ constructors),
+ - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
+ - @a CompatibleType is not a @ref basic_json nested type (e.g.,
+ @ref json_pointer, @ref iterator, etc ...)
+ - @ref @ref json_serializer<U> has a
+ `to_json(basic_json_t&, CompatibleType&&)` method
+
+ @tparam U = `uncvref_t<CompatibleType>`
+
+ @param[in] val the value to be forwarded to the respective constructor
+
+ @complexity Usually linear in the size of the passed @a val, also
+ depending on the implementation of the called `to_json()`
+ method.
+
+ @exceptionsafety Depends on the called constructor. For types directly
+ supported by the library (i.e., all types for which no `to_json()` function
+ was provided), strong guarantee holds: if an exception is thrown, there are
+ no changes to any JSON value.
+
+ @liveexample{The following code shows the constructor with several
+ compatible types.,basic_json__CompatibleType}
+
+ @since version 2.1.0
+ */
+ template <typename CompatibleType,
+ typename U = detail::uncvref_t<CompatibleType>,
+ detail::enable_if_t<
+ detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
+ basic_json(CompatibleType && val) noexcept(noexcept(
+ JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+ std::forward<CompatibleType>(val))))
+ {
+ JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+ assert_invariant();
+ }
+
+ /*!
+ @brief create a JSON value from an existing one
+
+ This is a constructor for existing @ref basic_json types.
+ It does not hijack copy/move constructors, since the parameter has different
+ template arguments than the current ones.
+
+ The constructor tries to convert the internal @ref m_value of the parameter.
+
+ @tparam BasicJsonType a type such that:
+ - @a BasicJsonType is a @ref basic_json type.
+ - @a BasicJsonType has different template arguments than @ref basic_json_t.
+
+ @param[in] val the @ref basic_json value to be converted.
+
+ @complexity Usually linear in the size of the passed @a val, also
+ depending on the implementation of the called `to_json()`
+ method.
+
+ @exceptionsafety Depends on the called constructor. For types directly
+ supported by the library (i.e., all types for which no `to_json()` function
+ was provided), strong guarantee holds: if an exception is thrown, there are
+ no changes to any JSON value.
+
+ @since version 3.1.2
+ */
+ template <typename BasicJsonType,
+ detail::enable_if_t<
+ detail::is_basic_json<BasicJsonType>::value and not std::is_same<basic_json, BasicJsonType>::value, int> = 0>
+ basic_json(const BasicJsonType& val)
+ {
+ using other_boolean_t = typename BasicJsonType::boolean_t;
+ using other_number_float_t = typename BasicJsonType::number_float_t;
+ using other_number_integer_t = typename BasicJsonType::number_integer_t;
+ using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+ using other_string_t = typename BasicJsonType::string_t;
+ using other_object_t = typename BasicJsonType::object_t;
+ using other_array_t = typename BasicJsonType::array_t;
+
+ switch (val.type())
+ {
+ case value_t::boolean:
+ JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+ break;
+ case value_t::number_float:
+ JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+ break;
+ case value_t::number_integer:
+ JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+ break;
+ case value_t::number_unsigned:
+ JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+ break;
+ case value_t::string:
+ JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+ break;
+ case value_t::object:
+ JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+ break;
+ case value_t::array:
+ JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+ break;
+ case value_t::null:
+ *this = nullptr;
+ break;
+ case value_t::discarded:
+ m_type = value_t::discarded;
+ break;
+ }
+ assert_invariant();
+ }
+
+ /*!
+ @brief create a container (array or object) from an initializer list
+
+ Creates a JSON value of type array or object from the passed initializer
+ list @a init. In case @a type_deduction is `true` (default), the type of
+ the JSON value to be created is deducted from the initializer list @a init
+ according to the following rules:
+
+ 1. If the list is empty, an empty JSON object value `{}` is created.
+ 2. If the list consists of pairs whose first element is a string, a JSON
+ object value is created where the first elements of the pairs are
+ treated as keys and the second elements are as values.
+ 3. In all other cases, an array is created.
+
+ The rules aim to create the best fit between a C++ initializer list and
+ JSON values. The rationale is as follows:
+
+ 1. The empty initializer list is written as `{}` which is exactly an empty
+ JSON object.
+ 2. C++ has no way of describing mapped types other than to list a list of
+ pairs. As JSON requires that keys must be of type string, rule 2 is the
+ weakest constraint one can pose on initializer lists to interpret them
+ as an object.
+ 3. In all other cases, the initializer list could not be interpreted as
+ JSON object type, so interpreting it as JSON array type is safe.
+
+ With the rules described above, the following JSON values cannot be
+ expressed by an initializer list:
+
+ - the empty array (`[]`): use @ref array(initializer_list_t)
+ with an empty initializer list in this case
+ - arrays whose elements satisfy rule 2: use @ref
+ array(initializer_list_t) with the same initializer list
+ in this case
+
+ @note When used without parentheses around an empty initializer list, @ref
+ basic_json() is called instead of this function, yielding the JSON null
+ value.
+
+ @param[in] init initializer list with JSON values
+
+ @param[in] type_deduction internal parameter; when set to `true`, the type
+ of the JSON value is deducted from the initializer list @a init; when set
+ to `false`, the type provided via @a manual_type is forced. This mode is
+ used by the functions @ref array(initializer_list_t) and
+ @ref object(initializer_list_t).
+
+ @param[in] manual_type internal parameter; when @a type_deduction is set
+ to `false`, the created JSON value will use the provided type (only @ref
+ value_t::array and @ref value_t::object are valid); when @a type_deduction
+ is set to `true`, this parameter has no effect
+
+ @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
+ `value_t::object`, but @a init contains an element which is not a pair
+ whose first element is a string. In this case, the constructor could not
+ create an object. If @a type_deduction would have be `true`, an array
+ would have been created. See @ref object(initializer_list_t)
+ for an example.
+
+ @complexity Linear in the size of the initializer list @a init.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes to any JSON value.
+
+ @liveexample{The example below shows how JSON values are created from
+ initializer lists.,basic_json__list_init_t}
+
+ @sa @ref array(initializer_list_t) -- create a JSON array
+ value from an initializer list
+ @sa @ref object(initializer_list_t) -- create a JSON object
+ value from an initializer list
+
+ @since version 1.0.0
+ */
+ basic_json(initializer_list_t init,
+ bool type_deduction = true,
+ value_t manual_type = value_t::array)
+ {
+ // check if each element is an array with two elements whose first
+ // element is a string
+ bool is_an_object = std::all_of(init.begin(), init.end(),
+ [](const detail::json_ref<basic_json>& element_ref)
+ {
+ return (element_ref->is_array() and element_ref->size() == 2 and (*element_ref)[0].is_string());
+ });
+
+ // adjust type if type deduction is not wanted
+ if (not type_deduction)
+ {
+ // if array is wanted, do not create an object though possible
+ if (manual_type == value_t::array)
+ {
+ is_an_object = false;
+ }
+
+ // if object is wanted but impossible, throw an exception
+ if (JSON_UNLIKELY(manual_type == value_t::object and not is_an_object))
+ {
+ JSON_THROW(type_error::create(301, "cannot create object from initializer list"));
+ }
+ }
+
+ if (is_an_object)
+ {
+ // the initializer list is a list of pairs -> create object
+ m_type = value_t::object;
+ m_value = value_t::object;
+
+ std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref)
+ {
+ auto element = element_ref.moved_or_copied();
+ m_value.object->emplace(
+ std::move(*((*element.m_value.array)[0].m_value.string)),
+ std::move((*element.m_value.array)[1]));
+ });
+ }
+ else
+ {
+ // the initializer list describes an array -> create array
+ m_type = value_t::array;
+ m_value.array = create<array_t>(init.begin(), init.end());
+ }
+
+ assert_invariant();
+ }
+
+ /*!
+ @brief explicitly create an array from an initializer list
+
+ Creates a JSON array value from a given initializer list. That is, given a
+ list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
+ initializer list is empty, the empty array `[]` is created.
+
+ @note This function is only needed to express two edge cases that cannot
+ be realized with the initializer list constructor (@ref
+ basic_json(initializer_list_t, bool, value_t)). These cases
+ are:
+ 1. creating an array whose elements are all pairs whose first element is a
+ string -- in this case, the initializer list constructor would create an
+ object, taking the first elements as keys
+ 2. creating an empty array -- passing the empty initializer list to the
+ initializer list constructor yields an empty object
+
+ @param[in] init initializer list with JSON values to create an array from
+ (optional)
+
+ @return JSON array value
+
+ @complexity Linear in the size of @a init.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes to any JSON value.
+
+ @liveexample{The following code shows an example for the `array`
+ function.,array}
+
+ @sa @ref basic_json(initializer_list_t, bool, value_t) --
+ create a JSON value from an initializer list
+ @sa @ref object(initializer_list_t) -- create a JSON object
+ value from an initializer list
+
+ @since version 1.0.0
+ */
+ static basic_json array(initializer_list_t init = {})
+ {
+ return basic_json(init, false, value_t::array);
+ }
+
+ /*!
+ @brief explicitly create an object from an initializer list
+
+ Creates a JSON object value from a given initializer list. The initializer
+ lists elements must be pairs, and their first elements must be strings. If
+ the initializer list is empty, the empty object `{}` is created.
+
+ @note This function is only added for symmetry reasons. In contrast to the
+ related function @ref array(initializer_list_t), there are
+ no cases which can only be expressed by this function. That is, any
+ initializer list @a init can also be passed to the initializer list
+ constructor @ref basic_json(initializer_list_t, bool, value_t).
+
+ @param[in] init initializer list to create an object from (optional)
+
+ @return JSON object value
+
+ @throw type_error.301 if @a init is not a list of pairs whose first
+ elements are strings. In this case, no object can be created. When such a
+ value is passed to @ref basic_json(initializer_list_t, bool, value_t),
+ an array would have been created from the passed initializer list @a init.
+ See example below.
+
+ @complexity Linear in the size of @a init.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes to any JSON value.
+
+ @liveexample{The following code shows an example for the `object`
+ function.,object}
+
+ @sa @ref basic_json(initializer_list_t, bool, value_t) --
+ create a JSON value from an initializer list
+ @sa @ref array(initializer_list_t) -- create a JSON array
+ value from an initializer list
+
+ @since version 1.0.0
+ */
+ static basic_json object(initializer_list_t init = {})
+ {
+ return basic_json(init, false, value_t::object);
+ }
+
+ /*!
+ @brief construct an array with count copies of given value
+
+ Constructs a JSON array value by creating @a cnt copies of a passed value.
+ In case @a cnt is `0`, an empty array is created.
+
+ @param[in] cnt the number of JSON copies of @a val to create
+ @param[in] val the JSON value to copy
+
+ @post `std::distance(begin(),end()) == cnt` holds.
+
+ @complexity Linear in @a cnt.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes to any JSON value.
+
+ @liveexample{The following code shows examples for the @ref
+ basic_json(size_type\, const basic_json&)
+ constructor.,basic_json__size_type_basic_json}
+
+ @since version 1.0.0
+ */
+ basic_json(size_type cnt, const basic_json& val)
+ : m_type(value_t::array)
+ {
+ m_value.array = create<array_t>(cnt, val);
+ assert_invariant();
+ }
+
+ /*!
+ @brief construct a JSON container given an iterator range
+
+ Constructs the JSON value with the contents of the range `[first, last)`.
+ The semantics depends on the different types a JSON value can have:
+ - In case of a null type, invalid_iterator.206 is thrown.
+ - In case of other primitive types (number, boolean, or string), @a first
+ must be `begin()` and @a last must be `end()`. In this case, the value is
+ copied. Otherwise, invalid_iterator.204 is thrown.
+ - In case of structured types (array, object), the constructor behaves as
+ similar versions for `std::vector` or `std::map`; that is, a JSON array
+ or object is constructed from the values in the range.
+
+ @tparam InputIT an input iterator type (@ref iterator or @ref
+ const_iterator)
+
+ @param[in] first begin of the range to copy from (included)
+ @param[in] last end of the range to copy from (excluded)
+
+ @pre Iterators @a first and @a last must be initialized. **This
+ precondition is enforced with an assertion (see warning).** If
+ assertions are switched off, a violation of this precondition yields
+ undefined behavior.
+
+ @pre Range `[first, last)` is valid. Usually, this precondition cannot be
+ checked efficiently. Only certain edge cases are detected; see the
+ description of the exceptions below. A violation of this precondition
+ yields undefined behavior.
+
+ @warning A precondition is enforced with a runtime assertion that will
+ result in calling `std::abort` if this precondition is not met.
+ Assertions can be disabled by defining `NDEBUG` at compile time.
+ See http://en.cppreference.com/w/cpp/error/assert for more
+ information.
+
+ @throw invalid_iterator.201 if iterators @a first and @a last are not
+ compatible (i.e., do not belong to the same JSON value). In this case,
+ the range `[first, last)` is undefined.
+ @throw invalid_iterator.204 if iterators @a first and @a last belong to a
+ primitive type (number, boolean, or string), but @a first does not point
+ to the first element any more. In this case, the range `[first, last)` is
+ undefined. See example code below.
+ @throw invalid_iterator.206 if iterators @a first and @a last belong to a
+ null value. In this case, the range `[first, last)` is undefined.
+
+ @complexity Linear in distance between @a first and @a last.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes to any JSON value.
+
+ @liveexample{The example below shows several ways to create JSON values by
+ specifying a subrange with iterators.,basic_json__InputIt_InputIt}
+
+ @since version 1.0.0
+ */
+ template<class InputIT, typename std::enable_if<
+ std::is_same<InputIT, typename basic_json_t::iterator>::value or
+ std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0>
+ basic_json(InputIT first, InputIT last)
+ {
+ assert(first.m_object != nullptr);
+ assert(last.m_object != nullptr);
+
+ // make sure iterator fits the current value
+ if (JSON_UNLIKELY(first.m_object != last.m_object))
+ {
+ JSON_THROW(invalid_iterator::create(201, "iterators are not compatible"));
+ }
+
+ // copy type from first iterator
+ m_type = first.m_object->m_type;
+
+ // check if iterator range is complete for primitive values
+ switch (m_type)
+ {
+ case value_t::boolean:
+ case value_t::number_float:
+ case value_t::number_integer:
+ case value_t::number_unsigned:
+ case value_t::string:
+ {
+ if (JSON_UNLIKELY(not first.m_it.primitive_iterator.is_begin()
+ or not last.m_it.primitive_iterator.is_end()))
+ {
+ JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+ }
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ switch (m_type)
+ {
+ case value_t::number_integer:
+ {
+ m_value.number_integer = first.m_object->m_value.number_integer;
+ break;
+ }
+
+ case value_t::number_unsigned:
+ {
+ m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+ break;
+ }
+
+ case value_t::number_float:
+ {
+ m_value.number_float = first.m_object->m_value.number_float;
+ break;
+ }
+
+ case value_t::boolean:
+ {
+ m_value.boolean = first.m_object->m_value.boolean;
+ break;
+ }
+
+ case value_t::string:
+ {
+ m_value = *first.m_object->m_value.string;
+ break;
+ }
+
+ case value_t::object:
+ {
+ m_value.object = create<object_t>(first.m_it.object_iterator,
+ last.m_it.object_iterator);
+ break;
+ }
+
+ case value_t::array:
+ {
+ m_value.array = create<array_t>(first.m_it.array_iterator,
+ last.m_it.array_iterator);
+ break;
+ }
+
+ default:
+ JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " +
+ std::string(first.m_object->type_name())));
+ }
+
+ assert_invariant();
+ }
+
+
+ ///////////////////////////////////////
+ // other constructors and destructor //
+ ///////////////////////////////////////
+
+ /// @private
+ basic_json(const detail::json_ref<basic_json>& ref)
+ : basic_json(ref.moved_or_copied())
+ {}
+
+ /*!
+ @brief copy constructor
+
+ Creates a copy of a given JSON value.
+
+ @param[in] other the JSON value to copy
+
+ @post `*this == other`
+
+ @complexity Linear in the size of @a other.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes to any JSON value.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is linear.
+ - As postcondition, it holds: `other == basic_json(other)`.
+
+ @liveexample{The following code shows an example for the copy
+ constructor.,basic_json__basic_json}
+
+ @since version 1.0.0
+ */
+ basic_json(const basic_json& other)
+ : m_type(other.m_type)
+ {
+ // check of passed value is valid
+ other.assert_invariant();
+
+ switch (m_type)
+ {
+ case value_t::object:
+ {
+ m_value = *other.m_value.object;
+ break;
+ }
+
+ case value_t::array:
+ {
+ m_value = *other.m_value.array;
+ break;
+ }
+
+ case value_t::string:
+ {
+ m_value = *other.m_value.string;
+ break;
+ }
+
+ case value_t::boolean:
+ {
+ m_value = other.m_value.boolean;
+ break;
+ }
+
+ case value_t::number_integer:
+ {
+ m_value = other.m_value.number_integer;
+ break;
+ }
+
+ case value_t::number_unsigned:
+ {
+ m_value = other.m_value.number_unsigned;
+ break;
+ }
+
+ case value_t::number_float:
+ {
+ m_value = other.m_value.number_float;
+ break;
+ }
+
+ default:
+ break;
+ }
+
+ assert_invariant();
+ }
+
+ /*!
+ @brief move constructor
+
+ Move constructor. Constructs a JSON value with the contents of the given
+ value @a other using move semantics. It "steals" the resources from @a
+ other and leaves it as JSON null value.
+
+ @param[in,out] other value to move to this object
+
+ @post `*this` has the same value as @a other before the call.
+ @post @a other is a JSON null value.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this constructor never throws
+ exceptions.
+
+ @requirement This function helps `basic_json` satisfying the
+ [MoveConstructible](http://en.cppreference.com/w/cpp/concept/MoveConstructible)
+ requirements.
+
+ @liveexample{The code below shows the move constructor explicitly called
+ via std::move.,basic_json__moveconstructor}
+
+ @since version 1.0.0
+ */
+ basic_json(basic_json&& other) noexcept
+ : m_type(std::move(other.m_type)),
+ m_value(std::move(other.m_value))
+ {
+ // check that passed value is valid
+ other.assert_invariant();
+
+ // invalidate payload
+ other.m_type = value_t::null;
+ other.m_value = {};
+
+ assert_invariant();
+ }
+
+ /*!
+ @brief copy assignment
+
+ Copy assignment operator. Copies a JSON value via the "copy and swap"
+ strategy: It is expressed in terms of the copy constructor, destructor,
+ and the `swap()` member function.
+
+ @param[in] other value to copy from
+
+ @complexity Linear.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is linear.
+
+ @liveexample{The code below shows and example for the copy assignment. It
+ creates a copy of value `a` which is then swapped with `b`. Finally\, the
+ copy of `a` (which is the null value after the swap) is
+ destroyed.,basic_json__copyassignment}
+
+ @since version 1.0.0
+ */
+ reference& operator=(basic_json other) noexcept (
+ std::is_nothrow_move_constructible<value_t>::value and
+ std::is_nothrow_move_assignable<value_t>::value and
+ std::is_nothrow_move_constructible<json_value>::value and
+ std::is_nothrow_move_assignable<json_value>::value
+ )
+ {
+ // check that passed value is valid
+ other.assert_invariant();
+
+ using std::swap;
+ swap(m_type, other.m_type);
+ swap(m_value, other.m_value);
+
+ assert_invariant();
+ return *this;
+ }
+
+ /*!
+ @brief destructor
+
+ Destroys the JSON value and frees all allocated memory.
+
+ @complexity Linear.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is linear.
+ - All stored elements are destroyed and all memory is freed.
+
+ @since version 1.0.0
+ */
+ ~basic_json() noexcept
+ {
+ assert_invariant();
+ m_value.destroy(m_type);
+ }
+
+ /// @}
+
+ public:
+ ///////////////////////
+ // object inspection //
+ ///////////////////////
+
+ /// @name object inspection
+ /// Functions to inspect the type of a JSON value.
+ /// @{
+
+ /*!
+ @brief serialization
+
+ Serialization function for JSON values. The function tries to mimic
+ Python's `json.dumps()` function, and currently supports its @a indent
+ and @a ensure_ascii parameters.
+
+ @param[in] indent If indent is nonnegative, then array elements and object
+ members will be pretty-printed with that indent level. An indent level of
+ `0` will only insert newlines. `-1` (the default) selects the most compact
+ representation.
+ @param[in] indent_char The character to use for indentation if @a indent is
+ greater than `0`. The default is ` ` (space).
+ @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+ in the output are escaped with `\uXXXX` sequences, and the result consists
+ of ASCII characters only.
+
+ @return string containing the serialization of the JSON value
+
+ @throw type_error.316 if a string stored inside the JSON value is not
+ UTF-8 encoded
+
+ @complexity Linear.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @liveexample{The following example shows the effect of different @a indent\,
+ @a indent_char\, and @a ensure_ascii parameters to the result of the
+ serialization.,dump}
+
+ @see https://docs.python.org/2/library/json.html#json.dump
+
+ @since version 1.0.0; indentation character @a indent_char, option
+ @a ensure_ascii and exceptions added in version 3.0.0
+ */
+ string_t dump(const int indent = -1, const char indent_char = ' ',
+ const bool ensure_ascii = false) const
+ {
+ string_t result;
+ serializer s(detail::output_adapter<char, string_t>(result), indent_char);
+
+ if (indent >= 0)
+ {
+ s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+ }
+ else
+ {
+ s.dump(*this, false, ensure_ascii, 0);
+ }
+
+ return result;
+ }
+
+ /*!
+ @brief return the type of the JSON value (explicit)
+
+ Return the type of the JSON value as a value from the @ref value_t
+ enumeration.
+
+ @return the type of the JSON value
+ Value type | return value
+ ------------------------- | -------------------------
+ null | value_t::null
+ boolean | value_t::boolean
+ string | value_t::string
+ number (integer) | value_t::number_integer
+ number (unsigned integer) | value_t::number_unsigned
+ number (floating-point) | value_t::number_float
+ object | value_t::object
+ array | value_t::array
+ discarded | value_t::discarded
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `type()` for all JSON
+ types.,type}
+
+ @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+ @sa @ref type_name() -- return the type as string
+
+ @since version 1.0.0
+ */
+ constexpr value_t type() const noexcept
+ {
+ return m_type;
+ }
+
+ /*!
+ @brief return whether type is primitive
+
+ This function returns true if and only if the JSON type is primitive
+ (string, number, boolean, or null).
+
+ @return `true` if type is primitive (string, number, boolean, or null),
+ `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_primitive()` for all JSON
+ types.,is_primitive}
+
+ @sa @ref is_structured() -- returns whether JSON value is structured
+ @sa @ref is_null() -- returns whether JSON value is `null`
+ @sa @ref is_string() -- returns whether JSON value is a string
+ @sa @ref is_boolean() -- returns whether JSON value is a boolean
+ @sa @ref is_number() -- returns whether JSON value is a number
+
+ @since version 1.0.0
+ */
+ constexpr bool is_primitive() const noexcept
+ {
+ return is_null() or is_string() or is_boolean() or is_number();
+ }
+
+ /*!
+ @brief return whether type is structured
+
+ This function returns true if and only if the JSON type is structured
+ (array or object).
+
+ @return `true` if type is structured (array or object), `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_structured()` for all JSON
+ types.,is_structured}
+
+ @sa @ref is_primitive() -- returns whether value is primitive
+ @sa @ref is_array() -- returns whether value is an array
+ @sa @ref is_object() -- returns whether value is an object
+
+ @since version 1.0.0
+ */
+ constexpr bool is_structured() const noexcept
+ {
+ return is_array() or is_object();
+ }
+
+ /*!
+ @brief return whether value is null
+
+ This function returns true if and only if the JSON value is null.
+
+ @return `true` if type is null, `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_null()` for all JSON
+ types.,is_null}
+
+ @since version 1.0.0
+ */
+ constexpr bool is_null() const noexcept
+ {
+ return (m_type == value_t::null);
+ }
+
+ /*!
+ @brief return whether value is a boolean
+
+ This function returns true if and only if the JSON value is a boolean.
+
+ @return `true` if type is boolean, `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_boolean()` for all JSON
+ types.,is_boolean}
+
+ @since version 1.0.0
+ */
+ constexpr bool is_boolean() const noexcept
+ {
+ return (m_type == value_t::boolean);
+ }
+
+ /*!
+ @brief return whether value is a number
+
+ This function returns true if and only if the JSON value is a number. This
+ includes both integer (signed and unsigned) and floating-point values.
+
+ @return `true` if type is number (regardless whether integer, unsigned
+ integer or floating-type), `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_number()` for all JSON
+ types.,is_number}
+
+ @sa @ref is_number_integer() -- check if value is an integer or unsigned
+ integer number
+ @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+ number
+ @sa @ref is_number_float() -- check if value is a floating-point number
+
+ @since version 1.0.0
+ */
+ constexpr bool is_number() const noexcept
+ {
+ return is_number_integer() or is_number_float();
+ }
+
+ /*!
+ @brief return whether value is an integer number
+
+ This function returns true if and only if the JSON value is a signed or
+ unsigned integer number. This excludes floating-point values.
+
+ @return `true` if type is an integer or unsigned integer number, `false`
+ otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_number_integer()` for all
+ JSON types.,is_number_integer}
+
+ @sa @ref is_number() -- check if value is a number
+ @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+ number
+ @sa @ref is_number_float() -- check if value is a floating-point number
+
+ @since version 1.0.0
+ */
+ constexpr bool is_number_integer() const noexcept
+ {
+ return (m_type == value_t::number_integer or m_type == value_t::number_unsigned);
+ }
+
+ /*!
+ @brief return whether value is an unsigned integer number
+
+ This function returns true if and only if the JSON value is an unsigned
+ integer number. This excludes floating-point and signed integer values.
+
+ @return `true` if type is an unsigned integer number, `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_number_unsigned()` for all
+ JSON types.,is_number_unsigned}
+
+ @sa @ref is_number() -- check if value is a number
+ @sa @ref is_number_integer() -- check if value is an integer or unsigned
+ integer number
+ @sa @ref is_number_float() -- check if value is a floating-point number
+
+ @since version 2.0.0
+ */
+ constexpr bool is_number_unsigned() const noexcept
+ {
+ return (m_type == value_t::number_unsigned);
+ }
+
+ /*!
+ @brief return whether value is a floating-point number
+
+ This function returns true if and only if the JSON value is a
+ floating-point number. This excludes signed and unsigned integer values.
+
+ @return `true` if type is a floating-point number, `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_number_float()` for all
+ JSON types.,is_number_float}
+
+ @sa @ref is_number() -- check if value is number
+ @sa @ref is_number_integer() -- check if value is an integer number
+ @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+ number
+
+ @since version 1.0.0
+ */
+ constexpr bool is_number_float() const noexcept
+ {
+ return (m_type == value_t::number_float);
+ }
+
+ /*!
+ @brief return whether value is an object
+
+ This function returns true if and only if the JSON value is an object.
+
+ @return `true` if type is object, `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_object()` for all JSON
+ types.,is_object}
+
+ @since version 1.0.0
+ */
+ constexpr bool is_object() const noexcept
+ {
+ return (m_type == value_t::object);
+ }
+
+ /*!
+ @brief return whether value is an array
+
+ This function returns true if and only if the JSON value is an array.
+
+ @return `true` if type is array, `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_array()` for all JSON
+ types.,is_array}
+
+ @since version 1.0.0
+ */
+ constexpr bool is_array() const noexcept
+ {
+ return (m_type == value_t::array);
+ }
+
+ /*!
+ @brief return whether value is a string
+
+ This function returns true if and only if the JSON value is a string.
+
+ @return `true` if type is string, `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_string()` for all JSON
+ types.,is_string}
+
+ @since version 1.0.0
+ */
+ constexpr bool is_string() const noexcept
+ {
+ return (m_type == value_t::string);
+ }
+
+ /*!
+ @brief return whether value is discarded
+
+ This function returns true if and only if the JSON value was discarded
+ during parsing with a callback function (see @ref parser_callback_t).
+
+ @note This function will always be `false` for JSON values after parsing.
+ That is, discarded values can only occur during parsing, but will be
+ removed when inside a structured value or replaced by null in other cases.
+
+ @return `true` if type is discarded, `false` otherwise.
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies `is_discarded()` for all JSON
+ types.,is_discarded}
+
+ @since version 1.0.0
+ */
+ constexpr bool is_discarded() const noexcept
+ {
+ return (m_type == value_t::discarded);
+ }
+
+ /*!
+ @brief return the type of the JSON value (implicit)
+
+ Implicitly return the type of the JSON value as a value from the @ref
+ value_t enumeration.
+
+ @return the type of the JSON value
+
+ @complexity Constant.
+
+ @exceptionsafety No-throw guarantee: this member function never throws
+ exceptions.
+
+ @liveexample{The following code exemplifies the @ref value_t operator for
+ all JSON types.,operator__value_t}
+
+ @sa @ref type() -- return the type of the JSON value (explicit)
+ @sa @ref type_name() -- return the type as string
+
+ @since version 1.0.0
+ */
+ constexpr operator value_t() const noexcept
+ {
+ return m_type;
+ }
+
+ /// @}
+
+ private:
+ //////////////////
+ // value access //
+ //////////////////
+
+ /// get a boolean (explicit)
+ boolean_t get_impl(boolean_t* /*unused*/) const
+ {
+ if (JSON_LIKELY(is_boolean()))
+ {
+ return m_value.boolean;
+ }
+
+ JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name())));
+ }
+
+ /// get a pointer to the value (object)
+ object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+ {
+ return is_object() ? m_value.object : nullptr;
+ }
+
+ /// get a pointer to the value (object)
+ constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+ {
+ return is_object() ? m_value.object : nullptr;
+ }
+
+ /// get a pointer to the value (array)
+ array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+ {
+ return is_array() ? m_value.array : nullptr;
+ }
+
+ /// get a pointer to the value (array)
+ constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+ {
+ return is_array() ? m_value.array : nullptr;
+ }
+
+ /// get a pointer to the value (string)
+ string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+ {
+ return is_string() ? m_value.string : nullptr;
+ }
+
+ /// get a pointer to the value (string)
+ constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+ {
+ return is_string() ? m_value.string : nullptr;
+ }
+
+ /// get a pointer to the value (boolean)
+ boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+ {
+ return is_boolean() ? &m_value.boolean : nullptr;
+ }
+
+ /// get a pointer to the value (boolean)
+ constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+ {
+ return is_boolean() ? &m_value.boolean : nullptr;
+ }
+
+ /// get a pointer to the value (integer number)
+ number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+ {
+ return is_number_integer() ? &m_value.number_integer : nullptr;
+ }
+
+ /// get a pointer to the value (integer number)
+ constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+ {
+ return is_number_integer() ? &m_value.number_integer : nullptr;
+ }
+
+ /// get a pointer to the value (unsigned number)
+ number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+ {
+ return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+ }
+
+ /// get a pointer to the value (unsigned number)
+ constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+ {
+ return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+ }
+
+ /// get a pointer to the value (floating-point number)
+ number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+ {
+ return is_number_float() ? &m_value.number_float : nullptr;
+ }
+
+ /// get a pointer to the value (floating-point number)
+ constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+ {
+ return is_number_float() ? &m_value.number_float : nullptr;
+ }
+
+ /*!
+ @brief helper function to implement get_ref()
+
+ This function helps to implement get_ref() without code duplication for
+ const and non-const overloads
+
+ @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+ @throw type_error.303 if ReferenceType does not match underlying value
+ type of the current JSON
+ */
+ template<typename ReferenceType, typename ThisType>
+ static ReferenceType get_ref_impl(ThisType& obj)
+ {
+ // delegate the call to get_ptr<>()
+ auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+ if (JSON_LIKELY(ptr != nullptr))
+ {
+ return *ptr;
+ }
+
+ JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name())));
+ }
+
+ public:
+ /// @name value access
+ /// Direct access to the stored value of a JSON value.
+ /// @{
+
+ /*!
+ @brief get special-case overload
+
+ This overloads avoids a lot of template boilerplate, it can be seen as the
+ identity method
+
+ @tparam BasicJsonType == @ref basic_json
+
+ @return a copy of *this
+
+ @complexity Constant.
+
+ @since version 2.1.0
+ */
+ template<typename BasicJsonType, detail::enable_if_t<
+ std::is_same<typename std::remove_const<BasicJsonType>::type, basic_json_t>::value,
+ int> = 0>
+ basic_json get() const
+ {
+ return *this;
+ }
+
+ /*!
+ @brief get special-case overload
+
+ This overloads converts the current @ref basic_json in a different
+ @ref basic_json type
+
+ @tparam BasicJsonType == @ref basic_json
+
+ @return a copy of *this, converted into @tparam BasicJsonType
+
+ @complexity Depending on the implementation of the called `from_json()`
+ method.
+
+ @since version 3.1.2
+ */
+ template<typename BasicJsonType, detail::enable_if_t<
+ not std::is_same<BasicJsonType, basic_json>::value and
+ detail::is_basic_json<BasicJsonType>::value, int> = 0>
+ BasicJsonType get() const
+ {
+ return *this;
+ }
+
+ /*!
+ @brief get a value (explicit)
+
+ Explicit type conversion between the JSON value and a compatible value
+ which is [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
+ and [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
+ The value is converted by calling the @ref json_serializer<ValueType>
+ `from_json()` method.
+
+ The function is equivalent to executing
+ @code {.cpp}
+ ValueType ret;
+ JSONSerializer<ValueType>::from_json(*this, ret);
+ return ret;
+ @endcode
+
+ This overloads is chosen if:
+ - @a ValueType is not @ref basic_json,
+ - @ref json_serializer<ValueType> has a `from_json()` method of the form
+ `void from_json(const basic_json&, ValueType&)`, and
+ - @ref json_serializer<ValueType> does not have a `from_json()` method of
+ the form `ValueType from_json(const basic_json&)`
+
+ @tparam ValueTypeCV the provided value type
+ @tparam ValueType the returned value type
+
+ @return copy of the JSON value, converted to @a ValueType
+
+ @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+ @liveexample{The example below shows several conversions from JSON values
+ to other types. There a few things to note: (1) Floating-point numbers can
+ be converted to integers\, (2) A JSON array can be converted to a standard
+ `std::vector<short>`\, (3) A JSON object can be converted to C++
+ associative containers such as `std::unordered_map<std::string\,
+ json>`.,get__ValueType_const}
+
+ @since version 2.1.0
+ */
+ template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+ detail::enable_if_t <
+ not detail::is_basic_json<ValueType>::value and
+ detail::has_from_json<basic_json_t, ValueType>::value and
+ not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+ int> = 0>
+ ValueType get() const noexcept(noexcept(
+ JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+ {
+ // we cannot static_assert on ValueTypeCV being non-const, because
+ // there is support for get<const basic_json_t>(), which is why we
+ // still need the uncvref
+ static_assert(not std::is_reference<ValueTypeCV>::value,
+ "get() cannot be used with reference types, you might want to use get_ref()");
+ static_assert(std::is_default_constructible<ValueType>::value,
+ "types must be DefaultConstructible when used with get()");
+
+ ValueType ret;
+ JSONSerializer<ValueType>::from_json(*this, ret);
+ return ret;
+ }
+
+ /*!
+ @brief get a value (explicit); special case
+
+ Explicit type conversion between the JSON value and a compatible value
+ which is **not** [CopyConstructible](http://en.cppreference.com/w/cpp/concept/CopyConstructible)
+ and **not** [DefaultConstructible](http://en.cppreference.com/w/cpp/concept/DefaultConstructible).
+ The value is converted by calling the @ref json_serializer<ValueType>
+ `from_json()` method.
+
+ The function is equivalent to executing
+ @code {.cpp}
+ return JSONSerializer<ValueTypeCV>::from_json(*this);
+ @endcode
+
+ This overloads is chosen if:
+ - @a ValueType is not @ref basic_json and
+ - @ref json_serializer<ValueType> has a `from_json()` method of the form
+ `ValueType from_json(const basic_json&)`
+
+ @note If @ref json_serializer<ValueType> has both overloads of
+ `from_json()`, this one is chosen.
+
+ @tparam ValueTypeCV the provided value type
+ @tparam ValueType the returned value type
+
+ @return copy of the JSON value, converted to @a ValueType
+
+ @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+ @since version 2.1.0
+ */
+ template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+ detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
+ detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+ int> = 0>
+ ValueType get() const noexcept(noexcept(
+ JSONSerializer<ValueTypeCV>::from_json(std::declval<const basic_json_t&>())))
+ {
+ static_assert(not std::is_reference<ValueTypeCV>::value,
+ "get() cannot be used with reference types, you might want to use get_ref()");
+ return JSONSerializer<ValueTypeCV>::from_json(*this);
+ }
+
+ /*!
+ @brief get a pointer value (explicit)
+
+ Explicit pointer access to the internally stored JSON value. No copies are
+ made.
+
+ @warning The pointer becomes invalid if the underlying JSON object
+ changes.
+
+ @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+ object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+ @ref number_unsigned_t, or @ref number_float_t.
+
+ @return pointer to the internally stored JSON value if the requested
+ pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+ @complexity Constant.
+
+ @liveexample{The example below shows how pointers to internal values of a
+ JSON value can be requested. Note that no type conversions are made and a
+ `nullptr` is returned if the value and the requested pointer type does not
+ match.,get__PointerType}
+
+ @sa @ref get_ptr() for explicit pointer-member access
+
+ @since version 1.0.0
+ */
+ template<typename PointerType, typename std::enable_if<
+ std::is_pointer<PointerType>::value, int>::type = 0>
+ PointerType get() noexcept
+ {
+ // delegate the call to get_ptr
+ return get_ptr<PointerType>();
+ }
+
+ /*!
+ @brief get a pointer value (explicit)
+ @copydoc get()
+ */
+ template<typename PointerType, typename std::enable_if<
+ std::is_pointer<PointerType>::value, int>::type = 0>
+ constexpr const PointerType get() const noexcept
+ {
+ // delegate the call to get_ptr
+ return get_ptr<PointerType>();
+ }
+
+ /*!
+ @brief get a pointer value (implicit)
+
+ Implicit pointer access to the internally stored JSON value. No copies are
+ made.
+
+ @warning Writing data to the pointee of the result yields an undefined
+ state.
+
+ @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+ object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+ @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
+ assertion.
+
+ @return pointer to the internally stored JSON value if the requested
+ pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+ @complexity Constant.
+
+ @liveexample{The example below shows how pointers to internal values of a
+ JSON value can be requested. Note that no type conversions are made and a
+ `nullptr` is returned if the value and the requested pointer type does not
+ match.,get_ptr}
+
+ @since version 1.0.0
+ */
+ template<typename PointerType, typename std::enable_if<
+ std::is_pointer<PointerType>::value, int>::type = 0>
+ PointerType get_ptr() noexcept
+ {
+ // get the type of the PointerType (remove pointer and const)
+ using pointee_t = typename std::remove_const<typename
+ std::remove_pointer<typename
+ std::remove_const<PointerType>::type>::type>::type;
+ // make sure the type matches the allowed types
+ static_assert(
+ std::is_same<object_t, pointee_t>::value
+ or std::is_same<array_t, pointee_t>::value
+ or std::is_same<string_t, pointee_t>::value
+ or std::is_same<boolean_t, pointee_t>::value
+ or std::is_same<number_integer_t, pointee_t>::value
+ or std::is_same<number_unsigned_t, pointee_t>::value
+ or std::is_same<number_float_t, pointee_t>::value
+ , "incompatible pointer type");
+
+ // delegate the call to get_impl_ptr<>()
+ return get_impl_ptr(static_cast<PointerType>(nullptr));
+ }
+
+ /*!
+ @brief get a pointer value (implicit)
+ @copydoc get_ptr()
+ */
+ template<typename PointerType, typename std::enable_if<
+ std::is_pointer<PointerType>::value and
+ std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
+ constexpr const PointerType get_ptr() const noexcept
+ {
+ // get the type of the PointerType (remove pointer and const)
+ using pointee_t = typename std::remove_const<typename
+ std::remove_pointer<typename
+ std::remove_const<PointerType>::type>::type>::type;
+ // make sure the type matches the allowed types
+ static_assert(
+ std::is_same<object_t, pointee_t>::value
+ or std::is_same<array_t, pointee_t>::value
+ or std::is_same<string_t, pointee_t>::value
+ or std::is_same<boolean_t, pointee_t>::value
+ or std::is_same<number_integer_t, pointee_t>::value
+ or std::is_same<number_unsigned_t, pointee_t>::value
+ or std::is_same<number_float_t, pointee_t>::value
+ , "incompatible pointer type");
+
+ // delegate the call to get_impl_ptr<>() const
+ return get_impl_ptr(static_cast<PointerType>(nullptr));
+ }
+
+ /*!
+ @brief get a reference value (implicit)
+
+ Implicit reference access to the internally stored JSON value. No copies
+ are made.
+
+ @warning Writing data to the referee of the result yields an undefined
+ state.
+
+ @tparam ReferenceType reference type; must be a reference to @ref array_t,
+ @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
+ @ref number_float_t. Enforced by static assertion.
+
+ @return reference to the internally stored JSON value if the requested
+ reference type @a ReferenceType fits to the JSON value; throws
+ type_error.303 otherwise
+
+ @throw type_error.303 in case passed type @a ReferenceType is incompatible
+ with the stored JSON value; see example below
+
+ @complexity Constant.
+
+ @liveexample{The example shows several calls to `get_ref()`.,get_ref}
+
+ @since version 1.1.0
+ */
+ template<typename ReferenceType, typename std::enable_if<
+ std::is_reference<ReferenceType>::value, int>::type = 0>
+ ReferenceType get_ref()
+ {
+ // delegate call to get_ref_impl
+ return get_ref_impl<ReferenceType>(*this);
+ }
+
+ /*!
+ @brief get a reference value (implicit)
+ @copydoc get_ref()
+ */
+ template<typename ReferenceType, typename std::enable_if<
+ std::is_reference<ReferenceType>::value and
+ std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int>::type = 0>
+ ReferenceType get_ref() const
+ {
+ // delegate call to get_ref_impl
+ return get_ref_impl<ReferenceType>(*this);
+ }
+
+ /*!
+ @brief get a value (implicit)
+
+ Implicit type conversion between the JSON value and a compatible value.
+ The call is realized by calling @ref get() const.
+
+ @tparam ValueType non-pointer type compatible to the JSON value, for
+ instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+ `std::vector` types for JSON arrays. The character type of @ref string_t
+ as well as an initializer list of this type is excluded to avoid
+ ambiguities as these types implicitly convert to `std::string`.
+
+ @return copy of the JSON value, converted to type @a ValueType
+
+ @throw type_error.302 in case passed type @a ValueType is incompatible
+ to the JSON value type (e.g., the JSON value is of type boolean, but a
+ string is requested); see example below
+
+ @complexity Linear in the size of the JSON value.
+
+ @liveexample{The example below shows several conversions from JSON values
+ to other types. There a few things to note: (1) Floating-point numbers can
+ be converted to integers\, (2) A JSON array can be converted to a standard
+ `std::vector<short>`\, (3) A JSON object can be converted to C++
+ associative containers such as `std::unordered_map<std::string\,
+ json>`.,operator__ValueType}
+
+ @since version 1.0.0
+ */
+ template < typename ValueType, typename std::enable_if <
+ not std::is_pointer<ValueType>::value and
+ not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
+ not std::is_same<ValueType, typename string_t::value_type>::value and
+ not detail::is_basic_json<ValueType>::value
+#ifndef _MSC_VER // fix for issue #167 operator<< ambiguity under VS2015
+ and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+#endif
+#if defined(JSON_HAS_CPP_17)
+ and not std::is_same<ValueType, typename std::string_view>::value
+#endif
+ , int >::type = 0 >
+ operator ValueType() const
+ {
+ // delegate the call to get<>() const
+ return get<ValueType>();
+ }
+
+ /// @}
+
+
+ ////////////////////
+ // element access //
+ ////////////////////
+
+ /// @name element access
+ /// Access to the JSON value.
+ /// @{
+
+ /*!
+ @brief access specified array element with bounds checking
+
+ Returns a reference to the element at specified location @a idx, with
+ bounds checking.
+
+ @param[in] idx index of the element to access
+
+ @return reference to the element at index @a idx
+
+ @throw type_error.304 if the JSON value is not an array; in this case,
+ calling `at` with an index makes no sense. See example below.
+ @throw out_of_range.401 if the index @a idx is out of range of the array;
+ that is, `idx >= size()`. See example below.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @complexity Constant.
+
+ @since version 1.0.0
+
+ @liveexample{The example below shows how array elements can be read and
+ written using `at()`. It also demonstrates the different exceptions that
+ can be thrown.,at__size_type}
+ */
+ reference at(size_type idx)
+ {
+ // at only works for arrays
+ if (JSON_LIKELY(is_array()))
+ {
+ JSON_TRY
+ {
+ return m_value.array->at(idx);
+ }
+ JSON_CATCH (std::out_of_range&)
+ {
+ // create better exception explanation
+ JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+ }
+ }
+ else
+ {
+ JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+ }
+ }
+
+ /*!
+ @brief access specified array element with bounds checking
+
+ Returns a const reference to the element at specified location @a idx,
+ with bounds checking.
+
+ @param[in] idx index of the element to access
+
+ @return const reference to the element at index @a idx
+
+ @throw type_error.304 if the JSON value is not an array; in this case,
+ calling `at` with an index makes no sense. See example below.
+ @throw out_of_range.401 if the index @a idx is out of range of the array;
+ that is, `idx >= size()`. See example below.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @complexity Constant.
+
+ @since version 1.0.0
+
+ @liveexample{The example below shows how array elements can be read using
+ `at()`. It also demonstrates the different exceptions that can be thrown.,
+ at__size_type_const}
+ */
+ const_reference at(size_type idx) const
+ {
+ // at only works for arrays
+ if (JSON_LIKELY(is_array()))
+ {
+ JSON_TRY
+ {
+ return m_value.array->at(idx);
+ }
+ JSON_CATCH (std::out_of_range&)
+ {
+ // create better exception explanation
+ JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+ }
+ }
+ else
+ {
+ JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+ }
+ }
+
+ /*!
+ @brief access specified object element with bounds checking
+
+ Returns a reference to the element at with specified key @a key, with
+ bounds checking.
+
+ @param[in] key key of the element to access
+
+ @return reference to the element at key @a key
+
+ @throw type_error.304 if the JSON value is not an object; in this case,
+ calling `at` with a key makes no sense. See example below.
+ @throw out_of_range.403 if the key @a key is is not stored in the object;
+ that is, `find(key) == end()`. See example below.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @complexity Logarithmic in the size of the container.
+
+ @sa @ref operator[](const typename object_t::key_type&) for unchecked
+ access by reference
+ @sa @ref value() for access by value with a default value
+
+ @since version 1.0.0
+
+ @liveexample{The example below shows how object elements can be read and
+ written using `at()`. It also demonstrates the different exceptions that
+ can be thrown.,at__object_t_key_type}
+ */
+ reference at(const typename object_t::key_type& key)
+ {
+ // at only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ JSON_TRY
+ {
+ return m_value.object->at(key);
+ }
+ JSON_CATCH (std::out_of_range&)
+ {
+ // create better exception explanation
+ JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+ }
+ }
+ else
+ {
+ JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+ }
+ }
+
+ /*!
+ @brief access specified object element with bounds checking
+
+ Returns a const reference to the element at with specified key @a key,
+ with bounds checking.
+
+ @param[in] key key of the element to access
+
+ @return const reference to the element at key @a key
+
+ @throw type_error.304 if the JSON value is not an object; in this case,
+ calling `at` with a key makes no sense. See example below.
+ @throw out_of_range.403 if the key @a key is is not stored in the object;
+ that is, `find(key) == end()`. See example below.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @complexity Logarithmic in the size of the container.
+
+ @sa @ref operator[](const typename object_t::key_type&) for unchecked
+ access by reference
+ @sa @ref value() for access by value with a default value
+
+ @since version 1.0.0
+
+ @liveexample{The example below shows how object elements can be read using
+ `at()`. It also demonstrates the different exceptions that can be thrown.,
+ at__object_t_key_type_const}
+ */
+ const_reference at(const typename object_t::key_type& key) const
+ {
+ // at only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ JSON_TRY
+ {
+ return m_value.object->at(key);
+ }
+ JSON_CATCH (std::out_of_range&)
+ {
+ // create better exception explanation
+ JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+ }
+ }
+ else
+ {
+ JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+ }
+ }
+
+ /*!
+ @brief access specified array element
+
+ Returns a reference to the element at specified location @a idx.
+
+ @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
+ then the array is silently filled up with `null` values to make `idx` a
+ valid reference to the last stored element.
+
+ @param[in] idx index of the element to access
+
+ @return reference to the element at index @a idx
+
+ @throw type_error.305 if the JSON value is not an array or null; in that
+ cases, using the [] operator with an index makes no sense.
+
+ @complexity Constant if @a idx is in the range of the array. Otherwise
+ linear in `idx - size()`.
+
+ @liveexample{The example below shows how array elements can be read and
+ written using `[]` operator. Note the addition of `null`
+ values.,operatorarray__size_type}
+
+ @since version 1.0.0
+ */
+ reference operator[](size_type idx)
+ {
+ // implicitly convert null value to an empty array
+ if (is_null())
+ {
+ m_type = value_t::array;
+ m_value.array = create<array_t>();
+ assert_invariant();
+ }
+
+ // operator[] only works for arrays
+ if (JSON_LIKELY(is_array()))
+ {
+ // fill up array with null values if given idx is outside range
+ if (idx >= m_value.array->size())
+ {
+ m_value.array->insert(m_value.array->end(),
+ idx - m_value.array->size() + 1,
+ basic_json());
+ }
+
+ return m_value.array->operator[](idx);
+ }
+
+ JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief access specified array element
+
+ Returns a const reference to the element at specified location @a idx.
+
+ @param[in] idx index of the element to access
+
+ @return const reference to the element at index @a idx
+
+ @throw type_error.305 if the JSON value is not an array; in that case,
+ using the [] operator with an index makes no sense.
+
+ @complexity Constant.
+
+ @liveexample{The example below shows how array elements can be read using
+ the `[]` operator.,operatorarray__size_type_const}
+
+ @since version 1.0.0
+ */
+ const_reference operator[](size_type idx) const
+ {
+ // const operator[] only works for arrays
+ if (JSON_LIKELY(is_array()))
+ {
+ return m_value.array->operator[](idx);
+ }
+
+ JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief access specified object element
+
+ Returns a reference to the element at with specified key @a key.
+
+ @note If @a key is not found in the object, then it is silently added to
+ the object and filled with a `null` value to make `key` a valid reference.
+ In case the value was `null` before, it is converted to an object.
+
+ @param[in] key key of the element to access
+
+ @return reference to the element at key @a key
+
+ @throw type_error.305 if the JSON value is not an object or null; in that
+ cases, using the [] operator with a key makes no sense.
+
+ @complexity Logarithmic in the size of the container.
+
+ @liveexample{The example below shows how object elements can be read and
+ written using the `[]` operator.,operatorarray__key_type}
+
+ @sa @ref at(const typename object_t::key_type&) for access by reference
+ with range checking
+ @sa @ref value() for access by value with a default value
+
+ @since version 1.0.0
+ */
+ reference operator[](const typename object_t::key_type& key)
+ {
+ // implicitly convert null value to an empty object
+ if (is_null())
+ {
+ m_type = value_t::object;
+ m_value.object = create<object_t>();
+ assert_invariant();
+ }
+
+ // operator[] only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ return m_value.object->operator[](key);
+ }
+
+ JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief read-only access specified object element
+
+ Returns a const reference to the element at with specified key @a key. No
+ bounds checking is performed.
+
+ @warning If the element with key @a key does not exist, the behavior is
+ undefined.
+
+ @param[in] key key of the element to access
+
+ @return const reference to the element at key @a key
+
+ @pre The element with key @a key must exist. **This precondition is
+ enforced with an assertion.**
+
+ @throw type_error.305 if the JSON value is not an object; in that case,
+ using the [] operator with a key makes no sense.
+
+ @complexity Logarithmic in the size of the container.
+
+ @liveexample{The example below shows how object elements can be read using
+ the `[]` operator.,operatorarray__key_type_const}
+
+ @sa @ref at(const typename object_t::key_type&) for access by reference
+ with range checking
+ @sa @ref value() for access by value with a default value
+
+ @since version 1.0.0
+ */
+ const_reference operator[](const typename object_t::key_type& key) const
+ {
+ // const operator[] only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ assert(m_value.object->find(key) != m_value.object->end());
+ return m_value.object->find(key)->second;
+ }
+
+ JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief access specified object element
+
+ Returns a reference to the element at with specified key @a key.
+
+ @note If @a key is not found in the object, then it is silently added to
+ the object and filled with a `null` value to make `key` a valid reference.
+ In case the value was `null` before, it is converted to an object.
+
+ @param[in] key key of the element to access
+
+ @return reference to the element at key @a key
+
+ @throw type_error.305 if the JSON value is not an object or null; in that
+ cases, using the [] operator with a key makes no sense.
+
+ @complexity Logarithmic in the size of the container.
+
+ @liveexample{The example below shows how object elements can be read and
+ written using the `[]` operator.,operatorarray__key_type}
+
+ @sa @ref at(const typename object_t::key_type&) for access by reference
+ with range checking
+ @sa @ref value() for access by value with a default value
+
+ @since version 1.1.0
+ */
+ template<typename T>
+ reference operator[](T* key)
+ {
+ // implicitly convert null to object
+ if (is_null())
+ {
+ m_type = value_t::object;
+ m_value = value_t::object;
+ assert_invariant();
+ }
+
+ // at only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ return m_value.object->operator[](key);
+ }
+
+ JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief read-only access specified object element
+
+ Returns a const reference to the element at with specified key @a key. No
+ bounds checking is performed.
+
+ @warning If the element with key @a key does not exist, the behavior is
+ undefined.
+
+ @param[in] key key of the element to access
+
+ @return const reference to the element at key @a key
+
+ @pre The element with key @a key must exist. **This precondition is
+ enforced with an assertion.**
+
+ @throw type_error.305 if the JSON value is not an object; in that case,
+ using the [] operator with a key makes no sense.
+
+ @complexity Logarithmic in the size of the container.
+
+ @liveexample{The example below shows how object elements can be read using
+ the `[]` operator.,operatorarray__key_type_const}
+
+ @sa @ref at(const typename object_t::key_type&) for access by reference
+ with range checking
+ @sa @ref value() for access by value with a default value
+
+ @since version 1.1.0
+ */
+ template<typename T>
+ const_reference operator[](T* key) const
+ {
+ // at only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ assert(m_value.object->find(key) != m_value.object->end());
+ return m_value.object->find(key)->second;
+ }
+
+ JSON_THROW(type_error::create(305, "cannot use operator[] with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief access specified object element with default value
+
+ Returns either a copy of an object's element at the specified key @a key
+ or a given default value if no element with key @a key exists.
+
+ The function is basically equivalent to executing
+ @code {.cpp}
+ try {
+ return at(key);
+ } catch(out_of_range) {
+ return default_value;
+ }
+ @endcode
+
+ @note Unlike @ref at(const typename object_t::key_type&), this function
+ does not throw if the given key @a key was not found.
+
+ @note Unlike @ref operator[](const typename object_t::key_type& key), this
+ function does not implicitly add an element to the position defined by @a
+ key. This function is furthermore also applicable to const objects.
+
+ @param[in] key key of the element to access
+ @param[in] default_value the value to return if @a key is not found
+
+ @tparam ValueType type compatible to JSON values, for instance `int` for
+ JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+ JSON arrays. Note the type of the expected value at @a key and the default
+ value @a default_value must be compatible.
+
+ @return copy of the element at key @a key or @a default_value if @a key
+ is not found
+
+ @throw type_error.306 if the JSON value is not an object; in that case,
+ using `value()` with a key makes no sense.
+
+ @complexity Logarithmic in the size of the container.
+
+ @liveexample{The example below shows how object elements can be queried
+ with a default value.,basic_json__value}
+
+ @sa @ref at(const typename object_t::key_type&) for access by reference
+ with range checking
+ @sa @ref operator[](const typename object_t::key_type&) for unchecked
+ access by reference
+
+ @since version 1.0.0
+ */
+ template<class ValueType, typename std::enable_if<
+ std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+ ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+ {
+ // at only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ // if key is found, return value and given default value otherwise
+ const auto it = find(key);
+ if (it != end())
+ {
+ return *it;
+ }
+
+ return default_value;
+ }
+
+ JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief overload for a default value of type const char*
+ @copydoc basic_json::value(const typename object_t::key_type&, ValueType) const
+ */
+ string_t value(const typename object_t::key_type& key, const char* default_value) const
+ {
+ return value(key, string_t(default_value));
+ }
+
+ /*!
+ @brief access specified object element via JSON Pointer with default value
+
+ Returns either a copy of an object's element at the specified key @a key
+ or a given default value if no element with key @a key exists.
+
+ The function is basically equivalent to executing
+ @code {.cpp}
+ try {
+ return at(ptr);
+ } catch(out_of_range) {
+ return default_value;
+ }
+ @endcode
+
+ @note Unlike @ref at(const json_pointer&), this function does not throw
+ if the given key @a key was not found.
+
+ @param[in] ptr a JSON pointer to the element to access
+ @param[in] default_value the value to return if @a ptr found no value
+
+ @tparam ValueType type compatible to JSON values, for instance `int` for
+ JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+ JSON arrays. Note the type of the expected value at @a key and the default
+ value @a default_value must be compatible.
+
+ @return copy of the element at key @a key or @a default_value if @a key
+ is not found
+
+ @throw type_error.306 if the JSON value is not an objec; in that case,
+ using `value()` with a key makes no sense.
+
+ @complexity Logarithmic in the size of the container.
+
+ @liveexample{The example below shows how object elements can be queried
+ with a default value.,basic_json__value_ptr}
+
+ @sa @ref operator[](const json_pointer&) for unchecked access by reference
+
+ @since version 2.0.2
+ */
+ template<class ValueType, typename std::enable_if<
+ std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+ ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+ {
+ // at only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ // if pointer resolves a value, return it or use default value
+ JSON_TRY
+ {
+ return ptr.get_checked(this);
+ }
+ JSON_CATCH (out_of_range&)
+ {
+ return default_value;
+ }
+ }
+
+ JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief overload for a default value of type const char*
+ @copydoc basic_json::value(const json_pointer&, ValueType) const
+ */
+ string_t value(const json_pointer& ptr, const char* default_value) const
+ {
+ return value(ptr, string_t(default_value));
+ }
+
+ /*!
+ @brief access the first element
+
+ Returns a reference to the first element in the container. For a JSON
+ container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
+
+ @return In case of a structured type (array or object), a reference to the
+ first element is returned. In case of number, string, or boolean values, a
+ reference to the value is returned.
+
+ @complexity Constant.
+
+ @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+ or an empty array or object (undefined behavior, **guarded by
+ assertions**).
+ @post The JSON value remains unchanged.
+
+ @throw invalid_iterator.214 when called on `null` value
+
+ @liveexample{The following code shows an example for `front()`.,front}
+
+ @sa @ref back() -- access the last element
+
+ @since version 1.0.0
+ */
+ reference front()
+ {
+ return *begin();
+ }
+
+ /*!
+ @copydoc basic_json::front()
+ */
+ const_reference front() const
+ {
+ return *cbegin();
+ }
+
+ /*!
+ @brief access the last element
+
+ Returns a reference to the last element in the container. For a JSON
+ container `c`, the expression `c.back()` is equivalent to
+ @code {.cpp}
+ auto tmp = c.end();
+ --tmp;
+ return *tmp;
+ @endcode
+
+ @return In case of a structured type (array or object), a reference to the
+ last element is returned. In case of number, string, or boolean values, a
+ reference to the value is returned.
+
+ @complexity Constant.
+
+ @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+ or an empty array or object (undefined behavior, **guarded by
+ assertions**).
+ @post The JSON value remains unchanged.
+
+ @throw invalid_iterator.214 when called on a `null` value. See example
+ below.
+
+ @liveexample{The following code shows an example for `back()`.,back}
+
+ @sa @ref front() -- access the first element
+
+ @since version 1.0.0
+ */
+ reference back()
+ {
+ auto tmp = end();
+ --tmp;
+ return *tmp;
+ }
+
+ /*!
+ @copydoc basic_json::back()
+ */
+ const_reference back() const
+ {
+ auto tmp = cend();
+ --tmp;
+ return *tmp;
+ }
+
+ /*!
+ @brief remove element given an iterator
+
+ Removes the element specified by iterator @a pos. The iterator @a pos must
+ be valid and dereferenceable. Thus the `end()` iterator (which is valid,
+ but is not dereferenceable) cannot be used as a value for @a pos.
+
+ If called on a primitive type other than `null`, the resulting JSON value
+ will be `null`.
+
+ @param[in] pos iterator to the element to remove
+ @return Iterator following the last removed element. If the iterator @a
+ pos refers to the last element, the `end()` iterator is returned.
+
+ @tparam IteratorType an @ref iterator or @ref const_iterator
+
+ @post Invalidates iterators and references at or after the point of the
+ erase, including the `end()` iterator.
+
+ @throw type_error.307 if called on a `null` value; example: `"cannot use
+ erase() with null"`
+ @throw invalid_iterator.202 if called on an iterator which does not belong
+ to the current JSON value; example: `"iterator does not fit current
+ value"`
+ @throw invalid_iterator.205 if called on a primitive type with invalid
+ iterator (i.e., any iterator which is not `begin()`); example: `"iterator
+ out of range"`
+
+ @complexity The complexity depends on the type:
+ - objects: amortized constant
+ - arrays: linear in distance between @a pos and the end of the container
+ - strings: linear in the length of the string
+ - other types: constant
+
+ @liveexample{The example shows the result of `erase()` for different JSON
+ types.,erase__IteratorType}
+
+ @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+ the given range
+ @sa @ref erase(const typename object_t::key_type&) -- removes the element
+ from an object at the given key
+ @sa @ref erase(const size_type) -- removes the element from an array at
+ the given index
+
+ @since version 1.0.0
+ */
+ template<class IteratorType, typename std::enable_if<
+ std::is_same<IteratorType, typename basic_json_t::iterator>::value or
+ std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
+ = 0>
+ IteratorType erase(IteratorType pos)
+ {
+ // make sure iterator fits the current value
+ if (JSON_UNLIKELY(this != pos.m_object))
+ {
+ JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+ }
+
+ IteratorType result = end();
+
+ switch (m_type)
+ {
+ case value_t::boolean:
+ case value_t::number_float:
+ case value_t::number_integer:
+ case value_t::number_unsigned:
+ case value_t::string:
+ {
+ if (JSON_UNLIKELY(not pos.m_it.primitive_iterator.is_begin()))
+ {
+ JSON_THROW(invalid_iterator::create(205, "iterator out of range"));
+ }
+
+ if (is_string())
+ {
+ AllocatorType<string_t> alloc;
+ std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+ std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+ m_value.string = nullptr;
+ }
+
+ m_type = value_t::null;
+ assert_invariant();
+ break;
+ }
+
+ case value_t::object:
+ {
+ result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+ break;
+ }
+
+ case value_t::array:
+ {
+ result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+ break;
+ }
+
+ default:
+ JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+ }
+
+ return result;
+ }
+
+ /*!
+ @brief remove elements given an iterator range
+
+ Removes the element specified by the range `[first; last)`. The iterator
+ @a first does not need to be dereferenceable if `first == last`: erasing
+ an empty range is a no-op.
+
+ If called on a primitive type other than `null`, the resulting JSON value
+ will be `null`.
+
+ @param[in] first iterator to the beginning of the range to remove
+ @param[in] last iterator past the end of the range to remove
+ @return Iterator following the last removed element. If the iterator @a
+ second refers to the last element, the `end()` iterator is returned.
+
+ @tparam IteratorType an @ref iterator or @ref const_iterator
+
+ @post Invalidates iterators and references at or after the point of the
+ erase, including the `end()` iterator.
+
+ @throw type_error.307 if called on a `null` value; example: `"cannot use
+ erase() with null"`
+ @throw invalid_iterator.203 if called on iterators which does not belong
+ to the current JSON value; example: `"iterators do not fit current value"`
+ @throw invalid_iterator.204 if called on a primitive type with invalid
+ iterators (i.e., if `first != begin()` and `last != end()`); example:
+ `"iterators out of range"`
+
+ @complexity The complexity depends on the type:
+ - objects: `log(size()) + std::distance(first, last)`
+ - arrays: linear in the distance between @a first and @a last, plus linear
+ in the distance between @a last and end of the container
+ - strings: linear in the length of the string
+ - other types: constant
+
+ @liveexample{The example shows the result of `erase()` for different JSON
+ types.,erase__IteratorType_IteratorType}
+
+ @sa @ref erase(IteratorType) -- removes the element at a given position
+ @sa @ref erase(const typename object_t::key_type&) -- removes the element
+ from an object at the given key
+ @sa @ref erase(const size_type) -- removes the element from an array at
+ the given index
+
+ @since version 1.0.0
+ */
+ template<class IteratorType, typename std::enable_if<
+ std::is_same<IteratorType, typename basic_json_t::iterator>::value or
+ std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
+ = 0>
+ IteratorType erase(IteratorType first, IteratorType last)
+ {
+ // make sure iterator fits the current value
+ if (JSON_UNLIKELY(this != first.m_object or this != last.m_object))
+ {
+ JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value"));
+ }
+
+ IteratorType result = end();
+
+ switch (m_type)
+ {
+ case value_t::boolean:
+ case value_t::number_float:
+ case value_t::number_integer:
+ case value_t::number_unsigned:
+ case value_t::string:
+ {
+ if (JSON_LIKELY(not first.m_it.primitive_iterator.is_begin()
+ or not last.m_it.primitive_iterator.is_end()))
+ {
+ JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+ }
+
+ if (is_string())
+ {
+ AllocatorType<string_t> alloc;
+ std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+ std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+ m_value.string = nullptr;
+ }
+
+ m_type = value_t::null;
+ assert_invariant();
+ break;
+ }
+
+ case value_t::object:
+ {
+ result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+ last.m_it.object_iterator);
+ break;
+ }
+
+ case value_t::array:
+ {
+ result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+ last.m_it.array_iterator);
+ break;
+ }
+
+ default:
+ JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+ }
+
+ return result;
+ }
+
+ /*!
+ @brief remove element from a JSON object given a key
+
+ Removes elements from a JSON object with the key value @a key.
+
+ @param[in] key value of the elements to remove
+
+ @return Number of elements removed. If @a ObjectType is the default
+ `std::map` type, the return value will always be `0` (@a key was not
+ found) or `1` (@a key was found).
+
+ @post References and iterators to the erased elements are invalidated.
+ Other references and iterators are not affected.
+
+ @throw type_error.307 when called on a type other than JSON object;
+ example: `"cannot use erase() with null"`
+
+ @complexity `log(size()) + count(key)`
+
+ @liveexample{The example shows the effect of `erase()`.,erase__key_type}
+
+ @sa @ref erase(IteratorType) -- removes the element at a given position
+ @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+ the given range
+ @sa @ref erase(const size_type) -- removes the element from an array at
+ the given index
+
+ @since version 1.0.0
+ */
+ size_type erase(const typename object_t::key_type& key)
+ {
+ // this erase only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ return m_value.object->erase(key);
+ }
+
+ JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief remove element from a JSON array given an index
+
+ Removes element from a JSON array at the index @a idx.
+
+ @param[in] idx index of the element to remove
+
+ @throw type_error.307 when called on a type other than JSON object;
+ example: `"cannot use erase() with null"`
+ @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
+ is out of range"`
+
+ @complexity Linear in distance between @a idx and the end of the container.
+
+ @liveexample{The example shows the effect of `erase()`.,erase__size_type}
+
+ @sa @ref erase(IteratorType) -- removes the element at a given position
+ @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+ the given range
+ @sa @ref erase(const typename object_t::key_type&) -- removes the element
+ from an object at the given key
+
+ @since version 1.0.0
+ */
+ void erase(const size_type idx)
+ {
+ // this erase only works for arrays
+ if (JSON_LIKELY(is_array()))
+ {
+ if (JSON_UNLIKELY(idx >= size()))
+ {
+ JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+ }
+
+ m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+ }
+ else
+ {
+ JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+ }
+ }
+
+ /// @}
+
+
+ ////////////
+ // lookup //
+ ////////////
+
+ /// @name lookup
+ /// @{
+
+ /*!
+ @brief find an element in a JSON object
+
+ Finds an element in a JSON object with key equivalent to @a key. If the
+ element is not found or the JSON value is not an object, end() is
+ returned.
+
+ @note This method always returns @ref end() when executed on a JSON type
+ that is not an object.
+
+ @param[in] key key value of the element to search for.
+
+ @return Iterator to an element with key equivalent to @a key. If no such
+ element is found or the JSON value is not an object, past-the-end (see
+ @ref end()) iterator is returned.
+
+ @complexity Logarithmic in the size of the JSON object.
+
+ @liveexample{The example shows how `find()` is used.,find__key_type}
+
+ @since version 1.0.0
+ */
+ template<typename KeyT>
+ iterator find(KeyT&& key)
+ {
+ auto result = end();
+
+ if (is_object())
+ {
+ result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+ }
+
+ return result;
+ }
+
+ /*!
+ @brief find an element in a JSON object
+ @copydoc find(KeyT&&)
+ */
+ template<typename KeyT>
+ const_iterator find(KeyT&& key) const
+ {
+ auto result = cend();
+
+ if (is_object())
+ {
+ result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+ }
+
+ return result;
+ }
+
+ /*!
+ @brief returns the number of occurrences of a key in a JSON object
+
+ Returns the number of elements with key @a key. If ObjectType is the
+ default `std::map` type, the return value will always be `0` (@a key was
+ not found) or `1` (@a key was found).
+
+ @note This method always returns `0` when executed on a JSON type that is
+ not an object.
+
+ @param[in] key key value of the element to count
+
+ @return Number of elements with key @a key. If the JSON value is not an
+ object, the return value will be `0`.
+
+ @complexity Logarithmic in the size of the JSON object.
+
+ @liveexample{The example shows how `count()` is used.,count}
+
+ @since version 1.0.0
+ */
+ template<typename KeyT>
+ size_type count(KeyT&& key) const
+ {
+ // return 0 for all nonobject types
+ return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+ }
+
+ /// @}
+
+
+ ///////////////
+ // iterators //
+ ///////////////
+
+ /// @name iterators
+ /// @{
+
+ /*!
+ @brief returns an iterator to the first element
+
+ Returns an iterator to the first element.
+
+ @image html range-begin-end.svg "Illustration from cppreference.com"
+
+ @return iterator to the first element
+
+ @complexity Constant.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is constant.
+
+ @liveexample{The following code shows an example for `begin()`.,begin}
+
+ @sa @ref cbegin() -- returns a const iterator to the beginning
+ @sa @ref end() -- returns an iterator to the end
+ @sa @ref cend() -- returns a const iterator to the end
+
+ @since version 1.0.0
+ */
+ iterator begin() noexcept
+ {
+ iterator result(this);
+ result.set_begin();
+ return result;
+ }
+
+ /*!
+ @copydoc basic_json::cbegin()
+ */
+ const_iterator begin() const noexcept
+ {
+ return cbegin();
+ }
+
+ /*!
+ @brief returns a const iterator to the first element
+
+ Returns a const iterator to the first element.
+
+ @image html range-begin-end.svg "Illustration from cppreference.com"
+
+ @return const iterator to the first element
+
+ @complexity Constant.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
+
+ @liveexample{The following code shows an example for `cbegin()`.,cbegin}
+
+ @sa @ref begin() -- returns an iterator to the beginning
+ @sa @ref end() -- returns an iterator to the end
+ @sa @ref cend() -- returns a const iterator to the end
+
+ @since version 1.0.0
+ */
+ const_iterator cbegin() const noexcept
+ {
+ const_iterator result(this);
+ result.set_begin();
+ return result;
+ }
+
+ /*!
+ @brief returns an iterator to one past the last element
+
+ Returns an iterator to one past the last element.
+
+ @image html range-begin-end.svg "Illustration from cppreference.com"
+
+ @return iterator one past the last element
+
+ @complexity Constant.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is constant.
+
+ @liveexample{The following code shows an example for `end()`.,end}
+
+ @sa @ref cend() -- returns a const iterator to the end
+ @sa @ref begin() -- returns an iterator to the beginning
+ @sa @ref cbegin() -- returns a const iterator to the beginning
+
+ @since version 1.0.0
+ */
+ iterator end() noexcept
+ {
+ iterator result(this);
+ result.set_end();
+ return result;
+ }
+
+ /*!
+ @copydoc basic_json::cend()
+ */
+ const_iterator end() const noexcept
+ {
+ return cend();
+ }
+
+ /*!
+ @brief returns a const iterator to one past the last element
+
+ Returns a const iterator to one past the last element.
+
+ @image html range-begin-end.svg "Illustration from cppreference.com"
+
+ @return const iterator one past the last element
+
+ @complexity Constant.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
+
+ @liveexample{The following code shows an example for `cend()`.,cend}
+
+ @sa @ref end() -- returns an iterator to the end
+ @sa @ref begin() -- returns an iterator to the beginning
+ @sa @ref cbegin() -- returns a const iterator to the beginning
+
+ @since version 1.0.0
+ */
+ const_iterator cend() const noexcept
+ {
+ const_iterator result(this);
+ result.set_end();
+ return result;
+ }
+
+ /*!
+ @brief returns an iterator to the reverse-beginning
+
+ Returns an iterator to the reverse-beginning; that is, the last element.
+
+ @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+ @complexity Constant.
+
+ @requirement This function helps `basic_json` satisfying the
+ [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of `reverse_iterator(end())`.
+
+ @liveexample{The following code shows an example for `rbegin()`.,rbegin}
+
+ @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+ @sa @ref rend() -- returns a reverse iterator to the end
+ @sa @ref crend() -- returns a const reverse iterator to the end
+
+ @since version 1.0.0
+ */
+ reverse_iterator rbegin() noexcept
+ {
+ return reverse_iterator(end());
+ }
+
+ /*!
+ @copydoc basic_json::crbegin()
+ */
+ const_reverse_iterator rbegin() const noexcept
+ {
+ return crbegin();
+ }
+
+ /*!
+ @brief returns an iterator to the reverse-end
+
+ Returns an iterator to the reverse-end; that is, one before the first
+ element.
+
+ @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+ @complexity Constant.
+
+ @requirement This function helps `basic_json` satisfying the
+ [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of `reverse_iterator(begin())`.
+
+ @liveexample{The following code shows an example for `rend()`.,rend}
+
+ @sa @ref crend() -- returns a const reverse iterator to the end
+ @sa @ref rbegin() -- returns a reverse iterator to the beginning
+ @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+ @since version 1.0.0
+ */
+ reverse_iterator rend() noexcept
+ {
+ return reverse_iterator(begin());
+ }
+
+ /*!
+ @copydoc basic_json::crend()
+ */
+ const_reverse_iterator rend() const noexcept
+ {
+ return crend();
+ }
+
+ /*!
+ @brief returns a const reverse iterator to the last element
+
+ Returns a const iterator to the reverse-beginning; that is, the last
+ element.
+
+ @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+ @complexity Constant.
+
+ @requirement This function helps `basic_json` satisfying the
+ [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
+
+ @liveexample{The following code shows an example for `crbegin()`.,crbegin}
+
+ @sa @ref rbegin() -- returns a reverse iterator to the beginning
+ @sa @ref rend() -- returns a reverse iterator to the end
+ @sa @ref crend() -- returns a const reverse iterator to the end
+
+ @since version 1.0.0
+ */
+ const_reverse_iterator crbegin() const noexcept
+ {
+ return const_reverse_iterator(cend());
+ }
+
+ /*!
+ @brief returns a const reverse iterator to one before the first
+
+ Returns a const reverse iterator to the reverse-end; that is, one before
+ the first element.
+
+ @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+ @complexity Constant.
+
+ @requirement This function helps `basic_json` satisfying the
+ [ReversibleContainer](http://en.cppreference.com/w/cpp/concept/ReversibleContainer)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
+
+ @liveexample{The following code shows an example for `crend()`.,crend}
+
+ @sa @ref rend() -- returns a reverse iterator to the end
+ @sa @ref rbegin() -- returns a reverse iterator to the beginning
+ @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+ @since version 1.0.0
+ */
+ const_reverse_iterator crend() const noexcept
+ {
+ return const_reverse_iterator(cbegin());
+ }
+
+ public:
+ /*!
+ @brief wrapper to access iterator member functions in range-based for
+
+ This function allows to access @ref iterator::key() and @ref
+ iterator::value() during range-based for loops. In these loops, a
+ reference to the JSON values is returned, so there is no access to the
+ underlying iterator.
+
+ For loop without iterator_wrapper:
+
+ @code{cpp}
+ for (auto it = j_object.begin(); it != j_object.end(); ++it)
+ {
+ std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+ }
+ @endcode
+
+ Range-based for loop without iterator proxy:
+
+ @code{cpp}
+ for (auto it : j_object)
+ {
+ // "it" is of type json::reference and has no key() member
+ std::cout << "value: " << it << '\n';
+ }
+ @endcode
+
+ Range-based for loop with iterator proxy:
+
+ @code{cpp}
+ for (auto it : json::iterator_wrapper(j_object))
+ {
+ std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+ }
+ @endcode
+
+ @note When iterating over an array, `key()` will return the index of the
+ element as string (see example).
+
+ @param[in] ref reference to a JSON value
+ @return iteration proxy object wrapping @a ref with an interface to use in
+ range-based for loops
+
+ @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @complexity Constant.
+
+ @note The name of this function is not yet final and may change in the
+ future.
+
+ @deprecated This stream operator is deprecated and will be removed in
+ future 4.0.0 of the library. Please use @ref items() instead;
+ that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+ */
+ JSON_DEPRECATED
+ static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+ {
+ return ref.items();
+ }
+
+ /*!
+ @copydoc iterator_wrapper(reference)
+ */
+ JSON_DEPRECATED
+ static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+ {
+ return ref.items();
+ }
+
+ /*!
+ @brief helper to access iterator member functions in range-based for
+
+ This function allows to access @ref iterator::key() and @ref
+ iterator::value() during range-based for loops. In these loops, a
+ reference to the JSON values is returned, so there is no access to the
+ underlying iterator.
+
+ For loop without `items()` function:
+
+ @code{cpp}
+ for (auto it = j_object.begin(); it != j_object.end(); ++it)
+ {
+ std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+ }
+ @endcode
+
+ Range-based for loop without `items()` function:
+
+ @code{cpp}
+ for (auto it : j_object)
+ {
+ // "it" is of type json::reference and has no key() member
+ std::cout << "value: " << it << '\n';
+ }
+ @endcode
+
+ Range-based for loop with `items()` function:
+
+ @code{cpp}
+ for (auto it : j_object.items())
+ {
+ std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+ }
+ @endcode
+
+ @note When iterating over an array, `key()` will return the index of the
+ element as string (see example). For primitive types (e.g., numbers),
+ `key()` returns an empty string.
+
+ @return iteration proxy object wrapping @a ref with an interface to use in
+ range-based for loops
+
+ @liveexample{The following code shows how the function is used.,items}
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @complexity Constant.
+
+ @since version 3.x.x.
+ */
+ iteration_proxy<iterator> items() noexcept
+ {
+ return iteration_proxy<iterator>(*this);
+ }
+
+ /*!
+ @copydoc items()
+ */
+ iteration_proxy<const_iterator> items() const noexcept
+ {
+ return iteration_proxy<const_iterator>(*this);
+ }
+
+ /// @}
+
+
+ //////////////
+ // capacity //
+ //////////////
+
+ /// @name capacity
+ /// @{
+
+ /*!
+ @brief checks whether the container is empty.
+
+ Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
+
+ @return The return value depends on the different types and is
+ defined as follows:
+ Value type | return value
+ ----------- | -------------
+ null | `true`
+ boolean | `false`
+ string | `false`
+ number | `false`
+ object | result of function `object_t::empty()`
+ array | result of function `array_t::empty()`
+
+ @liveexample{The following code uses `empty()` to check if a JSON
+ object contains any elements.,empty}
+
+ @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+ the Container concept; that is, their `empty()` functions have constant
+ complexity.
+
+ @iterators No changes.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @note This function does not return whether a string stored as JSON value
+ is empty - it returns whether the JSON container itself is empty which is
+ false in the case of a string.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of `begin() == end()`.
+
+ @sa @ref size() -- returns the number of elements
+
+ @since version 1.0.0
+ */
+ bool empty() const noexcept
+ {
+ switch (m_type)
+ {
+ case value_t::null:
+ {
+ // null values are empty
+ return true;
+ }
+
+ case value_t::array:
+ {
+ // delegate call to array_t::empty()
+ return m_value.array->empty();
+ }
+
+ case value_t::object:
+ {
+ // delegate call to object_t::empty()
+ return m_value.object->empty();
+ }
+
+ default:
+ {
+ // all other types are nonempty
+ return false;
+ }
+ }
+ }
+
+ /*!
+ @brief returns the number of elements
+
+ Returns the number of elements in a JSON value.
+
+ @return The return value depends on the different types and is
+ defined as follows:
+ Value type | return value
+ ----------- | -------------
+ null | `0`
+ boolean | `1`
+ string | `1`
+ number | `1`
+ object | result of function object_t::size()
+ array | result of function array_t::size()
+
+ @liveexample{The following code calls `size()` on the different value
+ types.,size}
+
+ @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+ the Container concept; that is, their size() functions have constant
+ complexity.
+
+ @iterators No changes.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @note This function does not return the length of a string stored as JSON
+ value - it returns the number of elements in the JSON value which is 1 in
+ the case of a string.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of `std::distance(begin(), end())`.
+
+ @sa @ref empty() -- checks whether the container is empty
+ @sa @ref max_size() -- returns the maximal number of elements
+
+ @since version 1.0.0
+ */
+ size_type size() const noexcept
+ {
+ switch (m_type)
+ {
+ case value_t::null:
+ {
+ // null values are empty
+ return 0;
+ }
+
+ case value_t::array:
+ {
+ // delegate call to array_t::size()
+ return m_value.array->size();
+ }
+
+ case value_t::object:
+ {
+ // delegate call to object_t::size()
+ return m_value.object->size();
+ }
+
+ default:
+ {
+ // all other types have size 1
+ return 1;
+ }
+ }
+ }
+
+ /*!
+ @brief returns the maximum possible number of elements
+
+ Returns the maximum number of elements a JSON value is able to hold due to
+ system or library implementation limitations, i.e. `std::distance(begin(),
+ end())` for the JSON value.
+
+ @return The return value depends on the different types and is
+ defined as follows:
+ Value type | return value
+ ----------- | -------------
+ null | `0` (same as `size()`)
+ boolean | `1` (same as `size()`)
+ string | `1` (same as `size()`)
+ number | `1` (same as `size()`)
+ object | result of function `object_t::max_size()`
+ array | result of function `array_t::max_size()`
+
+ @liveexample{The following code calls `max_size()` on the different value
+ types. Note the output is implementation specific.,max_size}
+
+ @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+ the Container concept; that is, their `max_size()` functions have constant
+ complexity.
+
+ @iterators No changes.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @requirement This function helps `basic_json` satisfying the
+ [Container](http://en.cppreference.com/w/cpp/concept/Container)
+ requirements:
+ - The complexity is constant.
+ - Has the semantics of returning `b.size()` where `b` is the largest
+ possible JSON value.
+
+ @sa @ref size() -- returns the number of elements
+
+ @since version 1.0.0
+ */
+ size_type max_size() const noexcept
+ {
+ switch (m_type)
+ {
+ case value_t::array:
+ {
+ // delegate call to array_t::max_size()
+ return m_value.array->max_size();
+ }
+
+ case value_t::object:
+ {
+ // delegate call to object_t::max_size()
+ return m_value.object->max_size();
+ }
+
+ default:
+ {
+ // all other types have max_size() == size()
+ return size();
+ }
+ }
+ }
+
+ /// @}
+
+
+ ///////////////
+ // modifiers //
+ ///////////////
+
+ /// @name modifiers
+ /// @{
+
+ /*!
+ @brief clears the contents
+
+ Clears the content of a JSON value and resets it to the default value as
+ if @ref basic_json(value_t) would have been called with the current value
+ type from @ref type():
+
+ Value type | initial value
+ ----------- | -------------
+ null | `null`
+ boolean | `false`
+ string | `""`
+ number | `0`
+ object | `{}`
+ array | `[]`
+
+ @post Has the same effect as calling
+ @code {.cpp}
+ *this = basic_json(type());
+ @endcode
+
+ @liveexample{The example below shows the effect of `clear()` to different
+ JSON types.,clear}
+
+ @complexity Linear in the size of the JSON value.
+
+ @iterators All iterators, pointers and references related to this container
+ are invalidated.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @sa @ref basic_json(value_t) -- constructor that creates an object with the
+ same value than calling `clear()`
+
+ @since version 1.0.0
+ */
+ void clear() noexcept
+ {
+ switch (m_type)
+ {
+ case value_t::number_integer:
+ {
+ m_value.number_integer = 0;
+ break;
+ }
+
+ case value_t::number_unsigned:
+ {
+ m_value.number_unsigned = 0;
+ break;
+ }
+
+ case value_t::number_float:
+ {
+ m_value.number_float = 0.0;
+ break;
+ }
+
+ case value_t::boolean:
+ {
+ m_value.boolean = false;
+ break;
+ }
+
+ case value_t::string:
+ {
+ m_value.string->clear();
+ break;
+ }
+
+ case value_t::array:
+ {
+ m_value.array->clear();
+ break;
+ }
+
+ case value_t::object:
+ {
+ m_value.object->clear();
+ break;
+ }
+
+ default:
+ break;
+ }
+ }
+
+ /*!
+ @brief add an object to an array
+
+ Appends the given element @a val to the end of the JSON value. If the
+ function is called on a JSON null value, an empty array is created before
+ appending @a val.
+
+ @param[in] val the value to add to the JSON array
+
+ @throw type_error.308 when called on a type other than JSON array or
+ null; example: `"cannot use push_back() with number"`
+
+ @complexity Amortized constant.
+
+ @liveexample{The example shows how `push_back()` and `+=` can be used to
+ add elements to a JSON array. Note how the `null` value was silently
+ converted to a JSON array.,push_back}
+
+ @since version 1.0.0
+ */
+ void push_back(basic_json&& val)
+ {
+ // push_back only works for null objects or arrays
+ if (JSON_UNLIKELY(not(is_null() or is_array())))
+ {
+ JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+ }
+
+ // transform null object into an array
+ if (is_null())
+ {
+ m_type = value_t::array;
+ m_value = value_t::array;
+ assert_invariant();
+ }
+
+ // add element to array (move semantics)
+ m_value.array->push_back(std::move(val));
+ // invalidate object
+ val.m_type = value_t::null;
+ }
+
+ /*!
+ @brief add an object to an array
+ @copydoc push_back(basic_json&&)
+ */
+ reference operator+=(basic_json&& val)
+ {
+ push_back(std::move(val));
+ return *this;
+ }
+
+ /*!
+ @brief add an object to an array
+ @copydoc push_back(basic_json&&)
+ */
+ void push_back(const basic_json& val)
+ {
+ // push_back only works for null objects or arrays
+ if (JSON_UNLIKELY(not(is_null() or is_array())))
+ {
+ JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+ }
+
+ // transform null object into an array
+ if (is_null())
+ {
+ m_type = value_t::array;
+ m_value = value_t::array;
+ assert_invariant();
+ }
+
+ // add element to array
+ m_value.array->push_back(val);
+ }
+
+ /*!
+ @brief add an object to an array
+ @copydoc push_back(basic_json&&)
+ */
+ reference operator+=(const basic_json& val)
+ {
+ push_back(val);
+ return *this;
+ }
+
+ /*!
+ @brief add an object to an object
+
+ Inserts the given element @a val to the JSON object. If the function is
+ called on a JSON null value, an empty object is created before inserting
+ @a val.
+
+ @param[in] val the value to add to the JSON object
+
+ @throw type_error.308 when called on a type other than JSON object or
+ null; example: `"cannot use push_back() with number"`
+
+ @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+ @liveexample{The example shows how `push_back()` and `+=` can be used to
+ add elements to a JSON object. Note how the `null` value was silently
+ converted to a JSON object.,push_back__object_t__value}
+
+ @since version 1.0.0
+ */
+ void push_back(const typename object_t::value_type& val)
+ {
+ // push_back only works for null objects or objects
+ if (JSON_UNLIKELY(not(is_null() or is_object())))
+ {
+ JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+ }
+
+ // transform null object into an object
+ if (is_null())
+ {
+ m_type = value_t::object;
+ m_value = value_t::object;
+ assert_invariant();
+ }
+
+ // add element to array
+ m_value.object->insert(val);
+ }
+
+ /*!
+ @brief add an object to an object
+ @copydoc push_back(const typename object_t::value_type&)
+ */
+ reference operator+=(const typename object_t::value_type& val)
+ {
+ push_back(val);
+ return *this;
+ }
+
+ /*!
+ @brief add an object to an object
+
+ This function allows to use `push_back` with an initializer list. In case
+
+ 1. the current value is an object,
+ 2. the initializer list @a init contains only two elements, and
+ 3. the first element of @a init is a string,
+
+ @a init is converted into an object element and added using
+ @ref push_back(const typename object_t::value_type&). Otherwise, @a init
+ is converted to a JSON value and added using @ref push_back(basic_json&&).
+
+ @param[in] init an initializer list
+
+ @complexity Linear in the size of the initializer list @a init.
+
+ @note This function is required to resolve an ambiguous overload error,
+ because pairs like `{"key", "value"}` can be both interpreted as
+ `object_t::value_type` or `std::initializer_list<basic_json>`, see
+ https://github.com/nlohmann/json/issues/235 for more information.
+
+ @liveexample{The example shows how initializer lists are treated as
+ objects when possible.,push_back__initializer_list}
+ */
+ void push_back(initializer_list_t init)
+ {
+ if (is_object() and init.size() == 2 and (*init.begin())->is_string())
+ {
+ basic_json&& key = init.begin()->moved_or_copied();
+ push_back(typename object_t::value_type(
+ std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+ }
+ else
+ {
+ push_back(basic_json(init));
+ }
+ }
+
+ /*!
+ @brief add an object to an object
+ @copydoc push_back(initializer_list_t)
+ */
+ reference operator+=(initializer_list_t init)
+ {
+ push_back(init);
+ return *this;
+ }
+
+ /*!
+ @brief add an object to an array
+
+ Creates a JSON value from the passed parameters @a args to the end of the
+ JSON value. If the function is called on a JSON null value, an empty array
+ is created before appending the value created from @a args.
+
+ @param[in] args arguments to forward to a constructor of @ref basic_json
+ @tparam Args compatible types to create a @ref basic_json object
+
+ @throw type_error.311 when called on a type other than JSON array or
+ null; example: `"cannot use emplace_back() with number"`
+
+ @complexity Amortized constant.
+
+ @liveexample{The example shows how `push_back()` can be used to add
+ elements to a JSON array. Note how the `null` value was silently converted
+ to a JSON array.,emplace_back}
+
+ @since version 2.0.8
+ */
+ template<class... Args>
+ void emplace_back(Args&& ... args)
+ {
+ // emplace_back only works for null objects or arrays
+ if (JSON_UNLIKELY(not(is_null() or is_array())))
+ {
+ JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name())));
+ }
+
+ // transform null object into an array
+ if (is_null())
+ {
+ m_type = value_t::array;
+ m_value = value_t::array;
+ assert_invariant();
+ }
+
+ // add element to array (perfect forwarding)
+ m_value.array->emplace_back(std::forward<Args>(args)...);
+ }
+
+ /*!
+ @brief add an object to an object if key does not exist
+
+ Inserts a new element into a JSON object constructed in-place with the
+ given @a args if there is no element with the key in the container. If the
+ function is called on a JSON null value, an empty object is created before
+ appending the value created from @a args.
+
+ @param[in] args arguments to forward to a constructor of @ref basic_json
+ @tparam Args compatible types to create a @ref basic_json object
+
+ @return a pair consisting of an iterator to the inserted element, or the
+ already-existing element if no insertion happened, and a bool
+ denoting whether the insertion took place.
+
+ @throw type_error.311 when called on a type other than JSON object or
+ null; example: `"cannot use emplace() with number"`
+
+ @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+ @liveexample{The example shows how `emplace()` can be used to add elements
+ to a JSON object. Note how the `null` value was silently converted to a
+ JSON object. Further note how no value is added if there was already one
+ value stored with the same key.,emplace}
+
+ @since version 2.0.8
+ */
+ template<class... Args>
+ std::pair<iterator, bool> emplace(Args&& ... args)
+ {
+ // emplace only works for null objects or arrays
+ if (JSON_UNLIKELY(not(is_null() or is_object())))
+ {
+ JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name())));
+ }
+
+ // transform null object into an object
+ if (is_null())
+ {
+ m_type = value_t::object;
+ m_value = value_t::object;
+ assert_invariant();
+ }
+
+ // add element to array (perfect forwarding)
+ auto res = m_value.object->emplace(std::forward<Args>(args)...);
+ // create result iterator and set iterator to the result of emplace
+ auto it = begin();
+ it.m_it.object_iterator = res.first;
+
+ // return pair of iterator and boolean
+ return {it, res.second};
+ }
+
+ /*!
+ @brief inserts element
+
+ Inserts element @a val before iterator @a pos.
+
+ @param[in] pos iterator before which the content will be inserted; may be
+ the end() iterator
+ @param[in] val element to insert
+ @return iterator pointing to the inserted @a val.
+
+ @throw type_error.309 if called on JSON values other than arrays;
+ example: `"cannot use insert() with string"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
+
+ @complexity Constant plus linear in the distance between @a pos and end of
+ the container.
+
+ @liveexample{The example shows how `insert()` is used.,insert}
+
+ @since version 1.0.0
+ */
+ iterator insert(const_iterator pos, const basic_json& val)
+ {
+ // insert only works for arrays
+ if (JSON_LIKELY(is_array()))
+ {
+ // check if iterator pos fits to this JSON value
+ if (JSON_UNLIKELY(pos.m_object != this))
+ {
+ JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+ }
+
+ // insert to array and return iterator
+ iterator result(this);
+ result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, val);
+ return result;
+ }
+
+ JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief inserts element
+ @copydoc insert(const_iterator, const basic_json&)
+ */
+ iterator insert(const_iterator pos, basic_json&& val)
+ {
+ return insert(pos, val);
+ }
+
+ /*!
+ @brief inserts elements
+
+ Inserts @a cnt copies of @a val before iterator @a pos.
+
+ @param[in] pos iterator before which the content will be inserted; may be
+ the end() iterator
+ @param[in] cnt number of copies of @a val to insert
+ @param[in] val element to insert
+ @return iterator pointing to the first element inserted, or @a pos if
+ `cnt==0`
+
+ @throw type_error.309 if called on JSON values other than arrays; example:
+ `"cannot use insert() with string"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
+
+ @complexity Linear in @a cnt plus linear in the distance between @a pos
+ and end of the container.
+
+ @liveexample{The example shows how `insert()` is used.,insert__count}
+
+ @since version 1.0.0
+ */
+ iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+ {
+ // insert only works for arrays
+ if (JSON_LIKELY(is_array()))
+ {
+ // check if iterator pos fits to this JSON value
+ if (JSON_UNLIKELY(pos.m_object != this))
+ {
+ JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+ }
+
+ // insert to array and return iterator
+ iterator result(this);
+ result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+ return result;
+ }
+
+ JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+ }
+
+ /*!
+ @brief inserts elements
+
+ Inserts elements from range `[first, last)` before iterator @a pos.
+
+ @param[in] pos iterator before which the content will be inserted; may be
+ the end() iterator
+ @param[in] first begin of the range of elements to insert
+ @param[in] last end of the range of elements to insert
+
+ @throw type_error.309 if called on JSON values other than arrays; example:
+ `"cannot use insert() with string"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
+ @throw invalid_iterator.210 if @a first and @a last do not belong to the
+ same JSON value; example: `"iterators do not fit"`
+ @throw invalid_iterator.211 if @a first or @a last are iterators into
+ container for which insert is called; example: `"passed iterators may not
+ belong to container"`
+
+ @return iterator pointing to the first element inserted, or @a pos if
+ `first==last`
+
+ @complexity Linear in `std::distance(first, last)` plus linear in the
+ distance between @a pos and end of the container.
+
+ @liveexample{The example shows how `insert()` is used.,insert__range}
+
+ @since version 1.0.0
+ */
+ iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+ {
+ // insert only works for arrays
+ if (JSON_UNLIKELY(not is_array()))
+ {
+ JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+ }
+
+ // check if iterator pos fits to this JSON value
+ if (JSON_UNLIKELY(pos.m_object != this))
+ {
+ JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+ }
+
+ // check if range iterators belong to the same JSON object
+ if (JSON_UNLIKELY(first.m_object != last.m_object))
+ {
+ JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+ }
+
+ if (JSON_UNLIKELY(first.m_object == this))
+ {
+ JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
+ }
+
+ // insert to array and return iterator
+ iterator result(this);
+ result.m_it.array_iterator = m_value.array->insert(
+ pos.m_it.array_iterator,
+ first.m_it.array_iterator,
+ last.m_it.array_iterator);
+ return result;
+ }
+
+ /*!
+ @brief inserts elements
+
+ Inserts elements from initializer list @a ilist before iterator @a pos.
+
+ @param[in] pos iterator before which the content will be inserted; may be
+ the end() iterator
+ @param[in] ilist initializer list to insert the values from
+
+ @throw type_error.309 if called on JSON values other than arrays; example:
+ `"cannot use insert() with string"`
+ @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+ example: `"iterator does not fit current value"`
+
+ @return iterator pointing to the first element inserted, or @a pos if
+ `ilist` is empty
+
+ @complexity Linear in `ilist.size()` plus linear in the distance between
+ @a pos and end of the container.
+
+ @liveexample{The example shows how `insert()` is used.,insert__ilist}
+
+ @since version 1.0.0
+ */
+ iterator insert(const_iterator pos, initializer_list_t ilist)
+ {
+ // insert only works for arrays
+ if (JSON_UNLIKELY(not is_array()))
+ {
+ JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+ }
+
+ // check if iterator pos fits to this JSON value
+ if (JSON_UNLIKELY(pos.m_object != this))
+ {
+ JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+ }
+
+ // insert to array and return iterator
+ iterator result(this);
+ result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, ilist.begin(), ilist.end());
+ return result;
+ }
+
+ /*!
+ @brief inserts elements
+
+ Inserts elements from range `[first, last)`.
+
+ @param[in] first begin of the range of elements to insert
+ @param[in] last end of the range of elements to insert
+
+ @throw type_error.309 if called on JSON values other than objects; example:
+ `"cannot use insert() with string"`
+ @throw invalid_iterator.202 if iterator @a first or @a last does does not
+ point to an object; example: `"iterators first and last must point to
+ objects"`
+ @throw invalid_iterator.210 if @a first and @a last do not belong to the
+ same JSON value; example: `"iterators do not fit"`
+
+ @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
+ of elements to insert.
+
+ @liveexample{The example shows how `insert()` is used.,insert__range_object}
+
+ @since version 3.0.0
+ */
+ void insert(const_iterator first, const_iterator last)
+ {
+ // insert only works for objects
+ if (JSON_UNLIKELY(not is_object()))
+ {
+ JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+ }
+
+ // check if range iterators belong to the same JSON object
+ if (JSON_UNLIKELY(first.m_object != last.m_object))
+ {
+ JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+ }
+
+ // passed iterators must belong to objects
+ if (JSON_UNLIKELY(not first.m_object->is_object()))
+ {
+ JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+ }
+
+ m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+ }
+
+ /*!
+ @brief updates a JSON object from another object, overwriting existing keys
+
+ Inserts all values from JSON object @a j and overwrites existing keys.
+
+ @param[in] j JSON object to read values from
+
+ @throw type_error.312 if called on JSON values other than objects; example:
+ `"cannot use update() with string"`
+
+ @complexity O(N*log(size() + N)), where N is the number of elements to
+ insert.
+
+ @liveexample{The example shows how `update()` is used.,update}
+
+ @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+ @since version 3.0.0
+ */
+ void update(const_reference j)
+ {
+ // implicitly convert null value to an empty object
+ if (is_null())
+ {
+ m_type = value_t::object;
+ m_value.object = create<object_t>();
+ assert_invariant();
+ }
+
+ if (JSON_UNLIKELY(not is_object()))
+ {
+ JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+ }
+ if (JSON_UNLIKELY(not j.is_object()))
+ {
+ JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name())));
+ }
+
+ for (auto it = j.cbegin(); it != j.cend(); ++it)
+ {
+ m_value.object->operator[](it.key()) = it.value();
+ }
+ }
+
+ /*!
+ @brief updates a JSON object from another object, overwriting existing keys
+
+ Inserts all values from from range `[first, last)` and overwrites existing
+ keys.
+
+ @param[in] first begin of the range of elements to insert
+ @param[in] last end of the range of elements to insert
+
+ @throw type_error.312 if called on JSON values other than objects; example:
+ `"cannot use update() with string"`
+ @throw invalid_iterator.202 if iterator @a first or @a last does does not
+ point to an object; example: `"iterators first and last must point to
+ objects"`
+ @throw invalid_iterator.210 if @a first and @a last do not belong to the
+ same JSON value; example: `"iterators do not fit"`
+
+ @complexity O(N*log(size() + N)), where N is the number of elements to
+ insert.
+
+ @liveexample{The example shows how `update()` is used__range.,update}
+
+ @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+ @since version 3.0.0
+ */
+ void update(const_iterator first, const_iterator last)
+ {
+ // implicitly convert null value to an empty object
+ if (is_null())
+ {
+ m_type = value_t::object;
+ m_value.object = create<object_t>();
+ assert_invariant();
+ }
+
+ if (JSON_UNLIKELY(not is_object()))
+ {
+ JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+ }
+
+ // check if range iterators belong to the same JSON object
+ if (JSON_UNLIKELY(first.m_object != last.m_object))
+ {
+ JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+ }
+
+ // passed iterators must belong to objects
+ if (JSON_UNLIKELY(not first.m_object->is_object()
+ or not last.m_object->is_object()))
+ {
+ JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+ }
+
+ for (auto it = first; it != last; ++it)
+ {
+ m_value.object->operator[](it.key()) = it.value();
+ }
+ }
+
+ /*!
+ @brief exchanges the values
+
+ Exchanges the contents of the JSON value with those of @a other. Does not
+ invoke any move, copy, or swap operations on individual elements. All
+ iterators and references remain valid. The past-the-end iterator is
+ invalidated.
+
+ @param[in,out] other JSON value to exchange the contents with
+
+ @complexity Constant.
+
+ @liveexample{The example below shows how JSON values can be swapped with
+ `swap()`.,swap__reference}
+
+ @since version 1.0.0
+ */
+ void swap(reference other) noexcept (
+ std::is_nothrow_move_constructible<value_t>::value and
+ std::is_nothrow_move_assignable<value_t>::value and
+ std::is_nothrow_move_constructible<json_value>::value and
+ std::is_nothrow_move_assignable<json_value>::value
+ )
+ {
+ std::swap(m_type, other.m_type);
+ std::swap(m_value, other.m_value);
+ assert_invariant();
+ }
+
+ /*!
+ @brief exchanges the values
+
+ Exchanges the contents of a JSON array with those of @a other. Does not
+ invoke any move, copy, or swap operations on individual elements. All
+ iterators and references remain valid. The past-the-end iterator is
+ invalidated.
+
+ @param[in,out] other array to exchange the contents with
+
+ @throw type_error.310 when JSON value is not an array; example: `"cannot
+ use swap() with string"`
+
+ @complexity Constant.
+
+ @liveexample{The example below shows how arrays can be swapped with
+ `swap()`.,swap__array_t}
+
+ @since version 1.0.0
+ */
+ void swap(array_t& other)
+ {
+ // swap only works for arrays
+ if (JSON_LIKELY(is_array()))
+ {
+ std::swap(*(m_value.array), other);
+ }
+ else
+ {
+ JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+ }
+ }
+
+ /*!
+ @brief exchanges the values
+
+ Exchanges the contents of a JSON object with those of @a other. Does not
+ invoke any move, copy, or swap operations on individual elements. All
+ iterators and references remain valid. The past-the-end iterator is
+ invalidated.
+
+ @param[in,out] other object to exchange the contents with
+
+ @throw type_error.310 when JSON value is not an object; example:
+ `"cannot use swap() with string"`
+
+ @complexity Constant.
+
+ @liveexample{The example below shows how objects can be swapped with
+ `swap()`.,swap__object_t}
+
+ @since version 1.0.0
+ */
+ void swap(object_t& other)
+ {
+ // swap only works for objects
+ if (JSON_LIKELY(is_object()))
+ {
+ std::swap(*(m_value.object), other);
+ }
+ else
+ {
+ JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+ }
+ }
+
+ /*!
+ @brief exchanges the values
+
+ Exchanges the contents of a JSON string with those of @a other. Does not
+ invoke any move, copy, or swap operations on individual elements. All
+ iterators and references remain valid. The past-the-end iterator is
+ invalidated.
+
+ @param[in,out] other string to exchange the contents with
+
+ @throw type_error.310 when JSON value is not a string; example: `"cannot
+ use swap() with boolean"`
+
+ @complexity Constant.
+
+ @liveexample{The example below shows how strings can be swapped with
+ `swap()`.,swap__string_t}
+
+ @since version 1.0.0
+ */
+ void swap(string_t& other)
+ {
+ // swap only works for strings
+ if (JSON_LIKELY(is_string()))
+ {
+ std::swap(*(m_value.string), other);
+ }
+ else
+ {
+ JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+ }
+ }
+
+ /// @}
+
+ public:
+ //////////////////////////////////////////
+ // lexicographical comparison operators //
+ //////////////////////////////////////////
+
+ /// @name lexicographical comparison operators
+ /// @{
+
+ /*!
+ @brief comparison: equal
+
+ Compares two JSON values for equality according to the following rules:
+ - Two JSON values are equal if (1) they are from the same type and (2)
+ their stored values are the same according to their respective
+ `operator==`.
+ - Integer and floating-point numbers are automatically converted before
+ comparison. Note than two NaN values are always treated as unequal.
+ - Two JSON null values are equal.
+
+ @note Floating-point inside JSON values numbers are compared with
+ `json::number_float_t::operator==` which is `double::operator==` by
+ default. To compare floating-point while respecting an epsilon, an alternative
+ [comparison function](https://github.com/mariokonrad/marnav/blob/master/src/marnav/math/floatingpoint.hpp#L34-#L39)
+ could be used, for instance
+ @code {.cpp}
+ template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
+ inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+ {
+ return std::abs(a - b) <= epsilon;
+ }
+ @endcode
+
+ @note NaN values never compare equal to themselves or to other NaN values.
+
+ @param[in] lhs first JSON value to consider
+ @param[in] rhs second JSON value to consider
+ @return whether the values @a lhs and @a rhs are equal
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @complexity Linear.
+
+ @liveexample{The example demonstrates comparing several JSON
+ types.,operator__equal}
+
+ @since version 1.0.0
+ */
+ friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+ {
+ const auto lhs_type = lhs.type();
+ const auto rhs_type = rhs.type();
+
+ if (lhs_type == rhs_type)
+ {
+ switch (lhs_type)
+ {
+ case value_t::array:
+ return (*lhs.m_value.array == *rhs.m_value.array);
+
+ case value_t::object:
+ return (*lhs.m_value.object == *rhs.m_value.object);
+
+ case value_t::null:
+ return true;
+
+ case value_t::string:
+ return (*lhs.m_value.string == *rhs.m_value.string);
+
+ case value_t::boolean:
+ return (lhs.m_value.boolean == rhs.m_value.boolean);
+
+ case value_t::number_integer:
+ return (lhs.m_value.number_integer == rhs.m_value.number_integer);
+
+ case value_t::number_unsigned:
+ return (lhs.m_value.number_unsigned == rhs.m_value.number_unsigned);
+
+ case value_t::number_float:
+ return (lhs.m_value.number_float == rhs.m_value.number_float);
+
+ default:
+ return false;
+ }
+ }
+ else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+ {
+ return (static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float);
+ }
+ else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+ {
+ return (lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer));
+ }
+ else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+ {
+ return (static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float);
+ }
+ else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+ {
+ return (lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned));
+ }
+ else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+ {
+ return (static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer);
+ }
+ else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+ {
+ return (lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned));
+ }
+
+ return false;
+ }
+
+ /*!
+ @brief comparison: equal
+ @copydoc operator==(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
+ {
+ return (lhs == basic_json(rhs));
+ }
+
+ /*!
+ @brief comparison: equal
+ @copydoc operator==(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
+ {
+ return (basic_json(lhs) == rhs);
+ }
+
+ /*!
+ @brief comparison: not equal
+
+ Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
+
+ @param[in] lhs first JSON value to consider
+ @param[in] rhs second JSON value to consider
+ @return whether the values @a lhs and @a rhs are not equal
+
+ @complexity Linear.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @liveexample{The example demonstrates comparing several JSON
+ types.,operator__notequal}
+
+ @since version 1.0.0
+ */
+ friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+ {
+ return not (lhs == rhs);
+ }
+
+ /*!
+ @brief comparison: not equal
+ @copydoc operator!=(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
+ {
+ return (lhs != basic_json(rhs));
+ }
+
+ /*!
+ @brief comparison: not equal
+ @copydoc operator!=(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
+ {
+ return (basic_json(lhs) != rhs);
+ }
+
+ /*!
+ @brief comparison: less than
+
+ Compares whether one JSON value @a lhs is less than another JSON value @a
+ rhs according to the following rules:
+ - If @a lhs and @a rhs have the same type, the values are compared using
+ the default `<` operator.
+ - Integer and floating-point numbers are automatically converted before
+ comparison
+ - In case @a lhs and @a rhs have different types, the values are ignored
+ and the order of the types is considered, see
+ @ref operator<(const value_t, const value_t).
+
+ @param[in] lhs first JSON value to consider
+ @param[in] rhs second JSON value to consider
+ @return whether @a lhs is less than @a rhs
+
+ @complexity Linear.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @liveexample{The example demonstrates comparing several JSON
+ types.,operator__less}
+
+ @since version 1.0.0
+ */
+ friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+ {
+ const auto lhs_type = lhs.type();
+ const auto rhs_type = rhs.type();
+
+ if (lhs_type == rhs_type)
+ {
+ switch (lhs_type)
+ {
+ case value_t::array:
+ return (*lhs.m_value.array) < (*rhs.m_value.array);
+
+ case value_t::object:
+ return *lhs.m_value.object < *rhs.m_value.object;
+
+ case value_t::null:
+ return false;
+
+ case value_t::string:
+ return *lhs.m_value.string < *rhs.m_value.string;
+
+ case value_t::boolean:
+ return lhs.m_value.boolean < rhs.m_value.boolean;
+
+ case value_t::number_integer:
+ return lhs.m_value.number_integer < rhs.m_value.number_integer;
+
+ case value_t::number_unsigned:
+ return lhs.m_value.number_unsigned < rhs.m_value.number_unsigned;
+
+ case value_t::number_float:
+ return lhs.m_value.number_float < rhs.m_value.number_float;
+
+ default:
+ return false;
+ }
+ }
+ else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+ {
+ return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
+ }
+ else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+ {
+ return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
+ }
+ else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+ {
+ return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
+ }
+ else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+ {
+ return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
+ }
+ else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+ {
+ return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+ }
+ else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+ {
+ return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
+ }
+
+ // We only reach this line if we cannot compare values. In that case,
+ // we compare types. Note we have to call the operator explicitly,
+ // because MSVC has problems otherwise.
+ return operator<(lhs_type, rhs_type);
+ }
+
+ /*!
+ @brief comparison: less than
+ @copydoc operator<(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
+ {
+ return (lhs < basic_json(rhs));
+ }
+
+ /*!
+ @brief comparison: less than
+ @copydoc operator<(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
+ {
+ return (basic_json(lhs) < rhs);
+ }
+
+ /*!
+ @brief comparison: less than or equal
+
+ Compares whether one JSON value @a lhs is less than or equal to another
+ JSON value by calculating `not (rhs < lhs)`.
+
+ @param[in] lhs first JSON value to consider
+ @param[in] rhs second JSON value to consider
+ @return whether @a lhs is less than or equal to @a rhs
+
+ @complexity Linear.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @liveexample{The example demonstrates comparing several JSON
+ types.,operator__greater}
+
+ @since version 1.0.0
+ */
+ friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+ {
+ return not (rhs < lhs);
+ }
+
+ /*!
+ @brief comparison: less than or equal
+ @copydoc operator<=(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
+ {
+ return (lhs <= basic_json(rhs));
+ }
+
+ /*!
+ @brief comparison: less than or equal
+ @copydoc operator<=(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
+ {
+ return (basic_json(lhs) <= rhs);
+ }
+
+ /*!
+ @brief comparison: greater than
+
+ Compares whether one JSON value @a lhs is greater than another
+ JSON value by calculating `not (lhs <= rhs)`.
+
+ @param[in] lhs first JSON value to consider
+ @param[in] rhs second JSON value to consider
+ @return whether @a lhs is greater than to @a rhs
+
+ @complexity Linear.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @liveexample{The example demonstrates comparing several JSON
+ types.,operator__lessequal}
+
+ @since version 1.0.0
+ */
+ friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+ {
+ return not (lhs <= rhs);
+ }
+
+ /*!
+ @brief comparison: greater than
+ @copydoc operator>(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
+ {
+ return (lhs > basic_json(rhs));
+ }
+
+ /*!
+ @brief comparison: greater than
+ @copydoc operator>(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
+ {
+ return (basic_json(lhs) > rhs);
+ }
+
+ /*!
+ @brief comparison: greater than or equal
+
+ Compares whether one JSON value @a lhs is greater than or equal to another
+ JSON value by calculating `not (lhs < rhs)`.
+
+ @param[in] lhs first JSON value to consider
+ @param[in] rhs second JSON value to consider
+ @return whether @a lhs is greater than or equal to @a rhs
+
+ @complexity Linear.
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @liveexample{The example demonstrates comparing several JSON
+ types.,operator__greaterequal}
+
+ @since version 1.0.0
+ */
+ friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+ {
+ return not (lhs < rhs);
+ }
+
+ /*!
+ @brief comparison: greater than or equal
+ @copydoc operator>=(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
+ {
+ return (lhs >= basic_json(rhs));
+ }
+
+ /*!
+ @brief comparison: greater than or equal
+ @copydoc operator>=(const_reference, const_reference)
+ */
+ template<typename ScalarType, typename std::enable_if<
+ std::is_scalar<ScalarType>::value, int>::type = 0>
+ friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
+ {
+ return (basic_json(lhs) >= rhs);
+ }
+
+ /// @}
+
+ ///////////////////
+ // serialization //
+ ///////////////////
+
+ /// @name serialization
+ /// @{
+
+ /*!
+ @brief serialize to stream
+
+ Serialize the given JSON value @a j to the output stream @a o. The JSON
+ value will be serialized using the @ref dump member function.
+
+ - The indentation of the output can be controlled with the member variable
+ `width` of the output stream @a o. For instance, using the manipulator
+ `std::setw(4)` on @a o sets the indentation level to `4` and the
+ serialization result is the same as calling `dump(4)`.
+
+ - The indentation character can be controlled with the member variable
+ `fill` of the output stream @a o. For instance, the manipulator
+ `std::setfill('\\t')` sets indentation to use a tab character rather than
+ the default space character.
+
+ @param[in,out] o stream to serialize to
+ @param[in] j JSON value to serialize
+
+ @return the stream @a o
+
+ @throw type_error.316 if a string stored inside the JSON value is not
+ UTF-8 encoded
+
+ @complexity Linear.
+
+ @liveexample{The example below shows the serialization with different
+ parameters to `width` to adjust the indentation level.,operator_serialize}
+
+ @since version 1.0.0; indentation character added in version 3.0.0
+ */
+ friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+ {
+ // read width member and use it as indentation parameter if nonzero
+ const bool pretty_print = (o.width() > 0);
+ const auto indentation = (pretty_print ? o.width() : 0);
+
+ // reset width to 0 for subsequent calls to this stream
+ o.width(0);
+
+ // do the actual serialization
+ serializer s(detail::output_adapter<char>(o), o.fill());
+ s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+ return o;
+ }
+
+ /*!
+ @brief serialize to stream
+ @deprecated This stream operator is deprecated and will be removed in
+ future 4.0.0 of the library. Please use
+ @ref operator<<(std::ostream&, const basic_json&)
+ instead; that is, replace calls like `j >> o;` with `o << j;`.
+ @since version 1.0.0; deprecated since version 3.0.0
+ */
+ JSON_DEPRECATED
+ friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+ {
+ return o << j;
+ }
+
+ /// @}
+
+
+ /////////////////////
+ // deserialization //
+ /////////////////////
+
+ /// @name deserialization
+ /// @{
+
+ /*!
+ @brief deserialize from a compatible input
+
+ This function reads from a compatible input. Examples are:
+ - an array of 1-byte values
+ - strings with character/literal type with size of 1 byte
+ - input streams
+ - container with contiguous storage of 1-byte values. Compatible container
+ types include `std::vector`, `std::string`, `std::array`,
+ `std::valarray`, and `std::initializer_list`. Furthermore, C-style
+ arrays can be used with `std::begin()`/`std::end()`. User-defined
+ containers can be used as long as they implement random-access iterators
+ and a contiguous storage.
+
+ @pre Each element of the container has a size of 1 byte. Violating this
+ precondition yields undefined behavior. **This precondition is enforced
+ with a static assertion.**
+
+ @pre The container storage is contiguous. Violating this precondition
+ yields undefined behavior. **This precondition is enforced with an
+ assertion.**
+ @pre Each element of the container has a size of 1 byte. Violating this
+ precondition yields undefined behavior. **This precondition is enforced
+ with a static assertion.**
+
+ @warning There is no way to enforce all preconditions at compile-time. If
+ the function is called with a noncompliant container and with
+ assertions switched off, the behavior is undefined and will most
+ likely yield segmentation violation.
+
+ @param[in] i input to read from
+ @param[in] cb a parser callback function of type @ref parser_callback_t
+ which is used to control the deserialization by filtering unwanted values
+ (optional)
+
+ @return result of the deserialization
+
+ @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+ of input; expected string literal""`
+ @throw parse_error.102 if to_unicode fails or surrogate error
+ @throw parse_error.103 if to_unicode fails
+
+ @complexity Linear in the length of the input. The parser is a predictive
+ LL(1) parser. The complexity can be higher if the parser callback function
+ @a cb has a super-linear complexity.
+
+ @note A UTF-8 byte order mark is silently ignored.
+
+ @liveexample{The example below demonstrates the `parse()` function reading
+ from an array.,parse__array__parser_callback_t}
+
+ @liveexample{The example below demonstrates the `parse()` function with
+ and without callback function.,parse__string__parser_callback_t}
+
+ @liveexample{The example below demonstrates the `parse()` function with
+ and without callback function.,parse__istream__parser_callback_t}
+
+ @liveexample{The example below demonstrates the `parse()` function reading
+ from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
+
+ @since version 2.0.3 (contiguous containers)
+ */
+ static basic_json parse(detail::input_adapter i,
+ const parser_callback_t cb = nullptr,
+ const bool allow_exceptions = true)
+ {
+ basic_json result;
+ parser(i, cb, allow_exceptions).parse(true, result);
+ return result;
+ }
+
+ /*!
+ @copydoc basic_json parse(detail::input_adapter, const parser_callback_t)
+ */
+ static basic_json parse(detail::input_adapter& i,
+ const parser_callback_t cb = nullptr,
+ const bool allow_exceptions = true)
+ {
+ basic_json result;
+ parser(i, cb, allow_exceptions).parse(true, result);
+ return result;
+ }
+
+ static bool accept(detail::input_adapter i)
+ {
+ return parser(i).accept(true);
+ }
+
+ static bool accept(detail::input_adapter& i)
+ {
+ return parser(i).accept(true);
+ }
+
+ /*!
+ @brief deserialize from an iterator range with contiguous storage
+
+ This function reads from an iterator range of a container with contiguous
+ storage of 1-byte values. Compatible container types include
+ `std::vector`, `std::string`, `std::array`, `std::valarray`, and
+ `std::initializer_list`. Furthermore, C-style arrays can be used with
+ `std::begin()`/`std::end()`. User-defined containers can be used as long
+ as they implement random-access iterators and a contiguous storage.
+
+ @pre The iterator range is contiguous. Violating this precondition yields
+ undefined behavior. **This precondition is enforced with an assertion.**
+ @pre Each element in the range has a size of 1 byte. Violating this
+ precondition yields undefined behavior. **This precondition is enforced
+ with a static assertion.**
+
+ @warning There is no way to enforce all preconditions at compile-time. If
+ the function is called with noncompliant iterators and with
+ assertions switched off, the behavior is undefined and will most
+ likely yield segmentation violation.
+
+ @tparam IteratorType iterator of container with contiguous storage
+ @param[in] first begin of the range to parse (included)
+ @param[in] last end of the range to parse (excluded)
+ @param[in] cb a parser callback function of type @ref parser_callback_t
+ which is used to control the deserialization by filtering unwanted values
+ (optional)
+ @param[in] allow_exceptions whether to throw exceptions in case of a
+ parse error (optional, true by default)
+
+ @return result of the deserialization
+
+ @throw parse_error.101 in case of an unexpected token
+ @throw parse_error.102 if to_unicode fails or surrogate error
+ @throw parse_error.103 if to_unicode fails
+
+ @complexity Linear in the length of the input. The parser is a predictive
+ LL(1) parser. The complexity can be higher if the parser callback function
+ @a cb has a super-linear complexity.
+
+ @note A UTF-8 byte order mark is silently ignored.
+
+ @liveexample{The example below demonstrates the `parse()` function reading
+ from an iterator range.,parse__iteratortype__parser_callback_t}
+
+ @since version 2.0.3
+ */
+ template<class IteratorType, typename std::enable_if<
+ std::is_base_of<
+ std::random_access_iterator_tag,
+ typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+ static basic_json parse(IteratorType first, IteratorType last,
+ const parser_callback_t cb = nullptr,
+ const bool allow_exceptions = true)
+ {
+ basic_json result;
+ parser(detail::input_adapter(first, last), cb, allow_exceptions).parse(true, result);
+ return result;
+ }
+
+ template<class IteratorType, typename std::enable_if<
+ std::is_base_of<
+ std::random_access_iterator_tag,
+ typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+ static bool accept(IteratorType first, IteratorType last)
+ {
+ return parser(detail::input_adapter(first, last)).accept(true);
+ }
+
+ /*!
+ @brief deserialize from stream
+ @deprecated This stream operator is deprecated and will be removed in
+ version 4.0.0 of the library. Please use
+ @ref operator>>(std::istream&, basic_json&)
+ instead; that is, replace calls like `j << i;` with `i >> j;`.
+ @since version 1.0.0; deprecated since version 3.0.0
+ */
+ JSON_DEPRECATED
+ friend std::istream& operator<<(basic_json& j, std::istream& i)
+ {
+ return operator>>(i, j);
+ }
+
+ /*!
+ @brief deserialize from stream
+
+ Deserializes an input stream to a JSON value.
+
+ @param[in,out] i input stream to read a serialized JSON value from
+ @param[in,out] j JSON value to write the deserialized input to
+
+ @throw parse_error.101 in case of an unexpected token
+ @throw parse_error.102 if to_unicode fails or surrogate error
+ @throw parse_error.103 if to_unicode fails
+
+ @complexity Linear in the length of the input. The parser is a predictive
+ LL(1) parser.
+
+ @note A UTF-8 byte order mark is silently ignored.
+
+ @liveexample{The example below shows how a JSON value is constructed by
+ reading a serialization from a stream.,operator_deserialize}
+
+ @sa parse(std::istream&, const parser_callback_t) for a variant with a
+ parser callback function to filter values while parsing
+
+ @since version 1.0.0
+ */
+ friend std::istream& operator>>(std::istream& i, basic_json& j)
+ {
+ parser(detail::input_adapter(i)).parse(false, j);
+ return i;
+ }
+
+ /// @}
+
+ ///////////////////////////
+ // convenience functions //
+ ///////////////////////////
+
+ /*!
+ @brief return the type as string
+
+ Returns the type name as string to be used in error messages - usually to
+ indicate that a function was called on a wrong JSON type.
+
+ @return a string representation of a the @a m_type member:
+ Value type | return value
+ ----------- | -------------
+ null | `"null"`
+ boolean | `"boolean"`
+ string | `"string"`
+ number | `"number"` (for all number types)
+ object | `"object"`
+ array | `"array"`
+ discarded | `"discarded"`
+
+ @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+ @complexity Constant.
+
+ @liveexample{The following code exemplifies `type_name()` for all JSON
+ types.,type_name}
+
+ @sa @ref type() -- return the type of the JSON value
+ @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+
+ @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
+ since 3.0.0
+ */
+ const char* type_name() const noexcept
+ {
+ {
+ switch (m_type)
+ {
+ case value_t::null:
+ return "null";
+ case value_t::object:
+ return "object";
+ case value_t::array:
+ return "array";
+ case value_t::string:
+ return "string";
+ case value_t::boolean:
+ return "boolean";
+ case value_t::discarded:
+ return "discarded";
+ default:
+ return "number";
+ }
+ }
+ }
+
+
+ private:
+ //////////////////////
+ // member variables //
+ //////////////////////
+
+ /// the type of the current element
+ value_t m_type = value_t::null;
+
+ /// the value of the current element
+ json_value m_value = {};
+
+ //////////////////////////////////////////
+ // binary serialization/deserialization //
+ //////////////////////////////////////////
+
+ /// @name binary serialization/deserialization support
+ /// @{
+
+ public:
+ /*!
+ @brief create a CBOR serialization of a given JSON value
+
+ Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
+ Binary Object Representation) serialization format. CBOR is a binary
+ serialization format which aims to be more compact than JSON itself, yet
+ more efficient to parse.
+
+ The library uses the following mapping from JSON values types to
+ CBOR types according to the CBOR specification (RFC 7049):
+
+ JSON value type | value/range | CBOR type | first byte
+ --------------- | ------------------------------------------ | ---------------------------------- | ---------------
+ null | `null` | Null | 0xF6
+ boolean | `true` | True | 0xF5
+ boolean | `false` | False | 0xF4
+ number_integer | -9223372036854775808..-2147483649 | Negative integer (8 bytes follow) | 0x3B
+ number_integer | -2147483648..-32769 | Negative integer (4 bytes follow) | 0x3A
+ number_integer | -32768..-129 | Negative integer (2 bytes follow) | 0x39
+ number_integer | -128..-25 | Negative integer (1 byte follow) | 0x38
+ number_integer | -24..-1 | Negative integer | 0x20..0x37
+ number_integer | 0..23 | Integer | 0x00..0x17
+ number_integer | 24..255 | Unsigned integer (1 byte follow) | 0x18
+ number_integer | 256..65535 | Unsigned integer (2 bytes follow) | 0x19
+ number_integer | 65536..4294967295 | Unsigned integer (4 bytes follow) | 0x1A
+ number_integer | 4294967296..18446744073709551615 | Unsigned integer (8 bytes follow) | 0x1B
+ number_unsigned | 0..23 | Integer | 0x00..0x17
+ number_unsigned | 24..255 | Unsigned integer (1 byte follow) | 0x18
+ number_unsigned | 256..65535 | Unsigned integer (2 bytes follow) | 0x19
+ number_unsigned | 65536..4294967295 | Unsigned integer (4 bytes follow) | 0x1A
+ number_unsigned | 4294967296..18446744073709551615 | Unsigned integer (8 bytes follow) | 0x1B
+ number_float | *any value* | Double-Precision Float | 0xFB
+ string | *length*: 0..23 | UTF-8 string | 0x60..0x77
+ string | *length*: 23..255 | UTF-8 string (1 byte follow) | 0x78
+ string | *length*: 256..65535 | UTF-8 string (2 bytes follow) | 0x79
+ string | *length*: 65536..4294967295 | UTF-8 string (4 bytes follow) | 0x7A
+ string | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow) | 0x7B
+ array | *size*: 0..23 | array | 0x80..0x97
+ array | *size*: 23..255 | array (1 byte follow) | 0x98
+ array | *size*: 256..65535 | array (2 bytes follow) | 0x99
+ array | *size*: 65536..4294967295 | array (4 bytes follow) | 0x9A
+ array | *size*: 4294967296..18446744073709551615 | array (8 bytes follow) | 0x9B
+ object | *size*: 0..23 | map | 0xA0..0xB7
+ object | *size*: 23..255 | map (1 byte follow) | 0xB8
+ object | *size*: 256..65535 | map (2 bytes follow) | 0xB9
+ object | *size*: 65536..4294967295 | map (4 bytes follow) | 0xBA
+ object | *size*: 4294967296..18446744073709551615 | map (8 bytes follow) | 0xBB
+
+ @note The mapping is **complete** in the sense that any JSON value type
+ can be converted to a CBOR value.
+
+ @note If NaN or Infinity are stored inside a JSON number, they are
+ serialized properly. This behavior differs from the @ref dump()
+ function which serializes NaN or Infinity to `null`.
+
+ @note The following CBOR types are not used in the conversion:
+ - byte strings (0x40..0x5F)
+ - UTF-8 strings terminated by "break" (0x7F)
+ - arrays terminated by "break" (0x9F)
+ - maps terminated by "break" (0xBF)
+ - date/time (0xC0..0xC1)
+ - bignum (0xC2..0xC3)
+ - decimal fraction (0xC4)
+ - bigfloat (0xC5)
+ - tagged items (0xC6..0xD4, 0xD8..0xDB)
+ - expected conversions (0xD5..0xD7)
+ - simple values (0xE0..0xF3, 0xF8)
+ - undefined (0xF7)
+ - half and single-precision floats (0xF9-0xFA)
+ - break (0xFF)
+
+ @param[in] j JSON value to serialize
+ @return MessagePack serialization as byte vector
+
+ @complexity Linear in the size of the JSON value @a j.
+
+ @liveexample{The example shows the serialization of a JSON value to a byte
+ vector in CBOR format.,to_cbor}
+
+ @sa http://cbor.io
+ @sa @ref from_cbor(detail::input_adapter, const bool strict) for the
+ analogous deserialization
+ @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+ @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+ related UBJSON format
+
+ @since version 2.0.9
+ */
+ static std::vector<uint8_t> to_cbor(const basic_json& j)
+ {
+ std::vector<uint8_t> result;
+ to_cbor(j, result);
+ return result;
+ }
+
+ static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
+ {
+ binary_writer<uint8_t>(o).write_cbor(j);
+ }
+
+ static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+ {
+ binary_writer<char>(o).write_cbor(j);
+ }
+
+ /*!
+ @brief create a MessagePack serialization of a given JSON value
+
+ Serializes a given JSON value @a j to a byte vector using the MessagePack
+ serialization format. MessagePack is a binary serialization format which
+ aims to be more compact than JSON itself, yet more efficient to parse.
+
+ The library uses the following mapping from JSON values types to
+ MessagePack types according to the MessagePack specification:
+
+ JSON value type | value/range | MessagePack type | first byte
+ --------------- | --------------------------------- | ---------------- | ----------
+ null | `null` | nil | 0xC0
+ boolean | `true` | true | 0xC3
+ boolean | `false` | false | 0xC2
+ number_integer | -9223372036854775808..-2147483649 | int64 | 0xD3
+ number_integer | -2147483648..-32769 | int32 | 0xD2
+ number_integer | -32768..-129 | int16 | 0xD1
+ number_integer | -128..-33 | int8 | 0xD0
+ number_integer | -32..-1 | negative fixint | 0xE0..0xFF
+ number_integer | 0..127 | positive fixint | 0x00..0x7F
+ number_integer | 128..255 | uint 8 | 0xCC
+ number_integer | 256..65535 | uint 16 | 0xCD
+ number_integer | 65536..4294967295 | uint 32 | 0xCE
+ number_integer | 4294967296..18446744073709551615 | uint 64 | 0xCF
+ number_unsigned | 0..127 | positive fixint | 0x00..0x7F
+ number_unsigned | 128..255 | uint 8 | 0xCC
+ number_unsigned | 256..65535 | uint 16 | 0xCD
+ number_unsigned | 65536..4294967295 | uint 32 | 0xCE
+ number_unsigned | 4294967296..18446744073709551615 | uint 64 | 0xCF
+ number_float | *any value* | float 64 | 0xCB
+ string | *length*: 0..31 | fixstr | 0xA0..0xBF
+ string | *length*: 32..255 | str 8 | 0xD9
+ string | *length*: 256..65535 | str 16 | 0xDA
+ string | *length*: 65536..4294967295 | str 32 | 0xDB
+ array | *size*: 0..15 | fixarray | 0x90..0x9F
+ array | *size*: 16..65535 | array 16 | 0xDC
+ array | *size*: 65536..4294967295 | array 32 | 0xDD
+ object | *size*: 0..15 | fix map | 0x80..0x8F
+ object | *size*: 16..65535 | map 16 | 0xDE
+ object | *size*: 65536..4294967295 | map 32 | 0xDF
+
+ @note The mapping is **complete** in the sense that any JSON value type
+ can be converted to a MessagePack value.
+
+ @note The following values can **not** be converted to a MessagePack value:
+ - strings with more than 4294967295 bytes
+ - arrays with more than 4294967295 elements
+ - objects with more than 4294967295 elements
+
+ @note The following MessagePack types are not used in the conversion:
+ - bin 8 - bin 32 (0xC4..0xC6)
+ - ext 8 - ext 32 (0xC7..0xC9)
+ - float 32 (0xCA)
+ - fixext 1 - fixext 16 (0xD4..0xD8)
+
+ @note Any MessagePack output created @ref to_msgpack can be successfully
+ parsed by @ref from_msgpack.
+
+ @note If NaN or Infinity are stored inside a JSON number, they are
+ serialized properly. This behavior differs from the @ref dump()
+ function which serializes NaN or Infinity to `null`.
+
+ @param[in] j JSON value to serialize
+ @return MessagePack serialization as byte vector
+
+ @complexity Linear in the size of the JSON value @a j.
+
+ @liveexample{The example shows the serialization of a JSON value to a byte
+ vector in MessagePack format.,to_msgpack}
+
+ @sa http://msgpack.org
+ @sa @ref from_msgpack(const std::vector<uint8_t>&, const size_t) for the
+ analogous deserialization
+ @sa @ref to_cbor(const basic_json& for the related CBOR format
+ @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+ related UBJSON format
+
+ @since version 2.0.9
+ */
+ static std::vector<uint8_t> to_msgpack(const basic_json& j)
+ {
+ std::vector<uint8_t> result;
+ to_msgpack(j, result);
+ return result;
+ }
+
+ static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
+ {
+ binary_writer<uint8_t>(o).write_msgpack(j);
+ }
+
+ static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+ {
+ binary_writer<char>(o).write_msgpack(j);
+ }
+
+ /*!
+ @brief create a UBJSON serialization of a given JSON value
+
+ Serializes a given JSON value @a j to a byte vector using the UBJSON
+ (Universal Binary JSON) serialization format. UBJSON aims to be more compact
+ than JSON itself, yet more efficient to parse.
+
+ The library uses the following mapping from JSON values types to
+ UBJSON types according to the UBJSON specification:
+
+ JSON value type | value/range | UBJSON type | marker
+ --------------- | --------------------------------- | ----------- | ------
+ null | `null` | null | `Z`
+ boolean | `true` | true | `T`
+ boolean | `false` | false | `F`
+ number_integer | -9223372036854775808..-2147483649 | int64 | `L`
+ number_integer | -2147483648..-32769 | int32 | `l`
+ number_integer | -32768..-129 | int16 | `I`
+ number_integer | -128..127 | int8 | `i`
+ number_integer | 128..255 | uint8 | `U`
+ number_integer | 256..32767 | int16 | `I`
+ number_integer | 32768..2147483647 | int32 | `l`
+ number_integer | 2147483648..9223372036854775807 | int64 | `L`
+ number_unsigned | 0..127 | int8 | `i`
+ number_unsigned | 128..255 | uint8 | `U`
+ number_unsigned | 256..32767 | int16 | `I`
+ number_unsigned | 32768..2147483647 | int32 | `l`
+ number_unsigned | 2147483648..9223372036854775807 | int64 | `L`
+ number_float | *any value* | float64 | `D`
+ string | *with shortest length indicator* | string | `S`
+ array | *see notes on optimized format* | array | `[`
+ object | *see notes on optimized format* | map | `{`
+
+ @note The mapping is **complete** in the sense that any JSON value type
+ can be converted to a UBJSON value.
+
+ @note The following values can **not** be converted to a UBJSON value:
+ - strings with more than 9223372036854775807 bytes (theoretical)
+ - unsigned integer numbers above 9223372036854775807
+
+ @note The following markers are not used in the conversion:
+ - `Z`: no-op values are not created.
+ - `C`: single-byte strings are serialized with `S` markers.
+
+ @note Any UBJSON output created @ref to_ubjson can be successfully parsed
+ by @ref from_ubjson.
+
+ @note If NaN or Infinity are stored inside a JSON number, they are
+ serialized properly. This behavior differs from the @ref dump()
+ function which serializes NaN or Infinity to `null`.
+
+ @note The optimized formats for containers are supported: Parameter
+ @a use_size adds size information to the beginning of a container and
+ removes the closing marker. Parameter @a use_type further checks
+ whether all elements of a container have the same type and adds the
+ type marker to the beginning of the container. The @a use_type
+ parameter must only be used together with @a use_size = true. Note
+ that @a use_size = true alone may result in larger representations -
+ the benefit of this parameter is that the receiving side is
+ immediately informed on the number of elements of the container.
+
+ @param[in] j JSON value to serialize
+ @param[in] use_size whether to add size annotations to container types
+ @param[in] use_type whether to add type annotations to container types
+ (must be combined with @a use_size = true)
+ @return UBJSON serialization as byte vector
+
+ @complexity Linear in the size of the JSON value @a j.
+
+ @liveexample{The example shows the serialization of a JSON value to a byte
+ vector in UBJSON format.,to_ubjson}
+
+ @sa http://ubjson.org
+ @sa @ref from_ubjson(detail::input_adapter, const bool strict) for the
+ analogous deserialization
+ @sa @ref to_cbor(const basic_json& for the related CBOR format
+ @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+
+ @since version 3.1.0
+ */
+ static std::vector<uint8_t> to_ubjson(const basic_json& j,
+ const bool use_size = false,
+ const bool use_type = false)
+ {
+ std::vector<uint8_t> result;
+ to_ubjson(j, result, use_size, use_type);
+ return result;
+ }
+
+ static void to_ubjson(const basic_json& j, detail::output_adapter<uint8_t> o,
+ const bool use_size = false, const bool use_type = false)
+ {
+ binary_writer<uint8_t>(o).write_ubjson(j, use_size, use_type);
+ }
+
+ static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+ const bool use_size = false, const bool use_type = false)
+ {
+ binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+ }
+
+ /*!
+ @brief create a JSON value from an input in CBOR format
+
+ Deserializes a given input @a i to a JSON value using the CBOR (Concise
+ Binary Object Representation) serialization format.
+
+ The library maps CBOR types to JSON value types as follows:
+
+ CBOR type | JSON value type | first byte
+ ---------------------- | --------------- | ----------
+ Integer | number_unsigned | 0x00..0x17
+ Unsigned integer | number_unsigned | 0x18
+ Unsigned integer | number_unsigned | 0x19
+ Unsigned integer | number_unsigned | 0x1A
+ Unsigned integer | number_unsigned | 0x1B
+ Negative integer | number_integer | 0x20..0x37
+ Negative integer | number_integer | 0x38
+ Negative integer | number_integer | 0x39
+ Negative integer | number_integer | 0x3A
+ Negative integer | number_integer | 0x3B
+ Negative integer | number_integer | 0x40..0x57
+ UTF-8 string | string | 0x60..0x77
+ UTF-8 string | string | 0x78
+ UTF-8 string | string | 0x79
+ UTF-8 string | string | 0x7A
+ UTF-8 string | string | 0x7B
+ UTF-8 string | string | 0x7F
+ array | array | 0x80..0x97
+ array | array | 0x98
+ array | array | 0x99
+ array | array | 0x9A
+ array | array | 0x9B
+ array | array | 0x9F
+ map | object | 0xA0..0xB7
+ map | object | 0xB8
+ map | object | 0xB9
+ map | object | 0xBA
+ map | object | 0xBB
+ map | object | 0xBF
+ False | `false` | 0xF4
+ True | `true` | 0xF5
+ Nill | `null` | 0xF6
+ Half-Precision Float | number_float | 0xF9
+ Single-Precision Float | number_float | 0xFA
+ Double-Precision Float | number_float | 0xFB
+
+ @warning The mapping is **incomplete** in the sense that not all CBOR
+ types can be converted to a JSON value. The following CBOR types
+ are not supported and will yield parse errors (parse_error.112):
+ - byte strings (0x40..0x5F)
+ - date/time (0xC0..0xC1)
+ - bignum (0xC2..0xC3)
+ - decimal fraction (0xC4)
+ - bigfloat (0xC5)
+ - tagged items (0xC6..0xD4, 0xD8..0xDB)
+ - expected conversions (0xD5..0xD7)
+ - simple values (0xE0..0xF3, 0xF8)
+ - undefined (0xF7)
+
+ @warning CBOR allows map keys of any type, whereas JSON only allows
+ strings as keys in object values. Therefore, CBOR maps with keys
+ other than UTF-8 strings are rejected (parse_error.113).
+
+ @note Any CBOR output created @ref to_cbor can be successfully parsed by
+ @ref from_cbor.
+
+ @param[in] i an input in CBOR format convertible to an input adapter
+ @param[in] strict whether to expect the input to be consumed until EOF
+ (true by default)
+ @return deserialized JSON value
+
+ @throw parse_error.110 if the given input ends prematurely or the end of
+ file was not reached when @a strict was set to true
+ @throw parse_error.112 if unsupported features from CBOR were
+ used in the given input @a v or if the input is not valid CBOR
+ @throw parse_error.113 if a string was expected as map key, but not found
+
+ @complexity Linear in the size of the input @a i.
+
+ @liveexample{The example shows the deserialization of a byte vector in CBOR
+ format to a JSON value.,from_cbor}
+
+ @sa http://cbor.io
+ @sa @ref to_cbor(const basic_json&) for the analogous serialization
+ @sa @ref from_msgpack(detail::input_adapter, const bool) for the
+ related MessagePack format
+ @sa @ref from_ubjson(detail::input_adapter, const bool) for the related
+ UBJSON format
+
+ @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+ consume input adapters, removed start_index parameter, and added
+ @a strict parameter since 3.0.0
+ */
+ static basic_json from_cbor(detail::input_adapter i,
+ const bool strict = true)
+ {
+ return binary_reader(i).parse_cbor(strict);
+ }
+
+ /*!
+ @copydoc from_cbor(detail::input_adapter, const bool)
+ */
+ template<typename A1, typename A2,
+ detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+ static basic_json from_cbor(A1 && a1, A2 && a2, const bool strict = true)
+ {
+ return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_cbor(strict);
+ }
+
+ /*!
+ @brief create a JSON value from an input in MessagePack format
+
+ Deserializes a given input @a i to a JSON value using the MessagePack
+ serialization format.
+
+ The library maps MessagePack types to JSON value types as follows:
+
+ MessagePack type | JSON value type | first byte
+ ---------------- | --------------- | ----------
+ positive fixint | number_unsigned | 0x00..0x7F
+ fixmap | object | 0x80..0x8F
+ fixarray | array | 0x90..0x9F
+ fixstr | string | 0xA0..0xBF
+ nil | `null` | 0xC0
+ false | `false` | 0xC2
+ true | `true` | 0xC3
+ float 32 | number_float | 0xCA
+ float 64 | number_float | 0xCB
+ uint 8 | number_unsigned | 0xCC
+ uint 16 | number_unsigned | 0xCD
+ uint 32 | number_unsigned | 0xCE
+ uint 64 | number_unsigned | 0xCF
+ int 8 | number_integer | 0xD0
+ int 16 | number_integer | 0xD1
+ int 32 | number_integer | 0xD2
+ int 64 | number_integer | 0xD3
+ str 8 | string | 0xD9
+ str 16 | string | 0xDA
+ str 32 | string | 0xDB
+ array 16 | array | 0xDC
+ array 32 | array | 0xDD
+ map 16 | object | 0xDE
+ map 32 | object | 0xDF
+ negative fixint | number_integer | 0xE0-0xFF
+
+ @warning The mapping is **incomplete** in the sense that not all
+ MessagePack types can be converted to a JSON value. The following
+ MessagePack types are not supported and will yield parse errors:
+ - bin 8 - bin 32 (0xC4..0xC6)
+ - ext 8 - ext 32 (0xC7..0xC9)
+ - fixext 1 - fixext 16 (0xD4..0xD8)
+
+ @note Any MessagePack output created @ref to_msgpack can be successfully
+ parsed by @ref from_msgpack.
+
+ @param[in] i an input in MessagePack format convertible to an input
+ adapter
+ @param[in] strict whether to expect the input to be consumed until EOF
+ (true by default)
+
+ @throw parse_error.110 if the given input ends prematurely or the end of
+ file was not reached when @a strict was set to true
+ @throw parse_error.112 if unsupported features from MessagePack were
+ used in the given input @a i or if the input is not valid MessagePack
+ @throw parse_error.113 if a string was expected as map key, but not found
+
+ @complexity Linear in the size of the input @a i.
+
+ @liveexample{The example shows the deserialization of a byte vector in
+ MessagePack format to a JSON value.,from_msgpack}
+
+ @sa http://msgpack.org
+ @sa @ref to_msgpack(const basic_json&) for the analogous serialization
+ @sa @ref from_cbor(detail::input_adapter, const bool) for the related CBOR
+ format
+ @sa @ref from_ubjson(detail::input_adapter, const bool) for the related
+ UBJSON format
+
+ @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+ consume input adapters, removed start_index parameter, and added
+ @a strict parameter since 3.0.0
+ */
+ static basic_json from_msgpack(detail::input_adapter i,
+ const bool strict = true)
+ {
+ return binary_reader(i).parse_msgpack(strict);
+ }
+
+ /*!
+ @copydoc from_msgpack(detail::input_adapter, const bool)
+ */
+ template<typename A1, typename A2,
+ detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+ static basic_json from_msgpack(A1 && a1, A2 && a2, const bool strict = true)
+ {
+ return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_msgpack(strict);
+ }
+
+ /*!
+ @brief create a JSON value from an input in UBJSON format
+
+ Deserializes a given input @a i to a JSON value using the UBJSON (Universal
+ Binary JSON) serialization format.
+
+ The library maps UBJSON types to JSON value types as follows:
+
+ UBJSON type | JSON value type | marker
+ ----------- | --------------------------------------- | ------
+ no-op | *no value, next value is read* | `N`
+ null | `null` | `Z`
+ false | `false` | `F`
+ true | `true` | `T`
+ float32 | number_float | `d`
+ float64 | number_float | `D`
+ uint8 | number_unsigned | `U`
+ int8 | number_integer | `i`
+ int16 | number_integer | `I`
+ int32 | number_integer | `l`
+ int64 | number_integer | `L`
+ string | string | `S`
+ char | string | `C`
+ array | array (optimized values are supported) | `[`
+ object | object (optimized values are supported) | `{`
+
+ @note The mapping is **complete** in the sense that any UBJSON value can
+ be converted to a JSON value.
+
+ @param[in] i an input in UBJSON format convertible to an input adapter
+ @param[in] strict whether to expect the input to be consumed until EOF
+ (true by default)
+
+ @throw parse_error.110 if the given input ends prematurely or the end of
+ file was not reached when @a strict was set to true
+ @throw parse_error.112 if a parse error occurs
+ @throw parse_error.113 if a string could not be parsed successfully
+
+ @complexity Linear in the size of the input @a i.
+
+ @liveexample{The example shows the deserialization of a byte vector in
+ UBJSON format to a JSON value.,from_ubjson}
+
+ @sa http://ubjson.org
+ @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+ analogous serialization
+ @sa @ref from_cbor(detail::input_adapter, const bool) for the related CBOR
+ format
+ @sa @ref from_msgpack(detail::input_adapter, const bool) for the related
+ MessagePack format
+
+ @since version 3.1.0
+ */
+ static basic_json from_ubjson(detail::input_adapter i,
+ const bool strict = true)
+ {
+ return binary_reader(i).parse_ubjson(strict);
+ }
+
+ template<typename A1, typename A2,
+ detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+ static basic_json from_ubjson(A1 && a1, A2 && a2, const bool strict = true)
+ {
+ return binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).parse_ubjson(strict);
+ }
+
+ /// @}
+
+ //////////////////////////
+ // JSON Pointer support //
+ //////////////////////////
+
+ /// @name JSON Pointer functions
+ /// @{
+
+ /*!
+ @brief access specified element via JSON Pointer
+
+ Uses a JSON pointer to retrieve a reference to the respective JSON value.
+ No bound checking is performed. Similar to @ref operator[](const typename
+ object_t::key_type&), `null` values are created in arrays and objects if
+ necessary.
+
+ In particular:
+ - If the JSON pointer points to an object key that does not exist, it
+ is created an filled with a `null` value before a reference to it
+ is returned.
+ - If the JSON pointer points to an array index that does not exist, it
+ is created an filled with a `null` value before a reference to it
+ is returned. All indices between the current maximum and the given
+ index are also filled with `null`.
+ - The special value `-` is treated as a synonym for the index past the
+ end.
+
+ @param[in] ptr a JSON pointer
+
+ @return reference to the element pointed to by @a ptr
+
+ @complexity Constant.
+
+ @throw parse_error.106 if an array index begins with '0'
+ @throw parse_error.109 if an array index was not a number
+ @throw out_of_range.404 if the JSON pointer can not be resolved
+
+ @liveexample{The behavior is shown in the example.,operatorjson_pointer}
+
+ @since version 2.0.0
+ */
+ reference operator[](const json_pointer& ptr)
+ {
+ return ptr.get_unchecked(this);
+ }
+
+ /*!
+ @brief access specified element via JSON Pointer
+
+ Uses a JSON pointer to retrieve a reference to the respective JSON value.
+ No bound checking is performed. The function does not change the JSON
+ value; no `null` values are created. In particular, the the special value
+ `-` yields an exception.
+
+ @param[in] ptr JSON pointer to the desired element
+
+ @return const reference to the element pointed to by @a ptr
+
+ @complexity Constant.
+
+ @throw parse_error.106 if an array index begins with '0'
+ @throw parse_error.109 if an array index was not a number
+ @throw out_of_range.402 if the array index '-' is used
+ @throw out_of_range.404 if the JSON pointer can not be resolved
+
+ @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
+
+ @since version 2.0.0
+ */
+ const_reference operator[](const json_pointer& ptr) const
+ {
+ return ptr.get_unchecked(this);
+ }
+
+ /*!
+ @brief access specified element via JSON Pointer
+
+ Returns a reference to the element at with specified JSON pointer @a ptr,
+ with bounds checking.
+
+ @param[in] ptr JSON pointer to the desired element
+
+ @return reference to the element pointed to by @a ptr
+
+ @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+ begins with '0'. See example below.
+
+ @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+ is not a number. See example below.
+
+ @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+ is out of range. See example below.
+
+ @throw out_of_range.402 if the array index '-' is used in the passed JSON
+ pointer @a ptr. As `at` provides checked access (and no elements are
+ implicitly inserted), the index '-' is always invalid. See example below.
+
+ @throw out_of_range.403 if the JSON pointer describes a key of an object
+ which cannot be found. See example below.
+
+ @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+ See example below.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @complexity Constant.
+
+ @since version 2.0.0
+
+ @liveexample{The behavior is shown in the example.,at_json_pointer}
+ */
+ reference at(const json_pointer& ptr)
+ {
+ return ptr.get_checked(this);
+ }
+
+ /*!
+ @brief access specified element via JSON Pointer
+
+ Returns a const reference to the element at with specified JSON pointer @a
+ ptr, with bounds checking.
+
+ @param[in] ptr JSON pointer to the desired element
+
+ @return reference to the element pointed to by @a ptr
+
+ @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+ begins with '0'. See example below.
+
+ @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+ is not a number. See example below.
+
+ @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+ is out of range. See example below.
+
+ @throw out_of_range.402 if the array index '-' is used in the passed JSON
+ pointer @a ptr. As `at` provides checked access (and no elements are
+ implicitly inserted), the index '-' is always invalid. See example below.
+
+ @throw out_of_range.403 if the JSON pointer describes a key of an object
+ which cannot be found. See example below.
+
+ @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+ See example below.
+
+ @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+ changes in the JSON value.
+
+ @complexity Constant.
+
+ @since version 2.0.0
+
+ @liveexample{The behavior is shown in the example.,at_json_pointer_const}
+ */
+ const_reference at(const json_pointer& ptr) const
+ {
+ return ptr.get_checked(this);
+ }
+
+ /*!
+ @brief return flattened JSON value
+
+ The function creates a JSON object whose keys are JSON pointers (see [RFC
+ 6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
+ primitive. The original JSON value can be restored using the @ref
+ unflatten() function.
+
+ @return an object that maps JSON pointers to primitive values
+
+ @note Empty objects and arrays are flattened to `null` and will not be
+ reconstructed correctly by the @ref unflatten() function.
+
+ @complexity Linear in the size the JSON value.
+
+ @liveexample{The following code shows how a JSON object is flattened to an
+ object whose keys consist of JSON pointers.,flatten}
+
+ @sa @ref unflatten() for the reverse function
+
+ @since version 2.0.0
+ */
+ basic_json flatten() const
+ {
+ basic_json result(value_t::object);
+ json_pointer::flatten("", *this, result);
+ return result;
+ }
+
+ /*!
+ @brief unflatten a previously flattened JSON value
+
+ The function restores the arbitrary nesting of a JSON value that has been
+ flattened before using the @ref flatten() function. The JSON value must
+ meet certain constraints:
+ 1. The value must be an object.
+ 2. The keys must be JSON pointers (see
+ [RFC 6901](https://tools.ietf.org/html/rfc6901))
+ 3. The mapped values must be primitive JSON types.
+
+ @return the original JSON from a flattened version
+
+ @note Empty objects and arrays are flattened by @ref flatten() to `null`
+ values and can not unflattened to their original type. Apart from
+ this example, for a JSON value `j`, the following is always true:
+ `j == j.flatten().unflatten()`.
+
+ @complexity Linear in the size the JSON value.
+
+ @throw type_error.314 if value is not an object
+ @throw type_error.315 if object values are not primitive
+
+ @liveexample{The following code shows how a flattened JSON object is
+ unflattened into the original nested JSON object.,unflatten}
+
+ @sa @ref flatten() for the reverse function
+
+ @since version 2.0.0
+ */
+ basic_json unflatten() const
+ {
+ return json_pointer::unflatten(*this);
+ }
+
+ /// @}
+
+ //////////////////////////
+ // JSON Patch functions //
+ //////////////////////////
+
+ /// @name JSON Patch functions
+ /// @{
+
+ /*!
+ @brief applies a JSON patch
+
+ [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
+ expressing a sequence of operations to apply to a JSON) document. With
+ this function, a JSON Patch is applied to the current JSON value by
+ executing all operations from the patch.
+
+ @param[in] json_patch JSON patch document
+ @return patched document
+
+ @note The application of a patch is atomic: Either all operations succeed
+ and the patched document is returned or an exception is thrown. In
+ any case, the original value is not changed: the patch is applied
+ to a copy of the value.
+
+ @throw parse_error.104 if the JSON patch does not consist of an array of
+ objects
+
+ @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
+ attributes are missing); example: `"operation add must have member path"`
+
+ @throw out_of_range.401 if an array index is out of range.
+
+ @throw out_of_range.403 if a JSON pointer inside the patch could not be
+ resolved successfully in the current JSON value; example: `"key baz not
+ found"`
+
+ @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
+ "move")
+
+ @throw other_error.501 if "test" operation was unsuccessful
+
+ @complexity Linear in the size of the JSON value and the length of the
+ JSON patch. As usually only a fraction of the JSON value is affected by
+ the patch, the complexity can usually be neglected.
+
+ @liveexample{The following code shows how a JSON patch is applied to a
+ value.,patch}
+
+ @sa @ref diff -- create a JSON patch by comparing two JSON values
+
+ @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+ @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
+
+ @since version 2.0.0
+ */
+ basic_json patch(const basic_json& json_patch) const
+ {
+ // make a working copy to apply the patch to
+ basic_json result = *this;
+
+ // the valid JSON Patch operations
+ enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+ const auto get_op = [](const std::string & op)
+ {
+ if (op == "add")
+ {
+ return patch_operations::add;
+ }
+ if (op == "remove")
+ {
+ return patch_operations::remove;
+ }
+ if (op == "replace")
+ {
+ return patch_operations::replace;
+ }
+ if (op == "move")
+ {
+ return patch_operations::move;
+ }
+ if (op == "copy")
+ {
+ return patch_operations::copy;
+ }
+ if (op == "test")
+ {
+ return patch_operations::test;
+ }
+
+ return patch_operations::invalid;
+ };
+
+ // wrapper for "add" operation; add value at ptr
+ const auto operation_add = [&result](json_pointer & ptr, basic_json val)
+ {
+ // adding to the root of the target document means replacing it
+ if (ptr.is_root())
+ {
+ result = val;
+ }
+ else
+ {
+ // make sure the top element of the pointer exists
+ json_pointer top_pointer = ptr.top();
+ if (top_pointer != ptr)
+ {
+ result.at(top_pointer);
+ }
+
+ // get reference to parent of JSON pointer ptr
+ const auto last_path = ptr.pop_back();
+ basic_json& parent = result[ptr];
+
+ switch (parent.m_type)
+ {
+ case value_t::null:
+ case value_t::object:
+ {
+ // use operator[] to add value
+ parent[last_path] = val;
+ break;
+ }
+
+ case value_t::array:
+ {
+ if (last_path == "-")
+ {
+ // special case: append to back
+ parent.push_back(val);
+ }
+ else
+ {
+ const auto idx = json_pointer::array_index(last_path);
+ if (JSON_UNLIKELY(static_cast<size_type>(idx) > parent.size()))
+ {
+ // avoid undefined behavior
+ JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+ }
+ else
+ {
+ // default case: insert add offset
+ parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+ }
+ }
+ break;
+ }
+
+ default:
+ {
+ // if there exists a parent it cannot be primitive
+ assert(false); // LCOV_EXCL_LINE
+ }
+ }
+ }
+ };
+
+ // wrapper for "remove" operation; remove value at ptr
+ const auto operation_remove = [&result](json_pointer & ptr)
+ {
+ // get reference to parent of JSON pointer ptr
+ const auto last_path = ptr.pop_back();
+ basic_json& parent = result.at(ptr);
+
+ // remove child
+ if (parent.is_object())
+ {
+ // perform range check
+ auto it = parent.find(last_path);
+ if (JSON_LIKELY(it != parent.end()))
+ {
+ parent.erase(it);
+ }
+ else
+ {
+ JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found"));
+ }
+ }
+ else if (parent.is_array())
+ {
+ // note erase performs range check
+ parent.erase(static_cast<size_type>(json_pointer::array_index(last_path)));
+ }
+ };
+
+ // type check: top level value must be an array
+ if (JSON_UNLIKELY(not json_patch.is_array()))
+ {
+ JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+ }
+
+ // iterate and apply the operations
+ for (const auto& val : json_patch)
+ {
+ // wrapper to get a value for an operation
+ const auto get_value = [&val](const std::string & op,
+ const std::string & member,
+ bool string_type) -> basic_json &
+ {
+ // find value
+ auto it = val.m_value.object->find(member);
+
+ // context-sensitive error message
+ const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
+
+ // check if desired value is present
+ if (JSON_UNLIKELY(it == val.m_value.object->end()))
+ {
+ JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'"));
+ }
+
+ // check if result is of type string
+ if (JSON_UNLIKELY(string_type and not it->second.is_string()))
+ {
+ JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'"));
+ }
+
+ // no error: return value
+ return it->second;
+ };
+
+ // type check: every element of the array must be an object
+ if (JSON_UNLIKELY(not val.is_object()))
+ {
+ JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+ }
+
+ // collect mandatory members
+ const std::string op = get_value("op", "op", true);
+ const std::string path = get_value(op, "path", true);
+ json_pointer ptr(path);
+
+ switch (get_op(op))
+ {
+ case patch_operations::add:
+ {
+ operation_add(ptr, get_value("add", "value", false));
+ break;
+ }
+
+ case patch_operations::remove:
+ {
+ operation_remove(ptr);
+ break;
+ }
+
+ case patch_operations::replace:
+ {
+ // the "path" location must exist - use at()
+ result.at(ptr) = get_value("replace", "value", false);
+ break;
+ }
+
+ case patch_operations::move:
+ {
+ const std::string from_path = get_value("move", "from", true);
+ json_pointer from_ptr(from_path);
+
+ // the "from" location must exist - use at()
+ basic_json v = result.at(from_ptr);
+
+ // The move operation is functionally identical to a
+ // "remove" operation on the "from" location, followed
+ // immediately by an "add" operation at the target
+ // location with the value that was just removed.
+ operation_remove(from_ptr);
+ operation_add(ptr, v);
+ break;
+ }
+
+ case patch_operations::copy:
+ {
+ const std::string from_path = get_value("copy", "from", true);
+ const json_pointer from_ptr(from_path);
+
+ // the "from" location must exist - use at()
+ basic_json v = result.at(from_ptr);
+
+ // The copy is functionally identical to an "add"
+ // operation at the target location using the value
+ // specified in the "from" member.
+ operation_add(ptr, v);
+ break;
+ }
+
+ case patch_operations::test:
+ {
+ bool success = false;
+ JSON_TRY
+ {
+ // check if "value" matches the one at "path"
+ // the "path" location must exist - use at()
+ success = (result.at(ptr) == get_value("test", "value", false));
+ }
+ JSON_CATCH (out_of_range&)
+ {
+ // ignore out of range errors: success remains false
+ }
+
+ // throw an exception if test fails
+ if (JSON_UNLIKELY(not success))
+ {
+ JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump()));
+ }
+
+ break;
+ }
+
+ case patch_operations::invalid:
+ {
+ // op must be "add", "remove", "replace", "move", "copy", or
+ // "test"
+ JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid"));
+ }
+ }
+ }
+
+ return result;
+ }
+
+ /*!
+ @brief creates a diff as a JSON patch
+
+ Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
+ be changed into the value @a target by calling @ref patch function.
+
+ @invariant For two JSON values @a source and @a target, the following code
+ yields always `true`:
+ @code {.cpp}
+ source.patch(diff(source, target)) == target;
+ @endcode
+
+ @note Currently, only `remove`, `add`, and `replace` operations are
+ generated.
+
+ @param[in] source JSON value to compare from
+ @param[in] target JSON value to compare against
+ @param[in] path helper value to create JSON pointers
+
+ @return a JSON patch to convert the @a source to @a target
+
+ @complexity Linear in the lengths of @a source and @a target.
+
+ @liveexample{The following code shows how a JSON patch is created as a
+ diff for two JSON values.,diff}
+
+ @sa @ref patch -- apply a JSON patch
+ @sa @ref merge_patch -- apply a JSON Merge Patch
+
+ @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+
+ @since version 2.0.0
+ */
+ static basic_json diff(const basic_json& source, const basic_json& target,
+ const std::string& path = "")
+ {
+ // the patch
+ basic_json result(value_t::array);
+
+ // if the values are the same, return empty patch
+ if (source == target)
+ {
+ return result;
+ }
+
+ if (source.type() != target.type())
+ {
+ // different types: replace value
+ result.push_back(
+ {
+ {"op", "replace"}, {"path", path}, {"value", target}
+ });
+ }
+ else
+ {
+ switch (source.type())
+ {
+ case value_t::array:
+ {
+ // first pass: traverse common elements
+ std::size_t i = 0;
+ while (i < source.size() and i < target.size())
+ {
+ // recursive call to compare array values at index i
+ auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+ result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+ ++i;
+ }
+
+ // i now reached the end of at least one array
+ // in a second pass, traverse the remaining elements
+
+ // remove my remaining elements
+ const auto end_index = static_cast<difference_type>(result.size());
+ while (i < source.size())
+ {
+ // add operations in reverse order to avoid invalid
+ // indices
+ result.insert(result.begin() + end_index, object(
+ {
+ {"op", "remove"},
+ {"path", path + "/" + std::to_string(i)}
+ }));
+ ++i;
+ }
+
+ // add other remaining elements
+ while (i < target.size())
+ {
+ result.push_back(
+ {
+ {"op", "add"},
+ {"path", path + "/" + std::to_string(i)},
+ {"value", target[i]}
+ });
+ ++i;
+ }
+
+ break;
+ }
+
+ case value_t::object:
+ {
+ // first pass: traverse this object's elements
+ for (auto it = source.cbegin(); it != source.cend(); ++it)
+ {
+ // escape the key name to be used in a JSON patch
+ const auto key = json_pointer::escape(it.key());
+
+ if (target.find(it.key()) != target.end())
+ {
+ // recursive call to compare object values at key it
+ auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
+ result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+ }
+ else
+ {
+ // found a key that is not in o -> remove it
+ result.push_back(object(
+ {
+ {"op", "remove"}, {"path", path + "/" + key}
+ }));
+ }
+ }
+
+ // second pass: traverse other object's elements
+ for (auto it = target.cbegin(); it != target.cend(); ++it)
+ {
+ if (source.find(it.key()) == source.end())
+ {
+ // found a key that is not in this -> add it
+ const auto key = json_pointer::escape(it.key());
+ result.push_back(
+ {
+ {"op", "add"}, {"path", path + "/" + key},
+ {"value", it.value()}
+ });
+ }
+ }
+
+ break;
+ }
+
+ default:
+ {
+ // both primitive type: replace value
+ result.push_back(
+ {
+ {"op", "replace"}, {"path", path}, {"value", target}
+ });
+ break;
+ }
+ }
+ }
+
+ return result;
+ }
+
+ /// @}
+
+ ////////////////////////////////
+ // JSON Merge Patch functions //
+ ////////////////////////////////
+
+ /// @name JSON Merge Patch functions
+ /// @{
+
+ /*!
+ @brief applies a JSON Merge Patch
+
+ The merge patch format is primarily intended for use with the HTTP PATCH
+ method as a means of describing a set of modifications to a target
+ resource's content. This function applies a merge patch to the current
+ JSON value.
+
+ The function implements the following algorithm from Section 2 of
+ [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
+
+ ```
+ define MergePatch(Target, Patch):
+ if Patch is an Object:
+ if Target is not an Object:
+ Target = {} // Ignore the contents and set it to an empty Object
+ for each Name/Value pair in Patch:
+ if Value is null:
+ if Name exists in Target:
+ remove the Name/Value pair from Target
+ else:
+ Target[Name] = MergePatch(Target[Name], Value)
+ return Target
+ else:
+ return Patch
+ ```
+
+ Thereby, `Target` is the current object; that is, the patch is applied to
+ the current value.
+
+ @param[in] patch the patch to apply
+
+ @complexity Linear in the lengths of @a patch.
+
+ @liveexample{The following code shows how a JSON Merge Patch is applied to
+ a JSON document.,merge_patch}
+
+ @sa @ref patch -- apply a JSON patch
+ @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
+
+ @since version 3.0.0
+ */
+ void merge_patch(const basic_json& patch)
+ {
+ if (patch.is_object())
+ {
+ if (not is_object())
+ {
+ *this = object();
+ }
+ for (auto it = patch.begin(); it != patch.end(); ++it)
+ {
+ if (it.value().is_null())
+ {
+ erase(it.key());
+ }
+ else
+ {
+ operator[](it.key()).merge_patch(it.value());
+ }
+ }
+ }
+ else
+ {
+ *this = patch;
+ }
+ }
+
+ /// @}
+};
+} // namespace nlohmann
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+// specialization of std::swap, and std::hash
+namespace std
+{
+/*!
+@brief exchanges the values of two JSON objects
+
+@since version 1.0.0
+*/
+template<>
+inline void swap(nlohmann::json& j1,
+ nlohmann::json& j2) noexcept(
+ is_nothrow_move_constructible<nlohmann::json>::value and
+ is_nothrow_move_assignable<nlohmann::json>::value
+ )
+{
+ j1.swap(j2);
+}
+
+/// hash value for JSON objects
+template<>
+struct hash<nlohmann::json>
+{
+ /*!
+ @brief return a hash value for a JSON object
+
+ @since version 1.0.0
+ */
+ std::size_t operator()(const nlohmann::json& j) const
+ {
+ // a naive hashing via the string representation
+ const auto& h = hash<nlohmann::json::string_t>();
+ return h(j.dump());
+ }
+};
+
+/// specialization for std::less<value_t>
+/// @note: do not remove the space after '<',
+/// see https://github.com/nlohmann/json/pull/679
+template<>
+struct less< ::nlohmann::detail::value_t>
+{
+ /*!
+ @brief compare two value_t enum values
+ @since version 3.0.0
+ */
+ bool operator()(nlohmann::detail::value_t lhs,
+ nlohmann::detail::value_t rhs) const noexcept
+ {
+ return nlohmann::detail::operator<(lhs, rhs);
+ }
+};
+
+} // namespace std
+
+/*!
+@brief user-defined string literal for JSON values
+
+This operator implements a user-defined string literal for JSON objects. It
+can be used by adding `"_json"` to a string literal and returns a JSON object
+if no parse error occurred.
+
+@param[in] s a string representation of a JSON object
+@param[in] n the length of string @a s
+@return a JSON object
+
+@since version 1.0.0
+*/
+inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+{
+ return nlohmann::json::parse(s, s + n);
+}
+
+/*!
+@brief user-defined string literal for JSON pointer
+
+This operator implements a user-defined string literal for JSON Pointers. It
+can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
+object if no parse error occurred.
+
+@param[in] s a string representation of a JSON Pointer
+@param[in] n the length of string @a s
+@return a JSON pointer object
+
+@since version 2.0.0
+*/
+inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+{
+ return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+
+
+// restore GCC/clang diagnostic settings
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+ #pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+ #pragma GCC diagnostic pop
+#endif
+
+// clean up
+#undef JSON_CATCH
+#undef JSON_THROW
+#undef JSON_TRY
+#undef JSON_LIKELY
+#undef JSON_UNLIKELY
+#undef JSON_DEPRECATED
+#undef JSON_HAS_CPP_14
+#undef JSON_HAS_CPP_17
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+#undef NLOHMANN_JSON_HAS_HELPER
+
+
+#endif
diff --git a/src/core/grid_generator/HCPIterator.h b/src/core/grid_generator/HCPIterator.h
index baa66f1e3f9b1a2aa218e899e3ed0d1b8cd9290e..dc84a29c61176ff55edd8e7ae53e3b8795ec8915 100644
--- a/src/core/grid_generator/HCPIterator.h
+++ b/src/core/grid_generator/HCPIterator.h
@@ -76,5 +76,39 @@ private:
bool ended_;
};
+/// Convenience class to enable range based for loops over grid points.
+/// Usage:
+/// \code for (const auto& pt : HCPGrid(...) ) \endcode
+class HCPGrid
+{
+public:
+ using iterator = HCPIterator;
+ using value_type = iterator::value_type;
+
+ /**
+ * @param domain volume were lattice points will be returned
+ * @param pointOfReference point somewhere in the world which fixes the lattice
+ * @param spacing spacing between grid points in x direction
+ */
+ HCPGrid(const AABB& domain, const Vector3<real_t>& pointOfReference, const real_t spacing)
+ : domain_(domain)
+ , pointOfReference_(pointOfReference)
+ , spacing_(spacing)
+ {}
+
+ HCPIterator begin() {return HCPIterator(domain_, pointOfReference_, spacing_);}
+ HCPIterator begin() const {return HCPIterator(domain_, pointOfReference_, spacing_);}
+ HCPIterator cbegin() const {return HCPIterator(domain_, pointOfReference_, spacing_);}
+
+ HCPIterator end() {return HCPIterator();}
+ HCPIterator end() const {return HCPIterator();}
+ HCPIterator cend() const {return HCPIterator();}
+
+private:
+ AABB domain_;
+ Vector3<real_t> pointOfReference_;
+ real_t spacing_;
+};
+
} // namespace grid_generator
} // namespace walberla
diff --git a/src/core/grid_generator/SCIterator.cpp b/src/core/grid_generator/SCIterator.cpp
index 73ff5330cdd90ed071b555f5b6bade95c3ba9ecc..6c4399a6489ab85d22d647f3e84516685d07e680 100644
--- a/src/core/grid_generator/SCIterator.cpp
+++ b/src/core/grid_generator/SCIterator.cpp
@@ -30,7 +30,7 @@
namespace walberla {
namespace grid_generator {
-SCIterator::SCIterator(const AABB& domain, const Vector3<real_t>& pointOfReference, const real_t spacing)
+SCIterator::SCIterator(const AABB& domain, const Vector3<real_t>& pointOfReference, const real_t& spacing)
: i_(0)
, j_(0)
, k_(0)
@@ -64,7 +64,7 @@ SCIterator::SCIterator(const AABB& domain, const Vector3<real_t>& pointOfReferen
auto min = domain.min() - pointOfReference_;
iReturn_ = int_c( ceil( min[0] / spacing[0] ) );
i_ = iReturn_;
- jReturn_ = int_c(ceil( min[1] / spacing[1] ) + real_c(0.1));
+ jReturn_ = int_c(ceil( min[1] / spacing[1] ));
j_ = jReturn_;
k_ = int_c (ceil( min[2] / spacing[2] ));
diff --git a/src/core/grid_generator/SCIterator.h b/src/core/grid_generator/SCIterator.h
index 39fde5c03c7ef024db2d728a59e3fd3ecad875c4..4946f8dbd3b4d5d55fb857773e4d9c1c141e0743 100644
--- a/src/core/grid_generator/SCIterator.h
+++ b/src/core/grid_generator/SCIterator.h
@@ -55,7 +55,7 @@ public:
* @param pointOfReference point somewhere in the world which fixes the lattice
* @param spacing spacing between grid points in x, y and z direction
*/
- SCIterator(const AABB& domain, const Vector3<real_t>& pointOfReference, const real_t spacing);
+ SCIterator(const AABB& domain, const Vector3<real_t>& pointOfReference, const real_t& spacing);
/**
* @brief begin iterator
* @param domain volume were lattice points will be returned
@@ -77,9 +77,9 @@ public:
static inline real_t getUnitCellX(const real_t spacing) { return spacing; }
static inline real_t getUnitCellY(const real_t spacing) { return spacing; }
static inline real_t getUnitCellZ(const real_t spacing) { return spacing; }
- static inline real_t getUnitCellX(const Vector3<real_t> spacing) { return spacing[0]; }
- static inline real_t getUnitCellY(const Vector3<real_t> spacing) { return spacing[1]; }
- static inline real_t getUnitCellZ(const Vector3<real_t> spacing) { return spacing[2]; }
+ static inline real_t getUnitCellX(const Vector3<real_t>& spacing) { return spacing[0]; }
+ static inline real_t getUnitCellY(const Vector3<real_t>& spacing) { return spacing[1]; }
+ static inline real_t getUnitCellZ(const Vector3<real_t>& spacing) { return spacing[2]; }
private:
void updatePoint();
@@ -99,5 +99,49 @@ private:
bool ended_;
};
+/// Convenience class to enable range based for loops over grid points.
+/// Usage:
+/// \code for (const auto& pt : SCGrid(...) ) \endcode
+class SCGrid
+{
+public:
+ using iterator = SCIterator;
+ using value_type = iterator::value_type;
+
+ /**
+ * @param domain volume were lattice points will be returned
+ * @param pointOfReference point somewhere in the world which fixes the lattice
+ * @param spacing spacing between grid points in x, y and z direction
+ */
+ SCGrid(const AABB& domain, const Vector3<real_t>& pointOfReference, const real_t spacing)
+ : domain_(domain)
+ , pointOfReference_(pointOfReference)
+ , spacing_(spacing, spacing, spacing)
+ {}
+ /**
+ * @brief begin iterator
+ * @param domain volume were lattice points will be returned
+ * @param pointOfReference point somewhere in the world which fixes the lattice
+ * @param spacing spacing between grid points in x, y and z direction
+ */
+ SCGrid(const AABB& domain, const Vector3<real_t>& pointOfReference, const Vector3<real_t>& spacing)
+ : domain_(domain)
+ , pointOfReference_(pointOfReference)
+ , spacing_(spacing)
+ {}
+
+ SCIterator begin() {return SCIterator(domain_, pointOfReference_, spacing_);}
+ SCIterator begin() const {return SCIterator(domain_, pointOfReference_, spacing_);}
+ SCIterator cbegin() const {return SCIterator(domain_, pointOfReference_, spacing_);}
+
+ SCIterator end() {return SCIterator();}
+ SCIterator end() const {return SCIterator();}
+ SCIterator cend() const {return SCIterator();}
+private:
+ AABB domain_;
+ Vector3<real_t> pointOfReference_;
+ Vector3<real_t> spacing_;
+};
+
} // namespace grid_generator
} // namespace walberla
diff --git a/src/core/logging/Initialization.cpp b/src/core/logging/Initialization.cpp
index b802081780a1b29f84be83267fe48a86cf69c4b0..cc50de9ceab8d160c5d2fd59c86b88f66bb5d6e8 100644
--- a/src/core/logging/Initialization.cpp
+++ b/src/core/logging/Initialization.cpp
@@ -142,15 +142,15 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
std::string type = loggingBlock.getParameter< std::string >( "logLevel" );
boost::algorithm::to_lower( type );
- if( type.compare("warning") == 0 ){
+ if( type == "warning" ){
logging::Logging::instance()->setLogLevel( logging::Logging::WARNING );
- } else if( type.compare("info") == 0 ){
+ } else if( type == "info" ){
logging::Logging::instance()->setLogLevel( logging::Logging::INFO );
- } else if( type.compare("progress") == 0 ){
+ } else if( type == "progress" ){
logging::Logging::instance()->setLogLevel( logging::Logging::PROGRESS );
- } else if( type.compare("detail") == 0 ){
+ } else if( type == "detail" ){
logging::Logging::instance()->setLogLevel( logging::Logging::DETAIL );
- } else if( type.compare("tracing") == 0 ){
+ } else if( type == "tracing" ){
logging::Logging::instance()->setLogLevel( logging::Logging::TRACING );
} else
throw std::runtime_error("Error: Unknown parameter for 'logLevel'. Possible parameters are: warning|info|progress|detail|tracing");
@@ -161,15 +161,15 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
std::string type = loggingBlock.getParameter< std::string >( "streamLogLevel" );
boost::algorithm::to_lower( type );
- if( type.compare("warning") == 0 ){
+ if( type == "warning" ){
logging::Logging::instance()->setStreamLogLevel( logging::Logging::WARNING );
- } else if( type.compare("info") == 0 ){
+ } else if( type == "info" ){
logging::Logging::instance()->setStreamLogLevel( logging::Logging::INFO );
- } else if( type.compare("progress") == 0 ){
+ } else if( type == "progress" ){
logging::Logging::instance()->setStreamLogLevel( logging::Logging::PROGRESS );
- } else if( type.compare("detail") == 0 ){
+ } else if( type == "detail" ){
logging::Logging::instance()->setStreamLogLevel( logging::Logging::DETAIL );
- } else if( type.compare("tracing") == 0 ){
+ } else if( type == "tracing" ){
logging::Logging::instance()->setStreamLogLevel( logging::Logging::TRACING );
} else
throw std::runtime_error("Error: Unknown parameter for 'streamLogLevel'. Possible parameters are: warning|info|progress|detail|tracing");
@@ -180,15 +180,15 @@ void configureLogging( const Config::BlockHandle & loggingBlock )
std::string type = loggingBlock.getParameter< std::string >( "fileLogLevel" );
boost::algorithm::to_lower( type );
- if( type.compare("warning") == 0 ){
+ if( type == "warning" ){
logging::Logging::instance()->setFileLogLevel( logging::Logging::WARNING );
- } else if( type.compare("info") == 0 ){
+ } else if( type == "info" ){
logging::Logging::instance()->setFileLogLevel( logging::Logging::INFO );
- } else if( type.compare("progress") == 0 ){
+ } else if( type == "progress" ){
logging::Logging::instance()->setFileLogLevel( logging::Logging::PROGRESS );
- } else if( type.compare("detail") == 0 ){
+ } else if( type == "detail" ){
logging::Logging::instance()->setFileLogLevel( logging::Logging::DETAIL );
- } else if( type.compare("tracing") == 0 ){
+ } else if( type == "tracing" ){
logging::Logging::instance()->setFileLogLevel( logging::Logging::TRACING );
} else
throw std::runtime_error("Error: Unknown parameter for 'fileLogLevel'. Possible parameters are: warning|info|progress|detail|tracing");
diff --git a/src/core/math/GenericAABB.h b/src/core/math/GenericAABB.h
index 270a7a53f469dcb8e3ea0e9769002a77727f3b8e..309d16f94887684c26f9f20117f426854a2bb380 100644
--- a/src/core/math/GenericAABB.h
+++ b/src/core/math/GenericAABB.h
@@ -216,6 +216,7 @@ private:
vector_type minCorner_; /// minimal values
vector_type maxCorner_; /// maximal values
};
+static_assert( std::is_trivially_copyable<GenericAABB<real_t>>::value, "GenericAABB<real_t> has to be trivially copyable!");
diff --git a/src/core/math/Matrix3.h b/src/core/math/Matrix3.h
index 27a29b9450d6c9d95630440b7ffc346d6e0fa630..54119bee96b0cdca50d44ffd4f1dee8ef054a53c 100644
--- a/src/core/math/Matrix3.h
+++ b/src/core/math/Matrix3.h
@@ -95,7 +95,7 @@ private:
public:
//**Constructors*****************************************************************************************************
- explicit inline Matrix3();
+ explicit inline Matrix3() = default;
explicit inline Matrix3( Type init );
explicit inline Matrix3( const Vector3<Type>& a, const Vector3<Type>& b, const Vector3<Type>& c );
explicit inline Matrix3( Type xx, Type xy, Type xz, Type yx, Type yy, Type yz, Type zx, Type zy, Type zz );
@@ -104,7 +104,7 @@ public:
template< typename Axis, typename Angle >
explicit Matrix3( Vector3<Axis> axis, Angle angle );
- inline Matrix3( const Matrix3& m );
+ inline Matrix3( const Matrix3& m ) = default;
template< typename Other >
inline Matrix3( const Matrix3<Other>& m );
@@ -122,7 +122,7 @@ public:
/*!\name Operators */
//@{
inline Matrix3& operator= ( Type set );
- inline Matrix3& operator= ( const Matrix3& set );
+ inline Matrix3& operator= ( const Matrix3& set ) = default;
template< typename Other > inline Matrix3& operator= ( const Matrix3<Other>& set );
template< typename Other > inline bool operator==( const Matrix3<Other>& rhs ) const;
template< typename Other > inline bool operator!=( const Matrix3<Other>& rhs ) const;
@@ -236,17 +236,23 @@ private:
//**Member variables****************************************************************************
/*!\name Member variables */
//@{
- Type v_[9]; //!< The nine statically allocated matrix elements.
- /*!< Access to the matrix elements is gained via the subscript or function call
- operator. The order of the elements is
- \f[\left(\begin{array}{*{3}{c}}
- 0 & 1 & 2 \\
- 3 & 4 & 5 \\
- 6 & 7 & 8 \\
- \end{array}\right)\f] */
+ /**
+ * The nine statically allocated matrix elements.
+ * Access to the matrix elements is gained via the subscript or function call
+ * operator. The order of the elements is
+ * \f[\left(\begin{array}{*{3}{c}}
+ * 0 & 1 & 2 \\
+ * 3 & 4 & 5 \\
+ * 6 & 7 & 8 \\
+ * \end{array}\right)\f]
+ **/
+ Type v_[9] = {Type(1), Type(0), Type(0),
+ Type(0), Type(1), Type(0),
+ Type(0), Type(0), Type(1)};
//@}
//*******************************************************************************************************************
};
+static_assert( std::is_trivially_copyable<Matrix3<real_t>>::value, "Matrix3<real_t> has to be trivially copyable!");
//**********************************************************************************************************************
@@ -258,21 +264,6 @@ private:
//
//======================================================================================================================
-//**********************************************************************************************************************
-/*!\fn Matrix3<Type>::Matrix3()
-// \brief The default constructor for Matrix3.
-//
-// The diagonal matrix elements are initialized with 1, all other elements are initialized
-// with 0.
-*/
-template< typename Type >
-inline Matrix3<Type>::Matrix3()
-{
- v_[0] = v_[4] = v_[8] = Type(1);
- v_[1] = v_[2] = v_[3] = v_[5] = v_[6] = v_[7] = Type(0);
-}
-//**********************************************************************************************************************
-
//**********************************************************************************************************************
/*!\fn Matrix3<Type>::Matrix3( Type init )
@@ -392,30 +383,6 @@ Matrix3<Type>::Matrix3( Vector3<Axis> axis, Angle angle )
//**********************************************************************************************************************
-//**********************************************************************************************************************
-/*!\fn Matrix3<Type>::Matrix3( const Matrix3& m )
-// \brief The copy constructor for Matrix3.
-//
-// \param m Matrix to be copied.
-//
-// The copy constructor is explicitly defined in order to enable/facilitate NRV optimization.
-*/
-template< typename Type >
-inline Matrix3<Type>::Matrix3( const Matrix3& m )
-{
- v_[0] = m.v_[0];
- v_[1] = m.v_[1];
- v_[2] = m.v_[2];
- v_[3] = m.v_[3];
- v_[4] = m.v_[4];
- v_[5] = m.v_[5];
- v_[6] = m.v_[6];
- v_[7] = m.v_[7];
- v_[8] = m.v_[8];
-}
-//**********************************************************************************************************************
-
-
//**********************************************************************************************************************
/*!\fn Matrix3<Type>::Matrix3( const Matrix3<Other>& m )
// \brief Conversion constructor from different Matrix3 instances.
@@ -514,36 +481,6 @@ inline Matrix3<Type>& Matrix3<Type>::operator=( Type set )
//**********************************************************************************************************************
-//**********************************************************************************************************************
-/*!\fn Matrix3<Type>& Matrix3<Type>::operator=( const Matrix3& set )
-// \brief Copy assignment operator for Matrix3.
-//
-// \param set Matrix to be copied.
-// \return Reference to the assigned matrix.
-//
-// Explicit definition of a copy assignment operator for performance reasons.
-*/
-template< typename Type >
-inline Matrix3<Type>& Matrix3<Type>::operator=( const Matrix3& set )
-{
- // This implementation is faster than the synthesized default copy assignment operator and
- // faster than an implementation with the C library function 'memcpy' in combination with a
- // protection against self-assignment. Additionally, this version goes without a protection
- // against self-assignment.
- v_[0] = set.v_[0];
- v_[1] = set.v_[1];
- v_[2] = set.v_[2];
- v_[3] = set.v_[3];
- v_[4] = set.v_[4];
- v_[5] = set.v_[5];
- v_[6] = set.v_[6];
- v_[7] = set.v_[7];
- v_[8] = set.v_[8];
- return *this;
-}
-//**********************************************************************************************************************
-
-
//**********************************************************************************************************************
/*!\fn Matrix3<Type>& Matrix3<Type>::operator=( const Matrix3<Other>& set )
// \brief Assignment operator for different Matrix3 instances.
@@ -1740,8 +1677,24 @@ Matrix3< typename MathTrait<T0,T1>::High > tensorProduct( Vector3<T0> v0, Vector
}
//**********************************************************************************************************************
-
-
+/**
+ * Equivalent to R*A*R.getTranspose().
+ */
+template< typename Type>
+inline Matrix3< Type > transformMatrixRART( const Matrix3<Type>& R, const Matrix3<Type>& A )
+{
+ const auto r0 = A[0]*R[0]*R[0] + A[1]*R[0]*R[1] + A[2]*R[0]*R[2] + A[3]*R[0]*R[1] + A[4]*R[1]*R[1] + A[5]*R[1]*R[2] + A[6]*R[0]*R[2] + A[7]*R[1]*R[2] + A[8]*R[2]*R[2];
+ const auto r1 = A[0]*R[0]*R[3] + A[1]*R[0]*R[4] + A[2]*R[0]*R[5] + A[3]*R[1]*R[3] + A[4]*R[1]*R[4] + A[5]*R[1]*R[5] + A[6]*R[2]*R[3] + A[7]*R[2]*R[4] + A[8]*R[2]*R[5];
+ const auto r2 = A[0]*R[0]*R[6] + A[1]*R[0]*R[7] + A[2]*R[0]*R[8] + A[3]*R[1]*R[6] + A[4]*R[1]*R[7] + A[5]*R[1]*R[8] + A[6]*R[2]*R[6] + A[7]*R[2]*R[7] + A[8]*R[2]*R[8];
+ const auto r3 = A[0]*R[0]*R[3] + A[1]*R[1]*R[3] + A[2]*R[2]*R[3] + A[3]*R[0]*R[4] + A[4]*R[1]*R[4] + A[5]*R[2]*R[4] + A[6]*R[0]*R[5] + A[7]*R[1]*R[5] + A[8]*R[2]*R[5];
+ const auto r4 = A[0]*R[3]*R[3] + A[1]*R[3]*R[4] + A[2]*R[3]*R[5] + A[3]*R[3]*R[4] + A[4]*R[4]*R[4] + A[5]*R[4]*R[5] + A[6]*R[3]*R[5] + A[7]*R[4]*R[5] + A[8]*R[5]*R[5];
+ const auto r5 = A[0]*R[3]*R[6] + A[1]*R[3]*R[7] + A[2]*R[3]*R[8] + A[3]*R[4]*R[6] + A[4]*R[4]*R[7] + A[5]*R[4]*R[8] + A[6]*R[5]*R[6] + A[7]*R[5]*R[7] + A[8]*R[5]*R[8];
+ const auto r6 = A[0]*R[0]*R[6] + A[1]*R[1]*R[6] + A[2]*R[2]*R[6] + A[3]*R[0]*R[7] + A[4]*R[1]*R[7] + A[5]*R[2]*R[7] + A[6]*R[0]*R[8] + A[7]*R[1]*R[8] + A[8]*R[2]*R[8];
+ const auto r7 = A[0]*R[3]*R[6] + A[1]*R[4]*R[6] + A[2]*R[5]*R[6] + A[3]*R[3]*R[7] + A[4]*R[4]*R[7] + A[5]*R[5]*R[7] + A[6]*R[3]*R[8] + A[7]*R[4]*R[8] + A[8]*R[5]*R[8];
+ const auto r8 = A[0]*R[6]*R[6] + A[1]*R[6]*R[7] + A[2]*R[6]*R[8] + A[3]*R[6]*R[7] + A[4]*R[7]*R[7] + A[5]*R[7]*R[8] + A[6]*R[6]*R[8] + A[7]*R[7]*R[8] + A[8]*R[8]*R[8];
+
+ return Matrix3<Type>(r0,r1,r2,r3,r4,r5,r6,r7,r8);
+}
} // namespace math
@@ -1839,3 +1792,30 @@ namespace mpi {
};
}
}
+
+//======================================================================================================================
+//
+// MPI Datatype
+//
+//======================================================================================================================
+
+namespace walberla {
+
+ template< typename T>
+ struct MPITrait< Matrix3<T> >
+ {
+ static inline MPI_Datatype type()
+ {
+ // cannot use mpi::Datatype here because its destructor calls MPI_Type_free and static variables are destroyed after the MPI_Finalize
+ static MPI_Datatype datatype;
+ static bool initialized = false;
+
+ if( ! initialized ) {
+ MPI_Type_contiguous(9, MPITrait<T>::type(), &datatype );
+ MPI_Type_commit( &datatype );
+ initialized = true;
+ }
+ return datatype;
+ }
+ };
+} // namespace walberla
diff --git a/src/core/math/Parser.cpp b/src/core/math/Parser.cpp
index 523048e20eb445026ce458e44f4d7aec28a40846..a2d48044392490a797629e47ade6a4fc32ccc760 100644
--- a/src/core/math/Parser.cpp
+++ b/src/core/math/Parser.cpp
@@ -66,8 +66,8 @@ namespace math {
FunctionParser::FunctionParser()
- : expression_ ( 0 ),
- symbolTable_( 0 ),
+ : expression_ ( nullptr ),
+ symbolTable_( nullptr ),
isConstant_(false),
isZero_(false)
{
@@ -125,7 +125,7 @@ void FunctionParser::parse( const std::string & eq )
double FunctionParser::evaluate( const std::map<std::string,double> & symbolTable) const
{
- if( expression_ == 0 )
+ if( expression_ == nullptr )
{
WALBERLA_ASSERT_NULLPTR( symbolTable_ );
WALBERLA_ABORT( "Error: You are trying to evaluate an expression which you never have parsed!" );
@@ -149,7 +149,7 @@ double FunctionParser::evaluate( const std::map<std::string,double> & symbolTabl
bool FunctionParser::symbolExists(const std::string & symbol) const
{
- if( expression_ == 0 )
+ if( expression_ == nullptr )
{
WALBERLA_ASSERT_NULLPTR( symbolTable_ );
WALBERLA_ABORT( "Error: You are trying to evaluate an expression which you never have parsed!" );
diff --git a/src/core/math/PhysicalCheck.cpp b/src/core/math/PhysicalCheck.cpp
index 321890603a9e7d0306858a94e489dad95b02cf4d..d87a0ad18b8abd855a340a03e748c1743e8c1ae3 100644
--- a/src/core/math/PhysicalCheck.cpp
+++ b/src/core/math/PhysicalCheck.cpp
@@ -318,7 +318,7 @@ namespace math {
if( !isDefined(varName) )
{
WALBERLA_ABORT( "Error in PhysicalCheck::getVarUnit(). Variable not found: " << varName );
- return 0;
+ return nullptr;
}
std::stringstream num, denom;
diff --git a/src/core/math/Quaternion.h b/src/core/math/Quaternion.h
index ccf6836d1f16a204b3ba179d1acfefdf1a0d1878..f6822daf30e9e9c44350f69f7e892c0d4b567cbb 100644
--- a/src/core/math/Quaternion.h
+++ b/src/core/math/Quaternion.h
@@ -36,6 +36,7 @@
#include "core/mpi/SendBuffer.h"
#include "core/mpi/RecvBuffer.h"
+#include <core/logging/Logging.h>
#include <boost/type_traits/is_floating_point.hpp>
#include <boost/type_traits/is_const.hpp>
@@ -115,7 +116,7 @@ public:
//**Constructors********************************************************************************
/*!\name Constructors */
//@{
- explicit inline Quaternion();
+ explicit inline Quaternion() = default;
explicit inline Quaternion( Type r, Type i, Type j, Type k );
@@ -127,7 +128,7 @@ public:
template< typename Other >
explicit inline Quaternion( const Vector3<Other>& euler );
- inline Quaternion( const Quaternion& q );
+ inline Quaternion( const Quaternion& q ) = default;
template< typename Other >
inline Quaternion( const Quaternion<Other>& q );
@@ -141,7 +142,7 @@ public:
//**Operators***********************************************************************************
/*!\name Operators */
//@{
- inline Quaternion& operator= ( const Quaternion& rhs );
+ inline Quaternion& operator= ( const Quaternion& rhs ) = default;
template< typename Other > inline Quaternion& operator= ( const Quaternion<Other>& rhs );
inline Type operator[]( size_t index ) const;
//@}
@@ -195,15 +196,20 @@ private:
//**Member variables****************************************************************************
/*!\name Member variables */
//@{
- Type v_[4]; //!< The four statically allocated quaternion elements.
- /*!< Access to the quaternion values is gained via the subscript operator.
- The order of the elements is
- \f[\left(\begin{array}{*{4}{c}}
- 0 & 1 & 2 & 3 \\
- \end{array}\right)\f] */
+ /**
+ * The four statically allocated quaternion elements.
+ *
+ * Access to the quaternion values is gained via the subscript operator.
+ * The order of the elements is
+ * \f[\left(\begin{array}{*{4}{c}}
+ * 0 & 1 & 2 & 3 \\
+ * \end{array}\right)\f]
+ **/
+ Type v_[4] = {Type(1), Type(0), Type(0), Type(0)};
//@}
//**********************************************************************************************
};
+static_assert( std::is_trivially_copyable<Quaternion<real_t>>::value, "Quaternion<real_t> has to be trivially copyable!");
//*************************************************************************************************
@@ -215,21 +221,6 @@ private:
//
//=================================================================================================
-//*************************************************************************************************
-/*!\brief The default constructor for Quaternion.
- *
- * The real part of the quaternion is initialized with 1, whereas the imaginary parts are
- * initialized with 0:
-
- \f[ \left(\begin{array}{c} 1 \\ 0 \\ 0 \\ 0 \end{array}\right) \f]
- */
-template< typename Type > // Data type of the quaternion
-inline Quaternion<Type>::Quaternion()
-{
- reset();
-}
-//*************************************************************************************************
-
//*************************************************************************************************
/*!\brief Constructor for a direct initialization of all quaternion elements.
@@ -331,24 +322,6 @@ inline Quaternion<Type>::Quaternion( const Vector3<Other>& euler )
//*************************************************************************************************
-//*************************************************************************************************
-/*!\brief The copy constructor for Quaternion.
- *
- * \param q Quaternion to be copied.
- *
- * The copy constructor is explicitly defined in order to enable/facilitate NRV optimization.
- */
-template< typename Type > // Data type of the quaternion
-inline Quaternion<Type>::Quaternion( const Quaternion& q )
-{
- v_[0] = q.v_[0];
- v_[1] = q.v_[1];
- v_[2] = q.v_[2];
- v_[3] = q.v_[3];
-}
-//*************************************************************************************************
-
-
//*************************************************************************************************
/*!\brief Conversion constructor from different Quaternion instances.
*
@@ -374,29 +347,6 @@ inline Quaternion<Type>::Quaternion( const Quaternion<Other>& q )
//
//=================================================================================================
-//*************************************************************************************************
-/*!\brief Copy assignment operator for Quaternion.
- *
- * \param rhs Quaternion to be copied.
- * \return Reference to the assigned quaternion.
- *
- * Explicit definition of a copy assignment operator for performance reasons.
- */
-template< typename Type > // Data type of the quaternion
-inline Quaternion<Type>& Quaternion<Type>::operator=( const Quaternion<Type>& rhs )
-{
- // This implementation is faster than the synthesized default copy assignment operator and
- // faster than an implementation with the C library function 'memcpy' in combination with a
- // protection against self-assignment. Additionally, this version goes without a protection
- // against self-assignment.
- v_[0] = rhs.v_[0];
- v_[1] = rhs.v_[1];
- v_[2] = rhs.v_[2];
- v_[3] = rhs.v_[3];
- return *this;
-}
-//*************************************************************************************************
-
//*************************************************************************************************
/*!\brief Assignment operator for different Quaternion instances.
@@ -457,7 +407,8 @@ inline Type Quaternion<Type>::operator[]( size_t index ) const
template< typename Type > // Data type of the quaternion
inline Quaternion<Type>& Quaternion<Type>::set( Type r, Type i, Type j, Type k )
{
- WALBERLA_CHECK_FLOAT_EQUAL( std::fabs( r*r + i*i + j*j + k*k ), Type(1), "Invalid quaternion parameters" );
+ WALBERLA_CHECK_FLOAT_EQUAL( std::fabs( r*r + i*i + j*j + k*k ), Type(1),
+ "Invalid quaternion parameters: " << r << ", "<< i << ", "<< j << ", "<< k );
v_[0] = r;
v_[1] = i;
v_[2] = j;
diff --git a/src/core/math/Rot3.h b/src/core/math/Rot3.h
new file mode 100644
index 0000000000000000000000000000000000000000..30b4952d6872707ccdd3766ffaa2edfd6209b635
--- /dev/null
+++ b/src/core/math/Rot3.h
@@ -0,0 +1,124 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Rot3.h
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <core/math/Matrix3.h>
+#include <core/math/Quaternion.h>
+
+#include <type_traits>
+
+namespace walberla {
+namespace math {
+
+/**
+ * Rotation class which merges quaternion and matrix representation.
+ *
+ * For numerical reasons the representation of a rotation via a quaternion
+ * is favourable. However application of the rotation to vectors and matrices
+ * is numerical more efficient with matrices. Therefore this class combines both
+ * representations and takes care that both are in sync.
+ */
+template <typename Type> // floating point type
+class Rot3
+{
+ //**Compile time checks*************************************************************************
+ /*! \cond internal */
+ static_assert(std::is_floating_point<Type>::value, "T has to be floating point!");
+ static_assert(!std::is_const<Type>::value, "T has to be non const!");
+ static_assert(!std::is_volatile<Type>::value, "T has to be non volatile!");
+ /*! \endcond */
+ //**********************************************************************************************
+public:
+ Rot3(const Quaternion<Type>& q);
+
+ const Quaternion<Type>& getQuaternion() const { return quat_; }
+ const Matrix3<Type>& getMatrix() const { return mat_; }
+
+ void rotate(const Quaternion<Type>& q);
+private:
+ Quaternion<Type> quat_;
+ Matrix3<Type> mat_;
+};
+
+template< typename Type > // floating point type
+inline Rot3<Type>::Rot3(const Quaternion<Type>& q)
+ : quat_(q)
+ , mat_ (q.toRotationMatrix())
+{
+ WALBERLA_ASSERT_FLOAT_EQUAL( mat_.getDeterminant(), real_t(1), "Corrupted rotation matrix determinant" );
+}
+
+template< typename Type > // floating point type
+inline void Rot3<Type>::rotate(const Quaternion<Type>& q)
+{
+ quat_ = q * quat_;
+ mat_ = quat_.toRotationMatrix();
+ WALBERLA_ASSERT_FLOAT_EQUAL( mat_.getDeterminant(), real_t(1), "Corrupted rotation matrix determinant" );
+}
+
+template< typename Type > // floating point type
+inline std::ostream& operator<<( std::ostream& os, const Rot3<Type>& r )
+{
+ os << r.getMatrix();
+ return os;
+}
+
+} // math
+} // walberla
+
+//======================================================================================================================
+//
+// Send/Recv Buffer Serialization Specialization
+//
+//======================================================================================================================
+
+namespace walberla {
+namespace mpi {
+
+template< typename T, // Element type of SendBuffer
+ typename G, // Growth policy of SendBuffer
+ typename V > // value type
+mpi::GenericSendBuffer<T,G>& operator<<( mpi::GenericSendBuffer<T,G> & buf, const math::Rot3<V>& obj )
+{
+ buf.addDebugMarker( "ro" );
+ buf << obj.getQuaternion();
+ return buf;
+}
+
+template< typename T, // Element type of RecvBuffer
+ typename V > // value type
+mpi::GenericRecvBuffer<T>& operator>>( mpi::GenericRecvBuffer<T> & buf, math::Rot3<V>& objparam )
+{
+ math::Quaternion<V> q;
+ buf.readDebugMarker( "ro" );
+ buf >> q;
+ objparam = math::Rot3<V>(q);
+ return buf;
+}
+
+template< typename V > // value type
+struct BufferSizeTrait< math::Rot3<V> > {
+ static const bool constantSize = true;
+ static const uint_t size = BufferSizeTrait< math::Quaternion<V> >::size + mpi::BUFFER_DEBUG_OVERHEAD;
+};
+
+} // mpi
+} // walberla
diff --git a/src/core/math/Vector2.h b/src/core/math/Vector2.h
index 1ad6f9cab05d9eda80a0684d736e5921ba26b5d0..a6ad5c30091e2de9c14245e62590659bb4a9ec45 100644
--- a/src/core/math/Vector2.h
+++ b/src/core/math/Vector2.h
@@ -107,12 +107,12 @@ public:
//*******************************************************************************************************************
//**Constructors*****************************************************************************************************
- explicit inline Vector2();
+ explicit inline Vector2() = default;
explicit inline Vector2( Type init );
template< typename Other > explicit inline Vector2( Other init );
explicit inline Vector2( Type x, Type y );
explicit inline Vector2( const Type* init );
- inline Vector2( const Vector2& v );
+ inline Vector2( const Vector2& v ) = default;
template< typename Other >
inline Vector2( const Vector2<Other>& v );
@@ -125,7 +125,7 @@ public:
//**Operators********************************************************************************************************
/*!\name Operators */
//@{
- inline Vector2& operator= ( const Vector2& v );
+ inline Vector2& operator= ( const Vector2& v ) = default;
template< typename Other > inline Vector2& operator= ( const Vector2<Other>& v );
template< typename Other > inline bool operator==( Other rhs ) const;
template< typename Other > inline bool operator==( const Vector2<Other>& rhs ) const;
@@ -172,15 +172,20 @@ public:
//**Member variables****************************************************************************
/*!\name Member variables */
//@{
- Type v_[2]; //!< The two statically allocated vector elements.
- /*!< Access to the vector values is gained via the subscript operator.
- The order of the elements is
- \f[\left(\begin{array}{*{2}{c}}
- 0 & 1 \\
- \end{array}\right)\f] */
+ /**
+ * The two statically allocated vector elements.
+ *
+ * Access to the vector values is gained via the subscript operator.
+ * The order of the elements is
+ * \f[\left(\begin{array}{*{2}{c}}
+ * 0 & 1 \\
+ * \end{array}\right)\f]
+ **/
+ Type v_[2] = {Type(), Type()};
//@}
//*******************************************************************************************************************
};
+static_assert( std::is_trivially_copyable<Vector2<real_t>>::value, "Vector2<real_t> has to be trivially copyable!");
//**********************************************************************************************************************
template<typename T>
@@ -193,19 +198,6 @@ Vector2<T> & normalize( Vector2<T> & v );
//
//======================================================================================================================
-//**********************************************************************************************************************
-/*!\fn Vector2<Type>::Vector2()
-// \brief The default constructor for Vector2.
-//
-// All vector elements are initialized to the default value (i.e. 0 for integral data types).
-*/
-template< typename Type >
-inline Vector2<Type>::Vector2()
-{
- v_[0] = v_[1] = Type();
-}
-//**********************************************************************************************************************
-
//**********************************************************************************************************************
/*!\fn Vector2<Type>::Vector2( Type init )
@@ -271,23 +263,6 @@ inline Vector2<Type>::Vector2( const Type* init )
//**********************************************************************************************************************
-//**********************************************************************************************************************
-/*!\fn Vector2<Type>::Vector2( const Vector2& v )
-// \brief The copy constructor for Vector2.
-//
-// \param v Vector to be copied.
-//
-// The copy constructor is explicitly defined in order to enable/facilitate NRV optimization.
-*/
-template< typename Type >
-inline Vector2<Type>::Vector2( const Vector2& v )
-{
- v_[0] = v.v_[0];
- v_[1] = v.v_[1];
-}
-//**********************************************************************************************************************
-
-
//**********************************************************************************************************************
/*!\fn Vector2<Type>::Vector2( const Vector2<Other>& v )
// \brief Conversion constructor from different Vector2 instances.
@@ -312,28 +287,6 @@ inline Vector2<Type>::Vector2( const Vector2<Other>& v )
//
//======================================================================================================================
-//**********************************************************************************************************************
-/*!\fn Vector2<Type>& Vector2<Type>::operator=( const Vector2& v )
-// \brief Copy assignment operator for Vector2.
-//
-// \param v Vector to be copied.
-// \return Reference to the assigned vector.
-//
-// Explicit definition of a copy assignment operator for performance reasons.
-*/
-template< typename Type >
-inline Vector2<Type>& Vector2<Type>::operator=( const Vector2& v )
-{
- // This implementation is faster than the synthesized default copy assignment operator and
- // faster than an implementation with the C library function 'memcpy' in combination with a
- // protection against self-assignment. Additionally, this version goes without a protection
- // against self-assignment.
- v_[0] = v.v_[0];
- v_[1] = v.v_[1];
- return *this;
-}
-//**********************************************************************************************************************
-
//**********************************************************************************************************************
/*!\fn Vector2<Type>& Vector2<Type>::operator=( const Vector2<Other>& v )
@@ -1696,13 +1649,13 @@ namespace walberla {
{
static inline MPI_Datatype type()
{
- static mpi::Datatype datatype;
+ // cannot use mpi::Datatype here because its destructor calls MPI_Type_free and static variables are destroyed after the MPI_Finalize
+ static MPI_Datatype datatype;
static bool initialized = false;
if( ! initialized ) {
- MPI_Datatype newDatatype;
- MPI_Type_contiguous(2, MPITrait<T>::type(), &newDatatype );
- datatype.init( newDatatype );
+ MPI_Type_contiguous(2, MPITrait<T>::type(), &datatype );
+ MPI_Type_commit( &datatype );
initialized = true;
}
return datatype;
diff --git a/src/core/math/Vector3.h b/src/core/math/Vector3.h
index f5b1ea819cff09f5813a162574ee318ab8bd7fa7..24485fef5a005aaf95dcfdc8f1fe913d62d4ab60 100644
--- a/src/core/math/Vector3.h
+++ b/src/core/math/Vector3.h
@@ -108,12 +108,12 @@ public:
//*******************************************************************************************************************
//**Constructors*****************************************************************************************************
- explicit inline Vector3();
+ explicit inline Vector3() = default;
explicit inline Vector3( Type init );
template< typename Other > explicit inline Vector3( Other init );
explicit inline Vector3( Type x, Type y, Type z );
explicit inline Vector3( const Type* init );
- inline Vector3( const Vector3& v );
+ inline Vector3( const Vector3& v ) = default;
template< typename Other >
inline Vector3( const Vector3<Other>& v );
@@ -126,7 +126,7 @@ public:
//**Operators********************************************************************************************************
/*!\name Operators */
//@{
- inline Vector3& operator= ( const Vector3& v );
+ inline Vector3& operator= ( const Vector3& v ) = default;
template< typename Other > inline Vector3& operator= ( const Vector3<Other>& v );
template< typename Other > inline bool operator==( Other rhs ) const;
template< typename Other > inline bool operator==( const Vector3<Other>& rhs ) const;
@@ -179,15 +179,20 @@ public:
//**Member variables****************************************************************************
/*!\name Member variables */
//@{
- Type v_[3]; //!< The three statically allocated vector elements.
- /*!< Access to the vector values is gained via the subscript operator.
- The order of the elements is
- \f[\left(\begin{array}{*{3}{c}}
- 0 & 1 & 2 \\
- \end{array}\right)\f] */
+ /**
+ * The three statically allocated vector elements.
+ *
+ * Access to the vector values is gained via the subscript operator.
+ * The order of the elements is
+ * \f[\left(\begin{array}{*{3}{c}}
+ * 0 & 1 & 2 \\
+ * \end{array}\right)\f]
+ **/
+ Type v_[3] = {Type(), Type(), Type()};
//@}
//*******************************************************************************************************************
};
+static_assert( std::is_trivially_copyable<Vector3<real_t>>::value, "Vector3<real_t> has to be trivially copyable!");
//**********************************************************************************************************************
template<typename T>
@@ -200,19 +205,6 @@ Vector3<T> & normalize( Vector3<T> & v );
//
//======================================================================================================================
-//**********************************************************************************************************************
-/*!\fn Vector3<Type>::Vector3()
-// \brief The default constructor for Vector3.
-//
-// All vector elements are initialized to the default value (i.e. 0 for integral data types).
-*/
-template< typename Type >
-inline Vector3<Type>::Vector3()
-{
- v_[0] = v_[1] = v_[2] = Type();
-}
-//**********************************************************************************************************************
-
//**********************************************************************************************************************
/*!\fn Vector3<Type>::Vector3( Type init )
@@ -281,24 +273,6 @@ inline Vector3<Type>::Vector3( const Type* init )
//**********************************************************************************************************************
-//**********************************************************************************************************************
-/*!\fn Vector3<Type>::Vector3( const Vector3& v )
-// \brief The copy constructor for Vector3.
-//
-// \param v Vector to be copied.
-//
-// The copy constructor is explicitly defined in order to enable/facilitate NRV optimization.
-*/
-template< typename Type >
-inline Vector3<Type>::Vector3( const Vector3& v )
-{
- v_[0] = v.v_[0];
- v_[1] = v.v_[1];
- v_[2] = v.v_[2];
-}
-//**********************************************************************************************************************
-
-
//**********************************************************************************************************************
/*!\fn Vector3<Type>::Vector3( const Vector3<Other>& v )
// \brief Conversion constructor from different Vector3 instances.
@@ -324,29 +298,6 @@ inline Vector3<Type>::Vector3( const Vector3<Other>& v )
//
//======================================================================================================================
-//**********************************************************************************************************************
-/*!\fn Vector3<Type>& Vector3<Type>::operator=( const Vector3& v )
-// \brief Copy assignment operator for Vector3.
-//
-// \param v Vector to be copied.
-// \return Reference to the assigned vector.
-//
-// Explicit definition of a copy assignment operator for performance reasons.
-*/
-template< typename Type >
-inline Vector3<Type>& Vector3<Type>::operator=( const Vector3& v )
-{
- // This implementation is faster than the synthesized default copy assignment operator and
- // faster than an implementation with the C library function 'memcpy' in combination with a
- // protection against self-assignment. Additionally, this version goes without a protection
- // against self-assignment.
- v_[0] = v.v_[0];
- v_[1] = v.v_[1];
- v_[2] = v.v_[2];
- return *this;
-}
-//**********************************************************************************************************************
-
//**********************************************************************************************************************
/*!\fn Vector3<Type>& Vector3<Type>::operator=( const Vector3<Other>& v )
@@ -642,6 +593,21 @@ inline Vector3<HIGH> Vector3<Type>::operator%( const Vector3<Other>& rhs ) const
//**********************************************************************************************************************
+//**********************************************************************************************************************
+/*!\brief Cross product (outer product) of two vectors (\f$ \vec{a}=\vec{b}\times\vec{c} \f$).
+//
+// \param lhs The left-hand-side vector for the cross product.
+// \param rhs The right-hand-side vector for the cross product.
+// \return The cross product.
+*/
+template< typename Type >
+inline Vector3<Type> cross( const Vector3<Type>& lhs, const Vector3<Type>& rhs )
+{
+ return lhs % rhs;
+}
+//**********************************************************************************************************************
+
+
//**********************************************************************************************************************
/*!\fn Vector3<HIGH> Vector3<Type>::operator+( const Vector3<Other>& rhs ) const
// \brief Addition operator for the addition of two vectors (\f$ \vec{a}=\vec{b}+\vec{c} \f$).
@@ -748,6 +714,13 @@ inline Vector3<HIGH> Vector3<Type>::operator/( Other rhs ) const
}
//**********************************************************************************************************************
+template< typename Type, typename Other >
+inline Vector3<HIGH> operator/( Other lhs, const Vector3<Type>& rhs )
+{
+ return Vector3<HIGH>( lhs/rhs[0], lhs/rhs[1], lhs/rhs[2] );
+}
+//**********************************************************************************************************************
+
//======================================================================================================================
//
@@ -1792,6 +1765,41 @@ Vector3<T> & normalize( Vector3<T> & v )
}
//**********************************************************************************************************************
+//**********************************************************************************************************************
+/**
+// \brief Length of the vector.
+//
+// \return Length of the vector.
+*/
+template<typename T>
+real_t length( const Vector3<T> & v )
+{
+ return v.length();
+}
+//**********************************************************************************************************************
+//**********************************************************************************************************************
+/**
+// \brief Length of the vector squared.
+//
+// \return Length of the vector squared.
+*/
+template<typename T>
+real_t sqrLength( const Vector3<T> & v )
+{
+ return v.sqrLength();
+}
+//**********************************************************************************************************************
+//**********************************************************************************************************************
+/**
+// \brief Dot product of two vectors.
+*/
+template<typename T>
+real_t dot( const Vector3<T> & v1, const Vector3<T> & v2 )
+{
+ return v1*v2;
+}
+//**********************************************************************************************************************
+
//**********************************************************************************************************************
/**
@@ -1895,13 +1903,13 @@ namespace walberla {
{
static inline MPI_Datatype type()
{
- static mpi::Datatype datatype;
+ // cannot use mpi::Datatype here because its destructor calls MPI_Type_free and static variables are destroyed after the MPI_Finalize
+ static MPI_Datatype datatype;
static bool initialized = false;
if( ! initialized ) {
- MPI_Datatype newDatatype;
- MPI_Type_contiguous(3, MPITrait<T>::type(), &newDatatype );
- datatype.init( newDatatype );
+ MPI_Type_contiguous(3, MPITrait<T>::type(), &datatype );
+ MPI_Type_commit( &datatype );
initialized = true;
}
return datatype;
diff --git a/src/core/math/equation_system/Equation.cpp b/src/core/math/equation_system/Equation.cpp
index 53bef41aa50ae3e29425ab947390380e891cf372..96717ca97ae89dca49dc9730448a264fd08fc969 100644
--- a/src/core/math/equation_system/Equation.cpp
+++ b/src/core/math/equation_system/Equation.cpp
@@ -23,8 +23,9 @@
#include "Operator.h"
#include "Variable.h"
-#include <cmath>
#include <algorithm>
+#include <cmath>
+#include <memory>
namespace walberla {
@@ -117,7 +118,7 @@ namespace math {
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// EQUATION
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- Equation::Equation( NodePtr root) : root_ (root)
+ Equation::Equation( const NodePtr& root) : root_ (root)
{
root_->collectVariables( varMap_ );
}
@@ -201,7 +202,7 @@ namespace math {
void Equation::rotate(bool flip, OpType& leftOp, OpType& rightOp){
NodePtr newNode;
if ( root_->left_->nodeDir_ == ND_LEFT ){
- newNode = NodePtr( new Node( leftOp ) );
+ newNode = std::make_shared<Node>( leftOp );
if (flip){
newNode->left_ = root_->left_->right_;
newNode->right_ = root_->right_;
@@ -211,7 +212,7 @@ namespace math {
}
root_->left_ = root_->left_->left_;
} else {
- newNode = NodePtr( new Node( rightOp ) );
+ newNode = std::make_shared<Node>( rightOp );
if (flip){
newNode->right_ = root_->left_->left_;
newNode->left_ = root_->right_;
diff --git a/src/core/math/equation_system/Equation.h b/src/core/math/equation_system/Equation.h
index 8b7749ab88a35c697822391aacf064be975ce02f..3ccbb14f7ef2ca2842222878448e44c10e3e7dfd 100644
--- a/src/core/math/equation_system/Equation.h
+++ b/src/core/math/equation_system/Equation.h
@@ -86,7 +86,7 @@ namespace math {
VarMap varMap_;
public:
- Equation( NodePtr root );
+ Equation( const NodePtr& root );
private:
uint_t countUnknownVariables(){ return uint_c( root_->countUnknownVariables() ); }
diff --git a/src/core/math/equation_system/EquationParser.cpp b/src/core/math/equation_system/EquationParser.cpp
index 6f4b379b6b54d4b1f5fef5b690ab0cb13cf6a7d2..477bc2e03a9d5f3e224afceb082019d935d49e62 100644
--- a/src/core/math/equation_system/EquationParser.cpp
+++ b/src/core/math/equation_system/EquationParser.cpp
@@ -26,6 +26,7 @@
#include <boost/algorithm/string/trim.hpp>
#include <boost/lexical_cast.hpp>
+#include <memory>
#define E_VAL 2.71828182845904523536
@@ -75,7 +76,7 @@ NodePtr EquationParser::parseNumber( const std::string& str, size_t& index ) con
value = boost::lexical_cast< double >( str.substr(start, index-start) );
}
- return NodePtr ( new Node(value) );
+ return std::make_shared<Node>( value );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -127,7 +128,7 @@ NodePtr EquationParser::parseVariable( const std::string& str, size_t& index ) c
if ( es_.varMap_.find(name) != es_.varMap_.end() ){
varPtr = es_.varMap_[name];
} else {
- varPtr = VarPtr( new Var ( name ) );
+ varPtr = std::make_shared<Var>( name );
es_.varMap_[name] = varPtr;
}
@@ -147,21 +148,21 @@ NodePtr EquationParser::parseVariable( const std::string& str, size_t& index ) c
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool EquationParser::checkFunction( const std::string& str, size_t& index ) const
{
- return (str.substr(index, 4).compare("exp(" ) == 0) ||
- (str.substr(index, 3).compare("ln(" ) == 0) ||
- (str.substr(index, 5).compare("sqrt(" ) == 0);
+ return (str.substr(index, 4) == "exp(") ||
+ (str.substr(index, 3) == "ln(") ||
+ (str.substr(index, 5) == "sqrt(");
}
NodePtr EquationParser::parseFunction( const std::string& str, size_t& index ) const
{
OpFunction opFunc;
- if ( str.substr(index, 4).compare("exp(") == 0 ){
+ if ( str.substr(index, 4) == "exp(" ){
opFunc = OP_FUNC_EXP;
index += 4;
- } else if ( str.substr(index, 3).compare("ln(") == 0 ){
+ } else if ( str.substr(index, 3) == "ln(" ){
opFunc = OP_FUNC_LN;
index += 3;
- } else if ( str.substr(index, 5).compare("sqrt(") == 0 ){
+ } else if ( str.substr(index, 5) == "sqrt(" ){
opFunc = OP_FUNC_SQRT;
index += 5;
} else {
@@ -177,19 +178,19 @@ NodePtr EquationParser::parseFunction( const std::string& str, size_t& index ) c
switch(opFunc)
{
case OP_FUNC_EXP:
- funcPtr = NodePtr( new Node( OP_PROD ) );
- funcPtr->left() = NodePtr( new Node( E_VAL ) );
+ funcPtr = std::make_shared<Node>( OP_PROD );
+ funcPtr->left() = std::make_shared<Node>( E_VAL );
funcPtr->right() = nodePtr;
return funcPtr;
case OP_FUNC_LN:
- funcPtr = NodePtr( new Node( OP_LOG ) );
- funcPtr->right() = NodePtr( new Node( E_VAL ) );
+ funcPtr = std::make_shared<Node>( OP_LOG );
+ funcPtr->right() = std::make_shared<Node>( E_VAL );
funcPtr->left() = nodePtr;
return funcPtr;
case OP_FUNC_SQRT:
- funcPtr = NodePtr( new Node( OP_PROD ) );
+ funcPtr = std::make_shared<Node>( OP_PROD );
funcPtr->left() = nodePtr;
- funcPtr->right() = NodePtr( new Node( 0.5 ) );
+ funcPtr->right() = std::make_shared<Node>( 0.5 );
return funcPtr;
default:
WALBERLA_ABORT( "Function not yet defined" );
@@ -327,7 +328,7 @@ EquationPtr EquationParser::parseEquation( const std::string& str, size_t& index
nodePtr->left() = leftPtr;
nodePtr->right() = rightPtr;
- return EquationPtr ( new Equation(nodePtr) );
+ return std::make_shared<Equation>( nodePtr );
}
} // namespace math
diff --git a/src/core/math/equation_system/Variable.cpp b/src/core/math/equation_system/Variable.cpp
index 04d9b7517c75fc3428aad650d4963dd872f2c92b..fcfd72f9a76751a20f57ef6a896a08e00228e85d 100644
--- a/src/core/math/equation_system/Variable.cpp
+++ b/src/core/math/equation_system/Variable.cpp
@@ -28,7 +28,7 @@
namespace walberla {
namespace math {
- Var::Var ( std::string name ) :
+ Var::Var ( const std::string& name ) :
name_ (name),
valid_ (false),
value_ (FP_NAN)
@@ -40,7 +40,7 @@ namespace math {
}
bool Var::operator==( const Var& var) const {
- return name_.compare( var.name_ ) == 0;
+ return name_ == var.name_;
}
std::ostream& operator<<( std::ostream& os, const Var & var ){
diff --git a/src/core/math/equation_system/Variable.h b/src/core/math/equation_system/Variable.h
index 503907b72d9c3abd1d517e7ff54c29f4a5d6f797..f80f19d5f9723e48d83c7e23d3c00df141d116de 100644
--- a/src/core/math/equation_system/Variable.h
+++ b/src/core/math/equation_system/Variable.h
@@ -36,7 +36,7 @@ namespace math {
double value_;
public:
- Var ( std::string name );
+ Var ( const std::string& name );
private:
Var& operator=( const Var& ){ return *this; }
diff --git a/src/core/math/extern/exprtk.h b/src/core/math/extern/exprtk.h
index 1a4423e4a4edffd3b4df85173811eaede9c45c45..f55657a617e1d7815b9f154fd073dcf843eed2ac 100644
--- a/src/core/math/extern/exprtk.h
+++ b/src/core/math/extern/exprtk.h
@@ -2,7 +2,7 @@
******************************************************************
* C++ Mathematical Expression Toolkit Library *
* *
- * Author: Arash Partow (1999-2017) *
+ * Author: Arash Partow (1999-2018) *
* URL: http://www.partow.net/programming/exprtk/index.html *
* *
* Copyright notice: *
@@ -67,7 +67,7 @@ namespace exprtk
#define exprtk_error_location \
"exprtk.hpp:" + details::to_str(__LINE__) \
- #if __GNUC__ >= 7
+ #if defined(__GNUC__) && (__GNUC__ >= 7)
#define exprtk_disable_fallthrough_begin \
_Pragma ("GCC diagnostic push") \
@@ -83,8 +83,12 @@ namespace exprtk
namespace details
{
- typedef unsigned char uchar_t;
- typedef char char_t;
+ typedef unsigned char uchar_t;
+ typedef char char_t;
+ typedef uchar_t* uchar_ptr;
+ typedef char_t* char_ptr;
+ typedef uchar_t const* uchar_cptr;
+ typedef char_t const* char_cptr;
inline bool is_whitespace(const char_t c)
{
@@ -283,6 +287,11 @@ namespace exprtk
return result;
}
+ inline std::string to_str(std::size_t i)
+ {
+ return to_str(static_cast<int>(i));
+ }
+
inline bool is_hex_digit(const std::string::value_type digit)
{
return (('0' <= digit) && (digit <= '9')) ||
@@ -384,7 +393,7 @@ namespace exprtk
return (*this);
}
- inline build_string& operator << (const char_t* s)
+ inline build_string& operator << (char_cptr s)
{
data_ += std::string(s);
return (*this);
@@ -577,77 +586,62 @@ namespace exprtk
const typename std::iterator_traits<Iterator>::value_type& zero_or_more,
const typename std::iterator_traits<Iterator>::value_type& zero_or_one)
{
- if (0 == std::distance(data_begin,data_end))
- {
- return false;
- }
-
Iterator d_itr = data_begin;
Iterator p_itr = pattern_begin;
- Iterator c_itr = data_begin;
- Iterator m_itr = data_begin;
- while ((data_end != d_itr) && (zero_or_more != (*p_itr)))
+ while ((p_itr != pattern_end) && (d_itr != data_end))
{
- if ((!Compare::cmp((*p_itr),(*d_itr))) && (zero_or_one != (*p_itr)))
+ if (zero_or_more == *p_itr)
{
- return false;
- }
+ while ((p_itr != pattern_end) && (*p_itr == zero_or_more || *p_itr == zero_or_one))
+ {
+ ++p_itr;
+ }
- ++p_itr;
- ++d_itr;
- }
+ if (p_itr == pattern_end)
+ return true;
- while (data_end != d_itr)
- {
- if (zero_or_more == (*p_itr))
- {
- if (pattern_end == (++p_itr))
+ const typename std::iterator_traits<Iterator>::value_type c = *(p_itr++);
+
+ while ((d_itr != data_end) && !Compare::cmp(c,*d_itr))
{
- return true;
+ ++d_itr;
}
- m_itr = p_itr;
- c_itr = d_itr;
- ++c_itr;
+ ++d_itr;
}
- else if ((Compare::cmp((*p_itr),(*d_itr))) || (zero_or_one == (*p_itr)))
+ else if ((*p_itr == zero_or_one) || Compare::cmp(*p_itr, *d_itr))
{
- ++p_itr;
++d_itr;
+ ++p_itr;
}
else
- {
- p_itr = m_itr;
- d_itr = c_itr++;
- }
+ return false;
}
- while ((p_itr != pattern_end) && (zero_or_more == (*p_itr))) { ++p_itr; }
-
- return (p_itr == pattern_end);
+ return (d_itr == data_end) && (p_itr == pattern_end);
}
inline bool wc_match(const std::string& wild_card,
const std::string& str)
{
- return match_impl<const char_t*,cs_match>(wild_card.data(),
- wild_card.data() + wild_card.size(),
- str.data(),
- str.data() + str.size(),
- '*',
- '?');
+ return match_impl<char_cptr,cs_match>(wild_card.data(),
+ wild_card.data() + wild_card.size(),
+ str.data(),
+ str.data() + str.size(),
+ '*',
+ '?');
}
inline bool wc_imatch(const std::string& wild_card,
const std::string& str)
{
- return match_impl<const char_t*,cis_match>(wild_card.data(),
- wild_card.data() + wild_card.size(),
- str.data(),
- str.data() + str.size(),
- '*',
- '?');
+ return match_impl<char_cptr,cis_match>(wild_card.data(),
+ wild_card.data() + wild_card.size(),
+ str.data(),
+ str.data() + str.size(),
+ '*',
+ '?');
}
inline bool sequence_match(const std::string& pattern,
@@ -728,7 +722,7 @@ namespace exprtk
1.0E+013, 1.0E+014, 1.0E+015, 1.0E+016
};
- static const std::size_t pow10_size = sizeof(pow10) / sizeof(double);
+ static const std::size_t pow10_size = sizeof(pow10) / sizeof(double);
namespace numeric
{
@@ -749,22 +743,28 @@ namespace exprtk
namespace details
{
struct unknown_type_tag { unknown_type_tag() {} };
- struct real_type_tag { real_type_tag() {} };
+ struct real_type_tag { real_type_tag () {} };
struct complex_type_tag { complex_type_tag() {} };
- struct int_type_tag { int_type_tag() {} };
+ struct int_type_tag { int_type_tag () {} };
template <typename T>
- struct number_type { typedef unknown_type_tag type; };
+ struct number_type
+ {
+ typedef unknown_type_tag type;
+ number_type() {}
+ };
- #define exprtk_register_real_type_tag(T) \
- template<> struct number_type<T> { typedef real_type_tag type; }; \
+ #define exprtk_register_real_type_tag(T) \
+ template<> struct number_type<T> \
+ { typedef real_type_tag type; number_type() {} }; \
- #define exprtk_register_complex_type_tag(T) \
- template<> struct number_type<std::complex<T> > \
- { typedef complex_type_tag type; }; \
+ #define exprtk_register_complex_type_tag(T) \
+ template<> struct number_type<std::complex<T> > \
+ { typedef complex_type_tag type; number_type() {} }; \
- #define exprtk_register_int_type_tag(T) \
- template<> struct number_type<T> { typedef int_type_tag type; }; \
+ #define exprtk_register_int_type_tag(T) \
+ template<> struct number_type<T> \
+ { typedef int_type_tag type; number_type() {} }; \
exprtk_register_real_type_tag(double )
exprtk_register_real_type_tag(long double)
@@ -984,7 +984,15 @@ namespace exprtk
template <typename T>
inline T root_impl(const T v0, const T v1, real_type_tag)
{
- return std::pow(v0,T(1) / v1);
+ if (v1 < T(0))
+ return std::numeric_limits<T>::quiet_NaN();
+
+ const std::size_t n = static_cast<std::size_t>(v1);
+
+ if ((v0 < T(0)) && (0 == (n % 2)))
+ return std::numeric_limits<T>::quiet_NaN();
+
+ return std::pow(v0, T(1) / n);
}
template <typename T>
@@ -1297,6 +1305,9 @@ namespace exprtk
template <typename T> inline T frac_impl(const T v, real_type_tag) { return (v - static_cast<long long>(v)); }
template <typename T> inline T trunc_impl(const T v, real_type_tag) { return T(static_cast<long long>(v)); }
+ template <typename T> inline T const_pi_impl(real_type_tag) { return T(numeric::constant::pi); }
+ template <typename T> inline T const_e_impl (real_type_tag) { return T(numeric::constant::e); }
+
template <typename T> inline T abs_impl(const T v, int_type_tag) { return ((v >= T(0)) ? v : -v); }
template <typename T> inline T exp_impl(const T v, int_type_tag) { return std::exp (v); }
template <typename T> inline T log_impl(const T v, int_type_tag) { return std::log (v); }
@@ -1351,161 +1362,161 @@ namespace exprtk
template <typename T>
inline int to_int32(const T v)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return to_int32_impl(v, num_type);
}
template <typename T>
inline long long int to_int64(const T v)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return to_int64_impl(v, num_type);
}
template <typename T>
inline bool is_nan(const T v)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return is_nan_impl(v, num_type);
}
template <typename T>
inline T min(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return min_impl(v0, v1, num_type);
}
template <typename T>
inline T max(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return max_impl(v0, v1, num_type);
}
template <typename T>
inline T equal(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return equal_impl(v0, v1, num_type);
}
template <typename T>
inline T nequal(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return nequal_impl(v0, v1, num_type);
}
template <typename T>
inline T modulus(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return modulus_impl(v0, v1, num_type);
}
template <typename T>
inline T pow(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return pow_impl(v0, v1, num_type);
}
template <typename T>
inline T logn(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return logn_impl(v0, v1, num_type);
}
template <typename T>
inline T root(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return root_impl(v0, v1, num_type);
}
template <typename T>
inline T roundn(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return roundn_impl(v0, v1, num_type);
}
template <typename T>
inline T hypot(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return hypot_impl(v0, v1, num_type);
}
template <typename T>
inline T atan2(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return atan2_impl(v0, v1, num_type);
}
template <typename T>
inline T shr(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return shr_impl(v0, v1, num_type);
}
template <typename T>
inline T shl(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return shl_impl(v0, v1, num_type);
}
template <typename T>
inline T and_opr(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return and_impl(v0, v1, num_type);
}
template <typename T>
inline T nand_opr(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return nand_impl(v0, v1, num_type);
}
template <typename T>
inline T or_opr(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return or_impl(v0, v1, num_type);
}
template <typename T>
inline T nor_opr(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return nor_impl(v0, v1, num_type);
}
template <typename T>
inline T xor_opr(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return xor_impl(v0, v1, num_type);
}
template <typename T>
inline T xnor_opr(const T v0, const T v1)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return xnor_impl(v0, v1, num_type);
}
template <typename T>
inline bool is_integer(const T v)
{
- typename details::number_type<T>::type num_type;
+ const typename details::number_type<T>::type num_type;
return is_integer_impl(v, num_type);
}
@@ -1545,13 +1556,13 @@ namespace exprtk
template <typename T> struct fast_exp<T, 1> { static inline T result(T v) { return v; } };
template <typename T> struct fast_exp<T, 0> { static inline T result(T ) { return T(1); } };
- #define exprtk_define_unary_function(FunctionName) \
- template <typename T> \
- inline T FunctionName (const T v) \
- { \
- typename details::number_type<T>::type num_type; \
- return FunctionName##_impl(v,num_type); \
- } \
+ #define exprtk_define_unary_function(FunctionName) \
+ template <typename T> \
+ inline T FunctionName (const T v) \
+ { \
+ const typename details::number_type<T>::type num_type; \
+ return FunctionName##_impl(v,num_type); \
+ } \
exprtk_define_unary_function(abs )
exprtk_define_unary_function(acos )
@@ -1776,7 +1787,7 @@ namespace exprtk
if ((3 != length) && (inf_length != length))
return false;
- const char_t* inf_itr = ('i' == (*itr)) ? inf_lc : inf_uc;
+ char_cptr inf_itr = ('i' == (*itr)) ? inf_lc : inf_uc;
while (end != itr)
{
@@ -1964,8 +1975,8 @@ namespace exprtk
{
const typename numeric::details::number_type<T>::type num_type;
- const char_t* begin = s.data();
- const char_t* end = s.data() + s.size();
+ char_cptr begin = s.data();
+ char_cptr end = s.data() + s.size();
return string_to_real(begin, end, t, num_type);
}
@@ -2204,9 +2215,7 @@ namespace exprtk
{
scan_token();
- if (token_list_.empty())
- return true;
- else if (token_list_.back().is_error())
+ if (!token_list_.empty() && token_list_.back().is_error())
return false;
}
@@ -2296,8 +2305,8 @@ namespace exprtk
inline std::string substr(const std::size_t& begin, const std::size_t& end)
{
- const char_t* begin_itr = ((base_itr_ + begin) < s_end_) ? (base_itr_ + begin) : s_end_;
- const char_t* end_itr = ((base_itr_ + end) < s_end_) ? (base_itr_ + end) : s_end_;
+ details::char_cptr begin_itr = ((base_itr_ + begin) < s_end_) ? (base_itr_ + begin) : s_end_;
+ details::char_cptr end_itr = ((base_itr_ + end) < s_end_) ? (base_itr_ + end) : s_end_;
return std::string(begin_itr,end_itr);
}
@@ -2314,11 +2323,28 @@ namespace exprtk
private:
- inline bool is_end(const char_t* itr)
+ inline bool is_end(details::char_cptr itr)
{
return (s_end_ == itr);
}
+ inline bool is_comment_start(details::char_cptr itr)
+ {
+ #ifndef exprtk_disable_comments
+ const char_t c0 = *(itr + 0);
+ const char_t c1 = *(itr + 1);
+
+ if ('#' == c0)
+ return true;
+ else if (!is_end(itr + 1))
+ {
+ if (('/' == c0) && ('/' == c1)) return true;
+ if (('/' == c0) && ('*' == c1)) return true;
+ }
+ #endif
+ return false;
+ }
+
inline void skip_whitespace()
{
while (!is_end(s_itr_) && details::is_whitespace(*s_itr_))
@@ -2348,47 +2374,72 @@ namespace exprtk
return (0 != mode);
}
- static inline bool comment_end(const char_t c0, const char_t c1, const int mode)
+ static inline bool comment_end(const char_t c0, const char_t c1, int& mode)
{
- return (
- ((1 == mode) && ('\n' == c0)) ||
- ((2 == mode) && ( '*' == c0) && ('/' == c1))
- );
+ if (
+ ((1 == mode) && ('\n' == c0)) ||
+ ((2 == mode) && ( '*' == c0) && ('/' == c1))
+ )
+ {
+ mode = 0;
+ return true;
+ }
+ else
+ return false;
}
};
int mode = 0;
int increment = 0;
- if (is_end(s_itr_) || is_end((s_itr_ + 1)))
+ if (is_end(s_itr_))
return;
else if (!test::comment_start(*s_itr_, *(s_itr_ + 1), mode, increment))
return;
+ details::char_cptr cmt_start = s_itr_;
+
s_itr_ += increment;
- while (!is_end(s_itr_) && !test::comment_end(*s_itr_, *(s_itr_ + 1), mode))
+ while (!is_end(s_itr_))
{
- ++s_itr_;
+ if ((1 == mode) && test::comment_end(*s_itr_, 0, mode))
+ {
+ ++s_itr_;
+ return;
+ }
+
+ if ((2 == mode))
+ {
+ if (!is_end((s_itr_ + 1)) && test::comment_end(*s_itr_, *(s_itr_ + 1), mode))
+ {
+ s_itr_ += 2;
+ return;
+ }
+ }
+
+ ++s_itr_;
}
- if (!is_end(s_itr_))
+ if (2 == mode)
{
- s_itr_ += mode;
-
- skip_whitespace();
- skip_comments ();
+ token_t t;
+ t.set_error(token::e_error, cmt_start, cmt_start + mode, base_itr_);
+ token_list_.push_back(t);
}
#endif
}
inline void scan_token()
{
- skip_whitespace();
- skip_comments ();
-
- if (is_end(s_itr_))
+ if (details::is_whitespace(*s_itr_))
+ {
+ skip_whitespace();
+ return;
+ }
+ else if (is_comment_start(s_itr_))
{
+ skip_comments();
return;
}
else if (details::is_operator_char(*s_itr_))
@@ -2502,7 +2553,7 @@ namespace exprtk
inline void scan_symbol()
{
- const char_t* initial_itr = s_itr_;
+ details::char_cptr initial_itr = s_itr_;
while (!is_end(s_itr_))
{
@@ -2553,11 +2604,11 @@ namespace exprtk
(15) .1234e-3
*/
- const char_t* initial_itr = s_itr_;
- bool dot_found = false;
- bool e_found = false;
- bool post_e_sign_found = false;
- bool post_e_digit_found = false;
+ details::char_cptr initial_itr = s_itr_;
+ bool dot_found = false;
+ bool e_found = false;
+ bool post_e_sign_found = false;
+ bool post_e_digit_found = false;
token_t t;
while (!is_end(s_itr_))
@@ -2640,7 +2691,7 @@ namespace exprtk
inline void scan_special_function()
{
- const char_t* initial_itr = s_itr_;
+ details::char_cptr initial_itr = s_itr_;
token_t t;
// $fdd(x,x,x) = at least 11 chars
@@ -2676,7 +2727,7 @@ namespace exprtk
#ifndef exprtk_disable_string_capabilities
inline void scan_string()
{
- const char_t* initial_itr = s_itr_ + 1;
+ details::char_cptr initial_itr = s_itr_ + 1;
token_t t;
if (std::distance(s_itr_,s_end_) < 2)
@@ -2714,7 +2765,7 @@ namespace exprtk
Note: The following 'awkward' conditional is
due to various broken msvc compilers.
*/
- #if _MSC_VER == 1600
+ #if defined(_MSC_VER) && (_MSC_VER == 1600)
const bool within_range = !is_end(s_itr_ + 2) &&
!is_end(s_itr_ + 3) ;
#else
@@ -2780,9 +2831,9 @@ namespace exprtk
token_list_itr_t token_itr_;
token_list_itr_t store_token_itr_;
token_t eof_token_;
- const char_t* base_itr_;
- const char_t* s_itr_;
- const char_t* s_end_;
+ details::char_cptr base_itr_;
+ details::char_cptr s_itr_;
+ details::char_cptr s_end_;
friend class token_scanner;
friend class token_modifier;
@@ -3307,7 +3358,7 @@ namespace exprtk
return true;
}
- // '- -' --> '-'
+ // '- -' --> '+'
else if ((t0.type == lexer::token::e_sub) && (t1.type == lexer::token::e_sub))
{
/*
@@ -3577,7 +3628,6 @@ namespace exprtk
add_invalid(lexer::token::e_string ,lexer::token::e_string );
add_invalid(lexer::token::e_number ,lexer::token::e_string );
add_invalid(lexer::token::e_string ,lexer::token::e_number );
- add_invalid(lexer::token::e_string ,lexer::token::e_ternary);
add_invalid_set1(lexer::token::e_assign );
add_invalid_set1(lexer::token::e_shr );
add_invalid_set1(lexer::token::e_shl );
@@ -3696,7 +3746,7 @@ namespace exprtk
case lexer::token::e_sub : return false;
case lexer::token::e_colon : return false;
case lexer::token::e_ternary : return false;
- default : return true;
+ default : return true ;
}
}
}
@@ -3710,7 +3760,7 @@ namespace exprtk
case lexer::token::e_eof : return false;
case lexer::token::e_colon : return false;
case lexer::token::e_ternary : return false;
- default : return true;
+ default : return true ;
}
}
else if (details::is_left_bracket(static_cast<char>(t)))
@@ -4204,6 +4254,11 @@ namespace exprtk
data_(reinterpret_cast<value_t*>(ts_.data))
{}
+ type_view(const type_store_t& ts)
+ : ts_(const_cast<type_store_t&>(ts)),
+ data_(reinterpret_cast<value_t*>(ts_.data))
+ {}
+
inline std::size_t size() const
{
return ts_.size;
@@ -5544,7 +5599,7 @@ namespace exprtk
virtual std::string str () const = 0;
- virtual const char_t* base() const = 0;
+ virtual char_cptr base() const = 0;
virtual std::size_t size() const = 0;
};
@@ -5587,7 +5642,7 @@ namespace exprtk
return value_;
}
- const char_t* base() const
+ char_cptr base() const
{
return value_.data();
}
@@ -5893,10 +5948,8 @@ namespace exprtk
else
return ((T(2) * arg1 <= (arg2 + arg0)) ? arg0 : arg2);
- default : {
- exprtk_debug(("trinary_node::value() - Error: Invalid operation\n"));
- return std::numeric_limits<T>::quiet_NaN();
- }
+ default : exprtk_debug(("trinary_node::value() - Error: Invalid operation\n"));
+ return std::numeric_limits<T>::quiet_NaN();
}
}
@@ -7494,7 +7547,7 @@ namespace exprtk
return ref();
}
- const char_t* base() const
+ char_cptr base() const
{
return &(*value_)[0];
}
@@ -7574,7 +7627,7 @@ namespace exprtk
return (*value_);
}
- const char_t* base() const
+ char_cptr base() const
{
return &(*value_)[0];
}
@@ -7652,7 +7705,7 @@ namespace exprtk
return value_;
}
- const char_t* base() const
+ char_cptr base() const
{
return value_.data();
}
@@ -7782,7 +7835,7 @@ namespace exprtk
return value_;
}
- const char_t* base() const
+ char_cptr base() const
{
return &value_[0];
}
@@ -7921,7 +7974,7 @@ namespace exprtk
return value_;
}
- const char_t* base() const
+ char_cptr base() const
{
return &value_[0];
}
@@ -8009,7 +8062,7 @@ namespace exprtk
return str0_node_ptr_->str();
}
- const char_t* base() const
+ char_cptr base() const
{
return str0_node_ptr_->base();
}
@@ -8069,12 +8122,12 @@ namespace exprtk
if (0 == str0_base_ptr_)
return;
- irange_ptr range_ptr = dynamic_cast<irange_ptr>(binary_node<T>::branch_[0].first);
+ irange_ptr range = dynamic_cast<irange_ptr>(binary_node<T>::branch_[0].first);
- if (0 == range_ptr)
+ if (0 == range)
return;
- str0_range_ptr_ = &(range_ptr->range_ref());
+ str0_range_ptr_ = &(range->range_ref());
}
if (is_generally_string_node(binary_node<T>::branch_[1].first))
@@ -8084,12 +8137,12 @@ namespace exprtk
if (0 == str1_base_ptr_)
return;
- irange_ptr range_ptr = dynamic_cast<irange_ptr>(binary_node<T>::branch_[1].first);
+ irange_ptr range = dynamic_cast<irange_ptr>(binary_node<T>::branch_[1].first);
- if (0 == range_ptr)
+ if (0 == range)
return;
- str1_range_ptr_ = &(range_ptr->range_ref());
+ str1_range_ptr_ = &(range->range_ref());
}
initialised_ = str0_base_ptr_ &&
@@ -8123,11 +8176,11 @@ namespace exprtk
const std::size_t size1 = range1.cache_size();
const std::size_t max_size = std::min(size0,size1);
- char_t* s0 = const_cast<char_t*>(str0_base_ptr_->base() + str0_r0);
- char_t* s1 = const_cast<char_t*>(str1_base_ptr_->base() + str1_r0);
+ char_ptr s0 = const_cast<char_ptr>(str0_base_ptr_->base() + str0_r0);
+ char_ptr s1 = const_cast<char_ptr>(str1_base_ptr_->base() + str1_r0);
loop_unroll::details lud(max_size);
- const char_t* upper_bound = s0 + lud.upper_bound;
+ char_cptr upper_bound = s0 + lud.upper_bound;
while (s0 < upper_bound)
{
@@ -8285,13 +8338,13 @@ namespace exprtk
struct asn_assignment
{
- static inline void execute(std::string& s, const char_t* data, const std::size_t size)
+ static inline void execute(std::string& s, char_cptr data, const std::size_t size)
{ s.assign(data,size); }
};
struct asn_addassignment
{
- static inline void execute(std::string& s, const char_t* data, const std::size_t size)
+ static inline void execute(std::string& s, char_cptr data, const std::size_t size)
{ s.append(data,size); }
};
@@ -8334,12 +8387,12 @@ namespace exprtk
if (0 == str1_base_ptr_)
return;
- irange_ptr range_ptr = dynamic_cast<irange_ptr>(binary_node<T>::branch_[1].first);
+ irange_ptr range = dynamic_cast<irange_ptr>(binary_node<T>::branch_[1].first);
- if (0 == range_ptr)
+ if (0 == range)
return;
- str1_range_ptr_ = &(range_ptr->range_ref());
+ str1_range_ptr_ = &(range->range_ref());
}
initialised_ = str0_base_ptr_ &&
@@ -8377,7 +8430,7 @@ namespace exprtk
return str0_node_ptr_->str();
}
- const char_t* base() const
+ char_cptr base() const
{
return str0_node_ptr_->base();
}
@@ -8443,12 +8496,12 @@ namespace exprtk
str0_base_ptr_ = dynamic_cast<str_base_ptr>(binary_node<T>::branch_[0].first);
- irange_ptr range_ptr = dynamic_cast<irange_ptr>(binary_node<T>::branch_[0].first);
+ irange_ptr range = dynamic_cast<irange_ptr>(binary_node<T>::branch_[0].first);
- if (0 == range_ptr)
+ if (0 == range)
return;
- str0_range_ptr_ = &(range_ptr->range_ref());
+ str0_range_ptr_ = &(range->range_ref());
}
if (is_generally_string_node(binary_node<T>::branch_[1].first))
@@ -8458,12 +8511,12 @@ namespace exprtk
if (0 == str1_base_ptr_)
return;
- irange_ptr range_ptr = dynamic_cast<irange_ptr>(binary_node<T>::branch_[1].first);
+ irange_ptr range = dynamic_cast<irange_ptr>(binary_node<T>::branch_[1].first);
- if (0 == range_ptr)
+ if (0 == range)
return;
- str1_range_ptr_ = &(range_ptr->range_ref());
+ str1_range_ptr_ = &(range->range_ref());
}
initialised_ = str0_base_ptr_ &&
@@ -8498,7 +8551,7 @@ namespace exprtk
std::copy(str1_base_ptr_->base() + s1_r0,
str1_base_ptr_->base() + s1_r0 + size,
- const_cast<char_t*>(base() + s0_r0));
+ const_cast<char_ptr>(base() + s0_r0));
}
}
@@ -8510,7 +8563,7 @@ namespace exprtk
return str0_node_ptr_->str();
}
- const char_t* base() const
+ char_cptr base() const
{
return str0_node_ptr_->base();
}
@@ -8664,7 +8717,7 @@ namespace exprtk
return value_;
}
- const char_t* base() const
+ char_cptr base() const
{
return &value_[0];
}
@@ -8784,7 +8837,7 @@ namespace exprtk
return value_;
}
- const char_t* base() const
+ char_cptr base() const
{
return &value_[0];
}
@@ -8877,7 +8930,7 @@ namespace exprtk
}
else
{
- arg_list_.clear();
+ arg_list_ .clear();
delete_branch_.clear();
return;
}
@@ -8918,7 +8971,7 @@ namespace exprtk
return str_base_ptr_->str();
}
- const char_t* base() const
+ char_cptr base() const
{
return str_base_ptr_->base();
}
@@ -11443,7 +11496,7 @@ namespace exprtk
return false;
ts.size = sbn->size();
- ts.data = reinterpret_cast<void*>(const_cast<char_t*>(sbn->base()));
+ ts.data = reinterpret_cast<void*>(const_cast<char_ptr>(sbn->base()));
ts.type = type_store_t::e_string;
range_list_[i].data = ts.data;
@@ -11464,7 +11517,7 @@ namespace exprtk
)
{
ts.size = rp.const_size();
- ts.data = static_cast<char_t*>(ts.data) + rp.n0_c.second;
+ ts.data = static_cast<char_ptr>(ts.data) + rp.n0_c.second;
range_list_[i].range = reinterpret_cast<range_t*>(0);
}
else
@@ -11546,10 +11599,10 @@ namespace exprtk
ts.size = rp.cache_size();
#ifndef exprtk_disable_string_capabilities
if (ts.type == type_store_t::e_string)
- ts.data = const_cast<char_t*>(rdt.str_node->base()) + rp.cache.first;
+ ts.data = const_cast<char_ptr>(rdt.str_node->base()) + rp.cache.first;
else
#endif
- ts.data = static_cast<char_t*>(rdt.data) + (rp.cache.first * rdt.type_size);
+ ts.data = static_cast<char_ptr>(rdt.data) + (rp.cache.first * rdt.type_size);
}
else
return false;
@@ -11629,7 +11682,7 @@ namespace exprtk
return ret_string_;
}
- const char_t* base() const
+ char_cptr base() const
{
return &ret_string_[0];
}
@@ -14965,12 +15018,12 @@ namespace exprtk
if (0 == str0_base_ptr_)
return;
- irange_ptr range_ptr = dynamic_cast<irange_ptr>(binary_node<T>::branch_[0].first);
+ irange_ptr range = dynamic_cast<irange_ptr>(binary_node<T>::branch_[0].first);
- if (0 == range_ptr)
+ if (0 == range)
return;
- str0_range_ptr_ = &(range_ptr->range_ref());
+ str0_range_ptr_ = &(range->range_ref());
}
if (is_generally_string_node(binary_node<T>::branch_[1].first))
@@ -14980,12 +15033,12 @@ namespace exprtk
if (0 == str1_base_ptr_)
return;
- irange_ptr range_ptr = dynamic_cast<irange_ptr>(binary_node<T>::branch_[1].first);
+ irange_ptr range = dynamic_cast<irange_ptr>(binary_node<T>::branch_[1].first);
- if (0 == range_ptr)
+ if (0 == range)
return;
- str1_range_ptr_ = &(range_ptr->range_ref());
+ str1_range_ptr_ = &(range->range_ref());
}
}
@@ -15448,70 +15501,70 @@ namespace exprtk
typename T1, typename T2>
inline expression_node<typename node_type::value_type>* allocate(const T1& t1, const T2& t2) const
{
- return (new node_type(t1,t2));
+ return (new node_type(t1, t2));
}
template <typename node_type,
typename T1, typename T2>
inline expression_node<typename node_type::value_type>* allocate_cr(const T1& t1, T2& t2) const
{
- return (new node_type(t1,t2));
+ return (new node_type(t1, t2));
}
template <typename node_type,
typename T1, typename T2>
inline expression_node<typename node_type::value_type>* allocate_rc(T1& t1, const T2& t2) const
{
- return (new node_type(t1,t2));
+ return (new node_type(t1, t2));
}
template <typename node_type,
typename T1, typename T2>
inline expression_node<typename node_type::value_type>* allocate_rr(T1& t1, T2& t2) const
{
- return (new node_type(t1,t2));
+ return (new node_type(t1, t2));
}
template <typename node_type,
typename T1, typename T2>
inline expression_node<typename node_type::value_type>* allocate_tt(T1 t1, T2 t2) const
{
- return (new node_type(t1,t2));
+ return (new node_type(t1, t2));
}
template <typename node_type,
typename T1, typename T2, typename T3>
inline expression_node<typename node_type::value_type>* allocate_ttt(T1 t1, T2 t2, T3 t3) const
{
- return (new node_type(t1,t2,t3));
+ return (new node_type(t1, t2, t3));
}
template <typename node_type,
typename T1, typename T2, typename T3, typename T4>
inline expression_node<typename node_type::value_type>* allocate_tttt(T1 t1, T2 t2, T3 t3, T4 t4) const
{
- return (new node_type(t1,t2,t3,t4));
+ return (new node_type(t1, t2, t3, t4));
}
template <typename node_type,
typename T1, typename T2, typename T3>
inline expression_node<typename node_type::value_type>* allocate_rrr(T1& t1, T2& t2, T3& t3) const
{
- return (new node_type(t1,t2,t3));
+ return (new node_type(t1, t2, t3));
}
template <typename node_type,
typename T1, typename T2, typename T3, typename T4>
inline expression_node<typename node_type::value_type>* allocate_rrrr(T1& t1, T2& t2, T3& t3, T4& t4) const
{
- return (new node_type(t1,t2,t3,t4));
+ return (new node_type(t1, t2, t3, t4));
}
template <typename node_type,
typename T1, typename T2, typename T3, typename T4, typename T5>
inline expression_node<typename node_type::value_type>* allocate_rrrrr(T1& t1, T2& t2, T3& t3, T4& t4, T5& t5) const
{
- return (new node_type(t1,t2,t3,t4,t5));
+ return (new node_type(t1, t2, t3, t4, t5));
}
template <typename node_type,
@@ -15519,7 +15572,7 @@ namespace exprtk
inline expression_node<typename node_type::value_type>* allocate(const T1& t1, const T2& t2,
const T3& t3) const
{
- return (new node_type(t1,t2,t3));
+ return (new node_type(t1, t2, t3));
}
template <typename node_type,
@@ -15528,7 +15581,7 @@ namespace exprtk
inline expression_node<typename node_type::value_type>* allocate(const T1& t1, const T2& t2,
const T3& t3, const T4& t4) const
{
- return (new node_type(t1,t2,t3,t4));
+ return (new node_type(t1, t2, t3, t4));
}
template <typename node_type,
@@ -15538,7 +15591,7 @@ namespace exprtk
const T3& t3, const T4& t4,
const T5& t5) const
{
- return (new node_type(t1,t2,t3,t4,t5));
+ return (new node_type(t1, t2, t3, t4, t5));
}
template <typename node_type,
@@ -15548,7 +15601,7 @@ namespace exprtk
const T3& t3, const T4& t4,
const T5& t5, const T6& t6) const
{
- return (new node_type(t1,t2,t3,t4,t5,t6));
+ return (new node_type(t1, t2, t3, t4, t5, t6));
}
template <typename node_type,
@@ -15560,7 +15613,7 @@ namespace exprtk
const T5& t5, const T6& t6,
const T7& t7) const
{
- return (new node_type(t1,t2,t3,t4,t5,t6,t7));
+ return (new node_type(t1, t2, t3, t4, t5, t6, t7));
}
template <typename node_type,
@@ -15573,7 +15626,7 @@ namespace exprtk
const T5& t5, const T6& t6,
const T7& t7, const T8& t8) const
{
- return (new node_type(t1,t2,t3,t4,t5,t6,t7,t8));
+ return (new node_type(t1, t2, t3, t4, t5, t6, t7, t8));
}
template <typename node_type,
@@ -15587,7 +15640,7 @@ namespace exprtk
const T7& t7, const T8& t8,
const T9& t9) const
{
- return (new node_type(t1,t2,t3,t4,t5,t6,t7,t8,t9));
+ return (new node_type(t1, t2, t3, t4, t5, t6, t7, t8, t9));
}
template <typename node_type,
@@ -15602,14 +15655,14 @@ namespace exprtk
const T7& t7, const T8& t8,
const T9& t9, const T10& t10) const
{
- return (new node_type(t1,t2,t3,t4,t5,t6,t7,t8,t9,t10));
+ return (new node_type(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10));
}
template <typename node_type,
typename T1, typename T2, typename T3>
inline expression_node<typename node_type::value_type>* allocate_type(T1 t1, T2 t2, T3 t3) const
{
- return (new node_type(t1,t2,t3));
+ return (new node_type(t1, t2, t3));
}
template <typename node_type,
@@ -15618,7 +15671,7 @@ namespace exprtk
inline expression_node<typename node_type::value_type>* allocate_type(T1 t1, T2 t2,
T3 t3, T4 t4) const
{
- return (new node_type(t1,t2,t3,t4));
+ return (new node_type(t1, t2, t3, t4));
}
template <typename node_type,
@@ -15629,7 +15682,7 @@ namespace exprtk
T3 t3, T4 t4,
T5 t5) const
{
- return (new node_type(t1,t2,t3,t4,t5));
+ return (new node_type(t1, t2, t3, t4, t5));
}
template <typename node_type,
@@ -15640,7 +15693,7 @@ namespace exprtk
T3 t3, T4 t4,
T5 t5, T6 t6) const
{
- return (new node_type(t1,t2,t3,t4,t5,t6));
+ return (new node_type(t1, t2, t3, t4, t5, t6));
}
template <typename node_type,
@@ -15652,7 +15705,7 @@ namespace exprtk
T5 t5, T6 t6,
T7 t7) const
{
- return (new node_type(t1,t2,t3,t4,t5,t6,t7));
+ return (new node_type(t1, t2, t3, t4, t5, t6, t7));
}
template <typename T>
@@ -15975,6 +16028,7 @@ namespace exprtk
{
public:
+ typedef T (*ff00_functor)();
typedef T (*ff01_functor)(T);
typedef T (*ff02_functor)(T,T);
typedef T (*ff03_functor)(T,T,T);
@@ -15993,6 +16047,16 @@ namespace exprtk
protected:
+ struct freefunc00 : public exprtk::ifunction<T>
+ {
+ using exprtk::ifunction<T>::operator();
+
+ freefunc00(ff00_functor ff) : exprtk::ifunction<T>(0), f(ff) {}
+ inline T operator() ()
+ { return f(); }
+ ff00_functor f;
+ };
+
struct freefunc01 : public exprtk::ifunction<T>
{
using exprtk::ifunction<T>::operator();
@@ -17021,11 +17085,11 @@ namespace exprtk
inline bool add_function(const std::string& function_name, ff##NN##_functor function) \
{ \
if (!valid()) \
- return false; \
- else if (!valid_symbol(function_name)) \
- return false; \
- else if (symbol_exists(function_name)) \
- return false; \
+ { return false; } \
+ if (!valid_symbol(function_name)) \
+ { return false; } \
+ if (symbol_exists(function_name)) \
+ { return false; } \
\
exprtk::ifunction<T>* ifunc = new freefunc##NN(function); \
\
@@ -17034,14 +17098,14 @@ namespace exprtk
return add_function(function_name,(*local_data().free_function_list_.back())); \
} \
- exprtk_define_freefunction(01) exprtk_define_freefunction(02)
- exprtk_define_freefunction(03) exprtk_define_freefunction(04)
- exprtk_define_freefunction(05) exprtk_define_freefunction(06)
- exprtk_define_freefunction(07) exprtk_define_freefunction(08)
- exprtk_define_freefunction(09) exprtk_define_freefunction(10)
- exprtk_define_freefunction(11) exprtk_define_freefunction(12)
- exprtk_define_freefunction(13) exprtk_define_freefunction(14)
- exprtk_define_freefunction(15)
+ exprtk_define_freefunction(00) exprtk_define_freefunction(01)
+ exprtk_define_freefunction(02) exprtk_define_freefunction(03)
+ exprtk_define_freefunction(04) exprtk_define_freefunction(05)
+ exprtk_define_freefunction(06) exprtk_define_freefunction(07)
+ exprtk_define_freefunction(08) exprtk_define_freefunction(09)
+ exprtk_define_freefunction(10) exprtk_define_freefunction(11)
+ exprtk_define_freefunction(12) exprtk_define_freefunction(13)
+ exprtk_define_freefunction(14) exprtk_define_freefunction(15)
#undef exprtk_define_freefunction
@@ -17189,12 +17253,13 @@ namespace exprtk
{
return add_pi () &&
add_epsilon () &&
- add_infinity();
+ add_infinity() ;
}
inline bool add_pi()
{
- static const T local_pi = T(details::numeric::constant::pi);
+ const typename details::numeric::details::number_type<T>::type num_type;
+ static const T local_pi = details::numeric::details::const_pi_impl<T>(num_type);
return add_constant("pi",local_pi);
}
@@ -17542,7 +17607,7 @@ namespace exprtk
size(0)
{}
- data_pack(void* ptr, data_type dt, std::size_t sz = 0)
+ data_pack(void* ptr, const data_type dt, const std::size_t sz = 0)
: pointer(ptr),
type(dt),
size(sz)
@@ -17657,6 +17722,13 @@ namespace exprtk
control_block_->ref_count++;
}
+ expression(const symbol_table<T>& symbol_table)
+ : control_block_(0)
+ {
+ set_expression(new details::null_node<T>());
+ symbol_table_list_.push_back(symbol_table);
+ }
+
inline expression<T>& operator=(const expression<T>& e)
{
if (this != &e)
@@ -17945,7 +18017,7 @@ namespace exprtk
std::size_t column_no;
};
- inline type make_error(error_mode mode,
+ inline type make_error(const error_mode mode,
const std::string& diagnostic = "",
const std::string& src_location = "")
{
@@ -17958,7 +18030,7 @@ namespace exprtk
return t;
}
- inline type make_error(error_mode mode,
+ inline type make_error(const error_mode mode,
const lexer::token& tk,
const std::string& diagnostic = "",
const std::string& src_location = "")
@@ -18129,11 +18201,11 @@ namespace exprtk
typedef typename expression<T>::symtab_list_t symbol_table_list_t;
typedef details::vector_holder<T>* vector_holder_ptr;
- typedef typename details::functor_t<T> functor_t;
- typedef typename functor_t::qfunc_t quaternary_functor_t;
- typedef typename functor_t::tfunc_t trinary_functor_t;
- typedef typename functor_t::bfunc_t binary_functor_t;
- typedef typename functor_t::ufunc_t unary_functor_t;
+ typedef typename details::functor_t<T> functor_t;
+ typedef typename functor_t::qfunc_t quaternary_functor_t;
+ typedef typename functor_t::tfunc_t trinary_functor_t;
+ typedef typename functor_t::bfunc_t binary_functor_t;
+ typedef typename functor_t::ufunc_t unary_functor_t;
typedef details::operator_type operator_t;
@@ -20410,6 +20482,7 @@ namespace exprtk
static const std::string s_ilike = "ilike";
static const std::string s_and1 = "&";
static const std::string s_or1 = "|";
+ static const std::string s_not = "not";
if (details::imatch(current_token().value,s_and))
{
@@ -20474,6 +20547,10 @@ namespace exprtk
current_state.set(e_level04, e_level04, details::e_ilike);
break;
}
+ else if (details::imatch(current_token().value,s_not))
+ {
+ break;
+ }
}
break_loop = true;
@@ -20953,7 +21030,7 @@ namespace exprtk
}
template <std::size_t MaxNumberofParameters>
- inline std::size_t parse_base_function_call(expression_node_ptr (¶m_list)[MaxNumberofParameters])
+ inline std::size_t parse_base_function_call(expression_node_ptr (¶m_list)[MaxNumberofParameters], const std::string& function_name = "")
{
std::fill_n(param_list, MaxNumberofParameters, reinterpret_cast<expression_node_ptr>(0));
@@ -20966,7 +21043,19 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR022 - Expected a '(' at start of function call, instead got: '" + current_token().value + "'",
+ "ERR022 - Expected a '(' at start of function call to '" + function_name +
+ "', instead got: '" + current_token().value + "'",
+ exprtk_error_location));
+
+ return 0;
+ }
+
+ if (token_is(token_t::e_rbracket, e_hold))
+ {
+ set_error(
+ make_error(parser_error::e_syntax,
+ current_token(),
+ "ERR023 - Expected at least one input parameter for function call '" + function_name + "'",
exprtk_error_location));
return 0;
@@ -20981,7 +21070,10 @@ namespace exprtk
if (0 == param_list[param_index])
return 0;
else if (token_is(token_t::e_rbracket))
+ {
+ sd.delete_ptr = false;
break;
+ }
else if (token_is(token_t::e_comma))
continue;
else
@@ -20989,14 +21081,23 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR023 - Expected a ',' between function input parameters, instead got: '" + current_token().value + "'",
+ "ERR024 - Expected a ',' between function input parameters, instead got: '" + current_token().value + "'",
exprtk_error_location));
return 0;
}
}
- sd.delete_ptr = false;
+ if (sd.delete_ptr)
+ {
+ set_error(
+ make_error(parser_error::e_syntax,
+ current_token(),
+ "ERR025 - Invalid number of input parameters passed to function '" + function_name + "'",
+ exprtk_error_location));
+
+ return 0;
+ }
return (param_index + 1);
}
@@ -21005,7 +21106,8 @@ namespace exprtk
{
typedef std::pair<base_ops_map_t::iterator,base_ops_map_t::iterator> map_range_t;
- const std::string operation_name = current_token().value;
+ const std::string operation_name = current_token().value;
+ const token_t diagnostic_token = current_token();
map_range_t itr_range = base_ops_map_.equal_range(operation_name);
@@ -21013,8 +21115,8 @@ namespace exprtk
{
set_error(
make_error(parser_error::e_syntax,
- current_token(),
- "ERR024 - No entry found for base operation: " + operation_name,
+ diagnostic_token,
+ "ERR026 - No entry found for base operation: " + operation_name,
exprtk_error_location));
return error_node();
@@ -21023,13 +21125,9 @@ namespace exprtk
static const std::size_t MaxNumberofParameters = 4;
expression_node_ptr param_list[MaxNumberofParameters] = {0};
- const std::size_t parameter_count = parse_base_function_call(param_list);
+ const std::size_t parameter_count = parse_base_function_call(param_list, operation_name);
- if (0 == parameter_count)
- {
- return error_node();
- }
- else if (parameter_count <= MaxNumberofParameters)
+ if ((parameter_count > 0) && (parameter_count <= MaxNumberofParameters))
{
for (base_ops_map_t::iterator itr = itr_range.first; itr != itr_range.second; ++itr)
{
@@ -21059,13 +21157,13 @@ namespace exprtk
for (std::size_t i = 0; i < MaxNumberofParameters; ++i)
{
- free_node(node_allocator_,param_list[i]);
+ free_node(node_allocator_, param_list[i]);
}
set_error(
make_error(parser_error::e_syntax,
- current_token(),
- "ERR025 - Invalid number of parameters for call to function: '" + operation_name + "'",
+ diagnostic_token,
+ "ERR027 - Invalid number of input parameters for call to function: '" + operation_name + "'",
exprtk_error_location));
return error_node();
@@ -21085,7 +21183,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR026 - Expected ',' between if-statement condition and consequent",
+ "ERR028 - Expected ',' between if-statement condition and consequent",
exprtk_error_location));
result = false;
}
@@ -21094,7 +21192,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR027 - Failed to parse consequent for if-statement",
+ "ERR029 - Failed to parse consequent for if-statement",
exprtk_error_location));
result = false;
}
@@ -21103,7 +21201,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR028 - Expected ',' between if-statement consequent and alternative",
+ "ERR030 - Expected ',' between if-statement consequent and alternative",
exprtk_error_location));
result = false;
}
@@ -21112,7 +21210,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR029 - Failed to parse alternative for if-statement",
+ "ERR031 - Failed to parse alternative for if-statement",
exprtk_error_location));
result = false;
}
@@ -21121,7 +21219,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR030 - Expected ')' at the end of if-statement",
+ "ERR032 - Expected ')' at the end of if-statement",
exprtk_error_location));
result = false;
}
@@ -21143,7 +21241,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR031 - Return types of ternary if-statement differ",
+ "ERR033 - Return types of ternary if-statement differ",
exprtk_error_location));
result = false;
@@ -21178,7 +21276,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR032 - Failed to parse body of consequent for if-statement",
+ "ERR034 - Failed to parse body of consequent for if-statement",
exprtk_error_location));
result = false;
@@ -21201,7 +21299,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR033 - Expected ';' at the end of the consequent for if-statement",
+ "ERR035 - Expected ';' at the end of the consequent for if-statement",
exprtk_error_location));
result = false;
@@ -21212,7 +21310,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR034 - Failed to parse body of consequent for if-statement",
+ "ERR036 - Failed to parse body of consequent for if-statement",
exprtk_error_location));
result = false;
@@ -21232,7 +21330,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR035 - Failed to parse body of the 'else' for if-statement",
+ "ERR037 - Failed to parse body of the 'else' for if-statement",
exprtk_error_location));
result = false;
@@ -21245,7 +21343,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR036 - Failed to parse body of if-else statement",
+ "ERR038 - Failed to parse body of if-else statement",
exprtk_error_location));
result = false;
@@ -21258,7 +21356,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR037 - Expected ';' at the end of the 'else-if' for the if-statement",
+ "ERR039 - Expected ';' at the end of the 'else-if' for the if-statement",
exprtk_error_location));
result = false;
@@ -21269,7 +21367,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR038 - Failed to parse body of the 'else' for if-statement",
+ "ERR040 - Failed to parse body of the 'else' for if-statement",
exprtk_error_location));
result = false;
@@ -21288,13 +21386,13 @@ namespace exprtk
if (consq_is_str && alter_is_str)
{
return expression_generator_
- .conditional_string(condition,consequent,alternative);
+ .conditional_string(condition, consequent, alternative);
}
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR039 - Return types of ternary if-statement differ",
+ "ERR041 - Return types of ternary if-statement differ",
exprtk_error_location));
result = false;
@@ -21304,15 +21402,15 @@ namespace exprtk
if (!result)
{
- free_node(node_allocator_, condition);
- free_node(node_allocator_, consequent);
- free_node(node_allocator_,alternative);
+ free_node(node_allocator_, condition);
+ free_node(node_allocator_, consequent);
+ free_node(node_allocator_, alternative);
return error_node();
}
else
return expression_generator_
- .conditional(condition,consequent,alternative);
+ .conditional(condition, consequent, alternative);
}
inline expression_node_ptr parse_conditional_statement()
@@ -21326,7 +21424,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR040 - Expected '(' at start of if-statement, instead got: '" + current_token().value + "'",
+ "ERR042 - Expected '(' at start of if-statement, instead got: '" + current_token().value + "'",
exprtk_error_location));
return error_node();
@@ -21336,7 +21434,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR041 - Failed to parse condition for if-statement",
+ "ERR043 - Failed to parse condition for if-statement",
exprtk_error_location));
return error_node();
@@ -21368,7 +21466,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR042 - Invalid if-statement",
+ "ERR044 - Invalid if-statement",
exprtk_error_location));
free_node(node_allocator_,condition);
@@ -21389,7 +21487,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR043 - Encountered invalid condition branch for ternary if-statement",
+ "ERR045 - Encountered invalid condition branch for ternary if-statement",
exprtk_error_location));
return error_node();
@@ -21399,7 +21497,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR044 - Expected '?' after condition of ternary if-statement",
+ "ERR046 - Expected '?' after condition of ternary if-statement",
exprtk_error_location));
result = false;
@@ -21409,7 +21507,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR045 - Failed to parse consequent for ternary if-statement",
+ "ERR047 - Failed to parse consequent for ternary if-statement",
exprtk_error_location));
result = false;
@@ -21419,7 +21517,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR046 - Expected ':' between ternary if-statement consequent and alternative",
+ "ERR048 - Expected ':' between ternary if-statement consequent and alternative",
exprtk_error_location));
result = false;
@@ -21429,7 +21527,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR047 - Failed to parse alternative for ternary if-statement",
+ "ERR049 - Failed to parse alternative for ternary if-statement",
exprtk_error_location));
result = false;
@@ -21452,7 +21550,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR048 - Return types of ternary if-statement differ",
+ "ERR050 - Return types of ternary if-statement differ",
exprtk_error_location));
result = false;
@@ -21489,7 +21587,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR049 - Expected '(' at start of while-loop condition statement",
+ "ERR051 - Expected '(' at start of while-loop condition statement",
exprtk_error_location));
return error_node();
@@ -21499,7 +21597,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR050 - Failed to parse condition for while-loop",
+ "ERR052 - Failed to parse condition for while-loop",
exprtk_error_location));
return error_node();
@@ -21509,7 +21607,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR051 - Expected ')' at end of while-loop condition statement",
+ "ERR053 - Expected ')' at end of while-loop condition statement",
exprtk_error_location));
result = false;
@@ -21524,7 +21622,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR052 - Failed to parse body of while-loop"));
+ "ERR054 - Failed to parse body of while-loop"));
result = false;
}
else if (0 == (result_node = expression_generator_.while_loop(condition,
@@ -21534,7 +21632,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR053 - Failed to synthesize while-loop",
+ "ERR055 - Failed to synthesize while-loop",
exprtk_error_location));
result = false;
@@ -21543,9 +21641,9 @@ namespace exprtk
if (!result)
{
- free_node(node_allocator_, branch);
- free_node(node_allocator_, condition);
- free_node(node_allocator_,result_node);
+ free_node(node_allocator_, branch);
+ free_node(node_allocator_, condition);
+ free_node(node_allocator_, result_node);
brkcnt_list_.pop_front();
@@ -21610,7 +21708,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR054 - Expected '" + token_t::to_str(seperator) + "' in body of repeat until loop",
+ "ERR056 - Expected '" + token_t::to_str(seperator) + "' in body of repeat until loop",
exprtk_error_location));
return error_node();
@@ -21634,7 +21732,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR055 - Failed to parse body of repeat until loop",
+ "ERR057 - Failed to parse body of repeat until loop",
exprtk_error_location));
return error_node();
@@ -21648,7 +21746,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR056 - Expected '(' before condition statement of repeat until loop",
+ "ERR058 - Expected '(' before condition statement of repeat until loop",
exprtk_error_location));
free_node(node_allocator_,branch);
@@ -21662,7 +21760,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR057 - Failed to parse condition for repeat until loop",
+ "ERR059 - Failed to parse condition for repeat until loop",
exprtk_error_location));
free_node(node_allocator_,branch);
@@ -21674,7 +21772,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR058 - Expected ')' after condition of repeat until loop",
+ "ERR060 - Expected ')' after condition of repeat until loop",
exprtk_error_location));
free_node(node_allocator_, branch);
@@ -21695,7 +21793,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR059 - Failed to synthesize repeat until loop",
+ "ERR061 - Failed to synthesize repeat until loop",
exprtk_error_location));
free_node(node_allocator_,condition);
@@ -21731,7 +21829,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR060 - Expected '(' at start of for-loop",
+ "ERR062 - Expected '(' at start of for-loop",
exprtk_error_location));
return error_node();
@@ -21751,7 +21849,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR061 - Expected a variable at the start of initialiser section of for-loop",
+ "ERR063 - Expected a variable at the start of initialiser section of for-loop",
exprtk_error_location));
return error_node();
@@ -21761,7 +21859,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR062 - Expected variable assignment of initialiser section of for-loop",
+ "ERR064 - Expected variable assignment of initialiser section of for-loop",
exprtk_error_location));
return error_node();
@@ -21776,7 +21874,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR063 - For-loop variable '" + loop_counter_symbol+ "' is being shadowed by a previous declaration",
+ "ERR065 - For-loop variable '" + loop_counter_symbol+ "' is being shadowed by a previous declaration",
exprtk_error_location));
return error_node();
@@ -21808,7 +21906,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR064 - Failed to add new local variable '" + loop_counter_symbol + "' to SEM",
+ "ERR066 - Failed to add new local variable '" + loop_counter_symbol + "' to SEM",
exprtk_error_location));
sem_.free_element(nse);
@@ -21830,7 +21928,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR065 - Failed to parse initialiser of for-loop",
+ "ERR067 - Failed to parse initialiser of for-loop",
exprtk_error_location));
result = false;
@@ -21840,7 +21938,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR066 - Expected ';' after initialiser of for-loop",
+ "ERR068 - Expected ';' after initialiser of for-loop",
exprtk_error_location));
result = false;
@@ -21854,7 +21952,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR067 - Failed to parse condition of for-loop",
+ "ERR069 - Failed to parse condition of for-loop",
exprtk_error_location));
result = false;
@@ -21864,7 +21962,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR068 - Expected ';' after condition section of for-loop",
+ "ERR070 - Expected ';' after condition section of for-loop",
exprtk_error_location));
result = false;
@@ -21878,7 +21976,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR069 - Failed to parse incrementor of for-loop",
+ "ERR071 - Failed to parse incrementor of for-loop",
exprtk_error_location));
result = false;
@@ -21888,7 +21986,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR070 - Expected ')' after incrementor section of for-loop",
+ "ERR072 - Expected ')' after incrementor section of for-loop",
exprtk_error_location));
result = false;
@@ -21904,7 +22002,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR071 - Failed to parse body of for-loop",
+ "ERR073 - Failed to parse body of for-loop",
exprtk_error_location));
result = false;
@@ -21956,7 +22054,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR072 - Expected keyword 'switch'",
+ "ERR074 - Expected keyword 'switch'",
exprtk_error_location));
return error_node();
@@ -21971,7 +22069,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR073 - Expected '{' for call to switch statement",
+ "ERR075 - Expected '{' for call to switch statement",
exprtk_error_location));
return error_node();
@@ -21984,7 +22082,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR074 - Expected either a 'case' or 'default' statement",
+ "ERR076 - Expected either a 'case' or 'default' statement",
exprtk_error_location));
return error_node();
@@ -22001,7 +22099,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR075 - Expected ':' for case of switch statement",
+ "ERR077 - Expected ':' for case of switch statement",
exprtk_error_location));
return error_node();
@@ -22016,7 +22114,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR076 - Expected ';' at end of case for switch statement",
+ "ERR078 - Expected ';' at end of case for switch statement",
exprtk_error_location));
return error_node();
@@ -22042,7 +22140,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR077 - Expected ':' for default of switch statement",
+ "ERR079 - Expected ':' for default of switch statement",
exprtk_error_location));
return error_node();
@@ -22064,7 +22162,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR078 - Expected ';' at end of default for switch statement",
+ "ERR080 - Expected ';' at end of default for switch statement",
exprtk_error_location));
return error_node();
@@ -22080,7 +22178,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR079 - Expected '}' at end of switch statement",
+ "ERR081 - Expected '}' at end of switch statement",
exprtk_error_location));
return error_node();
@@ -22103,7 +22201,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR080 - Expected token '[*]'",
+ "ERR082 - Expected token '[*]'",
exprtk_error_location));
return error_node();
@@ -22118,7 +22216,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR081 - Expected '{' for call to [*] statement",
+ "ERR083 - Expected '{' for call to [*] statement",
exprtk_error_location));
return error_node();
@@ -22131,7 +22229,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR082 - Expected a 'case' statement for multi-switch",
+ "ERR084 - Expected a 'case' statement for multi-switch",
exprtk_error_location));
return error_node();
@@ -22149,7 +22247,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR083 - Expected ':' for case of [*] statement",
+ "ERR085 - Expected ':' for case of [*] statement",
exprtk_error_location));
return error_node();
@@ -22165,7 +22263,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR084 - Expected ';' at end of case for [*] statement",
+ "ERR086 - Expected ';' at end of case for [*] statement",
exprtk_error_location));
return error_node();
@@ -22194,7 +22292,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR085 - Expected '}' at end of [*] statement",
+ "ERR087 - Expected '}' at end of [*] statement",
exprtk_error_location));
return error_node();
@@ -22224,19 +22322,19 @@ namespace exprtk
{
return parse_multi_switch_statement();
}
- else if (details::imatch(symbol,"avg" )) opt_type = details::e_avg ;
- else if (details::imatch(symbol,"mand")) opt_type = details::e_mand;
- else if (details::imatch(symbol,"max" )) opt_type = details::e_max ;
- else if (details::imatch(symbol,"min" )) opt_type = details::e_min ;
- else if (details::imatch(symbol,"mor" )) opt_type = details::e_mor ;
- else if (details::imatch(symbol,"mul" )) opt_type = details::e_prod;
- else if (details::imatch(symbol,"sum" )) opt_type = details::e_sum ;
+ else if (details::imatch(symbol, "avg" )) opt_type = details::e_avg ;
+ else if (details::imatch(symbol, "mand")) opt_type = details::e_mand;
+ else if (details::imatch(symbol, "max" )) opt_type = details::e_max ;
+ else if (details::imatch(symbol, "min" )) opt_type = details::e_min ;
+ else if (details::imatch(symbol, "mor" )) opt_type = details::e_mor ;
+ else if (details::imatch(symbol, "mul" )) opt_type = details::e_prod;
+ else if (details::imatch(symbol, "sum" )) opt_type = details::e_sum ;
else
{
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR086 - Unsupported vararg function: " + symbol,
+ "ERR088 - Unsupported vararg function: " + symbol,
exprtk_error_location));
return error_node();
@@ -22253,7 +22351,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR087 - Expected '(' for call to vararg function: " + symbol,
+ "ERR089 - Expected '(' for call to vararg function: " + symbol,
exprtk_error_location));
return error_node();
@@ -22275,7 +22373,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR088 - Expected ',' for call to vararg function: " + symbol,
+ "ERR090 - Expected ',' for call to vararg function: " + symbol,
exprtk_error_location));
return error_node();
@@ -22296,7 +22394,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR089 - Expected '[' as start of string range definition",
+ "ERR091 - Expected '[' as start of string range definition",
exprtk_error_location));
free_node(node_allocator_,expression);
@@ -22324,7 +22422,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR090 - Failed to generate string range node",
+ "ERR092 - Failed to generate string range node",
exprtk_error_location));
free_node(node_allocator_,expression);
@@ -22460,7 +22558,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR091 - Expected '" + token_t::to_str(close_bracket) + "' for call to multi-sequence" +
+ "ERR093 - Expected '" + token_t::to_str(close_bracket) + "' for call to multi-sequence" +
((!source.empty()) ? std::string(" section of " + source): ""),
exprtk_error_location));
@@ -22507,7 +22605,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR092 - Expected '" + details::to_str(seperator) + "' for call to multi-sequence section of " + source,
+ "ERR094 - Expected '" + details::to_str(seperator) + "' for call to multi-sequence section of " + source,
exprtk_error_location));
return error_node();
@@ -22541,7 +22639,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR093 - Expected '[' for start of range",
+ "ERR095 - Expected '[' for start of range",
exprtk_error_location));
return false;
@@ -22562,7 +22660,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR094 - Failed parse begin section of range",
+ "ERR096 - Failed parse begin section of range",
exprtk_error_location));
return false;
@@ -22586,7 +22684,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR095 - Range lower bound less than zero! Constraint: r0 >= 0",
+ "ERR097 - Range lower bound less than zero! Constraint: r0 >= 0",
exprtk_error_location));
return false;
@@ -22603,7 +22701,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR096 - Expected ':' for break in range",
+ "ERR098 - Expected ':' for break in range",
exprtk_error_location));
rp.free();
@@ -22626,7 +22724,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR097 - Failed parse end section of range",
+ "ERR099 - Failed parse end section of range",
exprtk_error_location));
rp.free();
@@ -22652,7 +22750,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR098 - Range upper bound less than zero! Constraint: r1 >= 0",
+ "ERR100 - Range upper bound less than zero! Constraint: r1 >= 0",
exprtk_error_location));
return false;
@@ -22669,7 +22767,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR099 - Expected ']' for start of range",
+ "ERR101 - Expected ']' for start of range",
exprtk_error_location));
rp.free();
@@ -22690,7 +22788,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR100 - Invalid range, Constraint: r0 <= r1",
+ "ERR102 - Invalid range, Constraint: r0 <= r1",
exprtk_error_location));
return false;
@@ -22731,7 +22829,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR101 - Unknown string symbol",
+ "ERR103 - Unknown string symbol",
exprtk_error_location));
return error_node();
@@ -22845,7 +22943,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR102 - Overflow in range for string: '" + const_str + "'[" +
+ "ERR104 - Overflow in range for string: '" + const_str + "'[" +
(rp.n0_c.first ? details::to_str(static_cast<int>(rp.n0_c.second)) : "?") + ":" +
(rp.n1_c.first ? details::to_str(static_cast<int>(rp.n1_c.second)) : "?") + "]",
exprtk_error_location));
@@ -22889,7 +22987,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR103 - Symbol '" + symbol+ " not a vector",
+ "ERR105 - Symbol '" + symbol+ " not a vector",
exprtk_error_location));
return error_node();
@@ -22915,7 +23013,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR104 - Failed to parse index for vector: '" + symbol + "'",
+ "ERR106 - Failed to parse index for vector: '" + symbol + "'",
exprtk_error_location));
return error_node();
@@ -22925,7 +23023,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR105 - Expected ']' for index of vector: '" + symbol + "'",
+ "ERR107 - Expected ']' for index of vector: '" + symbol + "'",
exprtk_error_location));
free_node(node_allocator_,index_expr);
@@ -22944,7 +23042,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR106 - Index of " + details::to_str(index) + " out of range for "
+ "ERR108 - Index of " + details::to_str(index) + " out of range for "
"vector '" + symbol + "' of size " + details::to_str(vec_size),
exprtk_error_location));
@@ -22976,7 +23074,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR107 - Zero parameter call to vararg function: "
+ "ERR109 - Zero parameter call to vararg function: "
+ vararg_function_name + " not allowed",
exprtk_error_location));
@@ -23001,7 +23099,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR108 - Expected ',' for call to vararg function: "
+ "ERR110 - Expected ',' for call to vararg function: "
+ vararg_function_name,
exprtk_error_location));
@@ -23015,7 +23113,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR109 - Zero parameter call to vararg function: "
+ "ERR111 - Zero parameter call to vararg function: "
+ vararg_function_name + " not allowed",
exprtk_error_location));
@@ -23027,7 +23125,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR110 - Invalid number of parameters to call to vararg function: "
+ "ERR112 - Invalid number of parameters to call to vararg function: "
+ vararg_function_name + ", require at least "
+ details::to_str(static_cast<int>(vararg_function->min_num_args())) + " parameters",
exprtk_error_location));
@@ -23039,7 +23137,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR111 - Invalid number of parameters to call to vararg function: "
+ "ERR113 - Invalid number of parameters to call to vararg function: "
+ vararg_function_name + ", require no more than "
+ details::to_str(static_cast<int>(vararg_function->max_num_args())) + " parameters",
exprtk_error_location));
@@ -23102,7 +23200,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
parser_.current_token(),
- "ERR112 - Failed parameter type check for function '" + function_name_ + "', "
+ "ERR114 - Failed parameter type check for function '" + function_name_ + "', "
"Expected '" + param_seq_list_[0] + "' call set: '" + param_seq +"'",
exprtk_error_location));
}
@@ -23123,7 +23221,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
parser_.current_token(),
- "ERR113 - Failed parameter type check for function '" + function_name_ + "', "
+ "ERR115 - Failed parameter type check for function '" + function_name_ + "', "
"Best match: '" + param_seq_list_[max_diff_index] + "' call set: '" + param_seq +"'",
exprtk_error_location));
}
@@ -23208,7 +23306,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
parser_.current_token(),
- "ERR114 - Invalid parameter sequence of '" + err_param_seq +
+ "ERR116 - Invalid parameter sequence of '" + err_param_seq +
"' for function: " + function_name_,
exprtk_error_location));
@@ -23230,7 +23328,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
parser_.current_token(),
- "ERR115 - Invalid parameter sequence of '" + err_param_seq +
+ "ERR117 - Invalid parameter sequence of '" + err_param_seq +
"' for function: " + function_name_,
exprtk_error_location));
return;
@@ -23264,7 +23362,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR116 - Type checker instantiation failure for generic function: " + function_name,
+ "ERR118 - Type checker instantiation failure for generic function: " + function_name,
exprtk_error_location));
return error_node();
@@ -23279,7 +23377,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR117 - Mismatch in zero parameter condition for generic function: "
+ "ERR119 - Mismatch in zero parameter condition for generic function: "
+ function_name,
exprtk_error_location));
@@ -23298,7 +23396,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR118 - Zero parameter call to generic function: "
+ "ERR120 - Zero parameter call to generic function: "
+ function_name + " not allowed",
exprtk_error_location));
@@ -23330,7 +23428,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR119 - Expected ',' for call to generic function: " + function_name,
+ "ERR121 - Expected ',' for call to generic function: " + function_name,
exprtk_error_location));
return error_node();
@@ -23347,7 +23445,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR120 - Zero parameter call to generic function: "
+ "ERR122 - Zero parameter call to generic function: "
+ function_name + " not allowed",
exprtk_error_location));
@@ -23364,7 +23462,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR121 - Expected ',' for call to generic function: " + function_name,
+ "ERR123 - Expected ',' for call to generic function: " + function_name,
exprtk_error_location));
return error_node();
@@ -23432,7 +23530,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR122 - Expected ',' for call to string function: " + function_name,
+ "ERR124 - Expected ',' for call to string function: " + function_name,
exprtk_error_location));
return error_node();
@@ -23448,7 +23546,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR123 - Expected ',' for call to string function: " + function_name,
+ "ERR125 - Expected ',' for call to string function: " + function_name,
exprtk_error_location));
return error_node();
@@ -23472,7 +23570,7 @@ namespace exprtk
template <typename Type, std::size_t NumberOfParameters>
struct parse_special_function_impl
{
- static inline expression_node_ptr process(parser<Type>& p,const details::operator_type opt_type)
+ static inline expression_node_ptr process(parser<Type>& p,const details::operator_type opt_type, const std::string& sf_name)
{
expression_node_ptr branch[NumberOfParameters];
expression_node_ptr result = error_node();
@@ -23488,7 +23586,7 @@ namespace exprtk
p.set_error(
make_error(parser_error::e_syntax,
p.current_token(),
- "ERR124 - Expected '(' for special function",
+ "ERR126 - Expected '(' for special function '" + sf_name + "'",
exprtk_error_location));
return error_node();
@@ -23509,7 +23607,7 @@ namespace exprtk
p.set_error(
make_error(parser_error::e_syntax,
p.current_token(),
- "ERR125 - Expected ',' before next parameter of special function",
+ "ERR127 - Expected ',' before next parameter of special function '" + sf_name + "'",
exprtk_error_location));
return p.error_node();
@@ -23518,7 +23616,15 @@ namespace exprtk
}
if (!p.token_is(token_t::e_rbracket))
+ {
+ p.set_error(
+ make_error(parser_error::e_syntax,
+ p.current_token(),
+ "ERR128 - Invalid number of parameters for special function '" + sf_name + "'",
+ exprtk_error_location));
+
return p.error_node();
+ }
else
result = p.expression_generator_.special_function(opt_type,branch);
@@ -23530,30 +23636,32 @@ namespace exprtk
inline expression_node_ptr parse_special_function()
{
+ const std::string sf_name = current_token().value;
+
// Expect: $fDD(expr0,expr1,expr2) or $fDD(expr0,expr1,expr2,expr3)
if (
- !details::is_digit(current_token().value[2]) ||
- !details::is_digit(current_token().value[3])
+ !details::is_digit(sf_name[2]) ||
+ !details::is_digit(sf_name[3])
)
{
set_error(
make_error(parser_error::e_token,
current_token(),
- "ERR126 - Invalid special function[1]: " + current_token().value,
+ "ERR129 - Invalid special function[1]: " + sf_name,
exprtk_error_location));
return error_node();
}
- const int id = (current_token().value[2] - '0') * 10 +
- (current_token().value[3] - '0');
+ const int id = (sf_name[2] - '0') * 10 +
+ (sf_name[3] - '0');
if (id >= details::e_sffinal)
{
set_error(
make_error(parser_error::e_token,
current_token(),
- "ERR127 - Invalid special function[2]: " + current_token().value,
+ "ERR130 - Invalid special function[2]: " + sf_name,
exprtk_error_location));
return error_node();
@@ -23565,8 +23673,8 @@ namespace exprtk
switch (NumberOfParameters)
{
- case 3 : return parse_special_function_impl<T,3>::process((*this),opt_type);
- case 4 : return parse_special_function_impl<T,4>::process((*this),opt_type);
+ case 3 : return parse_special_function_impl<T,3>::process((*this), opt_type, sf_name);
+ case 4 : return parse_special_function_impl<T,4>::process((*this), opt_type, sf_name);
default : return error_node();
}
}
@@ -23585,7 +23693,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR128 - Break call within a break call is not allowed",
+ "ERR131 - Break call within a break call is not allowed",
exprtk_error_location));
return error_node();
@@ -23608,7 +23716,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR129 - Failed to parse return expression for 'break' statement",
+ "ERR132 - Failed to parse return expression for 'break' statement",
exprtk_error_location));
return error_node();
@@ -23618,7 +23726,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR130 - Expected ']' at the completion of break's return expression",
+ "ERR133 - Expected ']' at the completion of break's return expression",
exprtk_error_location));
free_node(node_allocator_,return_expr);
@@ -23636,7 +23744,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR131 - Invalid use of 'break', allowed only in the scope of a loop",
+ "ERR134 - Invalid use of 'break', allowed only in the scope of a loop",
exprtk_error_location));
}
@@ -23659,7 +23767,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR132 - Invalid use of 'continue', allowed only in the scope of a loop",
+ "ERR135 - Invalid use of 'continue', allowed only in the scope of a loop",
exprtk_error_location));
return error_node();
@@ -23676,7 +23784,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR133 - Expected '[' as part of vector size definition",
+ "ERR136 - Expected '[' as part of vector size definition",
exprtk_error_location));
return error_node();
@@ -23686,7 +23794,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR134 - Failed to determine size of vector '" + vec_name + "'",
+ "ERR137 - Failed to determine size of vector '" + vec_name + "'",
exprtk_error_location));
return error_node();
@@ -23698,7 +23806,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR135 - Expected a literal number as size of vector '" + vec_name + "'",
+ "ERR138 - Expected a literal number as size of vector '" + vec_name + "'",
exprtk_error_location));
return error_node();
@@ -23717,7 +23825,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR136 - Invalid vector size. Must be an integer greater than zero, size: " +
+ "ERR139 - Invalid vector size. Must be an integer greater than zero, size: " +
details::to_str(details::numeric::to_int32(vector_size)),
exprtk_error_location));
@@ -23737,7 +23845,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR137 - Expected ']' as part of vector size definition",
+ "ERR140 - Expected ']' as part of vector size definition",
exprtk_error_location));
return error_node();
@@ -23749,7 +23857,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR138 - Expected ':=' as part of vector definition",
+ "ERR141 - Expected ':=' as part of vector definition",
exprtk_error_location));
return error_node();
@@ -23763,7 +23871,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR139 - Failed to parse single vector initialiser",
+ "ERR142 - Failed to parse single vector initialiser",
exprtk_error_location));
return error_node();
@@ -23776,7 +23884,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR140 - Expected ']' to close single value vector initialiser",
+ "ERR143 - Expected ']' to close single value vector initialiser",
exprtk_error_location));
return error_node();
@@ -23823,7 +23931,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR141 - Expected '{' as part of vector initialiser list",
+ "ERR144 - Expected '{' as part of vector initialiser list",
exprtk_error_location));
return error_node();
@@ -23843,7 +23951,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR142 - Expected '{' as part of vector initialiser list",
+ "ERR145 - Expected '{' as part of vector initialiser list",
exprtk_error_location));
return error_node();
@@ -23861,7 +23969,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR143 - Expected ',' between vector initialisers",
+ "ERR146 - Expected ',' between vector initialisers",
exprtk_error_location));
return error_node();
@@ -23883,7 +23991,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR144 - Expected ';' at end of vector definition",
+ "ERR147 - Expected ';' at end of vector definition",
exprtk_error_location));
return error_node();
@@ -23895,7 +24003,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR145 - Initialiser list larger than the number of elements in the vector: '" + vec_name + "'",
+ "ERR148 - Initialiser list larger than the number of elements in the vector: '" + vec_name + "'",
exprtk_error_location));
return error_node();
@@ -23915,7 +24023,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR146 - Illegal redefinition of local vector: '" + vec_name + "'",
+ "ERR149 - Illegal redefinition of local vector: '" + vec_name + "'",
exprtk_error_location));
return error_node();
@@ -23949,7 +24057,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR147 - Failed to add new local vector '" + vec_name + "' to SEM",
+ "ERR150 - Failed to add new local vector '" + vec_name + "' to SEM",
exprtk_error_location));
sem_.free_element(nse);
@@ -24004,7 +24112,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR148 - Illegal redefinition of local variable: '" + str_name + "'",
+ "ERR151 - Illegal redefinition of local variable: '" + str_name + "'",
exprtk_error_location));
free_node(node_allocator_,initialisation_expression);
@@ -24036,7 +24144,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR149 - Failed to add new local string variable '" + str_name + "' to SEM",
+ "ERR152 - Failed to add new local string variable '" + str_name + "' to SEM",
exprtk_error_location));
free_node(node_allocator_,initialisation_expression);
@@ -24082,7 +24190,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR150 - Illegal variable definition",
+ "ERR153 - Illegal variable definition",
exprtk_error_location));
return error_node();
@@ -24103,7 +24211,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR151 - Expected a symbol for variable definition",
+ "ERR154 - Expected a symbol for variable definition",
exprtk_error_location));
return error_node();
@@ -24113,7 +24221,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR152 - Illegal redefinition of reserved keyword: '" + var_name + "'",
+ "ERR155 - Illegal redefinition of reserved keyword: '" + var_name + "'",
exprtk_error_location));
return error_node();
@@ -24123,7 +24231,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR153 - Illegal redefinition of variable '" + var_name + "'",
+ "ERR156 - Illegal redefinition of variable '" + var_name + "'",
exprtk_error_location));
return error_node();
@@ -24133,7 +24241,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR154 - Illegal redefinition of local variable: '" + var_name + "'",
+ "ERR157 - Illegal redefinition of local variable: '" + var_name + "'",
exprtk_error_location));
return error_node();
@@ -24153,7 +24261,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR155 - Failed to parse initialisation expression",
+ "ERR158 - Failed to parse initialisation expression",
exprtk_error_location));
return error_node();
@@ -24171,7 +24279,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR156 - Expected ';' after variable definition",
+ "ERR159 - Expected ';' after variable definition",
exprtk_error_location));
free_node(node_allocator_,initialisation_expression);
@@ -24199,7 +24307,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR157 - Illegal redefinition of local variable: '" + var_name + "'",
+ "ERR160 - Illegal redefinition of local variable: '" + var_name + "'",
exprtk_error_location));
free_node(node_allocator_, initialisation_expression);
@@ -24231,7 +24339,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR158 - Failed to add new local variable '" + var_name + "' to SEM",
+ "ERR161 - Failed to add new local variable '" + var_name + "' to SEM",
exprtk_error_location));
free_node(node_allocator_, initialisation_expression);
@@ -24268,7 +24376,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR159 - Expected a '{}' for uninitialised var definition",
+ "ERR162 - Expected a '{}' for uninitialised var definition",
exprtk_error_location));
return error_node();
@@ -24278,7 +24386,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR160 - Expected ';' after uninitialised variable definition",
+ "ERR163 - Expected ';' after uninitialised variable definition",
exprtk_error_location));
return error_node();
@@ -24295,7 +24403,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR161 - Illegal redefinition of local variable: '" + var_name + "'",
+ "ERR164 - Illegal redefinition of local variable: '" + var_name + "'",
exprtk_error_location));
return error_node();
@@ -24325,7 +24433,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR162 - Failed to add new local variable '" + var_name + "' to SEM",
+ "ERR165 - Failed to add new local variable '" + var_name + "' to SEM",
exprtk_error_location));
sem_.free_element(nse);
@@ -24358,7 +24466,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR163 - Expected '(' at start of swap statement",
+ "ERR166 - Expected '(' at start of swap statement",
exprtk_error_location));
return error_node();
@@ -24377,7 +24485,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR164 - Expected a symbol for variable or vector element definition",
+ "ERR167 - Expected a symbol for variable or vector element definition",
exprtk_error_location));
return error_node();
@@ -24389,7 +24497,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR165 - First parameter to swap is an invalid vector element: '" + var0_name + "'",
+ "ERR168 - First parameter to swap is an invalid vector element: '" + var0_name + "'",
exprtk_error_location));
return error_node();
@@ -24422,7 +24530,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR166 - First parameter to swap is an invalid variable: '" + var0_name + "'",
+ "ERR169 - First parameter to swap is an invalid variable: '" + var0_name + "'",
exprtk_error_location));
return error_node();
@@ -24436,7 +24544,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR167 - Expected ',' between parameters to swap",
+ "ERR170 - Expected ',' between parameters to swap",
exprtk_error_location));
if (variable0_generated)
@@ -24454,7 +24562,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR168 - Expected a symbol for variable or vector element definition",
+ "ERR171 - Expected a symbol for variable or vector element definition",
exprtk_error_location));
if (variable0_generated)
@@ -24471,7 +24579,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR169 - Second parameter to swap is an invalid vector element: '" + var1_name + "'",
+ "ERR172 - Second parameter to swap is an invalid vector element: '" + var1_name + "'",
exprtk_error_location));
if (variable0_generated)
@@ -24509,7 +24617,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR170 - Second parameter to swap is an invalid variable: '" + var1_name + "'",
+ "ERR173 - Second parameter to swap is an invalid variable: '" + var1_name + "'",
exprtk_error_location));
if (variable0_generated)
@@ -24528,7 +24636,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR171 - Expected ')' at end of swap statement",
+ "ERR174 - Expected ')' at end of swap statement",
exprtk_error_location));
if (variable0_generated)
@@ -24585,7 +24693,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR172 - Return call within a return call is not allowed",
+ "ERR175 - Return call within a return call is not allowed",
exprtk_error_location));
return error_node();
@@ -24609,7 +24717,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR173 - Expected '[' at start of return statement",
+ "ERR176 - Expected '[' at start of return statement",
exprtk_error_location));
return error_node();
@@ -24632,7 +24740,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR174 - Expected ',' between values during call to return",
+ "ERR177 - Expected ',' between values during call to return",
exprtk_error_location));
return error_node();
@@ -24644,7 +24752,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR175 - Zero parameter return statement not allowed",
+ "ERR178 - Zero parameter return statement not allowed",
exprtk_error_location));
return error_node();
@@ -24659,7 +24767,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
prev_token,
- "ERR176 - Invalid ']' found during return call",
+ "ERR179 - Invalid ']' found during return call",
exprtk_error_location));
return error_node();
@@ -24712,7 +24820,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR177 - Invalid sequence of variable '"+ symbol + "' and bracket",
+ "ERR180 - Invalid sequence of variable '"+ symbol + "' and bracket",
exprtk_error_location));
return false;
@@ -24760,7 +24868,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR178 - Invalid sequence of brackets",
+ "ERR181 - Invalid sequence of brackets",
exprtk_error_location));
return false;
@@ -24857,7 +24965,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR179 - Failed to generate node for function: '" + symbol + "'",
+ "ERR182 - Failed to generate node for function: '" + symbol + "'",
exprtk_error_location));
return error_node();
@@ -24883,7 +24991,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR180 - Failed to generate node for vararg function: '" + symbol + "'",
+ "ERR183 - Failed to generate node for vararg function: '" + symbol + "'",
exprtk_error_location));
return error_node();
@@ -24909,7 +25017,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR181 - Failed to generate node for generic function: '" + symbol + "'",
+ "ERR184 - Failed to generate node for generic function: '" + symbol + "'",
exprtk_error_location));
return error_node();
@@ -24936,7 +25044,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR182 - Failed to generate node for string function: '" + symbol + "'",
+ "ERR185 - Failed to generate node for string function: '" + symbol + "'",
exprtk_error_location));
return error_node();
@@ -24962,7 +25070,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR183 - Invalid use of reserved symbol '" + symbol + "'",
+ "ERR186 - Invalid use of reserved symbol '" + symbol + "'",
exprtk_error_location));
return error_node();
@@ -25025,7 +25133,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_symtab,
current_token(),
- "ERR184 - Failed to create variable: '" + symbol + "'" +
+ "ERR187 - Failed to create variable: '" + symbol + "'" +
(error_message.empty() ? "" : " - " + error_message),
exprtk_error_location));
@@ -25045,7 +25153,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_symtab,
current_token(),
- "ERR185 - Failed to resolve symbol: '" + symbol + "'" +
+ "ERR188 - Failed to resolve symbol: '" + symbol + "'" +
(error_message.empty() ? "" : " - " + error_message),
exprtk_error_location));
}
@@ -25057,7 +25165,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR186 - Undefined symbol: '" + symbol + "'",
+ "ERR189 - Undefined symbol: '" + symbol + "'",
exprtk_error_location));
return error_node();
@@ -25164,7 +25272,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_symtab,
current_token(),
- "ERR187 - Variable or function detected, yet symbol-table is invalid, Symbol: " + current_token().value,
+ "ERR190 - Variable or function detected, yet symbol-table is invalid, Symbol: " + current_token().value,
exprtk_error_location));
return error_node();
@@ -25188,7 +25296,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_numeric,
current_token(),
- "ERR188 - Failed generate node for scalar: '" + current_token().value + "'",
+ "ERR191 - Failed generate node for scalar: '" + current_token().value + "'",
exprtk_error_location));
return error_node();
@@ -25202,7 +25310,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_numeric,
current_token(),
- "ERR189 - Failed to convert '" + current_token().value + "' to a number",
+ "ERR192 - Failed to convert '" + current_token().value + "' to a number",
exprtk_error_location));
return error_node();
@@ -25229,7 +25337,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR190 - Expected ')' instead of: '" + current_token().value + "'",
+ "ERR193 - Expected ')' instead of: '" + current_token().value + "'",
exprtk_error_location));
free_node(node_allocator_,branch);
@@ -25254,7 +25362,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR191 - Expected ']' instead of: '" + current_token().value + "'",
+ "ERR194 - Expected ']' instead of: '" + current_token().value + "'",
exprtk_error_location));
free_node(node_allocator_,branch);
@@ -25279,7 +25387,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR192 - Expected '}' instead of: '" + current_token().value + "'",
+ "ERR195 - Expected '}' instead of: '" + current_token().value + "'",
exprtk_error_location));
free_node(node_allocator_,branch);
@@ -25319,7 +25427,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR193 - Premature end of expression[1]",
+ "ERR196 - Premature end of expression[1]",
exprtk_error_location));
return error_node();
@@ -25329,7 +25437,7 @@ namespace exprtk
set_error(
make_error(parser_error::e_syntax,
current_token(),
- "ERR194 - Premature end of expression[2]",
+ "ERR197 - Premature end of expression[2]",
exprtk_error_location));
return error_node();
@@ -26022,19 +26130,19 @@ namespace exprtk
return false;
else
return (
- (details::e_lt == operation) ||
- (details::e_lte == operation) ||
- (details::e_gt == operation) ||
- (details::e_gte == operation) ||
- (details::e_eq == operation) ||
- (details::e_ne == operation) ||
- (details::e_equal == operation) ||
- (details::e_and == operation) ||
- (details::e_nand == operation) ||
- (details:: e_or == operation) ||
- (details:: e_nor == operation) ||
- (details:: e_xor == operation) ||
- (details::e_xnor == operation)
+ (details::e_lt == operation) ||
+ (details::e_lte == operation) ||
+ (details::e_gt == operation) ||
+ (details::e_gte == operation) ||
+ (details::e_eq == operation) ||
+ (details::e_ne == operation) ||
+ (details::e_equal == operation) ||
+ (details::e_and == operation) ||
+ (details::e_nand == operation) ||
+ (details:: e_or == operation) ||
+ (details:: e_nor == operation) ||
+ (details:: e_xor == operation) ||
+ (details::e_xnor == operation)
);
}
@@ -26228,8 +26336,8 @@ namespace exprtk
{
if ((0 == condition) || (0 == consequent))
{
- free_node(*node_allocator_, condition );
- free_node(*node_allocator_, consequent );
+ free_node(*node_allocator_, condition);
+ free_node(*node_allocator_, consequent);
free_node(*node_allocator_, alternative);
return error_node();
@@ -26240,7 +26348,7 @@ namespace exprtk
// True branch
if (details::is_true(condition))
{
- free_node(*node_allocator_, condition );
+ free_node(*node_allocator_, condition);
free_node(*node_allocator_, alternative);
return consequent;
@@ -26248,7 +26356,7 @@ namespace exprtk
// False branch
else
{
- free_node(*node_allocator_, condition );
+ free_node(*node_allocator_, condition);
free_node(*node_allocator_, consequent);
if (alternative)
@@ -26260,11 +26368,11 @@ namespace exprtk
else if ((0 != consequent) && (0 != alternative))
{
return node_allocator_->
- allocate<conditional_node_t>(condition,consequent,alternative);
+ allocate<conditional_node_t>(condition, consequent, alternative);
}
else
return node_allocator_->
- allocate<cons_conditional_node_t>(condition,consequent);
+ allocate<cons_conditional_node_t>(condition, consequent);
}
#ifndef exprtk_disable_string_capabilities
@@ -26274,8 +26382,8 @@ namespace exprtk
{
if ((0 == condition) || (0 == consequent))
{
- free_node(*node_allocator_, condition );
- free_node(*node_allocator_, consequent );
+ free_node(*node_allocator_, condition);
+ free_node(*node_allocator_, consequent);
free_node(*node_allocator_, alternative);
return error_node();
@@ -26286,7 +26394,7 @@ namespace exprtk
// True branch
if (details::is_true(condition))
{
- free_node(*node_allocator_, condition );
+ free_node(*node_allocator_, condition);
free_node(*node_allocator_, alternative);
return consequent;
@@ -26294,7 +26402,7 @@ namespace exprtk
// False branch
else
{
- free_node(*node_allocator_, condition );
+ free_node(*node_allocator_, condition);
free_node(*node_allocator_, consequent);
if (alternative)
@@ -26306,7 +26414,7 @@ namespace exprtk
}
else if ((0 != consequent) && (0 != alternative))
return node_allocator_->
- allocate<conditional_string_node_t>(condition,consequent,alternative);
+ allocate<conditional_string_node_t>(condition, consequent, alternative);
else
return error_node();
}
@@ -26333,7 +26441,7 @@ namespace exprtk
result = node_allocator_->allocate<details::null_node<Type> >();
free_node(*node_allocator_, condition);
- free_node(*node_allocator_, branch );
+ free_node(*node_allocator_, branch);
return result;
}
@@ -26370,7 +26478,7 @@ namespace exprtk
}
free_node(*node_allocator_, condition);
- free_node(*node_allocator_, branch );
+ free_node(*node_allocator_, branch);
return error_node();
}
@@ -26407,16 +26515,16 @@ namespace exprtk
result = node_allocator_->allocate<details::null_node<Type> >();
free_node(*node_allocator_, initialiser);
- free_node(*node_allocator_, condition );
+ free_node(*node_allocator_, condition);
free_node(*node_allocator_, incrementor);
- free_node(*node_allocator_, loop_body );
+ free_node(*node_allocator_, loop_body);
return result;
}
else if (details::is_null_node(condition))
{
free_node(*node_allocator_, initialiser);
- free_node(*node_allocator_, condition );
+ free_node(*node_allocator_, condition);
free_node(*node_allocator_, incrementor);
return loop_body;
@@ -28432,12 +28540,12 @@ namespace exprtk
{
case details::e_div : new_cobnode = expr_gen.node_allocator_->
template allocate_tt<typename details::cob_node<Type,details::mul_op<Type> > >
- (c / cobnode->c(),cobnode->move_branch(0));
+ (c / cobnode->c(), cobnode->move_branch(0));
break;
case details::e_mul : new_cobnode = expr_gen.node_allocator_->
template allocate_tt<typename details::cob_node<Type,details::div_op<Type> > >
- (c / cobnode->c(),cobnode->move_branch(0));
+ (c / cobnode->c(), cobnode->move_branch(0));
break;
default : return error_node();
@@ -28486,11 +28594,11 @@ namespace exprtk
{
const Type c = static_cast<details::literal_node<Type>*>(branch[1])->value();
- details::free_node(*(expr_gen.node_allocator_),branch[1]);
+ details::free_node(*(expr_gen.node_allocator_), branch[1]);
if (std::equal_to<T>()(T(0),c) && (details::e_mul == operation))
{
- free_node(*expr_gen.node_allocator_,branch[0]);
+ free_node(*expr_gen.node_allocator_, branch[0]);
return expr_gen(T(0));
}
@@ -35656,9 +35764,7 @@ namespace exprtk
{
scoped_bft<func_1param> sb(*this);
base_func::update(v0);
- T result = this->value(base_func::expression);
-
- return result;
+ return this->value(base_func::expression);
}
};
@@ -35672,9 +35778,7 @@ namespace exprtk
{
scoped_bft<func_2param> sb(*this);
base_func::update(v0, v1);
- T result = this->value(base_func::expression);
-
- return result;
+ return this->value(base_func::expression);
}
};
@@ -35688,9 +35792,7 @@ namespace exprtk
{
scoped_bft<func_3param> sb(*this);
base_func::update(v0, v1, v2);
- T result = this->value(base_func::expression);
-
- return result;
+ return this->value(base_func::expression);
}
};
@@ -35704,9 +35806,7 @@ namespace exprtk
{
scoped_bft<func_4param> sb(*this);
base_func::update(v0, v1, v2, v3);
- T result = this->value(base_func::expression);
-
- return result;
+ return this->value(base_func::expression);
}
};
@@ -35720,9 +35820,7 @@ namespace exprtk
{
scoped_bft<func_5param> sb(*this);
base_func::update(v0, v1, v2, v3, v4);
- T result = this->value(base_func::expression);
-
- return result;
+ return this->value(base_func::expression);
}
};
@@ -35736,9 +35834,7 @@ namespace exprtk
{
scoped_bft<func_6param> sb(*this);
base_func::update(v0, v1, v2, v3, v4, v5);
- T result = this->value(base_func::expression);
-
- return result;
+ return this->value(base_func::expression);
}
};
@@ -35785,8 +35881,6 @@ namespace exprtk
const Sequence<std::string,Allocator>& var_list,
const bool override = false)
{
- const std::size_t n = var_list.size();
-
const typename std::map<std::string,expression_t>::iterator itr = expr_map_.find(name);
if (expr_map_.end() != itr)
@@ -35804,6 +35898,8 @@ namespace exprtk
if (compile_expression(name,expression,var_list))
{
+ const std::size_t n = var_list.size();
+
fp_map_[n][name]->setup(expr_map_[name]);
return true;
@@ -35869,7 +35965,7 @@ namespace exprtk
inline bool add(const function& f, const bool override = false)
{
- return add(f.name_,f.expression_,f.v_,override);
+ return add(f.name_, f.expression_, f.v_,override);
}
private:
@@ -36493,8 +36589,8 @@ namespace exprtk
return false; \
} \
- exprtk_register_function("print" , p)
- exprtk_register_function("println" ,pl)
+ exprtk_register_function("print" , p)
+ exprtk_register_function("println", pl)
#undef exprtk_register_function
return true;
@@ -38160,9 +38256,9 @@ namespace exprtk
namespace information
{
static const char* library = "Mathematical Expression Toolkit";
- static const char* version = "2.7182818284590452353602874713526624977572470936"
- "999595749669676277240766303535475945713821785251";
- static const char* date = "20170505";
+ static const char* version = "2.71828182845904523536028747135266249775724709369"
+ "9959574966967627724076630353547594571382178525166";
+ static const char* date = "20180101";
static inline std::string data()
{
diff --git a/src/core/mpi/BufferDataTypeExtensions.h b/src/core/mpi/BufferDataTypeExtensions.h
index b05128c4a193aebd46f9f31fec2ed89dc41c30ec..bf51bd9f83ad3390976f72fea1502799c337317c 100644
--- a/src/core/mpi/BufferDataTypeExtensions.h
+++ b/src/core/mpi/BufferDataTypeExtensions.h
@@ -33,6 +33,7 @@
#include <boost/integer.hpp>
#include <boost/uuid/uuid.hpp>
+#include <array>
#include <deque>
#include <limits>
#include <list>
@@ -82,6 +83,51 @@ struct BufferSizeTrait< std::pair<T1,T2> > {
// ----------------------------- Standard Container Support -----------------------------------------------------------
// ---------------------------------------------------------------------------------------------------------------------
+template< typename T, // Element type of SendBuffer
+ typename G, // Growth policy of SendBuffer
+ typename Cont > // Container
+void sendNonResizableContainer( GenericSendBuffer<T,G> & buf, const Cont & container )
+{
+ buf.addDebugMarker( "ar" );
+ for( const auto & it : container )
+ buf << it;
+}
+
+template< typename T, // Element type of RecvBuffer
+ typename Cont > // Container
+void recvNonResizableContainer( GenericRecvBuffer<T> & buf, Cont & container )
+{
+ buf.readDebugMarker( "ar" );
+ for( auto & it : container )
+ buf >> it;
+}
+
+template< typename T, // Element type of SendBuffer
+ typename G, // Growth policy of SendBuffer
+ typename CT, // Element type
+ std::size_t N > // Array size
+GenericSendBuffer<T,G>& operator<<( GenericSendBuffer<T,G> & buf, const std::array<CT, N> & array )
+{
+ sendNonResizableContainer(buf, array);
+ return buf;
+}
+
+template< typename T, // Element type of RecvBuffer
+ typename CT, // Element type
+ std::size_t N > // Array size
+GenericRecvBuffer<T>& operator>>( GenericRecvBuffer<T> & buf, std::array<CT, N> & array )
+{
+ recvNonResizableContainer(buf, array);
+ return buf;
+}
+
+template<typename T, std::size_t N>
+struct BufferSizeTrait< std::array< T, N > > {
+ static const bool constantSize = true;
+ static const uint_t size = N * sizeof(T) + BUFFER_DEBUG_OVERHEAD;
+};
+
+
template< typename T, // Element type of SendBuffer
typename G, // Growth policy of SendBuffer
typename Cont> // Container
diff --git a/src/core/mpi/BufferSystem.cpp b/src/core/mpi/BufferSystem.cpp
index 1cabacc1d1dd8742067cf2bab3c134c3c316988a..551fce3e60dae2355ff448ab71e380fc9ca77437 100644
--- a/src/core/mpi/BufferSystem.cpp
+++ b/src/core/mpi/BufferSystem.cpp
@@ -41,7 +41,7 @@ std::set<int> BufferSystem::activeTags_;
BufferSystem::iterator::iterator( BufferSystem & bufferSystem, bool begin )
- : bufferSystem_( bufferSystem), currentRecvBuffer_( NULL ), currentSenderRank_( -1 )
+ : bufferSystem_( bufferSystem), currentRecvBuffer_( nullptr ), currentSenderRank_( -1 )
{
if ( begin ) // init iterator
++(*this);
@@ -86,7 +86,7 @@ BufferSystem::BufferSystem( const MPI_Comm & communicator, int tag )
: knownSizeComm_ ( communicator, tag ),
unknownSizeComm_( communicator, tag ),
noMPIComm_( communicator, tag ),
- currentComm_ ( NULL ),
+ currentComm_ ( nullptr ),
sizeChangesEverytime_( true ),
communicationRunning_( false )
{
@@ -97,7 +97,7 @@ BufferSystem::BufferSystem( const BufferSystem &other )
: knownSizeComm_ ( other.knownSizeComm_.getCommunicator(), other.knownSizeComm_.getTag() ),
unknownSizeComm_( other.knownSizeComm_.getCommunicator(), other.knownSizeComm_.getTag() ),
noMPIComm_ ( other.knownSizeComm_.getCommunicator(), other.knownSizeComm_.getTag() ),
- currentComm_ ( NULL ),
+ currentComm_ ( nullptr ),
sizeChangesEverytime_( other.sizeChangesEverytime_ ),
communicationRunning_( other.communicationRunning_ ),
recvInfos_( other.recvInfos_ ),
@@ -111,7 +111,7 @@ BufferSystem::BufferSystem( const BufferSystem &other )
else if ( other.currentComm_ == &other.noMPIComm_ )
currentComm_ = &noMPIComm_;
else
- currentComm_ = NULL; // receiver information not yet set
+ currentComm_ = nullptr; // receiver information not yet set
}
@@ -131,7 +131,7 @@ BufferSystem & BufferSystem::operator=( const BufferSystem & other )
else if ( other.currentComm_ == &other.noMPIComm_ )
currentComm_ = &noMPIComm_;
else
- currentComm_ = NULL; // receiver information not yet set
+ currentComm_ = nullptr; // receiver information not yet set
return *this;
}
@@ -419,7 +419,7 @@ RecvBuffer * BufferSystem::waitForNext( MPIRank & fromRank )
else
{
endCommunication();
- return NULL;
+ return nullptr;
}
}
diff --git a/src/core/mpi/Gatherv.cpp b/src/core/mpi/Gatherv.cpp
index d2576987d0232cb4de3e2d5fcb64e82fc9406b1f..af9aea36cf657f8c17dc977d6484c3b4a2d1eb4f 100644
--- a/src/core/mpi/Gatherv.cpp
+++ b/src/core/mpi/Gatherv.cpp
@@ -112,7 +112,7 @@ void gathervBuffer( const mpi::SendBuffer & sendBuffer, mpi::RecvBuffer & recvBu
// Gather the message sizes on root process
MPI_Gather( &sendBufferSize, 1, MPITrait<int>::type(),
- isGatherProcess? &sizes[0] : NULL, 1, MPITrait<int>::type(),
+ isGatherProcess? &sizes[0] : nullptr, 1, MPITrait<int>::type(),
targetRank, comm );
int totalSize = 0;
@@ -128,8 +128,8 @@ void gathervBuffer( const mpi::SendBuffer & sendBuffer, mpi::RecvBuffer & recvBu
MPI_Gatherv( sendBuffer.ptr(), int_c( sendBuffer.size() ), MPITrait< mpi::SendBuffer::ElementType >::type(),
recvBuffer.ptr(),
- isGatherProcess? &sizes[0] : NULL,
- isGatherProcess? &displacements[0] : NULL,
+ isGatherProcess? &sizes[0] : nullptr,
+ isGatherProcess? &displacements[0] : nullptr,
MPITrait< mpi::RecvBuffer::ElementType >::type(), targetRank, comm );
}
diff --git a/src/core/mpi/MPIWrapper.h b/src/core/mpi/MPIWrapper.h
index f97cb06b197565e4fdbb15f8e1983a614053e250..3cdc7d54626747d8a6d9010a2211e4ccfbbeb54d 100644
--- a/src/core/mpi/MPIWrapper.h
+++ b/src/core/mpi/MPIWrapper.h
@@ -91,6 +91,7 @@ typedef int MPI_File;
typedef int MPI_Offset;
typedef int MPI_Info;
typedef int MPI_Aint;
+typedef void (MPI_User_function) (void* a, void* b, int* len, MPI_Datatype*);
struct MPI_Status
{
@@ -245,6 +246,10 @@ inline int MPI_Type_commit( MPI_Datatype* ) { WALBERLA_MPI_FUNCTION_ERROR }
inline int MPI_Type_free( MPI_Datatype* ) { WALBERLA_MPI_FUNCTION_ERROR }
inline int MPI_Type_create_resized( MPI_Datatype, MPI_Aint, MPI_Aint, MPI_Datatype* ) { WALBERLA_MPI_FUNCTION_ERROR }
inline int MPI_Type_size( MPI_Datatype, int * ) { WALBERLA_MPI_FUNCTION_ERROR }
+inline int MPI_Type_get_extent(MPI_Datatype, MPI_Aint*, MPI_Aint*) { WALBERLA_MPI_FUNCTION_ERROR }
+inline int MPI_Type_create_struct(int, const int[], const MPI_Aint[], const MPI_Datatype[], MPI_Datatype*) { WALBERLA_MPI_FUNCTION_ERROR }
+
+inline int MPI_Op_create(MPI_User_function*, int, MPI_Op*) { WALBERLA_MPI_FUNCTION_ERROR }
inline int MPI_Get_processor_name( char*, int* ) { WALBERLA_MPI_FUNCTION_ERROR }
diff --git a/src/core/mpi/OpenMPBufferSystem.cpp b/src/core/mpi/OpenMPBufferSystem.cpp
index 54471ccf415c82cd2403d0a4db3c122de9ced943..45a614eb42b87451d40418ef59e46a7b79f1815e 100644
--- a/src/core/mpi/OpenMPBufferSystem.cpp
+++ b/src/core/mpi/OpenMPBufferSystem.cpp
@@ -47,14 +47,14 @@ OpenMPBufferSystem::OpenMPBufferSystem( const MPI_Comm & communicator, int tag,
}
-void OpenMPBufferSystem::addReceivingFunction( MPIRank rank, std::function<void ( RecvBuffer & buf ) > recvFunction )
+void OpenMPBufferSystem::addReceivingFunction( MPIRank rank, const std::function<void ( RecvBuffer & buf ) >& recvFunction )
{
dirty_ = true;
recvFunctions_[rank] = recvFunction;
}
-void OpenMPBufferSystem::addSendingFunction ( MPIRank rank, std::function<void ( SendBuffer & buf ) > sendFunction )
+void OpenMPBufferSystem::addSendingFunction ( MPIRank rank, const std::function<void ( SendBuffer & buf ) >& sendFunction )
{
dirty_ = true;
sendRanks_.push_back( rank );
@@ -184,7 +184,7 @@ void OpenMPBufferSystem::waitOpenMP()
for( int i = 0; i < numReceives; ++i )
{
MPIRank recvRank = INVALID_RANK;
- RecvBuffer * recvBuffer = NULL;
+ RecvBuffer * recvBuffer = nullptr;
#ifdef _OPENMP
#pragma omp critical
diff --git a/src/core/mpi/OpenMPBufferSystem.h b/src/core/mpi/OpenMPBufferSystem.h
index 9fd31e2b2146b23fef31a8b1ae768621cadeb738..3a41f36f0615a1aa2cd244f494438faee1d740a9 100644
--- a/src/core/mpi/OpenMPBufferSystem.h
+++ b/src/core/mpi/OpenMPBufferSystem.h
@@ -60,8 +60,8 @@ public:
bool isSizeCommunicatedInNextStep() const { return bs_.isSizeCommunicatedInNextStep(); }
- void addReceivingFunction( MPIRank rank, std::function<void ( RecvBuffer & buf ) > recvFunction );
- void addSendingFunction ( MPIRank rank, std::function<void ( SendBuffer & buf ) > sendFunction );
+ void addReceivingFunction( MPIRank rank, const std::function<void ( RecvBuffer & buf ) >& recvFunction );
+ void addSendingFunction ( MPIRank rank, const std::function<void ( SendBuffer & buf ) >& sendFunction );
void clearReceivingFunctions() { dirty_ = true; recvFunctions_.clear(); }
void clearSendingFunctions() { dirty_ = true; sendFunctions_.clear(); sendRanks_.clear(); }
diff --git a/src/core/mpi/RecvBuffer.h b/src/core/mpi/RecvBuffer.h
index 3caa764b7bfc9a2559d78204cc10bc2e8c33c6fb..19d45825ed2f6d00d8f8fdbd27e91cfc4dc23445 100644
--- a/src/core/mpi/RecvBuffer.h
+++ b/src/core/mpi/RecvBuffer.h
@@ -655,7 +655,7 @@ inline void GenericRecvBuffer<T>::readDebugMarker( const char * expectedMarker )
valid = false;
}
- WALBERLA_ASSERT( valid , "Packed and unpacked datatype do not match." );
+ WALBERLA_ASSERT( valid , "Packed and unpacked (" << expectedMarker << ") datatype do not match." );
}
#else
diff --git a/src/core/ptrvector/Algorithm.h b/src/core/ptrvector/Algorithm.h
deleted file mode 100644
index c00063d702e55c804b1b02ceadf44845a1ff1069..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/Algorithm.h
+++ /dev/null
@@ -1,95 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file Algorithm.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <boost/type_traits/is_base_of.hpp>
-
-namespace walberla {
-
-//=================================================================================================
-//
-// POLYMORPHIC COUNT
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Counts the pointer to objects with dynamic type \a D.
- *
- * \param first Iterator to the first pointer of the pointer range.
- * \param last Iterator to the pointer one past the last pointer of the pointer range.
- * \return The number of objects with dynamic type \a D.
- *
- * This function traverses the range \f$ [first,last) \f$ of pointers to objects with static
- * type \a S and counts all polymorphic pointers to objects of dynamic type \a D. Note that
- * in case \a D is not a type derived from \a S, a compile time error is created!
- */
-template< typename D // Dynamic type of the objects
- , typename S > // Static type of the objects
-inline size_t polymorphicCount( S *const * first, S *const * last )
-{
- static_assert(boost::is_base_of<S, D>::value && !boost::is_base_of<D, S>::value, "D has to be strictly derived from S");
-
- size_t count( 0 );
- for( S *const * it=first; it!=last; ++it )
- if( dynamic_cast<D*>( *it ) ) ++count;
- return count;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// POLYMORPHIC FIND
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Finds the next pointer to an object with dynamic type \a D.
- *
- * \param first Iterator to the first pointer of the pointer range.
- * \param last Iterator to the pointer one past the last pointer of the pointer range.
- * \return The next pointer to an object with dynamic type \a D.
- *
- * This function traverses the range \f$ [first,last) \f$ of pointers to objects with static
- * type \a S until it finds the next polymorphic pointer to an object of dynamic type \a D.
- * Note that in case \a D is not a type derived from \a S, a compile time error is created!
- */
-template< typename D // Dynamic type of the objects
- , typename S > // Static type of the objects
-inline S *const * polymorphicFind( S *const * first, S *const * last )
-{
- static_assert(boost::is_base_of<S, D>::value && !boost::is_base_of<D, S>::value, "D has to be strictly derived from S");
-
- while( first != last && !dynamic_cast<D*>( *first ) ) ++first;
- return first;
-}
-//*************************************************************************************************
-
-} // namespace
diff --git a/src/core/ptrvector/Null.h b/src/core/ptrvector/Null.h
deleted file mode 100644
index 0f08813a0244eacfe1f82e9f9249308e924c932c..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/Null.h
+++ /dev/null
@@ -1,289 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file Null.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Safe C++ NULL pointer implementation.
- * \ingroup util
- *
- * This implementation offers a remedy for the use of the NULL pointer in C++. For this, the
- * NULL macro is replaced by an instance of the Null class, which can only be assigned and
- * compared with pointers and pointers-to-member. Therefore the use of NULL regains the type
- * safety it lost in C++ due to the strict C++ type system.\n
- * The NULL pointer is used exactly as before:
-
- \code
- int* pi = NULL;
- if( pi == NULL ) {...}
- \endcode
- */
-class Null
-{
-public:
- //**Constructor*********************************************************************************
- /*!\name Constructor */
- //@{
- inline Null();
- //@}
- //**********************************************************************************************
-
- //**Destructor**********************************************************************************
- // No explicitly declared destructor.
- //**********************************************************************************************
-
- //**Conversion operators************************************************************************
- /*!\name Conversion operators */
- //@{
- template< typename T >
- inline operator T*() const;
-
- template< typename T, typename C >
- inline operator T C::*() const;
- //@}
- //**********************************************************************************************
-
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- template< typename T >
- inline bool equal( const T* rhs ) const;
-
- template< typename T, typename C >
- inline bool equal( const T C::* rhs ) const;
- //@}
- //**********************************************************************************************
-
-private:
- //**Forbidden operations************************************************************************
- /*!\name Forbidden operations */
- //@{
- Null( const Null& n ); //!< Copy constructor (private & undefined)
- Null& operator=( const Null& n ); //!< Copy assignment operator (private & undefined)
- void* operator&() const; //!< Address operator (private & undefined)
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// CONSTRUCTOR
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief The default constructor of the Null class.
- */
-inline Null::Null()
-{}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// CONVERSION OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Conversion operator to a pointer.
- *
- * This conversion operator offers a type safe conversion of zero to a pointer of any kind.
- */
-template< typename T >
-inline Null::operator T*() const
-{
- return 0;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Conversion operator to a pointer-to-member.
- *
- * This conversion operator offers the type safe conversion of zero to a pointer-to-member of
- * any kind.
- */
-template< typename T, typename C >
-inline Null::operator T C::*() const
-{
- return 0;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Comparison between Null and a pointer.
- *
- * The function offers a type safe comparison between zero and an arbitrary pointer.
- */
-template< typename T >
-inline bool Null::equal( const T* rhs ) const
-{
- return rhs == 0;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Comparison between Null and a pointer-to-member.
- *
- * The function offers a type safe comparison between zero and an arbitrary pointer-to-member.
- */
-template< typename T, typename C >
-inline bool Null::equal( const T C::* rhs ) const
-{
- return rhs == 0;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// GLOBAL OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\name Null operators */
-//@{
-template< typename T >
-inline bool operator==( const Null& lhs, const T& rhs );
-
-template< typename T >
-inline bool operator==( const T& lhs, const Null& rhs );
-
-template< typename T >
-inline bool operator!=( const Null& lhs, const T& rhs );
-
-template< typename T >
-inline bool operator!=( const T& lhs, const Null& rhs );
-//@}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Equality comparison between Null and a pointer or pointer-to-member.
- *
- * This operator takes a reference to an object of type T instead of a pointer of a pointer-
- * to-member to avoid the ambiguity with the built-in pointer comparison operators. However,
- * only pointers and pointers-to-member can be compared to Null.
- */
-template< typename T >
-inline bool operator==( const Null& lhs, const T& rhs )
-{
- return lhs.equal( rhs );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Equality comparison between a pointer or pointer-to-member and Null.
- *
- * This operator takes a reference to an object of type T instead of a pointer of a pointer-
- * to-member to avoid the ambiguity with the built-in pointer comparison operators. However,
- * only pointers and pointers-to-member can be compared to Null.
- */
-template< typename T >
-inline bool operator==( const T& lhs, const Null& rhs )
-{
- return rhs.equal( lhs );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Inequality comparison between Null and a pointer or pointer-to-member.
- *
- * This operator takes a reference to an object of type T instead of a pointer of a pointer-
- * to-member to avoid the ambiguity with the built-in pointer comparison operators. However,
- * only pointers and pointers-to-member can be compared to Null.
- */
-template< typename T >
-inline bool operator!=( const Null& lhs, const T& rhs )
-{
- return !lhs.equal( rhs );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Inequality comparison between a pointer or pointer-to-member and Null.
- *
- * This operator takes a reference to an object of type T instead of a pointer of a pointer-
- * to-member to avoid the ambiguity with the built-in pointer comparison operators. However,
- * only pointers and pointers-to-member can be compared to Null.
- */
-template< typename T >
-inline bool operator!=( const T& lhs, const Null& rhs )
-{
- return !rhs.equal( lhs );
-}
-//*************************************************************************************************
-
-} // namespace
-
-
-
-
-////=================================================================================================
-////
-//// NULL DEFINITION
-////
-////=================================================================================================
-
-//#ifdef NULL
-//# undef NULL
-//#endif
-
-////*************************************************************************************************
-///*!\brief Global NULL pointer.
-// * \ingroup util
-// *
-// * This instance of the Null class replaces the NULL macro to ensure a type-safe NULL pointer.
-// */
-//const walberla::Null NULL;
-////*************************************************************************************************
diff --git a/src/core/ptrvector/PtrIterator.h b/src/core/ptrvector/PtrIterator.h
deleted file mode 100644
index a6ecef7f3b6194ead74e78f2b52e030dd3c9b704..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/PtrIterator.h
+++ /dev/null
@@ -1,548 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PtrIterator.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <iterator>
-#include <core/ptrvector/Null.h>
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Implementation of an iterator for pointer vectors.
- * \ingroup util
- *
- * The PtrIterator class follows the example of the random-access iterator classes of the STL.
- * However, the focus of this iterator implementation is the use with (polymorphic) pointers.
- * Since the physics engine makes heavy use of polymorphic pointers, this implementation eases
- * the use of iterators over a range of pointers and improves the semantics on these pointers.\n
- *
- * In contrast to the STL iterators, the PtrIterator class slightly changes the meaning of the
- * access operators. Consider the following example:
-
- \code
- // Definition of class A
- class A
- {
- public:
- A( int i=0 ):i_(i) {}
-
- void set( int i ) { i_ = i; }
- int get() const { return i_; }
-
- private:
- int i_;
- };
-
- // Definition of a pointer vector for class A
- typedef PtrVector<A> AVector;
-
- AVector vector;
- AVector::Iterator it = vector.begin();
-
- // The subscript operator returns a handle to the underlying object
- A* a1 = it[0];
-
- // The dereference operator returns a handle to the underlying object
- A* a2 = *it;
-
- // The member access operator offers direct access to the underlying object
- it->set( 2 );
- \endcode
-
- * The constant iterators (iterator over constant objects) prohibit the access to non-const
- * member functions. Therefore the following operation results in a compile-time error:
-
- \code
- AVector vector;
- AVector::ConstIterator it = vector.begin();
-
- it->set( 2 ); // Compile-time error!
- \endcode
- */
-template< typename Type >
-class PtrIterator
-{
-public:
- //**Type definitions****************************************************************************
- // pe naming convention
- typedef std::random_access_iterator_tag IteratorCategory; //!< The iterator category.
- typedef Type* ValueType; //!< Type of the underlying pointers.
- typedef Type* const PointerType; //!< Pointer return type.
- typedef ValueType const& ReferenceType; //!< Reference return type.
- typedef ValueType const* IteratorType; //!< Type of the internal pointer.
- typedef std::ptrdiff_t DifferenceType; //!< Difference between two iterators.
-
- // STL iterator requirements
- typedef IteratorCategory iterator_category; //!< The iterator category.
- typedef ValueType value_type; //!< Type of the underlying pointers.
- typedef PointerType pointer; //!< Pointer return type.
- typedef ReferenceType reference; //!< Reference return type.
- typedef DifferenceType difference_type; //!< Difference between two iterators.
- //**********************************************************************************************
-
- //**Constructors********************************************************************************
- /*!\name Constructors */
- //@{
- inline PtrIterator();
- explicit inline PtrIterator( const IteratorType& it );
-
- template< typename Other >
- inline PtrIterator( const PtrIterator<Other>& it );
-
- // No explicitly declared copy constructor.
- //@}
- //**********************************************************************************************
-
- //**Destructor**********************************************************************************
- // No explicitly declared destructor.
- //**********************************************************************************************
-
- //**Copy assignment operator********************************************************************
- // No explicitly declared copy assignment operator.
- //**********************************************************************************************
-
- //**Operators***********************************************************************************
- /*!\name Operators */
- //@{
- inline PtrIterator& operator++();
- inline PtrIterator operator++( int );
- inline PtrIterator& operator--();
- inline PtrIterator operator--( int );
- inline PtrIterator& operator+=( DifferenceType n );
- inline PtrIterator operator+ ( DifferenceType n ) const;
- inline PtrIterator& operator-=( DifferenceType n );
- inline PtrIterator operator- ( DifferenceType n ) const;
- inline DifferenceType operator- ( const PtrIterator& it ) const;
- //@}
- //**********************************************************************************************
-
- //**Access operators****************************************************************************
- /*!\name Access operators */
- //@{
- inline PointerType& operator[]( DifferenceType n ) const;
- inline PointerType& operator*() const;
- inline PointerType& operator->() const;
- //@}
- //**********************************************************************************************
-
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- inline const IteratorType& base() const;
- //@}
- //**********************************************************************************************
-
-private:
- //**Member variables****************************************************************************
- /*!\name Member variables */
- //@{
- IteratorType it_; //!< Pointer to the current memory location.
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// CONSTRUCTORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Default constructor for PtrIterator.
- */
-template< typename Type >
-inline PtrIterator<Type>::PtrIterator()
- : it_(NULL) // Pointer to the current memory location
-{}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Standard constructor for PtrIterator.
- *
- * \param it The value of the iterator.
- */
-template< typename Type >
-inline PtrIterator<Type>::PtrIterator( const IteratorType& it )
- : it_(it) // Pointer to the current memory location
-{}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Conversion constructor from different PtrIterator instances.
- *
- * \param it The foreign PtrIterator instance to be copied.
- */
-template< typename Type >
-template< typename Other >
-inline PtrIterator<Type>::PtrIterator( const PtrIterator<Other>& it )
- : it_( it.base() ) // Pointer to the current memory location
-{}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Pre-increment operator.
- *
- * \return Reference to the incremented pointer iterator.
- */
-template< typename Type >
-inline PtrIterator<Type>& PtrIterator<Type>::operator++()
-{
- ++it_;
- return *this;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Post-increment operator.
- *
- * \return The incremented pointer iterator.
- */
-template< typename Type >
-inline PtrIterator<Type> PtrIterator<Type>::operator++( int )
-{
- PtrIterator tmp( *this );
- ++it_;
- return tmp;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Pre-decrement operator.
- *
- * \return Reference to the decremented pointer iterator.
- */
-template< typename Type >
-inline PtrIterator<Type>& PtrIterator<Type>::operator--()
-{
- --it_;
- return *this;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Post-decrement operator.
- *
- * \return The decremented pointer iterator.
- */
-template< typename Type >
-inline PtrIterator<Type> PtrIterator<Type>::operator--( int )
-{
- PtrIterator tmp( *this );
- --it_;
- return tmp;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Shifting the iterator by \a n elements to the higher elements.
- *
- * \param n The number of elements.
- * \return Reference to the shifted pointer iterator.
- */
-template< typename Type >
-inline PtrIterator<Type>& PtrIterator<Type>::operator+=( DifferenceType n )
-{
- it_ += n;
- return *this;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Shifting the iterator by \a n elements to the higher elements.
- *
- * \param n The number of elements.
- * \return The shifted pointer iterator.
- */
-template< typename Type >
-inline PtrIterator<Type> PtrIterator<Type>::operator+( DifferenceType n ) const
-{
- return PtrIterator( it_ + n );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Shifting the iterator by \a n elements to the lower elements.
- *
- * \param n The number of elements.
- * \return Reference to the shifted pointer iterator.
- */
-template< typename Type >
-inline PtrIterator<Type>& PtrIterator<Type>::operator-=( DifferenceType n )
-{
- it_ -= n;
- return *this;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Shifting the iterator by \a n elements to the lower elements.
- *
- * \param n The number of elements.
- * \return The shifted pointer iterator.
- */
-template< typename Type >
-inline PtrIterator<Type> PtrIterator<Type>::operator-( DifferenceType n ) const
-{
- return PtrIterator( it_ - n );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Calculating the number of elements between two pointer iterators.
- *
- * \param it The right hand side iterator.
- * \return The number of elements between the two pointer iterators.
- */
-template< typename Type >
-inline typename PtrIterator<Type>::DifferenceType PtrIterator<Type>::operator-( const PtrIterator& it ) const
-{
- return it_ - it.it_;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ACCESS OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Subscript operator for the direct element access.
- *
- * \param index Access index. Accesses the element \a index elements away from the current iterator position.
- * \return Handle to the accessed element.
- */
-template< typename Type >
-inline typename PtrIterator<Type>::PointerType& PtrIterator<Type>::operator[]( DifferenceType index ) const
-{
- return it_[index];
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a handle to the element at the current iterator position.
- *
- * \return Handle to the element at the current iterator position.
- */
-template< typename Type >
-inline typename PtrIterator<Type>::PointerType& PtrIterator<Type>::operator*() const
-{
- return *it_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Direct access to the element at the current iterator position.
- *
- * \return Reference to the element at the current iterator position.
- */
-template< typename Type >
-inline typename PtrIterator<Type>::PointerType& PtrIterator<Type>::operator->() const
-{
- return *it_;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Access to the underlying member of the pointer iterator.
- *
- * \return Pointer to the current memory location.
- */
-template< typename Type >
-inline const typename PtrIterator<Type>::IteratorType& PtrIterator<Type>::base() const
-{
- return it_;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// GLOBAL OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\name PtrIterator operators */
-//@{
-template< typename TypeL, typename TypeR >
-inline bool operator==( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs );
-
-template< typename TypeL, typename TypeR >
-inline bool operator!=( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs );
-
-template< typename TypeL, typename TypeR >
-inline bool operator<( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs );
-
-template< typename TypeL, typename TypeR >
-inline bool operator>( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs );
-
-template< typename TypeL, typename TypeR >
-inline bool operator<=( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs );
-
-template< typename TypeL, typename TypeR >
-inline bool operator>=( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs );
-//@}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Equality comparison between two PtrIterator objects.
- *
- * \param lhs The left-hand side pointer iterator.
- * \param rhs The right-hand side pointer iterator.
- * \return \a true if the iterators point to the same element, \a false if not.
- */
-template< typename TypeL, typename TypeR >
-inline bool operator==( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs )
-{
- return lhs.base() == rhs.base();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Inequality comparison between two PtrIterator objects.
- *
- * \param lhs The left-hand side pointer iterator.
- * \param rhs The right-hand side pointer iterator.
- * \return \a true if the iterators don't point to the same element, \a false if they do.
- */
-template< typename TypeL, typename TypeR >
-inline bool operator!=( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs )
-{
- return lhs.base() != rhs.base();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Less-than comparison between two PtrIterator objects.
- *
- * \param lhs The left-hand side pointer iterator.
- * \param rhs The right-hand side pointer iterator.
- * \return \a true if the left-hand side iterator points to a lower element, \a false if not.
- */
-template< typename TypeL, typename TypeR >
-inline bool operator<( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs )
-{
- return lhs.base() < rhs.base();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Greater-than comparison between two PtrIterator objects.
- *
- * \param lhs The left-hand side pointer iterator.
- * \param rhs The right-hand side pointer iterator.
- * \return \a true if the left-hand side iterator points to a higher element, \a false if not.
- */
-template< typename TypeL, typename TypeR >
-inline bool operator>( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs )
-{
- return lhs.base() > rhs.base();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Less-or-equal-than comparison between two PtrIterator objects.
- *
- * \param lhs The left-hand side pointer iterator.
- * \param rhs The right-hand side pointer iterator.
- * \return \a true if the left-hand side iterator points to a lower or the same element, \a false if not.
- */
-template< typename TypeL, typename TypeR >
-inline bool operator<=( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs )
-{
- return lhs.base() <= rhs.base();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Greater-or-equal-than comparison between two PtrIterator objects.
- *
- * \param lhs The left-hand side pointer iterator.
- * \param rhs The right-hand side pointer iterator.
- * \return \a true if the left-hand side iterator points to a higher or the same element, \a false if not.
- */
-template< typename TypeL, typename TypeR >
-inline bool operator>=( const PtrIterator<TypeL>& lhs, const PtrIterator<TypeR>& rhs )
-{
- return lhs.base() >= rhs.base();
-}
-//*************************************************************************************************
-
-} // namespace
diff --git a/src/core/ptrvector/PtrVector.h b/src/core/ptrvector/PtrVector.h
deleted file mode 100644
index 2e62290407295ed080e6b619f7242e709ee952fe..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/PtrVector.h
+++ /dev/null
@@ -1,2604 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PtrVector.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <algorithm>
-#include <stdexcept>
-#include <core/debug/Debug.h>
-#include <core/ptrvector/Algorithm.h>
-#include <core/ptrvector/Null.h>
-#include <core/ptrvector/policies/PtrDelete.h>
-#include <core/ptrvector/policies/OptimalGrowth.h>
-#include <core/ptrvector/PtrIterator.h>
-#include <core/Template.h>
-
-#include <boost/type_traits/is_base_of.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Implementation of a vector for (polymorphic) pointers.
- * \ingroup util
- *
- * \section basics Basic usage
- *
- * The \a std::vector is one of the standard libraries most useful tools. It is the standard
- * solution for a dynamically allocated, automatically growing, and memory managed array. It
- * provides fast random access to its elements, since a vector guarantees that the elements
- * lie adjacent in memory and manages the dynamically allocated memory according to the RAII
- * idiom.\n
- * Yet there are some situations, where users of \a std::vector experience several drawbacks,
- * especially when \a std::vector is used in combination with pointers. For instance, a
- * \a const_iterator over a range of pointers will not allow the stored pointers to change,
- * but the objects behind the pointers remain changeable. The following example illustrates
- * that it is possible to change the values of \a double values through an iterator-to-const:
-
- \code
- typedef std::vector<double*> Doubles;
-
- Doubles doubles; // Creating a vector for pointers to double values
-
- // Filling the vector with pointers to double values. All values are initialized with 1.
- for( size_t i=0; i<10; ++i )
- doubles.push_back( new double( 1.0 ) );
-
- // Accessing the first rigid body
- Doubles::const_iterator first = doubles.begin();
- **first = 2.0; // Changes the double value through an iterator-to-const
- \endcode
-
- * The basic reason for this behavior is that \a std::vector is unaware of the fact that it
- * stores pointers instead of objects and therefore the pointer are considered constant, not
- * the objects behind the pointer.\n
- * Another drawback of \a std::vector is the fact that during destruction of a vector object
- * the dynamically allocated bodies are not deleted. Again, \a std::vector is unaware of the
- * special property of pointers and therefore does not apply any kind of deletion policy. It
- * basically calls the default destructor for pointers, which in turn does nothing and
- * especially does not destroy the attached objects.\n
- * A different approach is taken by the Boost \a ptr_vector. A \a ptr_vector is perfectly
- * aware of the fact that is stores pointers to dynamically objects (and in consequence may
- * only be used with pointers to dynamically allocated objects) and takes full responsibility
- * for these resources. However, in order to accomplish this task, \a ptr_vector completely
- * abstracts from the fact that it stores pointers and provides a view as if it would contain
- * objects instead of pointers. However, unfortunately this strict memory management creates
- * problems in the context of \b walberla, where vectors to pointers are used both internally
- * (including proper resource management) and outside by the user (without any resource
- * management).\n
- * \b walberla provides a special vector container for pointers, which is
- * a cross of the functionalities of the \a std::vector and \a ptr_vector. The \b walberla PtrVector
- * is not a RAII class in the classical sense (as for instance the Boost \a ptr_vector) since
- * it does not strictly encapsule the resource management. As in the case of \a std::vector,
- * it still is the responsibility of a user of PtrVector to manage the resources accordingly.
- * However, it perfectly fits the requirements of \b walberla: PtrVector can be used internally
- * to store pointers to dynamically allocated objects and resources within RAII classes, and
- * outside of \b walberla by a user as storage for handles to resources that are managed elsewhere.
- * In contrast to the \a boost::ptr_vector, the PtrVector provides full access to the contained
- * pointers, but its iterators work similar to the \a ptr_vector
- * iterator and only provide access to the objects behind the pointers, creating the illusion
- * that objects are stored instead of pointers:
-
- \code
- typedef walberla::PtrVector<double> Doubles;
- Doubles doubles; // Creating an empty PtrVector for pointers to double values
-
- doubles.pushBack( new double(1.0) ); // A new pointer-to-double is added to the vector
-
- double_vector::iterator first = doubles.begin();
- *first = 2.0; // No indirection needed
-
- Doubles::ConstIterator second( first+1 );
- *second = 3.0; // Compile time error! It is not possible to change double
- // values via an iterator-to-const
- \endcode
-
- * Notice the differences in the usage of the iterator in contrast to the \a std::vector and
- * \a boost::ptr_vector. In contrast to them the functions of PtrVector follow the naming
- * convention of the \b walberla physics engine (i.e. pushBack instead of push_back). In addition,
- * the underlying iterator adds an additional dereference to all access operators, which eases
- * the access to the underlying objects:
-
- \code
- // STL style:
- **first = 2.0;
-
- // walberla style:
- *first = 2.0;
- \endcode
-
- * A noteworthy difference between the STL vector and the pointer vector is the used template
- * argument: instead of the pointer type, the \b walberla pointer vector is only provided with the
- * type of the underlying objects:
-
- \code
- // STL style:
- std::vector<double*> vector;
-
- // walberla style:
- walberla::PtrVector<double> vector;
- \endcode
-
- * Additionally, the \b walberla pointer vector offers some limited possibilities to configure the
- * memory management and the growth of the internal storage, and implements special features
- * for polymorphic pointers, as for instance a convenient way to iterate over a subset of
- * polymorphic objects contained in the pointer vector.\n\n
- *
- *
- * \section polymorphic Polymorphic pointers
- *
- * For polymorphic pointers, the PtrVector class additionally offers two special iterators to
- * iterate over all objects of a specific type: the CastIterator and ConstCastIterator.
-
- \code
- // Definition of class A and the derived type B
- class A { ... };
- class B : public A { ... };
-
- // Definition of function f for non-const pointer vectors
- void f( PtrVector<A>& vector )
- {
- PtrVector<A>::CastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::CastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- ...
- }
-
- // Definition of function f for const pointer vectors
- void f( const PtrVector<A>& vector )
- {
- PtrVector<A>::ConstCastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::ConstCastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- }
- \endcode
-
- * In the example, the cast iterators are used to iterate over all objects of type \a B within
- * the pointer vector, where \a B must be a type derived from \a A. The attempt to use these
- * iterators for types that are not derived from \a A results in a compile time error. Note that
- * the usage of the cast iterators is computationally more expensive than the use of the standard
- * iterators. Therefore these iterators should not be used unless a down-cast is really necessary,
- * e.g. in order to access a type specific function.\n\n
- *
- *
- * \section container Using a pointer vector within other container classes
- *
- * If a pointer vector is used within an other container and is used to store polymorphic pointers,
- * you might face the problem of not being able to create type definitions for the cast iterators.
- * Whereas it is possible to create typedefs for the standard iterators, it is unfortunately not
- * possible (yet) to create type definitions for template classes. In order to create a new return
- * type within the container, the following approach could be taken:
-
- \code
- template< typename A >
- class Container
- {
- public:
- template< typename C >
- struct CastIterator : public PtrVector<A>::CastIterator<C>
- {
- CastIterator( const PtrVector<A>::CastIterator<C>& it )
- : PtrVector<A>::CastIterator<C>( it ) // Initializing the base class
- {}
- };
-
- template< typename C >
- CastIterator<C> begin();
-
- template< typename C >
- CastIterator<C> end();
-
- private:
- PtrVector<A> vector_;
- };
- \endcode
-
- * Instead of a typedef within the Container class, a new class CastIterator is derived from the
- * PtrVector::CastIterator class. This approach acts similar as the typedef as a user can now
- * use the Container as follows:
-
- \code
- class A { ... };
- class B : public A { ... };
-
- Container<A>::CastIterator<B> begin;
- \endcode
-
- * This provides the same abstraction from the internal implementation as the desired typedef. The
- * same approach could be taken for a ConstCastIterator definition. However, to keep the code
- * footprint small you should consider using the original type instead.\n\n
- *
- *
- * \section adaptions Adapting a pointer vector
- *
- * The growth and deletion behavior of the PtrVector class can be adapted to any specific task. The
- * second template argument of the PtrVector specifies the growth rate. The following growth rates
- * can be selected:
- *
- * - ConstantGrowth
- * - LinearGrowth
- * - OptimalGrowth (the default behavior)
- *
- * The third template argument of the PtrVector specifies the deletion behavior for the case that
- * the pointer vector is destroyed. Note that the deletion behavior has only limited effect on
- * the memory management of the contained resources. For instance, copying a PtrVector always
- * results in a shallow copy, i.e., the contained resources are not copied/cloned. Therefore the
- * deletion policy should be considered a convenience functionality in the context of a resource
- * managing class. The following policies can be selected:
- *
- * - NoDelete : No deletion of the contained pointers (the default behavior).
- * - PtrDelete : Applies \a delete to all contained pointers.
- * - ArrayDelete : Applies \a delete[] to all contained pointers.\n\n
- */
-template< typename T // Type
- , typename D = PtrDelete // Deletion policy
- , typename G = OptimalGrowth > // Growth policy
-class PtrVector
-{
-private:
- //**Friend declarations*************************************************************************
- /*! \cond internal */
- template< typename T2, typename D2, typename G2 > friend class PtrVector;
- /*! \endcond */
- //**********************************************************************************************
-
-public:
- //**Type definitions****************************************************************************
- typedef T* ValueType; //!< Type of the underlying values.
- typedef T* PointerType; //!< Pointer to a non-const object.
- typedef const T* ConstPointerType; //!< Pointer to a const object.
- typedef T*& ReferenceType; //!< Reference to a non-const object.
- typedef T*const& ConstReferenceType; //!< Reference to a const object.
- typedef size_t SizeType; //!< Size type of the pointer vector.
- typedef PtrIterator<T> Iterator; //!< Iterator over non-const objects.
- typedef PtrIterator<const T> ConstIterator; //!< Iterator over const objects.
- typedef D DeletionPolicy; //!< Type of the deletion policy.
- typedef G GrowthPolicy; //!< Type of the growth policy.
-
- // STL iterator requirements
- typedef ValueType value_type; //!< Type of the underlying values.
- typedef PointerType pointer; //!< Pointer to a non-const object.
- typedef ConstPointerType const_pointer; //!< Pointer to a const object.
- typedef ReferenceType reference; //!< Reference to a non-const object.
- typedef ConstReferenceType const_reference; //!< Reference to a const object.
- typedef SizeType size_type; //!< Size type of the pointer vector.
- //**********************************************************************************************
-
- //**Forward declarations for nested classes*****************************************************
- template< typename C > class CastIterator;
- template< typename C > class ConstCastIterator;
- //**********************************************************************************************
-
- //**Constructors********************************************************************************
- /*!\name Constructors */
- //@{
- explicit inline PtrVector( SizeType initCapacity = 0 );
- inline PtrVector( const PtrVector& pv );
-
- template< typename T2, typename D2, typename G2 >
- inline PtrVector( const PtrVector<T2,D2,G2>& pv );
- //@}
- //**********************************************************************************************
-
- //**Destructor**********************************************************************************
- /*!\name Destructor */
- //@{
- inline ~PtrVector();
- //@}
- //**********************************************************************************************
-
- //**Assignment operators************************************************************************
- /*!\name Assignment operators */
- //@{
- PtrVector& operator=( const PtrVector& pv );
-
- template< typename T2, typename D2, typename G2 >
- PtrVector& operator=( const PtrVector<T2,D2,G2>& pv );
- //@}
- //**********************************************************************************************
-
- //**Get functions*******************************************************************************
- /*!\name Get functions */
- //@{
- inline SizeType maxSize() const;
- inline SizeType size() const;
- template< typename C > inline SizeType size() const;
- inline SizeType capacity() const;
- inline bool isEmpty() const;
- //@}
- //**********************************************************************************************
-
- //**Access functions****************************************************************************
- /*!\name Access functions */
- //@{
- inline ReferenceType operator[]( SizeType index );
- inline ConstReferenceType operator[]( SizeType index ) const;
- inline ReferenceType front();
- inline ConstReferenceType front() const;
- inline ReferenceType back();
- inline ConstReferenceType back() const;
- //@}
- //**********************************************************************************************
-
- //**Iterator functions**************************************************************************
- /*!\name Iterator functions */
- //@{
- inline Iterator begin();
- inline ConstIterator begin() const;
- template< typename C > inline CastIterator<C> begin();
- template< typename C > inline ConstCastIterator<C> begin() const;
-
- inline Iterator end();
- inline ConstIterator end() const;
- template< typename C > inline CastIterator<C> end();
- template< typename C > inline ConstCastIterator<C> end() const;
- //@}
- //**********************************************************************************************
-
- //**Element functions***************************************************************************
- /*!\name Element functions */
- //@{
- inline void pushBack ( PointerType p );
- inline void popBack ();
- inline void releaseBack();
-
- template< typename IteratorType >
- inline void assign( IteratorType first, IteratorType last );
-
- inline Iterator insert( Iterator pos, PointerType p );
-
- template< typename IteratorType >
- inline void insert( Iterator pos, IteratorType first, IteratorType last );
-
- /*! \cond internal */
- template< typename IteratorType >
- inline void insert( Iterator pos, IteratorType* first, IteratorType* last );
- /*! \endcond */
-
- inline Iterator erase ( Iterator pos );
- template< typename C > inline CastIterator<C> erase ( CastIterator<C> pos );
- inline Iterator release( Iterator pos );
- template< typename C > inline CastIterator<C> release( CastIterator<C> pos );
- inline void clear ();
- //@}
- //**********************************************************************************************
-
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- void reserve( SizeType newCapacity );
- inline void swap( PtrVector& pv ) /* throw() */;
- //@}
- //**********************************************************************************************
-
-private:
- //**Helper functions****************************************************************************
- /*!\name Helper functions */
- //@{
- inline size_t calcCapacity ( size_t minCapacity ) const;
- inline void deleteElement( PointerType ptr ) const;
- //@}
- //**********************************************************************************************
-
- //**Insertion helper functions******************************************************************
- /*!\name Insertion helper functions */
- //@{
- void insert( T**const pos, PointerType p );
-
- /*! \cond internal */
- template< typename IteratorType >
- inline void insert( Iterator pos, IteratorType first, IteratorType last, std::input_iterator_tag );
-
- template< typename IteratorType >
- inline void insert( Iterator pos, IteratorType first, IteratorType last, std::random_access_iterator_tag );
- /*! \endcond */
-
- template< typename IteratorType >
- void insert( T** pos, IteratorType first, IteratorType last, SizeType n );
- //@}
- //**********************************************************************************************
-
- //**Member variables****************************************************************************
- /*!\name Member variables */
- //@{
- SizeType size_; //!< The current size of the pointer vector.
- SizeType capacity_; //!< The capacity of the pointer vector.
- PointerType* begin_; //!< Pointer to the first element of the pointer vector.
- PointerType* end_; //!< Pointer to the last element of the pointer vector.
- //@}
- //**********************************************************************************************
-
-public:
- //**CastIterator/ConstCastIterator comparison operators*****************************************
- // The following comparison operators cannot be defined as namespace or member functions
- // but have to be injected into the surrounding scope via the Barton-Nackman trick since
- // the template arguments of nested templates cannot be deduced (C++ standard 14.8.2.4/4).
- /*!\name CastIterator/ConstCastIterator comparison operators */
- //@{
-
- //**********************************************************************************************
- /*!\brief Equality comparison between two CastIterator objects.
- //
- // \param lhs The left hand side cast iterator.
- // \param rhs The right hand side cast iterator.
- // \return \a true if the iterators point to the same element, \a false if not.
- */
- template< typename L, typename R >
- friend inline bool operator==( const CastIterator<L>& lhs, const CastIterator<R>& rhs )
- {
- return lhs.base() == rhs.base();
- }
- //**********************************************************************************************
-
- //**********************************************************************************************
- /*!\brief Equality comparison between a CastIterator and a ConstCastIterator.
- //
- // \param lhs The left hand side cast iterator.
- // \param rhs The right hand side constant cast iterator.
- // \return \a true if the iterators point to the same element, \a false if not.
- */
- template< typename L, typename R >
- friend inline bool operator==( const CastIterator<L>& lhs, const ConstCastIterator<R>& rhs )
- {
- return lhs.base() == rhs.base();
- }
- //**********************************************************************************************
-
- //**********************************************************************************************
- /*!\brief Equality comparison between a ConstCastIterator and a CastIterator.
- //
- // \param lhs The left hand side constant cast iterator.
- // \param rhs The right hand side cast iterator.
- // \return \a true if the iterators point to the same element, \a false if not.
- */
- template< typename L, typename R >
- friend inline bool operator==( const ConstCastIterator<L>& lhs, const CastIterator<R>& rhs )
- {
- return lhs.base() == rhs.base();
- }
- //**********************************************************************************************
-
- //**********************************************************************************************
- /*!\brief Equality comparison between two ConstCastIterator objects.
- //
- // \param lhs The left hand side constant cast iterator.
- // \param rhs The right hand side constant cast iterator.
- // \return \a true if the iterators point to the same element, \a false if not.
- */
- template< typename L, typename R >
- friend inline bool operator==( const ConstCastIterator<L>& lhs, const ConstCastIterator<R>& rhs )
- {
- return lhs.base() == rhs.base();
- }
- //**********************************************************************************************
-
- //**********************************************************************************************
- /*!\brief Inequality comparison between two CastIterator objects.
- //
- // \param lhs The left hand side cast iterator.
- // \param rhs The right hand side cast iterator.
- // \return \a true if the iterators don't point to the same element, \a false if they do.
- */
- template< typename L, typename R >
- friend inline bool operator!=( const CastIterator<L>& lhs, const CastIterator<R>& rhs )
- {
- return lhs.base() != rhs.base();
- }
- //**********************************************************************************************
-
- //**********************************************************************************************
- /*!\brief Inequality comparison between a CastIterator and a ConstCastIterator.
- //
- // \param lhs The left hand side cast iterator.
- // \param rhs The right hand side constant cast iterator.
- // \return \a true if the iterators don't point to the same element, \a false if they do.
- */
- template< typename L, typename R >
- friend inline bool operator!=( const CastIterator<L>& lhs, const ConstCastIterator<R>& rhs )
- {
- return lhs.base() != rhs.base();
- }
- //**********************************************************************************************
-
- //**********************************************************************************************
- /*!\brief Inequality comparison between a ConstCastIterator and a CastIterator.
- //
- // \param lhs The left hand side constant cast iterator.
- // \param rhs The right hand side cast iterator.
- // \return \a true if the iterators don't point to the same element, \a false if they do.
- */
- template< typename L, typename R >
- friend inline bool operator!=( const ConstCastIterator<L>& lhs, const CastIterator<R>& rhs )
- {
- return lhs.base() != rhs.base();
- }
- //**********************************************************************************************
-
- //**********************************************************************************************
- /*!\brief Inequality comparison between two ConstCastIterator objects.
- //
- // \param lhs The left hand side constant cast iterator.
- // \param rhs The right hand side constant cast iterator.
- // \return \a true if the iterators don't point to the same element, \a false if they do.
- */
- template< typename L, typename R >
- friend inline bool operator!=( const ConstCastIterator<L>& lhs, const ConstCastIterator<R>& rhs )
- {
- return lhs.base() != rhs.base();
- }
- //**********************************************************************************************
-
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// CONSTRUCTORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Standard constructor for PtrVector.
- *
- * \param initCapacity The initial capacity of the pointer vector.
- *
- * The default initial capacity of the pointer vector is specified by the selected growth policy.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline PtrVector<T,D,G>::PtrVector( SizeType initCapacity )
- : size_( 0 ) // Current size of the pointer vector
- , capacity_( initCapacity ) // Capacity of the pointer vector
- , begin_( new PointerType[initCapacity] ) // Pointer to the first element
- , end_( begin_ ) // Pointer to the last element
-{}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Copy constructor for PtrVector.
- *
- * \param pv The pointer vector to be copied.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline PtrVector<T,D,G>::PtrVector( const PtrVector& pv )
- : size_( pv.size_ ) // Current size of the pointer vector
- , capacity_( pv.size_ ) // Capacity of the pointer vector
- , begin_( new PointerType[capacity_] ) // Pointer to the first element
- , end_( begin_+size_ ) // Pointer to the last element
-{
- for( SizeType i=0; i<size_; ++i )
- begin_[i] = pv.begin_[i];
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Conversion constructor from different PtrVector instances.
- *
- * \param pv The pointer vector to be copied.
- */
-template< typename T // Type of the pointer vector
- , typename D // Deletion policy of the pointer vector
- , typename G > // Growth policy of the pointer vector
-template< typename T2 // Type of the foreign pointer vector
- , typename D2 // Deletion policy of the foreign pointer vector
- , typename G2 > // Growth policy of the foreign pointer vector
-inline PtrVector<T,D,G>::PtrVector( const PtrVector<T2,D2,G2>& pv )
- : size_( pv.size_ ) // Current size of the pointer vector
- , capacity_( pv.size_ ) // Capacity of the pointer vector
- , begin_( new PointerType[capacity_] ) // Pointer to the first element
- , end_( begin_+size_ ) // Pointer to the last element
-{
- for( SizeType i=0; i<size_; ++i )
- begin_[i] = pv.begin_[i];
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// DESTRUCTOR
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Destructor for PtrVector.
- *
- * In the destructor, the selected deletion policy is applied to all elements of the pointer
- * vector.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline PtrVector<T,D,G>::~PtrVector()
-{
- for( PointerType* it=begin_; it!=end_; ++it )
- deleteElement( *it );
- delete [] begin_;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ASSIGNMENT OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Copy assignment operator for PtrVector.
- *
- * \param pv The pointer vector to be copied.
- * \return Reference to the assigned pointer vector.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-PtrVector<T,D,G>& PtrVector<T,D,G>::operator=( const PtrVector& pv )
-{
- if( &pv == this ) return *this;
-
- if( pv.size_ > capacity_ ) {
- PointerType* newBegin( new PointerType[pv.size_] );
- end_ = std::copy( pv.begin_, pv.end_, newBegin );
- std::swap( begin_, newBegin );
- delete [] newBegin;
-
- size_ = pv.size_;
- capacity_ = pv.size_;
- }
- else {
- end_ = std::copy( pv.begin_, pv.end_, begin_ );
- size_ = pv.size_;
- }
-
- return *this;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Assignment operator for different PtrVector instances.
- *
- * \param pv The pointer vector to be copied.
- * \return Reference to the assigned pointer vector.
- */
-template< typename T // Type of the pointer vector
- , typename D // Deletion policy of the pointer vector
- , typename G > // Growth policy of the pointer vector
-template< typename T2 // Type of the foreign pointer vector
- , typename D2 // Deletion policy of the foreign pointer vector
- , typename G2 > // Growth policy of the foreign pointer vector
-PtrVector<T,D,G>& PtrVector<T,D,G>::operator=( const PtrVector<T2,D2,G2>& pv )
-{
- if( pv.size_ > capacity_ ) {
- PointerType* newBegin( new PointerType[pv.size_] );
- end_ = std::copy( pv.begin_, pv.end_, newBegin );
- std::swap( begin_, newBegin );
- delete [] newBegin;
-
- size_ = pv.size_;
- capacity_ = pv.size_;
- }
- else {
- end_ = std::copy( pv.begin_, pv.end_, begin_ );
- size_ = pv.size_;
- }
-
- return *this;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// GET FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns the maximum possible size of a pointer vector.
- *
- * \return The maximum possible size.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::SizeType PtrVector<T,D,G>::maxSize() const
-{
- return SizeType(-1) / sizeof(PointerType);
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the current size of the pointer vector.
- *
- * \return The current size.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::SizeType PtrVector<T,D,G>::size() const
-{
- return size_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the total number of objects of type \a C contained in the pointer vector.
- *
- * \return The total number of objects of type \a C.
- *
- * This function calculates the total number of objects of type \a C within the pointer vector,
- * where \a C is a type derived from the type \a T of objects contained in the pointer vector.
- * The attempt to use this function for types that are not derived from \a T results in a
- * compile time error.
-
- \code
- // Definition of class A and the derived type B
- class A { ... };
- class B : public A { ... };
-
- // Definition of a pointer vector for class A
- typedef PtrVector<A> AVector;
- AVector vector;
-
- AVector::SizeType total = vector.size(); // Calculating the total number of pointers
- AVector::SizeType numB = vector.size<B>(); // Calculating the total number of B objects
- \endcode
-
- * \b Note: The total number of objects of type \a C is not cached inside the pointer vector
- * but is calculated each time the function is called. Using the templated version of size()
- * to calculate the total number objects of type \a C is therefore more expensive than using
- * the non-template version of size() to get the total number of pointers in the vector!
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::SizeType PtrVector<T,D,G>::size() const
-{
- // The polymorphicCount() function returns the number of objects with dynamic type 'C'
- // contained in the range [begin,end). An equivalent code might look like this:
- //
- // SizeType count( 0 );
- // for( PointerType* it=begin_; it!=end_; ++it )
- // if( dynamic_cast<C*>( *it ) ) ++count;
- // return count;
- //
- // However, the specialization of polymorphicCount() for special type combinations is
- // much more efficient (and easier) than the specialization of this function!
- return polymorphicCount<C>( begin_, end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the capacity of the pointer vector.
- *
- * \return The capacity.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::SizeType PtrVector<T,D,G>::capacity() const
-{
- return capacity_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns \a true if the pointer vector has no elements.
- *
- * \return \a true if the pointer vector is empty, \a false if it is not.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline bool PtrVector<T,D,G>::isEmpty() const
-{
- return size_ == 0;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ACCESS FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Subscript operator for the direct access to the pointer vector elements.
- *
- * \param index Access index. The index has to be in the range \f$[0..size-1]\f$.
- * \return Handle to the accessed element.
- *
- * \b Note: No runtime check is performed to insure the validity of the access index.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::ReferenceType PtrVector<T,D,G>::operator[]( SizeType index )
-{
- return *(begin_+index);
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Subscript operator for the direct access to the pointer vector elements.
- *
- * \param index Access index. The index has to be in the range \f$[0..size-1]\f$.
- * \return Handle to the accessed element.
- *
- * \b Note: No runtime check is performed to insure the validity of the access index.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::ConstReferenceType PtrVector<T,D,G>::operator[]( SizeType index ) const
-{
- return *(begin_+index);
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a reference to the first element of the pointer vector.
- *
- * \return Handle to the first element.
- *
- * \b Note: No runtime check is performed if the first element exists!
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::ReferenceType PtrVector<T,D,G>::front()
-{
- WALBERLA_ASSERT( size_ > 0, "Pointer vector is empty, invalid access to the front element" );
- return *begin_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a reference to the first element of the pointer vector.
- *
- * \return Handle to the first element.
- *
- * \b Note: No runtime check is performed if the first element exists!
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::ConstReferenceType PtrVector<T,D,G>::front() const
-{
- WALBERLA_ASSERT( size_ > 0, "Pointer vector is empty, invalid access to the front element" );
- return *begin_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a reference to the last element of the pointer vector.
- *
- * \return Handle to the last element.
- *
- * \b Note: No runtime check is performed if the last element exists!
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::ReferenceType PtrVector<T,D,G>::back()
-{
- WALBERLA_ASSERT( size_ > 0, "Pointer vector is empty, invalid access to the back element" );
- return *(end_-1);
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a reference to the last element of the pointer vector.
- *
- * \return Handle to the last element.
- *
- * \b Note: No runtime check is performed if the last element exists!
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::ConstReferenceType PtrVector<T,D,G>::back() const
-{
- WALBERLA_ASSERT( size_ > 0, "Pointer vector is empty, invalid access to the back element" );
- return *(end_-1);
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ITERATOR FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the beginning of the pointer vector.
- *
- * \return Iterator to the beginning of the pointer vector.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::Iterator PtrVector<T,D,G>::begin()
-{
- return Iterator( begin_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the beginning of the pointer vector.
- *
- * \return Iterator to the beginning of the pointer vector.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::ConstIterator PtrVector<T,D,G>::begin() const
-{
- return ConstIterator( begin_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first element of type \a C within the pointer vector.
- *
- * \return Iterator to the first element of type \a C.
- *
- * This function returns an iterator to the first element of type \a C within in the pointer
- * vector, where \a C is a type derived from the type \a T of objects contained in the pointer
- * vector. In case there is no element of type \a C contained in the vector, an iterator just
- * past the last element of the pointer vector is returned. In combination with the according
- * end function (see example), this iterator allows to iterate over all objects of type \a C
- * in the range of the pointer vector. The attempt to use this function for types that are not
- * derived from \a T results in a compile time error.
-
- \code
- // Definition of class A and the derived type B
- class A { ... };
- class B : public A { ... };
-
- // Definition of function f for non-const pointer vectors
- void f( PtrVector<A>& vector )
- {
- PtrVector<A>::CastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::CastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- ...
- }
-
- // Definition of function f for const pointer vectors
- void f( const PtrVector<A>& vector )
- {
- PtrVector<A>::ConstCastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::ConstCastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- }
- \endcode
-
- * \b Note: Using the templated versions of begin() and end() to traverse all elements of type
- * \a C in the element range of the pointer vector is more expensive than using the non-template
- * versions to traverse the entire range of elements. Use this function only if you require a
- * type-specific member of type \a C.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C> PtrVector<T,D,G>::begin()
-{
- return CastIterator<C>( begin_, end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first element of type \a C within the pointer vector.
- *
- * \return Iterator to the first element of type \a C.
- *
- * This function returns an iterator to the first element of type \a C within in the pointer
- * vector, where \a C is a type derived from the type \a T of objects contained in the pointer
- * vector. In case there is no element of type \a C contained in the vector, an iterator just
- * past the last element of the pointer vector is returned. In combination with the according
- * end function (see example), this iterator allows to iterate over all objects of type \a C
- * in the range of the pointer vector. The attempt to use this function for types that are not
- * derived from \a T results in a compile time error.
-
- \code
- // Definition of class A and the derived type B
- class A { ... };
- class B : public A { ... };
-
- // Definition of function f for non-const pointer vectors
- void f( PtrVector<A>& vector )
- {
- PtrVector<A>::CastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::CastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- ...
- }
-
- // Definition of function f for const pointer vectors
- void f( const PtrVector<A>& vector )
- {
- PtrVector<A>::ConstCastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::ConstCastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- }
- \endcode
-
- * \b Note: Using the templated versions of begin() and end() to traverse all elements of type
- * \a C in the element range of the pointer vector is more expensive than using the non-template
- * version to traverse the entire range of elements. Use this function only if you require a
- * type-specific member of type \a C.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE ConstCastIterator<C> PtrVector<T,D,G>::begin() const
-{
- return ConstCastIterator<C>( begin_, end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last element of the pointer vector.
- *
- * \return Iterator just past the last element of the pointer vector.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::Iterator PtrVector<T,D,G>::end()
-{
- return Iterator( end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last element of the pointer vector.
- *
- * \return Iterator just past the last element of the pointer vector.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::ConstIterator PtrVector<T,D,G>::end() const
-{
- return ConstIterator( end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last element of the pointer vector.
- *
- * \return Iterator just past the last element of the pointer vector.
- *
- * This function returns an iterator just past the last element of the pointer vector. In
- * combination with the according begin function (see example), this iterator allows to iterate
- * over all objects of type \a C in the range of the pointer vector. The attempt to use this
- * function for types that are not derived from \a T results in a compile time error.
-
- \code
- // Definition of class A and the derived type B
- class A { ... };
- class B : public A { ... };
-
- // Definition of function f for non-const pointer vectors
- void f( PtrVector<A>& vector )
- {
- PtrVector<A>::CastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::CastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- ...
- }
-
- // Definition of function f for const pointer vectors
- void f( const PtrVector<A>& vector )
- {
- PtrVector<A>::ConstCastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::ConstCastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- }
- \endcode
-
- * \b Note: Using the templated versions of begin() and end() to traverse all elements of type
- * \a C in the element range of the pointer vector is more expensive than using the non-template
- * versions to traverse the entire range of elements. Use this function only if you require a
- * type-specific member of type \a C.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C> PtrVector<T,D,G>::end()
-{
- return CastIterator<C>( end_, end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last element of the pointer vector.
- *
- * \return Iterator just past the last element of the pointer vector.
- *
- * This function returns an iterator just past the last element of the pointer vector. In
- * combination with the according begin function (see example), this iterator allows to iterate
- * over all objects of type \a C in the range of the pointer vector. The attempt to use this
- * function for types that are not derived from \a T results in a compile time error.
-
- \code
- // Definition of class A and the derived type B
- class A { ... };
- class B : public A { ... };
-
- // Definition of function f for non-const pointer vectors
- void f( PtrVector<A>& vector )
- {
- PtrVector<A>::CastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::CastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- ...
- }
-
- // Definition of function f for const pointer vectors
- void f( const PtrVector<A>& vector )
- {
- PtrVector<A>::ConstCastIterator<B> begin = vector.begin<B>();
- PtrVector<A>::ConstCastIterator<B> end = vector.end<B>();
-
- // Loop over all objects of type B contained in the vector
- for( ; begin!=end; ++begin )
- }
- \endcode
-
- * \b Note: Using the templated versions of begin() and end() to traverse all elements of type
- * \a C in the element range of the pointer vector is more expensive than using the non-template
- * version to traverse the entire range of elements. Use this function only if you require a
- * type-specific member of type \a C.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE ConstCastIterator<C> PtrVector<T,D,G>::end() const
-{
- return ConstCastIterator<C>( end_, end_ );
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ELEMENT FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Adding an element to the end of the pointer vector.
- *
- * \param p The pointer to be added to the end of the pointer vector.
- * \return void
- * \exception std::length_error Maximum pointer vector length exceeded.
- *
- * The pushBack function runs in constant time.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline void PtrVector<T,D,G>::pushBack( PointerType p )
-{
- if( size_ != capacity_ ) {
- *end_ = p;
- ++end_;
- ++size_;
- }
- else {
- insert( end_, p );
- }
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Removing an element from the end of the pointer vector.
- *
- * \return void
- *
- * This function removes the element at the end of the pointer vector, i.e. the element
- * is deleted according to the deletion policy and removed from the vector. Note that in
- * case the deletion policy is NoDelete, this function is identical to the releaseBack()
- * function.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline void PtrVector<T,D,G>::popBack()
-{
- deleteElement( *--end_ );
- --size_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Releasing the element at the end of the pointer vector.
- *
- * \return void
- *
- * This function releases the element at the end of the pointer vector, i.e. the element is
- * removed without applying the deletion policy. Therefore the responsibility to delete the
- * element is passed to the function caller. Note that in case the deletion policy is NoDelete,
- * this function is identical to the popBack() function.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline void PtrVector<T,D,G>::releaseBack()
-{
- --end_;
- --size_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Assigning a range of elements to the pointer vector.
- *
- * \param first Iterator to the first element of the element range.
- * \param last Iterator to the element one past the last element of the element range.
- * \return void
- * \exception std::length_error Maximum pointer vector length exceeded.
- *
- * This functions assigns the elements in the range \f$ [first,last) \f$ to the pointer vector.
- * All elements previously contained in the pointer vector are removed. The assign function runs
- * in linear time.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename IteratorType >
-inline void PtrVector<T,D,G>::assign( IteratorType first, IteratorType last )
-{
- clear();
- insert( end(), first, last );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Inserting an element into the pointer vector.
- *
- * \param pos The position before which the element is inserted.
- * \param p The pointer to be inserted into the pointer vector.
- * \return Iterator to the inserted element.
- * \exception std::length_error Maximum pointer vector length exceeded.
- *
- * The insert function runs in linear time. Note however that inserting elements into a pointer
- * vector can be a relatively time-intensive operation.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::Iterator PtrVector<T,D,G>::insert( Iterator pos, PointerType p )
-{
- T** const base = const_cast<T**>( pos.base() );
- const auto diff( base - begin_ );
-
- if( size_ != capacity_ && base == end_ ) {
- *end_ = p;
- ++end_;
- ++size_;
- }
- else {
- insert( base, p );
- }
-
- return Iterator( begin_+diff );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Inserting a range of elements into the pointer vector.
- *
- * \param pos The position before which the elements are inserted.
- * \param first Iterator to the first element of the element range.
- * \param last Iterator to the element one past the last element of the element range.
- * \return void
- * \exception std::length_error Maximum pointer vector length exceeded.
- *
- * This functions inserts the elements in the range \f$ [first,last) \f$ into the pointer vector.
- * The insert function runs in linear time. Note however that inserting elements into a pointer
- * vector can be a relatively time-intensive operation.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename IteratorType >
-inline void PtrVector<T,D,G>::insert( Iterator pos, IteratorType first, IteratorType last )
-{
- insert( pos, first, last, typename IteratorType::iterator_category() );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*! \cond internal */
-/*!\brief Inserting a range of elements into the pointer vector.
- *
- * \param pos The position before which the elements are inserted.
- * \param first Pointer to the first element of the element range.
- * \param last Pointer to the element one past the last element of the element range.
- * \return void
- * \exception std::length_error Maximum pointer vector length exceeded.
- *
- * This functions inserts the elements in the range \f$ [first,last) \f$ into the pointer vector.
- * The insert function runs in linear time. Note however that inserting elements into a pointer
- * vector can be a relatively time-intensive operation.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename IteratorType >
-inline void PtrVector<T,D,G>::insert( Iterator pos, IteratorType* first, IteratorType* last )
-{
- insert( pos, first, last, std::random_access_iterator_tag() );
-}
-/*! \endcond */
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Removing an element from the pointer vector.
- *
- * \param pos The position of the element to be removed.
- * \return Iterator to the element after the erased element.
- *
- * This function erases an element from the pointer vector, i.e. the element is deleted
- * according to the deletion policy of the pointer vector and removed from the vector.
- * Note that in case the deletion policy is NoDelete, this function is identical to the
- * release() function.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::Iterator PtrVector<T,D,G>::erase( Iterator pos )
-{
- T** const base = const_cast<T**>( pos.base() );
- deleteElement( *base );
- std::copy( base+1, end_, base );
-
- --size_;
- --end_;
-
- return pos;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Removing an element from the pointer vector.
- *
- * \param pos The position of the element to be removed.
- * \return Iterator to the element after the erased element.
- *
- * This function erases an element from the pointer vector, i.e. the element is deleted
- * according to the deletion policy of the pointer vector and removed from the vector.
- * Note that in case the deletion policy is NoDelete, this function is identical to the
- * release() function.
- *
- * Note: The cast iterator \a pos is not invalidated but every other cast iterators including those
- * returned by end<C>() are.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C>
- PtrVector<T,D,G>::erase( CastIterator<C> pos )
-{
- T** const base = const_cast<T**>( pos.base() );
- deleteElement( *base );
- std::copy( base+1, end_, base );
-
- --size_;
- --end_;
-
- return CastIterator<C>( base, end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Releasing an element from the pointer vector.
- *
- * \param pos The position of the element to be released.
- * \return Iterator to the element after the released element.
- *
- * This function releases an element from the pointer vector, i.e. the element is removed
- * without applying the deletion policy. Therefore the responsibility to delete the element
- * is passed to the function caller.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline typename PtrVector<T,D,G>::Iterator PtrVector<T,D,G>::release( Iterator pos )
-{
- T** const base = const_cast<T**>( pos.base() );
- std::copy( base+1, end_, base );
-
- --size_;
- --end_;
-
- return pos;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Releasing an element from the pointer vector.
- *
- * \param pos The position of the element to be released.
- * \return Iterator to the element after the released element.
- *
- * This function releases an element from the pointer vector, i.e. the element is removed
- * without applying the deletion policy. Therefore the responsibility to delete the element
- * is passed to the function caller.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C>
- PtrVector<T,D,G>::release( CastIterator<C> pos )
-{
- T** const base = const_cast<T**>( pos.base() );
- std::copy( base+1, end_, base );
-
- --size_;
- --end_;
-
- return CastIterator<C>( base, end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Removing all elements from the pointer vector.
- *
- * \return void
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline void PtrVector<T,D,G>::clear()
-{
- for( PointerType* it=begin_; it!=end_; ++it )
- deleteElement( *it );
-
- end_ = begin_;
- size_ = 0;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Setting the minimum capacity of the pointer vector.
- *
- * \param newCapacity The new minimum capacity of the pointer vector.
- * \return void
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-void PtrVector<T,D,G>::reserve( SizeType newCapacity )
-{
- if( newCapacity > capacity_ )
- {
- // Calculating the new capacity
- newCapacity = calcCapacity( newCapacity );
-
- // Allocating a new array
- PointerType* tmp = new PointerType[newCapacity];
-
- // Replacing the old array
- std::copy( begin_, end_, tmp );
- std::swap( tmp, begin_ );
- capacity_ = newCapacity;
- end_ = begin_ + size_;
- delete [] tmp;
- }
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Swapping the contents of two pointer vectors.
- *
- * \param pv The pointer vector to be swapped.
- * \return void
- * \exception no-throw guarantee.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline void PtrVector<T,D,G>::swap( PtrVector& pv ) /* throw() */
-{
- // By using the 'std::swap' function to swap all member variables,
- // the function can give the nothrow guarantee.
- std::swap( size_, pv.size_ );
- std::swap( capacity_, pv.capacity_ );
- std::swap( begin_, pv.begin_ );
- std::swap( end_, pv.end_ );
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// HELPER FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Calculating the new capacity of the vector based on its growth policy.
- *
- * \param minCapacity The minimum necessary capacity.
- * \return The new capacity.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline size_t PtrVector<T,D,G>::calcCapacity( size_t minCapacity ) const
-{
- WALBERLA_ASSERT( minCapacity > capacity_, "Invalid new vector capacity" );
- const size_t newCapacity( GrowthPolicy()( capacity_, minCapacity ) );
- WALBERLA_ASSERT( newCapacity > capacity_, "Invalid new vector capacity" );
- return newCapacity;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Deleting an element of the pointer vector according to the deletion policy.
- *
- * \param ptr The element to be deleted.
- * \return void
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline void PtrVector<T,D,G>::deleteElement( PointerType ptr ) const
-{
- DeletionPolicy()( ptr );
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// INSERTION HELPER FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Inserting an element into the pointer vector.
- *
- * \param pos The position before which the element is inserted.
- * \param p The pointer to be inserted into the pointer vector.
- * \return void
- * \exception std::length_error Maximum pointer vector length exceeded.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-void PtrVector<T,D,G>::insert( T**const pos, PointerType p )
-{
- if( size_ != capacity_ ) {
- std::copy_backward( pos, end_, end_+1 );
- *pos = p;
- ++end_;
- ++size_;
- }
- else if( size_ == maxSize() ) {
- throw std::length_error( "Maximum pointer vector length exceeded!" );
- }
- else {
- SizeType newCapacity( calcCapacity( capacity_+1 ) );
- if( newCapacity > maxSize() || newCapacity < capacity_ ) newCapacity = maxSize();
-
- PointerType* newBegin = new PointerType[newCapacity];
- PointerType* newEnd = std::copy( begin_, pos, newBegin );
- *newEnd = p;
- ++newEnd;
- end_ = std::copy( pos, end_, newEnd );
-
- std::swap( newBegin, begin_ );
- delete [] newBegin;
- capacity_ = newCapacity;
- ++size_;
- }
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*! \cond internal */
-/*!\brief Inserting a range of elements into the pointer vector.
- *
- * \param pos The position before which the elements are inserted.
- * \param first Iterator to the first element of the element range.
- * \param last Iterator to the element one past the last element of the element range.
- * \return void
- * \exception std::length_error Maximum pointer vector length exceeded.
- *
- * This functions inserts the elements in the range \f$ [first,last) \f$ into the pointer vector.
- * The iterators are treated as input iterators.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename IteratorType >
-inline void PtrVector<T,D,G>::insert( Iterator pos, IteratorType first, IteratorType last,
- std::input_iterator_tag )
-{
- for( ; first!=last; ++first ) {
- pos = insert( pos, *first );
- ++pos;
- }
-}
-/*! \endcond */
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*! \cond internal */
-/*!\brief Inserting a range of elements into the pointer vector.
- *
- * \param pos The position before which the elements are inserted.
- * \param first Iterator to the first element of the element range.
- * \param last Iterator to the element one past the last element of the element range.
- * \return void
- * \exception std::length_error Maximum pointer vector length exceeded.
- *
- * This functions inserts the elements in the range \f$ [first,last) \f$ into the pointer vector.
- * The iterators are treated as random access iterators.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename IteratorType >
-inline void PtrVector<T,D,G>::insert( Iterator pos, IteratorType first, IteratorType last,
- std::random_access_iterator_tag )
-{
- T** const base = const_cast<T**>( pos.base() );
- const SizeType diff( last - first );
-
- if( size_+diff <= capacity_ && base == end_ ) {
- for( ; first!=last; ++first, ++end_ ) {
- *end_ = *first;
- }
- size_ += diff;
- }
- else {
- insert( base, first, last, diff );
- }
-}
-/*! \endcond */
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Inserting a range of elements into the pointer vector.
- *
- * \param pos The position before which the elements are inserted.
- * \param first Iterator to the first element of the element range.
- * \param last Iterator to the element one past the last element of the element range.
- * \param n The number of elements to be inserted.
- * \return void
- * \exception std::length_error Maximum pointer vector length exceeded.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename IteratorType >
-void PtrVector<T,D,G>::insert( T** pos, IteratorType first, IteratorType last, SizeType n )
-{
- const SizeType newSize( size_ + n );
-
- if( newSize <= capacity_ ) {
- std::copy_backward( pos, end_, end_+n );
- for( ; first!=last; ++first, ++pos ) {
- *pos = *first;
- }
- end_ += n;
- size_ = newSize;
- }
- else if( newSize > maxSize() || newSize < size_ ) {
- throw std::length_error( "Maximum pointer vector length exceeded!" );
- }
- else {
- PointerType* newBegin = new PointerType[newSize];
- PointerType* newEnd = std::copy( begin_, pos, newBegin );
-
- for( ; first!=last; ++first, ++newEnd ) {
- *newEnd = *first;
- }
-
- end_ = std::copy( pos, end_, newEnd );
-
- std::swap( newBegin, begin_ );
- delete [] newBegin;
- capacity_ = newSize;
- size_ = newSize;
- }
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// GLOBAL OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\name PtrVector operators */
-//@{
-template< typename T, typename D, typename G >
-inline bool operator==( const PtrVector<T,D,G>& lhs, const PtrVector<T,D,G>& rhs );
-
-template< typename T, typename D, typename G >
-inline bool operator!=( const PtrVector<T,D,G>& lhs, const PtrVector<T,D,G>& rhs );
-
-template< typename T, typename D, typename G >
-inline void swap( PtrVector<T,D,G>& a, PtrVector<T,D,G>& b ) /* throw() */;
-//@}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Equality comparison between two pointer vectors.
- *
- * \param lhs The left hand side pointer vector.
- * \param rhs The right hand side pointer vector.
- * \return \a true if the two pointer vectors are equal, \a false if they are not.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline bool operator==( const PtrVector<T,D,G>& lhs, const PtrVector<T,D,G>& rhs )
-{
- return lhs.size() == rhs.size() && std::equal( lhs.begin(), lhs.end(), rhs.begin() );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Inequality comparison between two pointer vectors.
- *
- * \param lhs The left hand side pointer vector.
- * \param rhs The right hand side pointer vector.
- * \return \a true if the two pointer vectors are inequal, \a false if they are not.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline bool operator!=( const PtrVector<T,D,G>& lhs, const PtrVector<T,D,G>& rhs )
-{
- return lhs.size() != rhs.size() || !std::equal( lhs.begin(), lhs.end(), rhs.begin() );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Swapping the contents of two pointer vectors.
- *
- * \param a The first pointer vector to be swapped.
- * \param b The second pointer vector to be swapped.
- * \return void
- * \exception no-throw guarantee.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-inline void swap( PtrVector<T,D,G>& a, PtrVector<T,D,G>& b ) /* throw() */
-{
- a.swap( b );
-}
-//*************************************************************************************************
-
-
-
-
-
-
-
-
-//=================================================================================================
-//
-// NESTED CLASS PTRVECTOR::CASTITERATOR
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Dynamic cast iterator for polymorphic pointer vectors.
- * \ingroup util
- *
- * The CastIterator class is part of the PtrVector class and represent a forward iterator
- * over all elements of type \a C contained in a range of elements of type \a T, where \a C
- * is a type derived from \a T.
-
- \code
- class A { ... };
- class B : public class A { ... };
-
- PtrVector<A>::CastIterator<B> begin;
- PtrVector<A>::CastIterator<B> end;
-
- // Loop over all elements of type B within the range [begin..end)
- for( ; begin!=end; ++begin )
- ...
- \endcode
-
- * \b Note: Using a CastIterator is computationally more expensive than using a standard
- * iterator over all elements contained in the vector.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-class PtrVector<T,D,G>::CastIterator
-{
-public:
- //**Type definitions****************************************************************************
- // pe naming convention
- typedef std::forward_iterator_tag IteratorCategory; //!< The iterator category.
- typedef C* ValueType; //!< Type of the underlying pointers.
- typedef C* PointerType; //!< Pointer return type.
- typedef C* const& ReferenceType; //!< Reference return type.
- typedef ptrdiff_t DifferenceType; //!< Difference between two iterators.
- typedef T* const* IteratorType; //!< Type of the internal pointer.
-
- // STL iterator requirements
- typedef IteratorCategory iterator_category; //!< The iterator category.
- typedef ValueType value_type; //!< Type of the underlying pointers.
- typedef PointerType pointer; //!< Pointer return type.
- typedef ReferenceType reference; //!< Reference return type.
- typedef DifferenceType difference_type; //!< Difference between two iterators.
- //**********************************************************************************************
-
- //**Constructors********************************************************************************
- /*!\name Constructors */
- //@{
- inline CastIterator();
- inline CastIterator( IteratorType begin, IteratorType end );
-
- template< typename Other >
- inline CastIterator( const CastIterator<Other>& it );
-
- // No explicitly declared copy constructor.
- //@}
- //**********************************************************************************************
-
- //**Destructor**********************************************************************************
- // No explicitly declared destructor.
- //**********************************************************************************************
-
- //**Copy assignment operator********************************************************************
- // No explicitly declared copy assignment operator.
- //**********************************************************************************************
-
- //**Operators***********************************************************************************
- /*!\name Operators */
- //@{
- inline CastIterator& operator++();
- inline CastIterator operator++( int );
- //@}
- //**********************************************************************************************
-
- //**Access operators****************************************************************************
- /*!\name Access operators */
- //@{
- inline PointerType operator*() const;
- inline PointerType operator->() const;
- //@}
- //**********************************************************************************************
-
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- inline const IteratorType& base() const;
- inline const IteratorType& stop() const;
- //@}
- //**********************************************************************************************
-
-private:
- //**Member variables****************************************************************************
- /*!\name Member variables */
- //@{
- IteratorType cur_; //!< Pointer to the current memory location.
- IteratorType end_; //!< Pointer to the element one past the last element in the element range.
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// CONSTRUCTOR
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Default constructor for CastIterator.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline PtrVector<T,D,G>::CastIterator<C>::CastIterator()
- : cur_(NULL) // Pointer to the current memory location
- , end_(NULL) // Pointer to the element one past the last element in the element range
-{
- static_assert(boost::is_base_of<T, C>::value && !boost::is_base_of<C, T>::value, "C has to be strictly derived from T");
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Standard constructor for CastIterator.
- *
- * \param begin The beginning of the element range.
- * \param end The end of the element range.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline PtrVector<T,D,G>::CastIterator<C>::CastIterator( IteratorType begin, IteratorType end )
- : cur_(begin) // Pointer to the current memory location
- , end_(end) // Pointer to the element one past the last element in the element range
-{
- static_assert(boost::is_base_of<T, C>::value && !boost::is_base_of<C, T>::value, "C has to be strictly derived from T");
- // The polymorphicFind() function finds the next pointer to an object with dynamic type 'C'
- // contained in the range [cur_,end). An equivalent code might look like this:
- //
- // while( cur_ != end_ && !dynamic_cast<C*>( *cur_ ) ) ++cur_;
- //
- // However, the specialization of polymorphicFind() for special type combinations is much
- // more efficient (and way easier!) than the specialization of this function!
- cur_ = polymorphicFind<C>( cur_, end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Conversion constructor from different CastIterator instances.
- *
- * \param it The foreign CastIterator instance to be copied.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-template< typename Other > // The foreign cast iterator type
-inline PtrVector<T,D,G>::CastIterator<C>::CastIterator( const CastIterator<Other>& it )
- : cur_( it.base() ) // Pointer to the current memory location
- , end_( it.stop() ) // Pointer to the element one past the last element in the element range
-{
- static_assert(boost::is_base_of<C, T>::value && !boost::is_base_of<C, T>::value, "C has to be strictly derived from T");
- static_assert(boost::is_convertible<Other*, C*>::value, "Other must be convertible to C" );
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Pre-increment operator.
- *
- * \return Reference to the incremented cast iterator.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C>&
- PtrVector<T,D,G>::CastIterator<C>::operator++()
-{
- // The polymorphicFind() function finds the next pointer to an object with dynamic type 'C'
- // contained in the range [cur_+1,end). An equivalent code might look like this:
- //
- // while( ++cur_ != end_ && !dynamic_cast<C*>( *cur_ ) ) {}
- //
- // However, the specialization of polymorphicFind() for special type combinations is much
- // more efficient (and way easier!) than the specialization of this function!
- cur_ = polymorphicFind<C>( ++cur_, end_ );
-
- return *this;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Post-increment operator.
- *
- * \return The incremented cast iterator.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C>
- PtrVector<T,D,G>::CastIterator<C>::operator++( int )
-{
- CastIterator tmp( *this );
-
- // The polymorphicFind() function finds the next pointer to an object with dynamic type 'C'
- // contained in the range [cur_+1,end). An equivalent code might look like this:
- //
- // while( ++cur_ != end_ && !dynamic_cast<C*>( *cur_ ) ) {}
- //
- // However, the specialization of polymorphicFind() for special type combinations is much
- // more efficient (and way easier!) than the specialization of this function!
- cur_ = polymorphicFind<C>( ++cur_, end_ );
-
- return tmp;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ACCESS OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns a handle to the element at the current iterator position.
- *
- * \return Handle to the element at the current iterator position.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C>::PointerType
- PtrVector<T,D,G>::CastIterator<C>::operator*() const
-{
- return static_cast<C*>( *cur_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Direct access to the element at the current iterator position.
- *
- * \return Reference to the element at the current iterator position.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C>::PointerType
- PtrVector<T,D,G>::CastIterator<C>::operator->() const
-{
- return static_cast<C*>( *cur_ );
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Direct access to the current memory location of the cast iterator.
- *
- * \return Pointer to the current memory location.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline const typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C>::IteratorType&
- PtrVector<T,D,G>::CastIterator<C>::base() const
-{
- return cur_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Direct access to the final memory location of the cast iterator.
- *
- * \return Pointer to the final memory location.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline const typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<C>::IteratorType&
- PtrVector<T,D,G>::CastIterator<C>::stop() const
-{
- return end_;
-}
-//*************************************************************************************************
-
-
-
-
-
-
-
-
-//=================================================================================================
-//
-// NESTED CLASS PTRVECTOR::CONSTCASTITERATOR
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Dynamic cast iterator for polymorphic pointer vectors.
- * \ingroup util
- *
- * The ConstCastIterator class is part of the PtrVector class and represent a forward iterator
- * over all elements of type \a C contained in a range of elements of type \a T, where \a C
- * is a type derived from \a T. The ConstCastIterator is the counterpart of CastIterator for
- * constant vectors.
-
- \code
- class A { ... };
- class B : public class A { ... };
-
- PtrVector<A>::ConstCastIterator<B> begin;
- PtrVector<A>::ConstCastIterator<B> end;
-
- // Loop over all elements of type B within the range [begin..end)
- for( ; begin!=end; ++begin )
- ...
- \endcode
-
- * \b Note: Using a ConstCastIterator is computationally more expensive than using a standard
- * iterator over all elements contained in the vector.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-class PtrVector<T,D,G>::ConstCastIterator
-{
-public:
- //**Type definitions****************************************************************************
- // pe naming convention
- typedef std::forward_iterator_tag IteratorCategory; //!< The iterator category.
- typedef const C* ValueType; //!< Type of the underlying pointers.
- typedef const C* PointerType; //!< Pointer return type.
- typedef const C* const& ReferenceType; //!< Reference return type.
- typedef ptrdiff_t DifferenceType; //!< Difference between two iterators.
- typedef const T* const* IteratorType; //!< Type of the internal pointer.
-
- // STL iterator requirements
- typedef IteratorCategory iterator_category; //!< The iterator category.
- typedef ValueType value_type; //!< Type of the underlying pointers.
- typedef PointerType pointer; //!< Pointer return type.
- typedef ReferenceType reference; //!< Reference return type.
- typedef DifferenceType difference_type; //!< Difference between two iterators.
- //**********************************************************************************************
-
- //**Constructors********************************************************************************
- /*!\name Constructors */
- //@{
- inline ConstCastIterator();
- inline ConstCastIterator( IteratorType begin, IteratorType end );
-
- template< typename Other >
- inline ConstCastIterator( const ConstCastIterator<Other>& it );
-
- template< typename Other >
- inline ConstCastIterator( const typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<Other>& it );
-
- // No explicitly declared copy constructor.
- //@}
- //**********************************************************************************************
-
- //**Destructor**********************************************************************************
- // No explicitly declared destructor.
- //**********************************************************************************************
-
- //**Copy assignment operator********************************************************************
- // No explicitly declared copy assignment operator.
- //**********************************************************************************************
-
- //**Operators***********************************************************************************
- /*!\name Operators */
- //@{
- inline ConstCastIterator& operator++();
- inline ConstCastIterator operator++( int );
- //@}
- //**********************************************************************************************
-
- //**Access operators****************************************************************************
- /*!\name Access operators */
- //@{
- inline PointerType operator*() const;
- inline PointerType operator->() const;
- //@}
- //**********************************************************************************************
-
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- inline const IteratorType& base() const;
- inline const IteratorType& stop() const;
- //@}
- //**********************************************************************************************
-
-private:
- //**Member variables****************************************************************************
- /*!\name Member variables */
- //@{
- IteratorType cur_; //!< Pointer to the current memory location.
- IteratorType end_; //!< Pointer to the element one past the last element in the element range.
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// CONSTRUCTOR
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Default constructor for ConstCastIterator.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline PtrVector<T,D,G>::ConstCastIterator<C>::ConstCastIterator()
- : cur_(NULL) // Pointer to the current memory location
- , end_(NULL) // Pointer to the element one past the last element in the element range
-{
- static_assert(boost::is_base_of<C, T>::value && !boost::is_base_of<C, T>::value, "C has to be strictly derived from T");
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Standard constructor for ConstCastIterator.
- *
- * \param begin The beginning of the element range.
- * \param end The end of the element range.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline PtrVector<T,D,G>::ConstCastIterator<C>::ConstCastIterator( IteratorType begin, IteratorType end )
- : cur_(begin) // Pointer to the current memory location
- , end_(end) // Pointer to the element one past the last element in the element range
-{
- // The polymorphicFind() function finds the next pointer to an object with dynamic type 'C'
- // contained in the range [cur_,end). An equivalent code might look like this:
- //
- // while( cur_ != end_ && !dynamic_cast<C*>( *cur_ ) ) ++cur_;
- //
- // However, the specialization of polymorphicFind() for special type combinations is much
- // more efficient (and way easier!) than the specialization of this function!
- cur_ = polymorphicFind<C>( cur_, end_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Conversion constructor from different ConstCastIterator instances.
- *
- * \param it The foreign ConstCastIterator instance to be copied.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-template< typename Other > // The foreign constant cast iterator type
-inline PtrVector<T,D,G>::ConstCastIterator<C>::ConstCastIterator( const ConstCastIterator<Other>& it )
- : cur_( it.base() ) // Pointer to the current memory location
- , end_( it.stop() ) // Pointer to the element one past the last element in the element range
-{
- static_assert(boost::is_base_of<C, T>::value && !boost::is_base_of<C, T>::value, "C has to be strictly derived from T");
- static_assert(boost::is_convertible<Other*, C*>::value, "Other must be convertible to C" );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Conversion constructor from CastIterator instances.
- *
- * \param it The foreign CastIterator instance to be copied.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-template< typename Other > // The foreign cast iterator type
-inline PtrVector<T,D,G>::ConstCastIterator<C>::ConstCastIterator( const typename PtrVector<T,D,G>::WALBERLA_TEMPLATE CastIterator<Other>& it )
- : cur_( it.base() ) // Pointer to the current memory location
- , end_( it.stop() ) // Pointer to the element one past the last element in the element range
-{
- static_assert(boost::is_base_of<C, T>::value && !boost::is_base_of<C, T>::value, "C has to be strictly derived from T");
- static_assert(boost::is_convertible<Other*, C*>::value, "Other must be convertible to C" );
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Pre-increment operator.
- *
- * \return Reference to the incremented cast iterator.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE ConstCastIterator<C>&
- PtrVector<T,D,G>::ConstCastIterator<C>::operator++()
-{
- // The polymorphicFind() function finds the next pointer to an object with dynamic type 'C'
- // contained in the range [cur_+1,end). An equivalent code might look like this:
- //
- // while( ++cur_ != end_ && !dynamic_cast<const C*>( *cur_ ) ) {}
- //
- // However, the specialization of polymorphicFind() for special type combinations is much
- // more efficient (and way easier!) than the specialization of this function!
- cur_ = polymorphicFind<const C>( ++cur_, end_ );
-
- return *this;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Post-increment operator.
- *
- * \return The incremented cast iterator.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE ConstCastIterator<C>
- PtrVector<T,D,G>::ConstCastIterator<C>::operator++( int )
-{
- ConstCastIterator tmp( *this );
-
- // The polymorphicFind() function finds the next pointer to an object with dynamic type 'C'
- // contained in the range [cur_+1,end). An equivalent code might look like this:
- //
- // while( ++cur_ != end_ && !dynamic_cast<const C*>( *cur_ ) ) {}
- //
- // However, the specialization of polymorphicFind() for special type combinations is much
- // more efficient (and way easier!) than the specialization of this function!
- cur_ = polymorphicFind<const C>( ++cur_, end_ );
-
- return tmp;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ACCESS OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns a handle to the element at the current iterator position.
- *
- * \return Handle to the element at the current iterator position.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE ConstCastIterator<C>::PointerType
- PtrVector<T,D,G>::ConstCastIterator<C>::operator*() const
-{
- return static_cast<const C*>( *cur_ );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Direct access to the element at the current iterator position.
- *
- * \return Reference to the element at the current iterator position.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline typename PtrVector<T,D,G>::WALBERLA_TEMPLATE ConstCastIterator<C>::PointerType
- PtrVector<T,D,G>::ConstCastIterator<C>::operator->() const
-{
- return static_cast<const C*>( *cur_ );
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Direct access to the current memory location of the constant cast iterator.
- *
- * \return Pointer to the current memory location.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline const typename PtrVector<T,D,G>::WALBERLA_TEMPLATE ConstCastIterator<C>::IteratorType&
- PtrVector<T,D,G>::ConstCastIterator<C>::base() const
-{
- return cur_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Direct access to the final memory location of the constant cast iterator.
- *
- * \return Pointer to the final memory location.
- */
-template< typename T // Type
- , typename D // Deletion policy
- , typename G > // Growth policy
-template< typename C > // Cast type
-inline const typename PtrVector<T,D,G>::WALBERLA_TEMPLATE ConstCastIterator<C>::IteratorType&
- PtrVector<T,D,G>::ConstCastIterator<C>::stop() const
-{
- return end_;
-}
-//*************************************************************************************************
-}
diff --git a/src/core/ptrvector/policies/ArrayDelete.h b/src/core/ptrvector/policies/ArrayDelete.h
deleted file mode 100644
index bf6b605abc8d82a6612b9943aa596ba4fbb2bae6..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/policies/ArrayDelete.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file ArrayDelete.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <boost/checked_delete.hpp>
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Array-delete policy class.
- * \ingroup util
- *
- * The ArrayDelete policy functor class applies an array delete operation to the given argument.
- * Note that the array delete operation is NOT permitted for inclomplete types (i.e. declared
- * but undefined data types). The attempt to apply an ArrayDelete functor to a pointer to an
- * array of objects of incomplete type results in a compile time error!
- */
-struct ArrayDelete
-{
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- template< typename Type >
- inline void operator()( Type ptr ) const;
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Implementation of the array-delete policy.
- *
- * \param ptr The pointer to the array to be deleted.
- * \return void
- *
- * This function applies an array delete operation to the given argument. Note that the array
- * delete operation is NOT permitted for inclomplete types (i.e. declared but undefined data
- * types). The attempt to use this function for a pointer to an array of objects of incomplete
- * type results in a compile time error!
- */
-template< typename Type >
-inline void ArrayDelete::operator()( Type ptr ) const
-{
- boost::checked_array_delete( ptr );
-}
-//*************************************************************************************************
-
-} // namespace
diff --git a/src/core/ptrvector/policies/ConstantGrowth.h b/src/core/ptrvector/policies/ConstantGrowth.h
deleted file mode 100644
index 2d20250ca78ac865eac5a1d362c35258f28ddaf2..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/policies/ConstantGrowth.h
+++ /dev/null
@@ -1,94 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file ConstantGrowth.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include <core/DataTypes.h>
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Constant growth policy class.
- * \ingroup util
- *
- * The ConstantGrowth policy class implements a constant growth strategy. It can be customized
- * for any purpose: the \a Growth template argument specifies the constant increase of the given
- * size.
- */
-template< size_t Growth >
-struct ConstantGrowth
-{
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- inline size_t operator()( size_t oldSize, size_t minSize ) const;
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*! \cond internal */
-/*!\brief Specialization of the constant growth policy for 0 growth.
- * \ingroup util
- */
-template<>
-struct ConstantGrowth<0>;
-/*! \endcond */
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns a new size depending on the given old size and the required minimum size.
- *
- * \param old The old size.
- * \param minimum The required minimum size.
- * \return The new size (at least the required minimum size).
- */
-template< size_t Growth >
-inline size_t ConstantGrowth<Growth>::operator()( size_t old, size_t minimum ) const
-{
- const size_t needed( math::max<size_t>( old+Growth, minimum ) );
- return ( ( needed )?( 4 * ( (needed-1)/4+1 ) ):( 0 ) );
-}
-//*************************************************************************************************
-
-} // namespace
diff --git a/src/core/ptrvector/policies/LinearGrowth.h b/src/core/ptrvector/policies/LinearGrowth.h
deleted file mode 100644
index 314b79380525dda287747d986be18a28a15010c4..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/policies/LinearGrowth.h
+++ /dev/null
@@ -1,106 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file LinearGrowth.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <core/math/Utility.h>
-#include <core/DataTypes.h>
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Linear growth policy class.
- * \ingroup util
- *
- * The LinearGrowth policy class implements a linear growth strategy. It can be customized for
- * any purpose: the \a Growth template argument specifies the factor of the size growth.
- */
-template< size_t Growth >
-struct LinearGrowth
-{
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- inline size_t operator()( size_t oldSize, size_t minSize ) const;
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*! \cond internal */
-/*!\brief Specialization of the linear growth policy for 0 growth.
- * \ingroup util
- */
-template<>
-struct LinearGrowth<0>;
-/*! \endcond */
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*! \cond internal */
-/*!\brief Specialization of the linear growth policy for 1 growth.
- * \ingroup util
- */
-template<>
-struct LinearGrowth<1>;
-/*! \endcond */
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns a new size depending on the given old size and the required minimum size.
- *
- * \param old The old size.
- * \param minimum The required minimum size.
- * \return The new size (at least the required minimum size).
- */
-template< size_t Growth >
-inline size_t LinearGrowth<Growth>::operator()( size_t old, size_t minimum ) const
-{
- const size_t needed( math::max<size_t>( old*Growth, minimum ) );
- return ( ( needed )?( 4 * ( (needed-1)/4+1 ) ):( 0 ) );
-}
-//*************************************************************************************************
-
-} // namespace
diff --git a/src/core/ptrvector/policies/NoDelete.h b/src/core/ptrvector/policies/NoDelete.h
deleted file mode 100644
index 14b24aae3c1b48891a0b39ed02be7366b7d6a978..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/policies/NoDelete.h
+++ /dev/null
@@ -1,69 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file NoDelete.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief No-delete policy class.
- * \ingroup util
- */
-struct NoDelete
-{
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- template< typename Type >
- inline void operator()( const Type& ptr ) const;
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Implementation of the no-delete policy.
- *
- * \param ptr The pointer to delete.
- * \return void
- */
-template< typename Type >
-inline void NoDelete::operator()( const Type& /*ptr*/ ) const
-{}
-//*************************************************************************************************
-
-} // namespace
diff --git a/src/core/ptrvector/policies/OptimalGrowth.h b/src/core/ptrvector/policies/OptimalGrowth.h
deleted file mode 100644
index 59abed396b4ac6dccb2a35077f49f085e465c3c7..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/policies/OptimalGrowth.h
+++ /dev/null
@@ -1,85 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file OptimalGrowth.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <core/math/Utility.h>
-#include <core/DataTypes.h>
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Optimal growth policy class.
- * \ingroup util
- *
- * The OptimalGrowth policy class implements the optimal growth strategy suggested by Andrew
- * Koenig for the std::vector class (see Andrew Koenig's column in the September 1998 issue of
- * JOOP (Journal of Object-Oriented Programming), or the Dr. Dobb's article 'C++ Made Easier:
- * How Vectors Grow', 2001). It applies an exponential growth strategy using a factor of 1.5
- * and additionally ensures that the sizes returns are always multiples of four.
- */
-struct OptimalGrowth
-{
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- inline size_t operator()( size_t oldSize, size_t minSize ) const;
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns a new size depending on the given old size and the required minimum size.
- *
- * \param old The old size.
- * \param minimum The required minimum size.
- * \return The new size (at least the required minimum size).
- */
-inline size_t OptimalGrowth::operator()( size_t old, size_t minimum ) const
-{
- const size_t needed( math::max( static_cast<size_t>( real_c(old)*1.5 ), minimum ) );
- return ( ( needed )?( 4 * ( (needed-1)/4 + 1 ) ):( 0 ) );
-}
-//*************************************************************************************************
-
-} // namespace
diff --git a/src/core/ptrvector/policies/PtrDelete.h b/src/core/ptrvector/policies/PtrDelete.h
deleted file mode 100644
index 1940275e2ece96848af8982873160b8bb41c7cd8..0000000000000000000000000000000000000000
--- a/src/core/ptrvector/policies/PtrDelete.h
+++ /dev/null
@@ -1,88 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PtrDelete.h
-//! \ingroup core
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <boost/checked_delete.hpp>
-
-namespace walberla {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Pointer-delete policy class.
- * \ingroup util
- *
- * The PtrDelete policy functor class applies a delete operation to the given argument. Note that
- * the delete operation is NOT permitted for inclomplete types (i.e. declared but undefined data
- * types). The attempt to apply a PtrDelete functor to a pointer to an object of incomplete type
- * results in a compile time error!
- */
-struct PtrDelete
-{
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- template< typename Type >
- inline void operator()( Type ptr ) const;
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Implementation of the pointer-delete policy.
- *
- * \param ptr The pointer to delete.
- * \return void
- *
- * This function applies a standard delete operation to the given argument. Note that the delete
- * operation is NOT permitted for inclomplete types (i.e. declared but undefined data types). The
- * attempt to use this function for a pointer to an object of incomplete type results in a compile
- * time error!
- */
-template< typename Type >
-inline void PtrDelete::operator()( Type ptr ) const
-{
- boost::checked_delete( ptr );
-}
-//*************************************************************************************************
-
-} // namespace
diff --git a/src/core/timing/Time.cpp b/src/core/timing/Time.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ca04b5b4733f1e4d3857155b841d0130ad19f62b
--- /dev/null
+++ b/src/core/timing/Time.cpp
@@ -0,0 +1,69 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Time.h
+//! \ingroup core
+//! \author Klaus Iglberger
+//! \brief Header file for time functions
+//!
+//! Copyright (C) 2009 Klaus Iglberger
+//! Taken from "pe Physics Engine" with small changes
+//
+//======================================================================================================================
+
+#include "Time.h"
+
+#include <chrono>
+
+#if defined(_MSC_VER)
+# ifndef NOMINMAX
+# define NOMINMAX
+# endif
+# include <windows.h>
+# include <winsock.h>
+# include <time.h>
+# include <sys/timeb.h>
+#else
+# include <sys/resource.h>
+# include <sys/time.h>
+# include <sys/types.h>
+#endif
+
+
+namespace walberla {
+namespace timing {
+
+double getCpuTime()
+{
+#ifdef WIN32
+ FILETIME CreateTime, ExitTime, KernelTime, UserTime;
+ SYSTEMTIME SysTime;
+
+ if( GetProcessTimes( GetCurrentProcess(), &CreateTime, &ExitTime, &KernelTime, &UserTime ) != 1 ) {
+ return 0.0;
+ }
+ else {
+ FileTimeToSystemTime( &UserTime, &SysTime );
+ return ( static_cast<double>( SysTime.wSecond ) + static_cast<double>( SysTime.wMilliseconds )/1E3 );
+ }
+#else
+ struct rusage ruse;
+ getrusage( RUSAGE_SELF, &ruse );
+ return ( static_cast<double>( ruse.ru_utime.tv_sec ) + static_cast<double>( ruse.ru_utime.tv_usec )/1E6 );
+#endif
+}
+
+} // namespace timing
+} // namespace walberla
diff --git a/src/core/timing/Time.h b/src/core/timing/Time.h
index f6112885951e14185e2bdddd3215bde85c495b67..374a49f0a47edfafbc945f13415d833d913dd933 100644
--- a/src/core/timing/Time.h
+++ b/src/core/timing/Time.h
@@ -33,20 +33,6 @@
#include <chrono>
-#if defined(_MSC_VER)
-# ifndef NOMINMAX
-# define NOMINMAX
-# endif
-# include <windows.h>
-# include <winsock.h>
-# include <time.h>
-# include <sys/timeb.h>
-#else
-# include <sys/resource.h>
-# include <sys/time.h>
-# include <sys/types.h>
-#endif
-
namespace walberla {
namespace timing {
@@ -58,14 +44,6 @@ namespace timing {
//
//======================================================================================================================
-//**********************************************************************************************************************
-/*!\name Time functions */
-//@{
-inline double getWcTime();
-inline double getCpuTime();
-//@}
-//**********************************************************************************************************************
-
//**********************************************************************************************************************
/*!\brief Returns the current wall clock time in seconds.
@@ -86,25 +64,7 @@ inline double getWcTime()
//
// \return The current CPU time in seconds.
*/
-inline double getCpuTime()
-{
-#ifdef WIN32
- FILETIME CreateTime, ExitTime, KernelTime, UserTime;
- SYSTEMTIME SysTime;
-
- if( GetProcessTimes( GetCurrentProcess(), &CreateTime, &ExitTime, &KernelTime, &UserTime ) != 1 ) {
- return 0.0;
- }
- else {
- FileTimeToSystemTime( &UserTime, &SysTime );
- return ( static_cast<double>( SysTime.wSecond ) + static_cast<double>( SysTime.wMilliseconds )/1E3 );
- }
-#else
- struct rusage ruse;
- getrusage( RUSAGE_SELF, &ruse );
- return ( static_cast<double>( ruse.ru_utime.tv_sec ) + static_cast<double>( ruse.ru_utime.tv_usec )/1E6 );
-#endif
-}
+double getCpuTime();
//**********************************************************************************************************************
diff --git a/src/core/timing/Timer.h b/src/core/timing/Timer.h
index 90ec22a2930cf47abaaf853fbcda1f93a5288c05..ec0cc9ee3b3e8f9adea4c476301d51cdb3eec854 100644
--- a/src/core/timing/Timer.h
+++ b/src/core/timing/Timer.h
@@ -27,6 +27,7 @@
#include "CpuPolicy.h"
#include "WcPolicy.h"
#include "core/DataTypes.h"
+#include "core/extern/json.hpp"
#include <limits>
@@ -441,6 +442,22 @@ inline void Timer<TP>::merge( const Timer<TP> & other )
}
//**********************************************************************************************************************
+//**********************************************************************************************************************
+/*!\brief Converts timer to json The signature is required by the json library
+// \relates Timer
+*/
+template < typename TP > // Timing policy
+void to_json( nlohmann::json& j, const Timer< TP >& timer )
+{
+ j = nlohmann::json{{"total", timer.total()},
+ {"average", timer.average()},
+ {"count", timer.getCounter()},
+ {"min", timer.min()},
+ {"max", timer.max()},
+ {"variance", timer.variance()}};
+}
+//**********************************************************************************************************************
+
} // namespace timing
typedef timing::Timer<timing::CpuPolicy> CpuTimer;
diff --git a/src/core/timing/TimingNode.h b/src/core/timing/TimingNode.h
index 2f0597f7a591b12907932942e76f107b4f90015d..80f2586907ef1950ef8d4b6cac814942019c34e3 100644
--- a/src/core/timing/TimingNode.h
+++ b/src/core/timing/TimingNode.h
@@ -30,6 +30,8 @@
#include "core/mpi/MPIManager.h"
#include "core/mpi/Reduce.h"
#include "core/mpi/SetReduction.h"
+#include "core/extern/json.hpp"
+
#include <algorithm>
#include <iomanip>
@@ -111,7 +113,7 @@ void TimingNode<TP>::swap(TimingNode<TP>& tt)
}
}
-/// Finds the spezified timer in the timing hierarchy
+/// Finds the specified timer in the timing hierarchy
/// \param name timer name which may include more than one hierarchy separated by "."
/// \code findTimer(tn, "firstLevel.secondLevel.thirdLevel.timerName"); \endcode
/// \relates TimingNode
@@ -130,6 +132,31 @@ const Timer<TP>& findTimer( const TimingNode<TP>& tn, const std::string& name)
}
}
+/// Checks if the specified timer exists in the timing hierarchy
+/// \param name timer name which may include more than one hierarchy separated by "."
+/// \code timerExists(tn, "firstLevel.secondLevel.thirdLevel.timerName"); \endcode
+/// \relates TimingNode
+template< typename TP > // Timing policy
+bool timerExists( const TimingNode<TP>& tn, const std::string& name )
+{
+ auto pos = name.find_first_of(".");
+ if (pos != std::string::npos)
+ {
+ if( tn.tree_.find(name.substr(0, pos)) != tn.tree_.end() )
+ {
+ return timerExists( tn.tree_.at(name.substr(0, pos)), name.substr(pos+1, std::string::npos));
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return tn.tree_.find(name) != tn.tree_.end();
+ }
+}
+
/// Resets the timer in the TimingNode structure and all sub timers
/// \relates TimingNode
template< typename TP > // Timing policy
@@ -456,6 +483,43 @@ std::ostream& operator<<(std::ostream& os, const TimingNode<TP>& tn)
return os;
}
+/// convertes a TimingNode to json. The signature is required by the json library
+/// \relates TimingNode
+template < typename TP > // Timing policy
+void to_json( nlohmann::json& j, const TimingNode< TP >& tn )
+{
+ /// ignore the first timer in the timing node since it is empty
+ if( tn.last_ == nullptr )
+ {
+ j = nlohmann::json( tn.tree_ );
+ } else
+ {
+ j = nlohmann::json( tn.timer_ );
+ j["childs"] = nlohmann::json( tn.tree_ );
+ }
+}
+
+namespace internal {
+/// adds a sub timer containing the remainder of all other subtimers on the same hierarchy level
+/// \relates TimingNode
+template< typename TP >
+// Timing policy
+void addRemainderNodes(timing::TimingNode<TP> &tn) {
+ if (tn.tree_.empty()) {
+ return;
+ }
+ double remainder = tn.timer_.total();
+ for (auto i = tn.tree_.begin(); i != tn.tree_.end(); ++i) {
+ remainder -= i->second.timer_.total();
+ addRemainderNodes(i->second);
+ }
+ if (tn.last_ != nullptr) {
+ WALBERLA_ASSERT( tn.tree_.find("Remainder") == tn.tree_.end());
+ tn.tree_["Remainder"].timer_ = timing::Timer<TP>(1, 0, 0, remainder, 0);
+ tn.tree_["Remainder"].last_ = &tn;
+ }
+}
+} /// namespace internal
}
typedef timing::TimingNode<timing::WcPolicy> WcTimingNode;
diff --git a/src/core/timing/TimingPool.cpp b/src/core/timing/TimingPool.cpp
index 97dfc1a893567ae2b9c6a2be6e5af41a383fb999..372a81b6ad4cd84a3880ecdc15d348498d845e24 100644
--- a/src/core/timing/TimingPool.cpp
+++ b/src/core/timing/TimingPool.cpp
@@ -163,11 +163,11 @@ void TimingPool<TP>::mpiReduce( std::vector<double> & min,
if( targetRank >= 0 )
{
- void * minTarget = targetRank == rank ? &minRed.front() : NULL;
- void * maxTarget = targetRank == rank ? &maxRed.front() : NULL;
- void * sumTarget = targetRank == rank ? &sumRed.front() : NULL;
- void * sumSqTarget = targetRank == rank ? &sumSqRed.front() : NULL;
- void * countTarget = targetRank == rank ? &countRed.front() : NULL;
+ void * minTarget = targetRank == rank ? &minRed.front() : nullptr;
+ void * maxTarget = targetRank == rank ? &maxRed.front() : nullptr;
+ void * sumTarget = targetRank == rank ? &sumRed.front() : nullptr;
+ void * sumSqTarget = targetRank == rank ? &sumSqRed.front() : nullptr;
+ void * countTarget = targetRank == rank ? &countRed.front() : nullptr;
MPI_Reduce( &min.front(), minTarget,
int_c(min.size()), MPITrait<double>::type(), MPI_MIN, targetRank,MPI_COMM_WORLD );
diff --git a/src/core/timing/TimingTree.h b/src/core/timing/TimingTree.h
index f34fc7f8845dd0e96c91ceb8038aafc5c4fb9f10..8ae9b51c43cc80ef00e00dd433ff038f299acdf9 100644
--- a/src/core/timing/TimingTree.h
+++ b/src/core/timing/TimingTree.h
@@ -28,6 +28,7 @@
#include "core/logging/Logging.h"
#include "core/mpi/MPIManager.h"
#include "core/mpi/Reduce.h"
+#include "core/extern/json.hpp"
#include <algorithm>
#include <iostream>
@@ -59,13 +60,13 @@ public:
void swap(TimingTree<TP>& tt);
- /// Starts a timer beneath the current hirarchy level
+ /// Starts a timer beneath the current hierarchy level
void start(const std::string& name);
- /// Stops the last started timer and jumps back one hirarchy level
+ /// Stops the last started timer and jumps back one hierarchy level
void stop(const std::string& name);
/// Checks if specified timer is currently running.
bool isTimerRunning(const std::string& name) const;
- /// Resets the the timing hirarchy
+ /// Resets the the timing hierarchy
void reset();
//** Reduction ******************************************************************************************************
@@ -81,15 +82,21 @@ public:
/// Returns the raw tree data structure
const TimingNode<TP>& getRawData() const;
+
const Timer<TP>& operator[](const std::string& name) const;
+ inline bool timerExists ( const std::string & n ) const;
/// Returns the name of the currently running timer
/// Might be expensive due to value search.
std::string getCurrentTimerName() const;
+
+ /// Returns a copy of the timing tree containing the remaining time as a subnode
+ TimingTree< TP > getCopyWithRemainder() const;
+
private:
/// Tree data structure
TimingNode<TP> root_;
- /// Pointer to the current hirarchy level.
+ /// Pointer to the current hierarchy level.
TimingNode<TP>* current_;
};
@@ -204,7 +211,7 @@ const TimingNode<TP>& TimingTree<TP>::getRawData() const
return root_;
}
-/// Finds the spezified timer in the timing hierarchy
+/// Finds the specified timer in the timing hierarchy
/// \param name timer name which may include more than one hierarchy separated by "."
/// \code tt["firstLevel.secondLevel.thirdLevel.timerName"].total(); \endcode
template< typename TP > // Timing policy
@@ -213,6 +220,15 @@ const Timer<TP>& TimingTree<TP>::operator[](const std::string& name) const
return findTimer(root_, name);
}
+/// Checks if the specified timer exists in the timing hierarchy
+/// \param name timer name which may include more than one hierarchy separated by "."
+/// \code tt.timerExists("firstLevel.secondLevel.thirdLevel.timerName"); \endcode
+template< typename TP > // Timing policy
+bool TimingTree<TP>::timerExists(const std::string& name) const
+{
+ return walberla::timing::timerExists(root_, name);
+}
+
template< typename TP > // Timing policy
std::string TimingTree<TP>::getCurrentTimerName() const
{
@@ -228,6 +244,21 @@ std::string TimingTree<TP>::getCurrentTimerName() const
return "No timer found!";
}
+template < typename TP > // Timing policy
+TimingTree< TP > TimingTree< TP >::getCopyWithRemainder() const
+{
+ TimingTree< TP > tt( *this );
+ timing::internal::addRemainderNodes< TP >( tt.root_ );
+ return tt;
+}
+
+/// convertes a TimingTree to json. The signature is required by the json library
+/// \relates TimingTree
+template < typename TP > // Timing policy
+void to_json( nlohmann::json& j, const TimingTree< TP >& tt )
+{
+ j = nlohmann::json( tt.getRawData() );
+}
}
typedef timing::TimingTree<timing::WcPolicy> WcTimingTree;
diff --git a/src/cuda/AddGPUFieldToStorage.impl.h b/src/cuda/AddGPUFieldToStorage.impl.h
index 03b90c728fe345259079ee7c67c176eec9ff64dc..1befc3e81bc4a04fd89c1ec9561e1e417023cc05 100644
--- a/src/cuda/AddGPUFieldToStorage.impl.h
+++ b/src/cuda/AddGPUFieldToStorage.impl.h
@@ -73,7 +73,7 @@ namespace cuda {
uint_t nrOfGhostLayers,
bool usePitchedMem )
{
- auto func = boost::bind ( internal::createGPUField<GPUField_T>, _1, _2, nrOfGhostLayers, fSize, layout, usePitchedMem );
+ auto func = std::bind ( internal::createGPUField<GPUField_T>, std::placeholders::_1, std::placeholders::_2, nrOfGhostLayers, fSize, layout, usePitchedMem );
return bs->addStructuredBlockData< GPUField_T >( func, identifier );
}
@@ -84,7 +84,7 @@ namespace cuda {
const std::string & identifier,
bool usePitchedMem )
{
- auto func = boost::bind ( internal::createGPUFieldFromCPUField<Field_T>, _1, _2, cpuFieldID, usePitchedMem );
+ auto func = std::bind ( internal::createGPUFieldFromCPUField<Field_T>, std::placeholders::_1, std::placeholders::_2, cpuFieldID, usePitchedMem );
return bs->addStructuredBlockData< GPUField<typename Field_T::value_type> >( func, identifier );
}
diff --git a/src/cuda/FieldCopy.h b/src/cuda/FieldCopy.h
index 07fd04c808032fccd21c3f00f98600294b124a9b..4f13fa999ffec19249183fecd2a4fe0939e2674e 100644
--- a/src/cuda/FieldCopy.h
+++ b/src/cuda/FieldCopy.h
@@ -52,7 +52,7 @@ namespace cuda {
std::function<void()> fieldCpyFunctor( const shared_ptr< StructuredBlockStorage > & blocks,
BlockDataID dstID, ConstBlockDataID srcID )
{
- return boost::bind( fieldCpy<DstType,SrcType>, blocks, dstID, srcID );
+ return std::bind( fieldCpy<DstType,SrcType>, blocks, dstID, srcID );
}
@@ -68,7 +68,7 @@ namespace cuda {
template<typename DstType, typename SrcType>
std::function<void(IBlock*)> fieldCpyFunctor( BlockDataID dstID, ConstBlockDataID srcID )
{
- return boost::bind( fieldCpySweepFunction<DstType,SrcType>, dstID, srcID, _1 );
+ return std::bind( fieldCpySweepFunction<DstType,SrcType>, dstID, srcID, std::placeholders::_1 );
}
diff --git a/src/domain_decomposition/BlockDataID.h b/src/domain_decomposition/BlockDataID.h
index db26b5436972a84912b0abe8affcbe883e939aa5..d5e25b5080cd0df6f4e3ea27cf1aebd6cb8f3070 100644
--- a/src/domain_decomposition/BlockDataID.h
+++ b/src/domain_decomposition/BlockDataID.h
@@ -26,6 +26,8 @@
#include "core/mpi/RecvBuffer.h"
#include "core/mpi/SendBuffer.h"
+#include <type_traits>
+
namespace walberla {
namespace domain_decomposition {
@@ -42,14 +44,14 @@ class BlockDataID
public:
- BlockDataID() : id_( 0 ) {}
+ BlockDataID() = default;
explicit BlockDataID( const uint_t id ) : id_( id ) {}
- BlockDataID( const BlockDataID& bdid ) : id_( bdid.id_ ) {}
+ BlockDataID( const BlockDataID& bdid ) = default;
void pack( mpi::SendBuffer & buffer ) const { buffer << id_; }
void unpack( mpi::RecvBuffer & buffer ) { buffer >> id_; }
- BlockDataID& operator=( const BlockDataID& bdid ) { id_ = bdid.id_; return *this; }
+ BlockDataID& operator=( const BlockDataID& bdid ) = default;
bool operator==( const BlockDataID& bdid ) const { return id_ == bdid.id_; }
bool operator!=( const BlockDataID& bdid ) const { return id_ != bdid.id_; }
@@ -59,26 +61,26 @@ public:
private:
- uint_t id_;
+ uint_t id_ = 0;
}; // class BlockDataID
-
+static_assert( std::is_trivially_copyable<BlockDataID>::value, "BlockDataID has to be trivially copyable!");
class ConstBlockDataID
{
public:
- ConstBlockDataID() : id_( 0 ) {}
+ ConstBlockDataID() = default;
explicit ConstBlockDataID( const uint_t id ) : id_( id ) {}
ConstBlockDataID( const BlockDataID& bdid ) : id_( bdid.id_ ) {}
- ConstBlockDataID( const ConstBlockDataID& bdid ) : id_( bdid.id_ ) {}
+ ConstBlockDataID( const ConstBlockDataID& bdid ) = default;
void pack( mpi::SendBuffer & buffer ) const { buffer << id_; }
void unpack( mpi::RecvBuffer & buffer ) { buffer >> id_; }
ConstBlockDataID& operator=( const BlockDataID& bdid ) { id_ = bdid.id_; return *this; }
- ConstBlockDataID& operator=( const ConstBlockDataID& bdid ) { id_ = bdid.id_; return *this; }
+ ConstBlockDataID& operator=( const ConstBlockDataID& bdid ) = default;
bool operator==( const ConstBlockDataID& bdid ) const { return id_ == bdid.id_; }
bool operator!=( const ConstBlockDataID& bdid ) const { return id_ != bdid.id_; }
@@ -88,10 +90,10 @@ public:
private:
- uint_t id_;
+ uint_t id_ = 0;
}; // class ConstBlockDataID
-
+static_assert( std::is_trivially_copyable<ConstBlockDataID>::value, "ConstBlockDataID has to be trivially copyable!");
} // namespace domain_decomposition
diff --git a/src/domain_decomposition/BlockStorage.cpp b/src/domain_decomposition/BlockStorage.cpp
index 9ee33473a1b8100cf8f88d162093502812334fe6..4077562951e5662c466e8e6f009abf0293f8f402 100644
--- a/src/domain_decomposition/BlockStorage.cpp
+++ b/src/domain_decomposition/BlockStorage.cpp
@@ -109,7 +109,7 @@ BlockDataID BlockStorage::addBlockData( const internal::SelectableBlockDataHandl
if( dh )
block->addData( id, dh->initialize( block.get() ) );
else
- block->addData( id, NULL );
+ block->addData( id, nullptr );
}
return id;
@@ -229,7 +229,7 @@ BlockDataID BlockStorage::loadBlockData( const std::string & file, const interna
dh->deserialize( block, id, buffer );
}
else
- block->addData( id, NULL );
+ block->addData( id, nullptr );
}
return id;
diff --git a/src/domain_decomposition/MakeBlockDataInitFunction.h b/src/domain_decomposition/MakeBlockDataInitFunction.h
index 466f944c110341acdde00a786e45fa39d3764e05..de41cd696de30b312f47883cbc59987a3e6b71d2 100644
--- a/src/domain_decomposition/MakeBlockDataInitFunction.h
+++ b/src/domain_decomposition/MakeBlockDataInitFunction.h
@@ -23,7 +23,6 @@
#include "IBlock.h"
-#include <boost/bind.hpp>
#include <functional>
@@ -35,119 +34,19 @@ namespace domain_decomposition {
/// \cond internal
namespace internal
{
- template<class T>
- T * newFunc( const IBlock* const ) {
- return new T();
+ template<class T, typename... Args>
+ T * newFunc( const IBlock* const, Args&... args ) {
+ return new T(args...);
}
-
- template<class T, class P1>
- T * newFunc( const IBlock* const , const P1 & p1 ) {
- return new T(p1);
- }
-
- template<class T, class P1, class P2>
- T * newFunc( const IBlock* const , const P1 & p1, const P2 & p2 ) {
- return new T(p1, p2);
- }
-
- template<class T, class P1, class P2, class P3>
- T * newFunc( const IBlock* const , const P1 & p1, const P2 & p2, const P3 & p3 ) {
- return new T(p1, p2, p3);
- }
-
- template<class T, class P1, class P2, class P3, class P4>
- T * newFunc( const IBlock* const , const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4 ) {
- return new T(p1, p2, p3, p4);
- }
-
- template<class T, class P1, class P2, class P3, class P4, class P5>
- T * newFunc( const IBlock* const , const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5 ) {
- return new T(p1, p2, p3, p4, p5);
- }
-
- template<class T, class P1, class P2, class P3, class P4, class P5, class P6>
- T * newFunc( const IBlock* const , const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5, const P6 & p6 ) {
- return new T(p1, p2, p3, p4, p5, p6);
- }
-
- template<class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7>
- T * newFunc( const IBlock* const , const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5, const P6 & p6, const P7 & p7 ) {
- return new T(p1, p2, p3, p4, p5, p6,p7);
- }
-
- template<class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
- T * newFunc( const IBlock* const , const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5, const P6 & p6, const P7 & p7, const P8 & p8 ) {
- return new T(p1, p2, p3, p4, p5, p6, p7,p8 );
- }
-
- template<class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9>
- T * newFunc( const IBlock* const , const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5, const P6 & p6, const P7 & p7, const P8 & p8, const P9 & p9 ) {
- return new T(p1, p2, p3, p4, p5, p6, p7,p8, p9 );
- }
-
} // namespace internal
/// \endcond
-template<class T>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction() {
- return boost::bind( internal::newFunc<T>, _1);
-}
-
-template<class T, class P1>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1) {
- return boost::bind( internal::newFunc<T,P1>, _1,p1);
-}
-
-template<class T, class P1, class P2>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1, const P2 & p2) {
- return boost::bind( internal::newFunc<T,P1,P2>, _1,p1,p2);
-}
-
-template<class T, class P1, class P2, class P3>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1, const P2 & p2, const P3 & p3) {
- return boost::bind( internal::newFunc<T,P1,P2,P3>, _1,p1,p2,p3);
-}
-
-template<class T, class P1, class P2, class P3, class P4>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4) {
- return boost::bind( internal::newFunc<T,P1,P2,P3,P4>, _1,p1,p2,p3,p4);
-}
-
-template<class T, class P1, class P2, class P3, class P4, class P5>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5) {
- return boost::bind( internal::newFunc<T,P1,P2,P3,P4,P5>, _1,p1,p2,p3,p4,p5);
-}
-
-template<class T, class P1, class P2, class P3, class P4, class P5, class P6>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5, const P6 & p6) {
- return boost::bind( internal::newFunc<T,P1,P2,P3,P4,P5,P6>, _1,p1,p2,p3,p4,p5,p6);
-}
-
-template<class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5, const P6 & p6, const P7 & p7) {
- return boost::bind( internal::newFunc<T,P1,P2,P3,P4,P5,P6,P7>, _1,p1,p2,p3,p4,p5,p6,p7);
-}
-
-template<class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
-std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5, const P6 & p6, const P7 & p7, const P8 & p8) {
- return boost::bind( internal::newFunc<T,P1,P2,P3,P4,P5,P6,P7,P8>, _1,p1,p2,p3,p4,p5,p6,p7,p8);
-}
-
-template<class T, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9>
+template<class T, typename... Args>
std::function< T* ( const IBlock* const block ) >
-makeBlockDataInitFunction(const P1 & p1, const P2 & p2, const P3 & p3, const P4 & p4, const P5 & p5, const P6 & p6, const P7 & p7, const P8 & p8, const P9 & p9) {
- return boost::bind( internal::newFunc<T,P1,P2,P3,P4,P5,P6,P7,P8,P9>, _1,p1,p2,p3,p4,p5,p6,p7,p8,p9);
+makeBlockDataInitFunction(Args&&... args) {
+ return std::bind( internal::newFunc<T,Args...>, std::placeholders::_1, std::forward<Args>(args)... );
}
diff --git a/src/domain_decomposition/MapPointToPeriodicDomain.cpp b/src/domain_decomposition/MapPointToPeriodicDomain.cpp
index 82f365e0e5d9bd733f7207eb407a7a7cadc57036..1c86e7364e0ca2622d9a540b1cb496f3aed42c3e 100644
--- a/src/domain_decomposition/MapPointToPeriodicDomain.cpp
+++ b/src/domain_decomposition/MapPointToPeriodicDomain.cpp
@@ -40,7 +40,7 @@ void mapPointToPeriodicDomain( const std::array< bool, 3 > & periodic, const AAB
shift = std::max( shift, real_t(0) );
x = domain.xMax() - shift;
if( isIdentical( x, domain.xMax() ) || x < domain.xMin() )
- x = domain.xMin();
+ x = std::nextafter(domain.xMax(), domain.xMin());
}
else if( x >= domain.xMax() )
{
@@ -61,7 +61,7 @@ void mapPointToPeriodicDomain( const std::array< bool, 3 > & periodic, const AAB
shift = std::max( shift, real_t(0) );
y = domain.yMax() - shift;
if( isIdentical( y, domain.yMax() ) || y < domain.yMin() )
- y = domain.yMin();
+ y = std::nextafter(domain.yMax(), domain.yMin());
}
else if( y >= domain.yMax() )
{
@@ -82,7 +82,7 @@ void mapPointToPeriodicDomain( const std::array< bool, 3 > & periodic, const AAB
shift = std::max( shift, real_t(0) );
z = domain.zMax() - shift;
if( isIdentical( z, domain.zMax() ) || z < domain.zMin() )
- z = domain.zMin();
+ z = std::nextafter(domain.zMax(), domain.zMin());
}
else if( z >= domain.zMax() )
{
diff --git a/src/domain_decomposition/StructuredBlockStorage.cpp b/src/domain_decomposition/StructuredBlockStorage.cpp
index 6cdafd357e306aa28fa335e6000eb994295249bd..1c4351735d963adc90229ba1de4a8e4e44a0d6b9 100644
--- a/src/domain_decomposition/StructuredBlockStorage.cpp
+++ b/src/domain_decomposition/StructuredBlockStorage.cpp
@@ -194,7 +194,7 @@ void StructuredBlockStorage::resetCellDecomposition( const std::vector< uint_t >
WALBERLA_ASSERT_GREATER( yCells[i], 0 );
WALBERLA_ASSERT_GREATER( zCells[i], 0 );
- domainCellBB_.push_back( CellInterval( 0, 0, 0, cell_idx_c( xCells[i]-1 ), cell_idx_c( yCells[i]-1 ), cell_idx_c( zCells[i]-1 ) ) );
+ domainCellBB_.emplace_back( 0, 0, 0, cell_idx_c( xCells[i]-1 ), cell_idx_c( yCells[i]-1 ), cell_idx_c( zCells[i]-1 ) );
dx_.push_back( xWidth / real_c( xCells[i] ) );
dy_.push_back( yWidth / real_c( yCells[i] ) );
diff --git a/src/domain_decomposition/StructuredBlockStorage.h b/src/domain_decomposition/StructuredBlockStorage.h
index 4315429d285f3189e82d367f75d0a2f48bd895c8..2d398ca3dcf3e363d1afae8b76efbcb449c7c6c1 100644
--- a/src/domain_decomposition/StructuredBlockStorage.h
+++ b/src/domain_decomposition/StructuredBlockStorage.h
@@ -29,7 +29,7 @@
#include "core/cell/CellInterval.h"
#include "core/debug/Debug.h"
-#include <boost/bind.hpp>
+#include <functional>
namespace walberla {
@@ -112,7 +112,7 @@ public:
bdc.incompatibleSelectors_, bdc.identifier_ ); return *this; }
template< typename T >
StructuredBlockDataAdder & operator<<( const StructuredBlockDataCreator<T> & sbdc ) {
- dataHandling_.add( walberla::make_shared< internal::BlockDataHandlingHelper<T> >( walberla::make_shared< internal::BlockDataHandlingFunctionAdaptor<T> >( boost::bind( sbdc.function_, _1, &storage_ ) ) ),
+ dataHandling_.add( walberla::make_shared< internal::BlockDataHandlingHelper<T> >( walberla::make_shared< internal::BlockDataHandlingFunctionAdaptor<T> >( std::bind( sbdc.function_, std::placeholders::_1, &storage_ ) ) ),
sbdc.requiredSelectors_, sbdc.incompatibleSelectors_, sbdc.identifier_ ); return *this; }
operator BlockDataID() { return storage_.getBlockStorage().addBlockData( dataHandling_, identifier_ ); }
private:
@@ -1076,7 +1076,7 @@ inline BlockDataID StructuredBlockStorage::addStructuredBlockData(
const std::string& identifier, const Set<SUID>& requiredSelectors, const Set<SUID>& incompatibleSelectors )
{
internal::SelectableBlockDataHandlingWrapper dataHandling(
- walberla::make_shared< internal::BlockDataHandlingHelper<T> >( walberla::make_shared< internal::BlockDataHandlingFunctionAdaptor<T> >( boost::bind( function, _1, this ) ) ),
+ walberla::make_shared< internal::BlockDataHandlingHelper<T> >( walberla::make_shared< internal::BlockDataHandlingFunctionAdaptor<T> >( std::bind( function, std::placeholders::_1, this ) ) ),
requiredSelectors, incompatibleSelectors, identifier );
diff --git a/src/fft/Fft.cpp b/src/fft/Fft.cpp
index bbae269ea245a124fe5ca0b8208d5bd408db6bb4..37517dc45f9620b0be8014ea83343851d526be4e 100644
--- a/src/fft/Fft.cpp
+++ b/src/fft/Fft.cpp
@@ -7,7 +7,7 @@ namespace fft {
template <typename Field_T>
FourierTransform<Field_T>::FourierTransform( shared_ptr< StructuredBlockForest > & blocks, BlockDataID fieldId,
- std::function<real_t(uint_t,uint_t,uint_t)> greens )
+ const std::function<real_t(uint_t,uint_t,uint_t)>& greens )
: blocks_(blocks), fieldId_(fieldId), greens_()
{
#ifdef WALBERLA_USE_PFFT
diff --git a/src/fft/Fft.h b/src/fft/Fft.h
index 481c96bb86843ef632034bd4e301dfb6596a9d92..5e4372b1c0510c414e2ddf0545c9e3e9489cb2c3 100644
--- a/src/fft/Fft.h
+++ b/src/fft/Fft.h
@@ -22,7 +22,7 @@ class FourierTransform
{
public:
FourierTransform( shared_ptr< StructuredBlockForest > & blocks, BlockDataID fieldId,
- std::function<real_t(uint_t,uint_t,uint_t)> greens = std::function<real_t(uint_t,uint_t,uint_t)>() );
+ const std::function<real_t(uint_t,uint_t,uint_t)>& greens = std::function<real_t(uint_t,uint_t,uint_t)>() );
void operator() ();
private:
diff --git a/src/field/StabilityChecker.h b/src/field/StabilityChecker.h
index 396a7c07725f3ec835389fa370bd92fabdd1d02e..74b4470ed093b8dbd6ab7d1fdb2d74a182bb79be 100644
--- a/src/field/StabilityChecker.h
+++ b/src/field/StabilityChecker.h
@@ -394,7 +394,7 @@ void StabilityChecker< Field_T, Filter_T >::operator()()
vtkWriter->addCellDataWriter( walberla::make_shared< vtk::DumpBlockStructureProcess >( "process" ) );
vtkWriter->addCellDataWriter( walberla::make_shared< vtk::DumpBlockStructureLevel >( "level" ) );
- vtkWriter->addCellDataWriter( walberla::make_shared< FValueVTKWriter >( boost::ref( failedCells_ ), "F" ) );
+ vtkWriter->addCellDataWriter( walberla::make_shared< FValueVTKWriter >( std::ref( failedCells_ ), "F" ) );
vtkWriter->addCellDataWriter( walberla::make_shared< LocalCoordVTKWriter >( "blockLocalCoordinate" ) );
vtkWriter->addCellDataWriter( walberla::make_shared< GlobalCoordVTKWriter >( "globalCoordinate" ) );
diff --git a/src/field/adaptors/AdaptorCreators.h b/src/field/adaptors/AdaptorCreators.h
index af7f5e55bd0e4756f67820945b61eb2d31002bea..1c410ca91246600c385f5ba0a6691b7a67474462 100644
--- a/src/field/adaptors/AdaptorCreators.h
+++ b/src/field/adaptors/AdaptorCreators.h
@@ -23,7 +23,9 @@
#pragma once
#include "blockforest/BlockDataHandling.h"
-#include <boost/bind.hpp>
+
+#include <functional>
+
namespace walberla {
diff --git a/src/field/adaptors/GhostLayerFieldAdaptor.h b/src/field/adaptors/GhostLayerFieldAdaptor.h
index 6aa81b7d2d6280cd6ab144b5166ae65779883df6..f26f87b0ab8d55a7c0d6426ab3e61f06e9b3eda7 100644
--- a/src/field/adaptors/GhostLayerFieldAdaptor.h
+++ b/src/field/adaptors/GhostLayerFieldAdaptor.h
@@ -183,6 +183,7 @@ public:
inline T operator()( cell_idx_t x, cell_idx_t y, cell_idx_t z, uint_t f) const { return functor_( glField_, x,y,z,cell_idx_c(f)); }
inline T operator()( const Cell & c ) const { return functor_( glField_, c[0], c[1], c[2] ); }
inline T operator()( const Cell & c, cell_idx_t f ) const { return functor_( glField_, c[0], c[1], c[2], f ); }
+ inline T operator()( const Cell & c, uint_t f ) const { return functor_( glField_, c[0], c[1], c[2], cell_idx_c(f) ); }
inline T get( cell_idx_t x, cell_idx_t y, cell_idx_t z) const { return functor_( glField_, x, y, z ); }
@@ -190,6 +191,7 @@ public:
inline T get( cell_idx_t x, cell_idx_t y, cell_idx_t z, uint_t f ) const { return functor_( glField_, x, y, z, cell_idx_c(f) ); }
inline T get( const Cell & c ) const { return functor_( glField_, c[0], c[1], c[2] ); }
inline T get( const Cell & c, cell_idx_t f ) const { return functor_( glField_, c[0], c[1], c[2], f ); }
+ inline T get( const Cell & c, uint_t f ) const { return functor_( glField_, c[0], c[1], c[2], cell_idx_c(f) ); }
//@}
//*******************************************************************************************************************
diff --git a/src/field/allocation/AlignedMalloc.cpp b/src/field/allocation/AlignedMalloc.cpp
index 1e14ff21e29f4555ca42097e35ce77cbca80d7cf..578bcfd9f456c41cf6e01066ca5a780ac2e985dd 100644
--- a/src/field/allocation/AlignedMalloc.cpp
+++ b/src/field/allocation/AlignedMalloc.cpp
@@ -43,7 +43,7 @@ namespace field {
pa=std::malloc((size+alignment-1)+sizeof(void *));
if(!pa)
- return 0;
+ return nullptr;
// Find next aligned position, starting at pa+sizeof(void*)-1
ptr=(void*)( ((size_t)pa+sizeof(void *)+alignment-1) & ~(alignment-1));
@@ -75,7 +75,7 @@ namespace field {
pa=std::malloc( (size+2*alignment-1 )+sizeof(void *));
if(!pa)
- return 0;
+ return nullptr;
// Find next aligned position, starting at pa+sizeof(void*)-1
ptr=(void*)( ((size_t)pa+sizeof(void *)+alignment-1) & ~(alignment-1));
diff --git a/src/field/allocation/FieldAllocator.h b/src/field/allocation/FieldAllocator.h
index 5be0ecf4b0dbd2b5e292d446dd13d62aae9aca23..418fb6c0bd6d520f4a6a213a957000c27da23dc7 100644
--- a/src/field/allocation/FieldAllocator.h
+++ b/src/field/allocation/FieldAllocator.h
@@ -48,6 +48,8 @@ namespace field {
{
public:
+ virtual ~FieldAllocator() = default;
+
/**
* \brief Allocate memory for a field of given sizes and initializes reference counter with one
*
@@ -240,7 +242,7 @@ namespace field {
virtual T * allocateMemory ( uint_t size )
{
- void * ptr = aligned_malloc_with_offset(size * sizeof(T), alignment, offset_ % alignment );
+ void * ptr = aligned_malloc_with_offset(size * sizeof(T) + alignment, alignment, offset_ % alignment );
if(!ptr)
throw std::bad_alloc();
diff --git a/src/field/communication/StencilRestrictedPackInfo.h b/src/field/communication/StencilRestrictedPackInfo.h
new file mode 100644
index 0000000000000000000000000000000000000000..72e40584519dde9d15729fb15067ec8278930fc5
--- /dev/null
+++ b/src/field/communication/StencilRestrictedPackInfo.h
@@ -0,0 +1,135 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file PdfFieldPackInfo.h
+//! \ingroup lbm
+//! \author Martin Bauer <martin.bauer@fau.de>
+//! \author Florian Schornbaum <florian.schornbaum@fau.de>
+//! \brief Packs only certain components of a field
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "communication/UniformPackInfo.h"
+#include "core/debug/Debug.h"
+#include "stencil/Directions.h"
+
+
+namespace walberla {
+namespace field {
+namespace communication {
+
+
+/**
+ * \brief PackInfo that packs only the components that point to the neighbor.
+ *
+ * see also documentation for FieldPackInfo
+ *
+ * \warning For fields with nrOfGhostLayers > 1: only the components pointing towards
+ * the boundary are communicated, which may not be the desired behavior
+ * for the 'inner' ghost layers
+ */
+template< typename GhostLayerField_T, typename Stencil_T >
+class StencilRestrictedPackInfo : public walberla::communication::UniformPackInfo
+{
+public:
+ StencilRestrictedPackInfo( const BlockDataID & fieldId ) : fieldId_( fieldId ) {}
+ virtual ~StencilRestrictedPackInfo() {}
+
+ bool constantDataExchange() const { return true; }
+ bool threadsafeReceiving() const { return true; }
+
+ void unpackData( IBlock * receiver, stencil::Direction dir, mpi::RecvBuffer & buffer );
+
+ void communicateLocal( const IBlock * sender, IBlock * receiver, stencil::Direction dir );
+
+protected:
+
+ void packDataImpl( const IBlock * sender, stencil::Direction dir, mpi::SendBuffer & outBuffer ) const;
+
+ const BlockDataID fieldId_;
+
+ static_assert(GhostLayerField_T::F_SIZE == Stencil_T::Size, "Size of stencil and f size of field have to be equal");
+};
+
+
+template< typename GhostLayerField_T, typename Stencil >
+void StencilRestrictedPackInfo<GhostLayerField_T, Stencil>::unpackData( IBlock * receiver, stencil::Direction dir, mpi::RecvBuffer & buffer )
+{
+ if( Stencil::idx[ stencil::inverseDir[dir] ] >= Stencil::Size )
+ return;
+
+ GhostLayerField_T * pdfField = receiver->getData< GhostLayerField_T >( fieldId_ );
+ WALBERLA_ASSERT_NOT_NULLPTR( pdfField );
+ WALBERLA_ASSERT_EQUAL( pdfField->nrOfGhostLayers(), 1 );
+
+ stencil::Direction packerDirection = stencil::inverseDir[dir];
+
+ for(auto i = pdfField->beginGhostLayerOnlyXYZ(dir); i != pdfField->end(); ++i )
+ for(uint_t f = 0; f < Stencil::d_per_d_length[packerDirection]; ++f)
+ buffer >> i.getF( Stencil::idx[ Stencil::d_per_d[packerDirection][f] ] );
+}
+
+
+
+template< typename GhostLayerField_T, typename Stencil >
+void StencilRestrictedPackInfo<GhostLayerField_T, Stencil>::communicateLocal( const IBlock * sender, IBlock * receiver, stencil::Direction dir )
+{
+ if( Stencil::idx[dir] >= Stencil::Size )
+ return;
+
+ const GhostLayerField_T * sf = sender ->getData< GhostLayerField_T >( fieldId_ );
+ GhostLayerField_T * rf = receiver->getData< GhostLayerField_T >( fieldId_ );
+
+ WALBERLA_ASSERT_EQUAL( sf->xyzSize(), rf->xyzSize() );
+
+ typename GhostLayerField_T::const_iterator srcIter = sf->beginSliceBeforeGhostLayerXYZ(dir);
+ typename GhostLayerField_T::iterator dstIter = rf->beginGhostLayerOnlyXYZ(stencil::inverseDir[dir]);
+
+ while( srcIter != sf->end() )
+ {
+ for( uint_t f = 0; f < Stencil::d_per_d_length[dir]; ++f )
+ dstIter.getF( Stencil::idx[ Stencil::d_per_d[dir][f] ] ) = srcIter.getF( Stencil::idx[ Stencil::d_per_d[dir][f] ] );
+
+ ++srcIter;
+ ++dstIter;
+ }
+ WALBERLA_ASSERT( srcIter == sf->end() );
+ WALBERLA_ASSERT( dstIter == rf->end() );
+}
+
+
+
+template< typename GhostLayerField_T, typename Stencil >
+void StencilRestrictedPackInfo<GhostLayerField_T, Stencil>::packDataImpl( const IBlock * sender, stencil::Direction dir, mpi::SendBuffer & outBuffer ) const
+{
+ if( Stencil::idx[dir] >= Stencil::Size )
+ return;
+
+ const GhostLayerField_T * pdfField = sender->getData< GhostLayerField_T >( fieldId_ );
+ WALBERLA_ASSERT_NOT_NULLPTR( pdfField );
+ WALBERLA_ASSERT_EQUAL( pdfField->nrOfGhostLayers(), 1 );
+
+ for( auto i = pdfField->beginSliceBeforeGhostLayerXYZ(dir); i != pdfField->end(); ++i )
+ for(uint_t f = 0; f < Stencil::d_per_d_length[dir]; ++f)
+ outBuffer << i.getF( Stencil::idx[ Stencil::d_per_d[dir][f] ] );
+}
+
+
+
+} // namespace communication
+} // namespace field
+} // namespace walberla
diff --git a/src/field/interpolators/TrilinearFieldInterpolator.h b/src/field/interpolators/TrilinearFieldInterpolator.h
index 48d6b2ce9436bb5a87871a558bf0904c196c4e1d..bdac4ff1a6d752b6d5d898139de421fb5793f43b 100644
--- a/src/field/interpolators/TrilinearFieldInterpolator.h
+++ b/src/field/interpolators/TrilinearFieldInterpolator.h
@@ -26,7 +26,7 @@
#include "domain_decomposition/StructuredBlockStorage.h"
#include "field/FlagField.h"
-
+#include "field/interpolators/NearestNeighborFieldInterpolator.h"
namespace walberla {
namespace field {
diff --git a/src/field/iterators/IteratorMacros.h b/src/field/iterators/IteratorMacros.h
index 0c11a6014fc6447147574857fcceb3a47cc1cb65..162028971bee80e5c5dc3e1408926154050883f7 100644
--- a/src/field/iterators/IteratorMacros.h
+++ b/src/field/iterators/IteratorMacros.h
@@ -486,7 +486,7 @@
CODE \
++it0; ++it1; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
} \
} \
else \
@@ -503,7 +503,7 @@
CODE \
++it0; ++it1; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
} \
} }
@@ -532,8 +532,8 @@
CODE \
++it0; ++it1; ++it2; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
} \
} \
else \
@@ -551,11 +551,11 @@
CODE \
++it0; ++it1; ++it2; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
} \
} }
-
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_10( it0, f0, it1, f1, it2, f2, it3, f3, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (f0) ); \
@@ -584,9 +584,9 @@
CODE \
++it0; ++it1; ++it2; ++it3; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
} \
} \
else \
@@ -605,9 +605,9 @@
CODE \
++it0; ++it1; ++it2; ++it3; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
} \
} }
@@ -642,10 +642,10 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
} \
} \
else \
@@ -665,10 +665,10 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
} \
} }
@@ -706,11 +706,11 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
} \
} \
else \
@@ -731,11 +731,11 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
} \
} }
@@ -776,12 +776,12 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
} \
} \
else \
@@ -803,12 +803,12 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
} \
} }
@@ -852,13 +852,13 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; ++it7; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
- WALBERLA_ASSERT( it7 == (f7)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it7, (f7)->end() ); \
} \
} \
else \
@@ -881,16 +881,16 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; ++it7; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
- WALBERLA_ASSERT( it7 == (f7)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it7, (f7)->end() ); \
} \
} }
-
+
#else // == not WALBERLA_CXX_COMPILER_IS_MSVC
#define WALBERLA_FOR_ALL_CELLS_XYZ_OMP( field, omp, CODE ) \
@@ -956,7 +956,7 @@
} \
} \
} }
-
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_XYZ_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_XYZ_OMP_4( field, gl, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (field) ); \
@@ -1041,7 +1041,7 @@
} \
} \
} }
-
+
#define WALBERLA_FOR_ALL_CELLS_YZ_OMP( field, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (field) ); \
const ::walberla::cell_idx_t ySize__ = ::walberla::cell_idx_c( (field)->ySize() ); \
@@ -1096,7 +1096,7 @@
} \
} \
} }
-
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_YZ_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_YZ_OMP_4( field, gl, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (field) ); \
@@ -1168,7 +1168,7 @@
} \
} \
} }
-
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_4( it0, f0, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (f0) ); \
@@ -1228,7 +1228,7 @@
CODE \
++it0; ++it1; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
} \
} \
else \
@@ -1245,10 +1245,10 @@
CODE \
++it0; ++it1; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
} \
} }
-
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_8( it0, f0, it1, f1, it2, f2, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (f0) ); \
@@ -1274,8 +1274,8 @@
CODE \
++it0; ++it1; ++it2; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
} \
} \
else \
@@ -1293,11 +1293,11 @@
CODE \
++it0; ++it1; ++it2; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
} \
} }
-
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_10( it0, f0, it1, f1, it2, f2, it3, f3, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (f0) ); \
@@ -1326,9 +1326,9 @@
CODE \
++it0; ++it1; ++it2; ++it3; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
} \
} \
else \
@@ -1347,9 +1347,9 @@
CODE \
++it0; ++it1; ++it2; ++it3; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
} \
} }
@@ -1384,10 +1384,10 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
} \
} \
else \
@@ -1407,10 +1407,10 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
} \
} }
@@ -1448,11 +1448,11 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
} \
} \
else \
@@ -1473,11 +1473,11 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
} \
} }
@@ -1518,12 +1518,12 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
} \
} \
else \
@@ -1545,12 +1545,12 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
} \
} }
@@ -1594,13 +1594,13 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; ++it7; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
- WALBERLA_ASSERT( it7 == (f7)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it7, (f7)->end() ); \
} \
} \
else \
@@ -1623,13 +1623,13 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; ++it7; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
- WALBERLA_ASSERT( it7 == (f7)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it7, (f7)->end() ); \
} \
} }
@@ -1650,7 +1650,7 @@
} \
} \
} }
-
+
#define WALBERLA_FOR_ALL_CELLS_IN_INTERVAL_XYZ_OMP( interval, omp, CODE ) \
{ for( ::walberla::cell_idx_t z = interval.zMin(); z <= interval.zMax(); ++z ) { \
for( ::walberla::cell_idx_t y = interval.yMin(); y <= interval.yMax(); ++y ) { \
@@ -1688,7 +1688,7 @@
CODE \
} \
} }
-
+
#define WALBERLA_FOR_ALL_CELLS_IN_INTERVAL_YZ_OMP( interval, omp, CODE ) \
{ for( ::walberla::cell_idx_t z = interval.zMin(); z <= interval.zMax(); ++z ) { \
for( ::walberla::cell_idx_t y = interval.yMin(); y <= interval.yMax(); ++y ) \
@@ -1697,7 +1697,7 @@
} \
} }
-// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_YZ_OMP' (using the same signature) instead
+// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_YZ_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_INCLUDING_GHOST_LAYER_YZ_OMP_4( field, gl, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (field) ); \
WALBERLA_ASSERT_GREATER_EQUAL_2( (field)->nrOfGhostLayers(), gl ); \
@@ -1710,7 +1710,7 @@
CODE \
} \
} }
-
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_4( it0, f0, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (f0) ); \
@@ -1733,8 +1733,8 @@
CODE \
++it0; ++it1; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); }
-
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); }
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_8( it0, f0, it1, f1, it2, f2, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (f0) ); \
@@ -1750,9 +1750,9 @@
CODE \
++it0; ++it1; ++it2; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); }
-
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); }
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_10( it0, f0, it1, f1, it2, f2, it3, f3, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (f0) ); \
@@ -1771,10 +1771,10 @@
CODE \
++it0; ++it1; ++it2; ++it3; \
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); }
-
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); }
+
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_12( it0, f0, it1, f1, it2, f2, it3, f3, it4, f4, omp, CODE ) \
{ WALBERLA_ASSERT_NOT_NULLPTR_1( (f0) ); \
@@ -1796,10 +1796,10 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4;\
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); }
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); }
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_14( it0, f0, it1, f1, it2, f2, it3, f3, it4, f4, it5, f5, omp, CODE ) \
@@ -1825,11 +1825,11 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5;\
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); }
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); }
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_16( it0, f0, it1, f1, it2, f2, it3, f3, it4, f4, it5, f5, it6, f6, omp, CODE ) \
@@ -1858,12 +1858,12 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6;\
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); }
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); }
// Do not call this macro, call 'WALBERLA_FOR_ALL_CELLS_OMP' (using the same signature) instead
#define WALBERLA_FOR_ALL_CELLS_OMP_18( it0, f0, it1, f1, it2, f2, it3, f3, it4, f4, it5, f5, it6, f6, it7, f7, omp, CODE ) \
@@ -1895,13 +1895,13 @@
CODE \
++it0; ++it1; ++it2; ++it3; ++it4; ++it5; ++it6; ++it7;\
} \
- WALBERLA_ASSERT( it1 == (f1)->end() ); \
- WALBERLA_ASSERT( it2 == (f2)->end() ); \
- WALBERLA_ASSERT( it3 == (f3)->end() ); \
- WALBERLA_ASSERT( it4 == (f4)->end() ); \
- WALBERLA_ASSERT( it5 == (f5)->end() ); \
- WALBERLA_ASSERT( it6 == (f6)->end() ); \
- WALBERLA_ASSERT( it7 == (f7)->end() ); }
+ WALBERLA_ASSERT_EQUAL_2( it1, (f1)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it2, (f2)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it3, (f3)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it4, (f4)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it5, (f5)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it6, (f6)->end() ); \
+ WALBERLA_ASSERT_EQUAL_2( it7, (f7)->end() ); }
#endif // OpenMP
diff --git a/src/field/python/CommunicationExport.impl.h b/src/field/python/CommunicationExport.impl.h
index 798cc22c23b5dc976e8eafafe65fd8e00c16c8b6..15066bcb0320a2ea7bf630b8848c971dddc5c464 100644
--- a/src/field/python/CommunicationExport.impl.h
+++ b/src/field/python/CommunicationExport.impl.h
@@ -26,12 +26,19 @@
#include "field/communication/PackInfo.h"
+#include "field/communication/StencilRestrictedPackInfo.h"
#include "field/communication/UniformMPIDatatypeInfo.h"
#include "python_coupling/helper/MplHelpers.h"
#include "python_coupling/helper/BoostPythonHelpers.h"
#include "python_coupling/helper/MplHelpers.h"
+#include "stencil/D2Q9.h"
+#include "stencil/D3Q7.h"
+#include "stencil/D3Q15.h"
+#include "stencil/D3Q19.h"
+#include "stencil/D3Q27.h"
+
namespace walberla {
namespace field {
@@ -39,6 +46,86 @@ namespace field {
namespace internal {
+ //===================================================================================================================
+ //
+ // createStencilRestrictedPackInfo Export
+ //
+ //===================================================================================================================
+
+ template< typename FieldType >
+ typename std::enable_if<FieldType::F_SIZE == 27, boost::python::object>::type
+ createStencilRestrictedPackInfoObject( BlockDataID bdId )
+ {
+ typedef GhostLayerField<typename FieldType::value_type, 27> GlField_T;
+ using field::communication::StencilRestrictedPackInfo;
+ return boost::python::object( make_shared< StencilRestrictedPackInfo<GlField_T, stencil::D3Q27> >( bdId) );
+ }
+
+ template< typename FieldType >
+ typename std::enable_if<FieldType::F_SIZE == 19, boost::python::object>::type
+ createStencilRestrictedPackInfoObject( BlockDataID bdId )
+ {
+ typedef GhostLayerField<typename FieldType::value_type, 19> GlField_T;
+ using field::communication::StencilRestrictedPackInfo;
+ return boost::python::object( make_shared< StencilRestrictedPackInfo<GlField_T, stencil::D3Q19> >( bdId) );
+ }
+
+ template< typename FieldType >
+ typename std::enable_if<FieldType::F_SIZE == 15, boost::python::object>::type
+ createStencilRestrictedPackInfoObject( BlockDataID bdId )
+ {
+ typedef GhostLayerField<typename FieldType::value_type, 15> GlField_T;
+ using field::communication::StencilRestrictedPackInfo;
+ return boost::python::object( make_shared< StencilRestrictedPackInfo<GlField_T, stencil::D3Q15> >( bdId) );
+ }
+
+ template< typename FieldType >
+ typename std::enable_if<FieldType::F_SIZE == 7, boost::python::object>::type
+ createStencilRestrictedPackInfoObject( BlockDataID bdId )
+ {
+ typedef GhostLayerField<typename FieldType::value_type, 7> GlField_T;
+ using field::communication::StencilRestrictedPackInfo;
+ return boost::python::object( make_shared< StencilRestrictedPackInfo<GlField_T, stencil::D3Q7> >( bdId) );
+ }
+
+ template< typename FieldType >
+ typename std::enable_if<FieldType::F_SIZE == 9, boost::python::object>::type
+ createStencilRestrictedPackInfoObject( BlockDataID bdId )
+ {
+ typedef GhostLayerField<typename FieldType::value_type, 9> GlField_T;
+ using field::communication::StencilRestrictedPackInfo;
+ return boost::python::object( make_shared< StencilRestrictedPackInfo<GlField_T, stencil::D2Q9> >( bdId) );
+ }
+
+ template< typename FieldType >
+ typename std::enable_if<!(FieldType::F_SIZE == 9 ||
+ FieldType::F_SIZE == 7 ||
+ FieldType::F_SIZE == 15 ||
+ FieldType::F_SIZE == 19 ||
+ FieldType::F_SIZE == 27), boost::python::object>::type
+ createStencilRestrictedPackInfoObject( BlockDataID )
+ {
+ PyErr_SetString( PyExc_ValueError, "This works only for fields with fSize in 7, 9, 15, 19 or 27" );
+ throw boost::python::error_already_set();
+ }
+
+ FunctionExporterClass( createStencilRestrictedPackInfoObject, boost::python::object( BlockDataID ) );
+
+ template< typename FieldVector>
+ boost::python::object createStencilRestrictedPackInfo( const shared_ptr<StructuredBlockStorage> & bs,
+ const std::string & blockDataName )
+ {
+ auto bdId = python_coupling::blockDataIDFromString( *bs, blockDataName );
+ if ( bs->begin() == bs->end() ) {
+ // if no blocks are on this field an arbitrary PackInfo can be returned
+ return createStencilRestrictedPackInfoObject< GhostLayerField<real_t,1> > ( bdId );
+ }
+
+ IBlock * firstBlock = & ( * bs->begin() );
+ python_coupling::Dispatcher<FieldVector, Exporter_createStencilRestrictedPackInfoObject > dispatcher( firstBlock );
+ return dispatcher( bdId )( bdId ) ;
+ }
+
//===================================================================================================================
//
// createPackInfo Export
@@ -114,6 +201,34 @@ namespace internal {
return dispatcher( bdId )( bdId, numberOfGhostLayers );
}
+ template< typename T>
+ void exportStencilRestrictedPackInfo()
+ {
+ using field::communication::StencilRestrictedPackInfo;
+ using namespace boost::python;
+
+ {
+ typedef StencilRestrictedPackInfo<GhostLayerField<T, 9>, stencil::D2Q9> Pi;
+ class_< Pi, shared_ptr<Pi>, bases<walberla::communication::UniformPackInfo>, boost::noncopyable >( "StencilRestrictedPackInfo", no_init );
+ }
+ {
+ typedef StencilRestrictedPackInfo<GhostLayerField<T, 7>, stencil::D3Q7> Pi;
+ class_< Pi, shared_ptr<Pi>, bases<walberla::communication::UniformPackInfo>, boost::noncopyable >( "StencilRestrictedPackInfo", no_init );
+ }
+ {
+ typedef StencilRestrictedPackInfo<GhostLayerField<T, 15>, stencil::D3Q15> Pi;
+ class_< Pi, shared_ptr<Pi>, bases<walberla::communication::UniformPackInfo>, boost::noncopyable >( "StencilRestrictedPackInfo", no_init );
+ }
+ {
+ typedef StencilRestrictedPackInfo<GhostLayerField<T, 19>, stencil::D3Q19> Pi;
+ class_< Pi, shared_ptr<Pi>, bases<walberla::communication::UniformPackInfo>, boost::noncopyable >( "StencilRestrictedPackInfo", no_init );
+ }
+ {
+ typedef StencilRestrictedPackInfo<GhostLayerField<T, 27>, stencil::D3Q27> Pi;
+ class_< Pi, shared_ptr<Pi>, bases<walberla::communication::UniformPackInfo>, boost::noncopyable >( "StencilRestrictedPackInfo", no_init );
+ }
+
+ }
} // namespace internal
@@ -126,8 +241,13 @@ void exportCommunicationClasses()
{
using namespace boost::python;
+ internal::exportStencilRestrictedPackInfo<float>();
+ internal::exportStencilRestrictedPackInfo<double>();
+
def( "createMPIDatatypeInfo",&internal::createMPIDatatypeInfo<FieldTypes>, ( arg("blocks"), arg("blockDataName"), arg("numberOfGhostLayers" ) =0 ) );
def( "createPackInfo", &internal::createPackInfo<FieldTypes>, ( arg("blocks"), arg("blockDataName"), arg("numberOfGhostLayers" ) =0 ) );
+ def( "createStencilRestrictedPackInfo", &internal::createStencilRestrictedPackInfo<FieldTypes>,
+ (arg("blocks"), arg("blockDataName") ));
}
diff --git a/src/field/python/FieldExport.impl.h b/src/field/python/FieldExport.impl.h
index ecbbbae8ca9d72cd0b9c1db0352159297853a5c7..c8c2936a2b80b87a2ab48d3dcad25c5ef0832a66 100644
--- a/src/field/python/FieldExport.impl.h
+++ b/src/field/python/FieldExport.impl.h
@@ -490,6 +490,65 @@ namespace internal {
}
+ //===================================================================================================================
+ //
+ // Aligned Allocation
+ //
+ //===================================================================================================================
+
+ template<typename T>
+ shared_ptr<field::FieldAllocator<T> > getAllocator(uint_t alignment)
+ {
+ if( alignment == 0 )
+ return shared_ptr<field::FieldAllocator<T> >(); // leave to default - auto-detection of alignment
+ else if ( alignment == 16 )
+ return make_shared< field::AllocateAligned<T, 16> >();
+ else if ( alignment == 32 )
+ return make_shared< field::AllocateAligned<T, 32> >();
+ else if ( alignment == 64 )
+ return make_shared< field::AllocateAligned<T, 64> >();
+ else if ( alignment == 128 )
+ return make_shared< field::AllocateAligned<T, 128> >();
+ else {
+ PyErr_SetString( PyExc_ValueError, "Alignment parameter has to be one of 0, 16, 32, 64, 128." );
+ throw boost::python::error_already_set();
+ return shared_ptr<field::FieldAllocator<T> >();
+ }
+ }
+
+ template< typename GhostLayerField_T >
+ class GhostLayerFieldDataHandling : public blockforest::AlwaysInitializeBlockDataHandling< GhostLayerField_T >
+ {
+ public:
+ typedef typename GhostLayerField_T::value_type Value_T;
+
+ GhostLayerFieldDataHandling( const weak_ptr<StructuredBlockStorage> &blocks, const uint_t nrOfGhostLayers,
+ const Value_T &initValue, const Layout layout, uint_t alignment = 0 ) :
+ blocks_( blocks ), nrOfGhostLayers_( nrOfGhostLayers ), initValue_( initValue ), layout_( layout ),
+ alignment_( alignment ) {}
+
+ GhostLayerField_T * initialize( IBlock * const block )
+ {
+ auto blocks = blocks_.lock();
+ WALBERLA_CHECK_NOT_NULLPTR( blocks, "Trying to access 'AlwaysInitializeBlockDataHandling' for a block "
+ "storage object that doesn't exist anymore" );
+ GhostLayerField_T * field = new GhostLayerField_T ( blocks->getNumberOfXCells( *block ),
+ blocks->getNumberOfYCells( *block ),
+ blocks->getNumberOfZCells( *block ),
+ nrOfGhostLayers_, initValue_, layout_,
+ getAllocator<Value_T>(alignment_) );
+ return field;
+ }
+
+ private:
+ weak_ptr< StructuredBlockStorage > blocks_;
+
+ uint_t nrOfGhostLayers_;
+ Value_T initValue_;
+ Layout layout_;
+ uint_t alignment_;
+ };
+
//===================================================================================================================
//
@@ -627,7 +686,8 @@ namespace internal {
for( auto i = flags.begin(); i != flags.end(); ++i )
result.append( i->toString() );
- return result;
+ boost::python::object objectResult = result;
+ return objectResult;
}
@@ -640,7 +700,8 @@ namespace internal {
for( auto i = flags.begin(); i != flags.end(); ++i )
result[ i->toString() ] = ff.getFlag( *i );
- return result;
+ boost::python::object objectResult = result;
+ return objectResult;
}
template<typename T>
@@ -843,10 +904,10 @@ namespace internal {
{
public:
CreateFieldExporter( uint_t xs, uint_t ys, uint_t zs, uint_t fs, uint_t gl,
- Layout layout, const boost::python::object & type,
- const shared_ptr<boost::python::object> & resultPointer )
+ Layout layout, const boost::python::object & type, uint_t alignment,
+ const shared_ptr<boost::python::object> & resultPointer )
: xs_( xs ), ys_(ys), zs_(zs), fs_(fs), gl_(gl),
- layout_( layout), type_( type ), resultPointer_( resultPointer )
+ layout_( layout), type_( type ), alignment_(alignment), resultPointer_( resultPointer )
{}
template< typename FieldType>
@@ -862,7 +923,8 @@ namespace internal {
if( python_coupling::isCppEqualToPythonType<T>( (PyTypeObject *)type_.ptr() ) )
{
T initVal = T(); //extract<T> ( initValue_ );
- *resultPointer_ = object( make_shared< GhostLayerField<T,F_SIZE> >( xs_,ys_,zs_, gl_, initVal, layout_ ) );
+ *resultPointer_ = object( make_shared< GhostLayerField<T,F_SIZE> >( xs_,ys_,zs_, gl_, initVal, layout_,
+ getAllocator<T>(alignment_)));
}
}
@@ -874,6 +936,7 @@ namespace internal {
uint_t gl_;
Layout layout_;
boost::python::object type_;
+ uint_t alignment_;
shared_ptr<boost::python::object> resultPointer_;
};
@@ -881,7 +944,8 @@ namespace internal {
boost::python::object createPythonField( boost::python::list size,
boost::python::object type,
uint_t ghostLayers,
- Layout layout)
+ Layout layout,
+ uint_t alignment)
{
using namespace boost::python;
uint_t xSize = extract<uint_t> ( size[0] );
@@ -898,7 +962,7 @@ namespace internal {
}
auto result = make_shared<boost::python::object>();
- CreateFieldExporter exporter( xSize,ySize, zSize, fSize, ghostLayers, layout, type, result );
+ CreateFieldExporter exporter( xSize,ySize, zSize, fSize, ghostLayers, layout, type, alignment, result );
python_coupling::for_each_noncopyable_type< FieldTypes > ( exporter );
if ( *result == object() )
@@ -952,12 +1016,13 @@ namespace internal {
class AddToStorageExporter
{
public:
- AddToStorageExporter( const shared_ptr<StructuredBlockStorage> & blocks,
+ AddToStorageExporter(const shared_ptr<StructuredBlockStorage> & blocks,
const std::string & name, uint_t fs, uint_t gl, Layout layout,
const boost::python::object & type,
- const boost::python::object & initObj )
+ const boost::python::object & initObj,
+ uint_t alignment )
: blocks_( blocks ), name_( name ), fs_( fs ),
- gl_(gl),layout_( layout), type_( type ), initObj_( initObj), found_(false)
+ gl_(gl),layout_( layout), type_( type ), initObj_( initObj), alignment_(alignment), found_(false)
{}
template< typename FieldType>
@@ -972,11 +1037,15 @@ namespace internal {
if( !found_ && python_coupling::isCppEqualToPythonType<T>( (PyTypeObject *)type_.ptr() ) )
{
- if ( initObj_ == object() )
- field::addToStorage< GhostLayerField<T,F_SIZE> >( blocks_, name_, T(), layout_, gl_ );
- else
- field::addToStorage< GhostLayerField<T,F_SIZE> >( blocks_, name_, extract<T>(initObj_), layout_, gl_ );
-
+ typedef internal::GhostLayerFieldDataHandling< GhostLayerField<T,F_SIZE > > DataHandling;
+ if ( initObj_ == object() ) {
+ auto dataHandling = walberla::make_shared< DataHandling >( blocks_, gl_, T(), layout_, alignment_ );
+ blocks_->addBlockData( dataHandling, name_ );
+ }
+ else {
+ auto dataHandling = walberla::make_shared< DataHandling >( blocks_, gl_, extract<T>(initObj_), layout_, alignment_ );
+ blocks_->addBlockData( dataHandling, name_ );
+ }
found_ = true;
}
}
@@ -990,12 +1059,14 @@ namespace internal {
Layout layout_;
boost::python::object type_;
boost::python::object initObj_;
+ uint_t alignment_;
bool found_;
};
template<typename FieldTypes>
void addToStorage( const shared_ptr<StructuredBlockStorage> & blocks, const std::string & name,
- boost::python::object type, uint_t fs, uint_t gl, Layout layout, boost::python::object initValue )
+ boost::python::object type, uint_t fs, uint_t gl, Layout layout, boost::python::object initValue,
+ uint_t alignment)
{
using namespace boost::python;
@@ -1005,8 +1076,8 @@ namespace internal {
}
auto result = make_shared<boost::python::object>();
- AddToStorageExporter exporter( blocks, name, fs, gl, layout, type, initValue );
- python_coupling::for_each_noncopyable_type< FieldTypes > ( boost::ref(exporter) );
+ AddToStorageExporter exporter( blocks, name, fs, gl, layout, type, initValue, alignment );
+ python_coupling::for_each_noncopyable_type< FieldTypes > ( std::ref(exporter) );
if ( ! exporter.successful() ) {
PyErr_SetString( PyExc_ValueError, "Adding Field failed.");
@@ -1079,7 +1150,7 @@ namespace internal {
auto fieldID = python_coupling::blockDataIDFromString( *blocks, name );
CreateVTKWriterExporter exporter(blocks, fieldID, vtkName);
- python_coupling::for_each_noncopyable_type< FieldTypes > ( boost::ref(exporter) );
+ python_coupling::for_each_noncopyable_type< FieldTypes > ( std::ref(exporter) );
if ( ! exporter.getCreatedWriter() ) {
PyErr_SetString( PyExc_ValueError, "Failed to create writer");
throw boost::python::error_already_set();
@@ -1154,7 +1225,7 @@ namespace internal {
auto fieldID = python_coupling::blockDataIDFromString( *blocks, name );
CreateFlagFieldVTKWriterExporter exporter(blocks, fieldID, vtkName, flagMapping);
- python_coupling::for_each_noncopyable_type< FieldTypes > ( boost::ref(exporter) );
+ python_coupling::for_each_noncopyable_type< FieldTypes > ( std::ref(exporter) );
if ( ! exporter.getCreatedWriter() ) {
PyErr_SetString( PyExc_ValueError, "Failed to create writer");
throw boost::python::error_already_set();
@@ -1221,7 +1292,7 @@ namespace internal {
auto fieldID = python_coupling::blockDataIDFromString( *blocks, name );
CreateBinarizationVTKWriterExporter exporter(blocks, fieldID, vtkName, mask);
- python_coupling::for_each_noncopyable_type< FieldTypes > ( boost::ref(exporter) );
+ python_coupling::for_each_noncopyable_type< FieldTypes > ( std::ref(exporter) );
if ( ! exporter.getCreatedWriter() ) {
PyErr_SetString( PyExc_ValueError, "Failed to create writer");
throw boost::python::error_already_set();
@@ -1252,7 +1323,8 @@ void exportFields()
def( "createField", &internal::createPythonField<FieldTypes>, ( ( arg("size") ),
( arg("type") ),
( arg("ghostLayers") = uint_t(1) ),
- ( arg("layout") = zyxf ) ) );
+ ( arg("layout") = zyxf ),
+ ( arg("alignment") = 0 )) );
def( "createFlagField", &internal::createPythonFlagField, ( ( arg("size") ),
( arg("nrOfBits") = uint_t(32) ),
@@ -1264,7 +1336,8 @@ void exportFields()
( arg("fSize") = 1 ),
( arg("ghostLayers") = uint_t(1) ),
( arg("layout") = zyxf ),
- ( arg("initValue") = object() ) ) );
+ ( arg("initValue") = object() ),
+ ( arg("alignment") = 0 ) ) );
def( "addFlagFieldToStorage",&internal::addFlagFieldToStorage, ( ( arg("blocks") ),
( arg("name") ),
diff --git a/src/gather/DataProcessor.h b/src/gather/DataProcessor.h
index a2efd154aef4d02a762f15f7feaa903a17c30fe5..b337becc9a3aae5bb2c3782df4e9d37e09354d05 100644
--- a/src/gather/DataProcessor.h
+++ b/src/gather/DataProcessor.h
@@ -43,6 +43,8 @@ class DataProcessor
{
public:
+ virtual ~DataProcessor() = default;
+
/*
* Process "graph like" data
* every entry in the outer vector is a data-point.
diff --git a/src/gather/MPIGatherScheme.cpp b/src/gather/MPIGatherScheme.cpp
index 9775cce2b0f639b76a07d0e94628d45cb1ef846a..c40a63c691255072678aa70c9621fc38583e08f9 100644
--- a/src/gather/MPIGatherScheme.cpp
+++ b/src/gather/MPIGatherScheme.cpp
@@ -137,7 +137,7 @@ void MPIGatherScheme::runSetupPhase()
recvBuffer.resize( uint_c( nrOfGatherProcesses ) );
MPI_Gather( & bytesToSend_, 1, MPITrait<decltype(bytesToSend_)>::type(),
- recvBuffer.empty()? NULL : & recvBuffer[0], 1, MPITrait<decltype(bytesToSend_)>::type(),
+ recvBuffer.empty()? nullptr : & recvBuffer[0], 1, MPITrait<decltype(bytesToSend_)>::type(),
gatherRank_, gatherCommunicator_ );
WALBERLA_ASSERT_EQUAL( displacementVector_.size(), 0 );
@@ -193,8 +193,8 @@ void MPIGatherScheme::communicate()
mpi::GenericRecvBuffer<unsigned char> recvBuffer;
- int * displacementVectorPtr = NULL;
- int * sendBytesPerProcessPtr = NULL;
+ int * displacementVectorPtr = nullptr;
+ int * sendBytesPerProcessPtr = nullptr;
if ( mpiManager->rank() == gatherRankInGlobalComm_ ) {
recvBuffer.resize( uint_c( gatherMsgSize_ ) );
displacementVectorPtr = &displacementVector_[0];
diff --git a/src/geometry/bodies/AABBBody.h b/src/geometry/bodies/AABBBody.h
index 7ca1391631727a493399d7a89143a758ff9ab23d..bf2aed3c6bbae45dc586459f6036840511b5c049 100644
--- a/src/geometry/bodies/AABBBody.h
+++ b/src/geometry/bodies/AABBBody.h
@@ -30,13 +30,12 @@ namespace geometry {
template<>
-inline real_t overlapFraction ( const AABB & body, const Vector3<real_t> & cellMidpoint, real_t dx, uint_t )
+inline real_t overlapFraction ( const AABB & body, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx, uint_t )
{
- const real_t dx2 = real_t( 0.5 ) * dx;
- AABB box ( cellMidpoint[0] - dx2, cellMidpoint[1] - dx2, cellMidpoint[2] - dx2,
- cellMidpoint[0] + dx2, cellMidpoint[1] + dx2, cellMidpoint[2] + dx2 );
+ AABB box = AABB::createFromMinMaxCorner( cellMidpoint[0] - real_t(0.5)*dx[0], cellMidpoint[1] - real_t(0.5)*dx[1], cellMidpoint[2] - real_t(0.5)*dx[2],
+ cellMidpoint[0] + real_t(0.5)*dx[0], cellMidpoint[1] + real_t(0.5)*dx[1], cellMidpoint[2] + real_t(0.5)*dx[2]);
- return body.intersectionVolume( box ) / ( dx * dx * dx );
+ return body.intersectionVolume( box ) / ( dx[0] * dx[1] * dx[2] );
}
diff --git a/src/geometry/bodies/BodyFromConfig.cpp b/src/geometry/bodies/BodyFromConfig.cpp
index 6ad56cfa85835ade19d22702541cc78619671f15..0b9d1947c67ac5d85312be760139b75038f47733 100644
--- a/src/geometry/bodies/BodyFromConfig.cpp
+++ b/src/geometry/bodies/BodyFromConfig.cpp
@@ -20,6 +20,8 @@
//======================================================================================================================
#include "BodyFromConfig.h"
+
+#include <memory>
#include "core/Abort.h"
@@ -107,8 +109,8 @@ BodyLogicalAND<Sphere,AABB> sphereSliceFromConfig ( const Config::BlockHandle &
{
Sphere sphere = sphereFromConfig(block.getOneBlock("Sphere"));
AABB box = AABBFromConfig (block.getOneBlock("Box"));
- auto spherePtr = shared_ptr<Sphere>( new Sphere(sphere) );
- auto boxPtr = shared_ptr<AABB> ( new AABB(box) );
+ auto spherePtr = std::make_shared<Sphere>( sphere );
+ auto boxPtr = std::make_shared<AABB> ( box );
return BodyLogicalAND<Sphere,AABB>(spherePtr, boxPtr);
}
@@ -122,10 +124,10 @@ BodyLogicalAND<Sphere,BodyLogicalNOT<Sphere> > hollowSphereFromConfig ( const Co
if ( ! block.isDefined( "outer_radius" ) )
WALBERLA_ABORT( "Missing parameter 'outer_radius' for sphere defined in block " << block.getKey() );
- auto inner = shared_ptr<Sphere>( new Sphere( block.getParameter<Vector3<real_t> > ( "midpoint" ),
- block.getParameter<real_t > ( "inner_radius" ) ) );
- auto outer = shared_ptr<Sphere>( new Sphere ( block.getParameter<Vector3<real_t> > ( "midpoint" ),
- block.getParameter<real_t > ( "outer_radius" ) ) );
+ auto inner = std::make_shared<Sphere>( block.getParameter<Vector3<real_t> > ( "midpoint" ),
+ block.getParameter<real_t > ( "inner_radius" ) );
+ auto outer = std::make_shared<Sphere>( block.getParameter<Vector3<real_t> > ( "midpoint" ),
+ block.getParameter<real_t > ( "outer_radius" ) );
auto not_inner = make_shared<BodyLogicalNOT<Sphere> >(inner);
diff --git a/src/geometry/bodies/BodyOverlapFunctions.h b/src/geometry/bodies/BodyOverlapFunctions.h
index 92a454f6a1004f2ba8888d4a6949a487150e6869..ecebb7f570e02633e722fcaa3e9d8fdac747152d 100644
--- a/src/geometry/bodies/BodyOverlapFunctions.h
+++ b/src/geometry/bodies/BodyOverlapFunctions.h
@@ -61,16 +61,17 @@ namespace geometry {
*
* \param body the body object
* \param cellMidpoint midpoint of the cell in global coordinates
- * \param dx the edge length of the cell, cell is assumed to be cubic
+ * \param dx the edge length(s) of the cell, dx or (dx, dy, dz)
* \param maxDepth sub sampling depth: the cell edge is divided in half \p maxDepth+1 times.
* Values less than zero result in no subdivisions, making this function behave like contains().
********************************************************************************************************************/
template <typename Body> real_t overlapFraction ( const Body & body, const Vector3<real_t> & cellMidpoint,
- real_t dx, uint_t maxDepth=4 );
+ real_t dx, uint_t maxDepth=4 );
template <typename Body> real_t overlapFraction ( const Body & body, const Vector3<real_t> & cellMidpoint,
- real_t dx, int maxDepth );
-
+ real_t dx, int maxDepth );
+ template <typename Body> real_t overlapFraction ( const Body & body, const Vector3<real_t> & cellMidpoint,
+ const Vector3<real_t> & dx, uint_t maxDepth=4 );
/****************************************************************************************************************//**
@@ -99,8 +100,7 @@ namespace geometry {
* Determines in a fast way (bounding box etc) if a body and a block overlap
* when no fast computation is possible return DONT_KNOW
********************************************************************************************************************/
- template <typename Body> FastOverlapResult fastOverlapCheck ( const Body & body,
- const Vector3<real_t> & cellMidpoint, real_t dx );
+ template <typename Body> FastOverlapResult fastOverlapCheck ( const Body & body, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx );
diff --git a/src/geometry/bodies/BodyOverlapFunctions.impl.h b/src/geometry/bodies/BodyOverlapFunctions.impl.h
index e289dada3a6bdd4c4f2d07f78f80015fe8b36de8..19b16da3c49f090ca455c817c4bbd07fa1d48fef 100644
--- a/src/geometry/bodies/BodyOverlapFunctions.impl.h
+++ b/src/geometry/bodies/BodyOverlapFunctions.impl.h
@@ -34,7 +34,7 @@ namespace geometry {
template <typename Body>
FastOverlapResult fastOverlapCheck ( const Body & /*body*/,
const Vector3<real_t> & /*cellMidpoint*/,
- real_t /*dx*/ )
+ const Vector3<real_t> & /*dx*/ )
{
// Default implementation has to fastOverlapCheck
return DONT_KNOW;
@@ -42,7 +42,7 @@ namespace geometry {
template< typename Body>
- real_t cellSupersampling( const Vector3<real_t> & cellMidpoint, real_t dx, const Body & body, uint_t maxDepth=4, uint_t depth = uint_t(0u) )
+ real_t cellSupersampling( const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx, const Body & body, uint_t maxDepth=4, uint_t depth = uint_t(0u) )
{
FastOverlapResult r = fastOverlapCheck( body, cellMidpoint, dx );
if ( r == CONTAINED_INSIDE_BODY )
@@ -56,9 +56,9 @@ namespace geometry {
for( int signZ = -1; signZ <= 1; signZ += 2 )
{
// epsilon is subtracted due to symmetry reasons ( i.e. a sphere on a cell boundary should be symmetric)
- const Vector3<real_t> corner( cellMidpoint[0] + real_c(signX) * dx * (real_t(0.5) - real_comparison::Epsilon<real_t>::value ),
- cellMidpoint[1] + real_c(signY) * dx * (real_t(0.5) - real_comparison::Epsilon<real_t>::value ),
- cellMidpoint[2] + real_c(signZ) * dx * (real_t(0.5) - real_comparison::Epsilon<real_t>::value ) );
+ const Vector3<real_t> corner( cellMidpoint[0] + real_c(signX) * dx[0] * (real_t(0.5) - real_comparison::Epsilon<real_t>::value ),
+ cellMidpoint[1] + real_c(signY) * dx[1] * (real_t(0.5) - real_comparison::Epsilon<real_t>::value ),
+ cellMidpoint[2] + real_c(signZ) * dx[2] * (real_t(0.5) - real_comparison::Epsilon<real_t>::value ) );
if ( contains( body, corner ) )
++nrCornerPointsInBody;
}
@@ -76,7 +76,7 @@ namespace geometry {
for( int signY = -1; signY <= 1; signY += 2 )
for( int signZ = -1; signZ <= 1; signZ += 2 )
{
- const Vector3<real_t> offsetVec ( real_c(signX) * real_t(0.25) * dx, real_c(signY) * real_t(0.25) * dx, real_c(signZ) * real_t(0.25) * dx );
+ const Vector3<real_t> offsetVec ( real_c(signX) * real_t(0.25) * dx[0], real_c(signY) * real_t(0.25) * dx[1], real_c(signZ) * real_t(0.25) * dx[2] );
fraction += cellSupersampling( cellMidpoint + offsetVec, dx*real_t(0.5), body, maxDepth, depth+uint_t(1u) );
}
fraction *= real_t(0.125);
@@ -89,14 +89,7 @@ namespace geometry {
template < typename Body >
real_t overlapFraction ( const Body & body, const Vector3<real_t> & cellMidpoint, real_t dx, uint_t maxDepth )
{
- FastOverlapResult r = fastOverlapCheck( body, cellMidpoint, dx );
- if ( r == CONTAINED_INSIDE_BODY )
- return real_t(1);
- else if ( r == COMPLETELY_OUTSIDE )
- return real_t(0);
-
- // default: fall-back to super-sampling
- return cellSupersampling( cellMidpoint, dx, body, maxDepth );
+ return overlapFraction<Body>(body, cellMidpoint, Vector3<real_t>(dx), maxDepth);
}
template < typename Body >
@@ -109,6 +102,22 @@ namespace geometry {
return real_t(0);
}
+ template < typename Body >
+ real_t overlapFraction ( const Body & body, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx, uint_t maxDepth )
+ {
+ FastOverlapResult r = fastOverlapCheck( body, cellMidpoint, dx );
+ if ( r == CONTAINED_INSIDE_BODY )
+ return real_t(1);
+ else if ( r == COMPLETELY_OUTSIDE )
+ return real_t(0);
+
+ // default: fall-back to super-sampling
+ real_t overlapFractionBySuperSampling = cellSupersampling( cellMidpoint, dx, body, maxDepth );
+ WALBERLA_ASSERT_GREATER_EQUAL(overlapFractionBySuperSampling, real_t(0));
+ WALBERLA_ASSERT_LESS_EQUAL(overlapFractionBySuperSampling, real_t(1));
+ return overlapFractionBySuperSampling;
+ }
+
} // namespace geometry
} // namespace walberla
diff --git a/src/geometry/bodies/DynamicBody.h b/src/geometry/bodies/DynamicBody.h
index dd666f106720f9a45aa01c55710323e1437106d7..8a0ecfd52ef852c5f875474a0f4acbc79b91192b 100644
--- a/src/geometry/bodies/DynamicBody.h
+++ b/src/geometry/bodies/DynamicBody.h
@@ -30,8 +30,9 @@ namespace geometry {
class AbstractBody {
public:
+ virtual ~AbstractBody() = default;
virtual bool contains (const Vector3<real_t> & point ) const = 0;
- virtual FastOverlapResult fastOverlapCheck ( const Vector3<real_t> & cellMidpoint, real_t dx ) const = 0;
+ virtual FastOverlapResult fastOverlapCheck ( const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx ) const = 0;
virtual FastOverlapResult fastOverlapCheck ( const AABB & box ) const = 0;
};
@@ -43,11 +44,12 @@ public:
DynamicBody( const Body & b )
: body_(b)
{}
+
virtual bool contains (const Vector3<real_t> & point ) const
{
return geometry::contains( body_, point );
}
- virtual FastOverlapResult fastOverlapCheck ( const Vector3<real_t> & cellMidpoint, real_t dx ) const
+ virtual FastOverlapResult fastOverlapCheck ( const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx ) const
{
return geometry::fastOverlapCheck( body_, cellMidpoint, dx );
}
@@ -79,7 +81,7 @@ inline FastOverlapResult fastOverlapCheck ( const AbstractBody & body, const AAB
}
template<>
-inline FastOverlapResult fastOverlapCheck ( const AbstractBody & body, const Vector3<real_t> & cellMidpoint, real_t dx )
+inline FastOverlapResult fastOverlapCheck ( const AbstractBody & body, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx )
{
return body.fastOverlapCheck( cellMidpoint, dx );
}
diff --git a/src/geometry/bodies/Ellipsoid.cpp b/src/geometry/bodies/Ellipsoid.cpp
index db2c6044d24fdbfa3d86fc138af545be981ca415..bf6727ab5e7b6ccbc4a0760d6775b627b617bbc9 100644
--- a/src/geometry/bodies/Ellipsoid.cpp
+++ b/src/geometry/bodies/Ellipsoid.cpp
@@ -28,7 +28,7 @@ namespace geometry {
Ellipsoid::Ellipsoid( const Vector3<real_t> & midp,
Vector3<real_t> axis1,
Vector3<real_t> axis2,
- Vector3<real_t> radii )
+ const Vector3<real_t>& radii )
: midpoint_( midp ), radii_( radii )
{
normalize( axis1 );
@@ -99,10 +99,10 @@ namespace geometry {
}
template<>
- FastOverlapResult fastOverlapCheck ( const Ellipsoid & ellipsoid, const Vector3<real_t> & cellMidpoint, real_t dx )
+ FastOverlapResult fastOverlapCheck ( const Ellipsoid & ellipsoid, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx )
{
- AABB box = AABB::createFromMinMaxCorner( cellMidpoint[0] - real_t(0.5)*dx, cellMidpoint[1] - real_t(0.5)*dx, cellMidpoint[2] - real_t(0.5)*dx,
- cellMidpoint[0] + real_t(0.5)*dx, cellMidpoint[1] + real_t(0.5)*dx, cellMidpoint[2] + real_t(0.5)*dx);
+ AABB box = AABB::createFromMinMaxCorner( cellMidpoint[0] - real_t(0.5)*dx[0], cellMidpoint[1] - real_t(0.5)*dx[1], cellMidpoint[2] - real_t(0.5)*dx[2],
+ cellMidpoint[0] + real_t(0.5)*dx[0], cellMidpoint[1] + real_t(0.5)*dx[1], cellMidpoint[2] + real_t(0.5)*dx[2]);
if ( ! ellipsoid.boundingBox().intersects( box ) )
return COMPLETELY_OUTSIDE;
@@ -114,7 +114,8 @@ namespace geometry {
const real_t midPointDistSq = (ellipsoid.midpoint() - cellMidpoint).sqrLength();
// Check against inner circle of box
- const real_t dist2 = ellipsoid.minRadius() - sqrt3half * dx;
+ const real_t dxMax = dx.max();
+ const real_t dist2 = ellipsoid.minRadius() - sqrt3half * dxMax;
if ( midPointDistSq < dist2 * dist2 )
return CONTAINED_INSIDE_BODY;
diff --git a/src/geometry/bodies/Ellipsoid.h b/src/geometry/bodies/Ellipsoid.h
index 9fe84117277c6f31f0b738a5a4d4702f5fb317f9..0dbaf4b0ab158615fc52e95f4fad14e0a6fd991f 100644
--- a/src/geometry/bodies/Ellipsoid.h
+++ b/src/geometry/bodies/Ellipsoid.h
@@ -59,7 +59,7 @@ namespace geometry {
* \param radii the length of the semi axes
*****************************************************************************************************************/
explicit Ellipsoid( const Vector3<real_t> & midpoint,
- Vector3<real_t> axis1, Vector3<real_t> axis2, Vector3<real_t> radii );
+ Vector3<real_t> axis1, Vector3<real_t> axis2, const Vector3<real_t>& radii );
const AABB & boundingBox() const { return boundingBox_; }
@@ -91,7 +91,7 @@ namespace geometry {
// Body concept
template<> FastOverlapResult fastOverlapCheck ( const Ellipsoid & e, const AABB & box );
- template<> FastOverlapResult fastOverlapCheck ( const Ellipsoid & e, const Vector3<real_t> & cellMidpoint, real_t dx );
+ template<> FastOverlapResult fastOverlapCheck ( const Ellipsoid & e, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx );
template<> bool contains ( const Ellipsoid & ellipsoid, const Vector3<real_t> & point );
diff --git a/src/geometry/bodies/Sphere.cpp b/src/geometry/bodies/Sphere.cpp
index a2033fb8ebcd651e36332d6d17b2ecbb90ef0328..f7fc0dce0f1bc57ca1da2e0d686c832552ebb8dd 100644
--- a/src/geometry/bodies/Sphere.cpp
+++ b/src/geometry/bodies/Sphere.cpp
@@ -32,13 +32,6 @@ namespace geometry {
updateBoxes();
}
- Sphere::Sphere( const Sphere & o )
- : midpoint_( o.midpoint_ ),
- radius_( o.radius_ ),
- boundingBox_ ( o.boundingBox_ ),
- innerBox_ ( o.innerBox_ )
- {}
-
void Sphere::updateBoxes()
{
static const real_t oneOverSqrt3 = real_t(1) / std::sqrt( real_t(3) );
@@ -70,19 +63,20 @@ namespace geometry {
}
template<>
- FastOverlapResult fastOverlapCheck ( const Sphere & sphere, const Vector3<real_t> & cellMidpoint, real_t dx )
+ FastOverlapResult fastOverlapCheck ( const Sphere & sphere, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx )
{
static const real_t sqrt3half = std::sqrt( real_t(3) ) / real_t(2);
const real_t midPointDistSq = (sphere.midpoint() - cellMidpoint).sqrLength();
+ const real_t dxMax = dx.max();
// Check against outer circle of box
- const real_t dist1 = sphere.radius() + sqrt3half * dx;
+ const real_t dist1 = sphere.radius() + sqrt3half * dxMax;
if ( midPointDistSq > dist1 * dist1 )
return COMPLETELY_OUTSIDE;
// Check against inner circle of box
- const real_t dist2 = sphere.radius() - sqrt3half * dx;
+ const real_t dist2 = sphere.radius() - sqrt3half * dxMax;
if ( midPointDistSq < dist2 * dist2 )
return CONTAINED_INSIDE_BODY;
diff --git a/src/geometry/bodies/Sphere.h b/src/geometry/bodies/Sphere.h
index f9a3bbad964698c2654e9f5cd73ac9dde78e895d..f4050d044b242e7c874fc796674093fbf4e6b02e 100644
--- a/src/geometry/bodies/Sphere.h
+++ b/src/geometry/bodies/Sphere.h
@@ -48,7 +48,7 @@ namespace geometry {
public:
explicit Sphere( const Vector3<real_t> & midp, real_t rad );
- Sphere( const Sphere & o );
+ Sphere( const Sphere & o ) = default;
void setMidpoint( const Vector3<real_t> & point ) { midpoint_ = point; updateBoxes(); }
void setMidpoint( real_t newVal, uint_t coord ) { midpoint_[coord] = newVal; updateBoxes(); }
@@ -76,7 +76,7 @@ namespace geometry {
// Body concept
template<> FastOverlapResult fastOverlapCheck ( const Sphere & sphere, const AABB & box );
- template<> FastOverlapResult fastOverlapCheck ( const Sphere & sphere, const Vector3<real_t> & cellMidpoint, real_t dx );
+ template<> FastOverlapResult fastOverlapCheck ( const Sphere & sphere, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx );
template<> bool contains ( const Sphere & sphere, const Vector3<real_t> & point );
diff --git a/src/geometry/initializer/OverlapFieldFromBody.h b/src/geometry/initializer/OverlapFieldFromBody.h
index eb7f85d132aa6d0f60fc2fc4bc7a5043bfdf09a0..3671049ace5727d153abd98c41b717cd24672c81 100644
--- a/src/geometry/initializer/OverlapFieldFromBody.h
+++ b/src/geometry/initializer/OverlapFieldFromBody.h
@@ -140,6 +140,7 @@ namespace initializer {
const real_t dx = structuredBlockStorage_.dx();
const real_t dy = structuredBlockStorage_.dy();
const real_t dz = structuredBlockStorage_.dz();
+ const Vector3<real_t> dxVec(dx, dy, dz);
for( auto blockIt = structuredBlockStorage_.begin(); blockIt != structuredBlockStorage_.end(); ++blockIt )
{
@@ -170,7 +171,7 @@ namespace initializer {
currentMidpoint[0] = firstCellMidpoint[0];
for( cell_idx_t x = -gl; x < cell_idx_c(ff->xSize())+gl; ++x, currentMidpoint[0] += dx )
{
- real_t overlap = overlapFraction( body, currentMidpoint, dx, superSamplingDepth );
+ real_t overlap = overlapFraction( body, currentMidpoint, dxVec, superSamplingDepth );
real_t & val = ff->get(x,y,z);
WALBERLA_ASSERT( val >=0 && val <= 1);
diff --git a/src/geometry/mesh/TriangleMeshIO.cpp b/src/geometry/mesh/TriangleMeshIO.cpp
index a880bff033046b595eb65da287a9e18b865a8bd9..ad3c1349c6f59185eee11386a78b7d171f369b80 100644
--- a/src/geometry/mesh/TriangleMeshIO.cpp
+++ b/src/geometry/mesh/TriangleMeshIO.cpp
@@ -32,6 +32,7 @@
#include <boost/algorithm/string.hpp>
+#include <cmath>
#include <fstream>
#include <map>
#include <sstream>
@@ -363,11 +364,11 @@ namespace geometry {
for( size_t i=1; i<splitVec.size(); ++i )
{
boost::trim(splitVec[i]);
- if( splitVec[i].compare("vertex_vectors") == 0 ) {
+ if( splitVec[i] == "vertex_vectors" ) {
state = VERTEX;
- } else if ( splitVec[i].compare("normal_vectors") == 0 ) {
+ } else if ( splitVec[i] == "normal_vectors" ) {
state = NORMAL;
- } else if ( splitVec[i].compare("face_indices") == 0 ) {
+ } else if ( splitVec[i] == "face_indices" ) {
state = FACE;
} else {
//std::cerr << "Unknown section in povray file: " << splitVec[i] << "\n";
@@ -678,9 +679,9 @@ namespace geometry {
os << " ";
for( auto it = mesh.getVertexColors().begin(); it != mesh.getVertexColors().end(); ++it )
{
- os << static_cast<uint16_t>( (*it)[0] * 255.0f + 0.5f ) << ' '
- << static_cast<uint16_t>( (*it)[1] * 255.0f + 0.5f ) << ' '
- << static_cast<uint16_t>( (*it)[2] * 255.0f + 0.5f ) << ' ';
+ os << std::lround( (*it)[0] * 255.0f ) << ' '
+ << std::lround( (*it)[1] * 255.0f ) << ' '
+ << std::lround( (*it)[2] * 255.0f ) << ' ';
}
os << " </DataArray>\n";
}
diff --git a/src/geometry/structured/BinaryRawFile.cpp b/src/geometry/structured/BinaryRawFile.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5b4c81256db3041cc6617fd245720f421da70915
--- /dev/null
+++ b/src/geometry/structured/BinaryRawFile.cpp
@@ -0,0 +1,71 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BinaryRawFileReader.cpp
+//! \ingroup geometry
+//! \author Christian Godenschwager <christian.godenschwager@fau.de>
+//
+//======================================================================================================================
+
+#include "BinaryRawFile.h"
+
+
+namespace walberla {
+namespace geometry {
+
+BinaryRawFile::BinaryRawFile( const std::string & filename, const Vector3< uint_t > & size, const std::string & datatype )
+ : size_( size )
+{
+ init( filename, datatype );
+}
+
+BinaryRawFile::BinaryRawFile( const Config::BlockHandle & configBlock )
+{
+ size_ = configBlock.getParameter< Vector3< uint_t > >( "size" );
+ const std::string filename = configBlock.getParameter< std::string >( "filename" );
+ const std::string datatype = configBlock.getParameter< std::string >( "datatype" );
+
+ init( filename, datatype );
+}
+
+void BinaryRawFile::init( const std::string & filename, const std::string & datatype )
+{
+ if (datatype == "uint8")
+ init<uint8_t>( filename );
+ else if (datatype == "int8")
+ init<int8_t>( filename );
+ else if (datatype == "uint16")
+ init<uint16_t>( filename );
+ else if (datatype == "int16")
+ init<int16_t>( filename );
+ else if (datatype == "uint32")
+ init<uint32_t>( filename );
+ else if (datatype == "int32")
+ init<int32_t>( filename );
+ else if (datatype == "uint64")
+ init<uint64_t>( filename );
+ else if (datatype == "int64")
+ init<int64_t>( filename );
+ else if (datatype == "float")
+ init<float>( filename );
+ else if (datatype == "double")
+ init<double>( filename );
+ else
+ WALBERLA_ABORT( "Unknown datatype!" );
+}
+
+
+} // namespace geometry
+} // namespace walberla
\ No newline at end of file
diff --git a/src/geometry/structured/BinaryRawFile.h b/src/geometry/structured/BinaryRawFile.h
new file mode 100644
index 0000000000000000000000000000000000000000..8a9e69346fbc801860146c493ed5e7451d35d809
--- /dev/null
+++ b/src/geometry/structured/BinaryRawFile.h
@@ -0,0 +1,170 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BinaryRawFileReader.h
+//! \ingroup geometry
+//! \author Christian Godenschwager <christian.godenschwager@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "core/DataTypes.h"
+#include "core/mpi/Broadcast.h"
+#include "core/mpi/MPIManager.h"
+#include "core/mpi/BufferDataTypeExtensions.h"
+#include "core/math/AABB.h"
+#include "core/math/Vector3.h"
+#include "core/config/Config.h"
+
+#include <fstream>
+#include <string>
+#include <vector>
+#include <iterator>
+
+
+namespace walberla {
+namespace geometry {
+
+class BinaryRawFile
+{
+public:
+ BinaryRawFile( const std::string & filename, const Vector3< uint_t > & size, const std::string & datatype );
+
+ template< typename T >
+ static BinaryRawFile loadFile( const std::string & filename, const Vector3< uint_t > & size );
+
+ BinaryRawFile( const Config::BlockHandle & configBlock );
+
+ inline bool get( const Vector3< uint_t > & pos ) const;
+ inline bool get( const uint_t x, const uint_t y, const uint_t z ) const;
+
+ const Vector3< uint_t> & size() const { return size_; }
+
+private:
+ template< typename T >
+ BinaryRawFile( const std::string & filename, const Vector3< uint_t > & size, const T );
+
+ void init( const std::string & filename, const std::string & datatype );
+
+ template< typename T >
+ void init( const std::string & filename );
+
+ Vector3< uint_t > size_;
+ std::vector< bool > data_;
+};
+
+class BinaryRawFileInterpolator
+{
+public:
+ enum Interpolator { NEAREST_NEIGHBOR };
+
+ BinaryRawFileInterpolator( const AABB & aabb, const BinaryRawFile & binaryRawFile, Interpolator interpolator )
+ : aabb_(aabb), interpolator_(interpolator), binaryRawFile_( binaryRawFile ) {}
+
+ inline bool get( const Vector3< real_t > & pos ) const;
+ inline bool get( const real_t x, const real_t y, const real_t z ) const;
+
+ const AABB & aabb() const { return aabb_; }
+
+ Interpolator interpolator() const { return interpolator_; }
+
+private:
+ inline bool getNearestNeighbor( const real_t x, const real_t y, const real_t z ) const;
+
+ AABB aabb_;
+ Interpolator interpolator_;
+ const BinaryRawFile & binaryRawFile_;
+};
+
+
+template<typename T>
+BinaryRawFile::BinaryRawFile( const std::string & filename, const Vector3<uint_t> & size, const T )
+ : size_(size)
+{
+ init<T>( filename );
+}
+
+
+template<typename T>
+void BinaryRawFile::init( const std::string & filename )
+{
+ const uint_t numElements = size_[0] * size_[1] * size_[2];
+ data_.reserve( numElements );
+ WALBERLA_ROOT_SECTION()
+ {
+ std::ifstream ifs( filename, std::ifstream::in | std::ifstream::binary );
+ std::transform( std::istream_iterator<T>( ifs ), std::istream_iterator<T>(),
+ std::back_inserter( data_ ), []( const T v ) { return v > T( 0 ); } );
+ WALBERLA_CHECK_EQUAL( numElements, data_.size(), "Error reading file \"" << filename << "\"!" );
+ }
+ mpi::broadcastObject( data_ );
+}
+
+template< typename T >
+static BinaryRawFile loadFile( const std::string & filename, const Vector3< uint_t > & size )
+{
+ return BinaryRawFileReader( filename, size, T() );
+}
+
+bool BinaryRawFile::get( const Vector3< uint_t > & pos ) const
+{
+ return get( pos[0], pos[1], pos[2] );
+}
+
+inline bool BinaryRawFile::get( const uint_t x, const uint_t y, const uint_t z ) const
+{
+ WALBERLA_ASSERT_LESS( x, size_[0] );
+ WALBERLA_ASSERT_LESS( y, size_[1] );
+ WALBERLA_ASSERT_LESS( z, size_[2] );
+
+ const uint_t i = z * size_[0] * size_[1] + y * size_[0] + x;
+
+ WALBERLA_ASSERT_LESS( i, data_.size() );
+
+ return data_[i];
+}
+
+
+bool BinaryRawFileInterpolator::get( const Vector3< real_t > & pos ) const
+{
+ return get( pos[0], pos[1], pos[2] );
+}
+
+
+bool BinaryRawFileInterpolator::get( const real_t x, const real_t y, const real_t z ) const
+{
+ WALBERLA_ASSERT( aabb_.contains( x, y, z ) );
+
+ switch (interpolator_)
+ {
+ case NEAREST_NEIGHBOR:
+ return getNearestNeighbor( x, y, z );
+ default:
+ WALBERLA_ABORT( "Unknown Interpolator!" );
+ }
+}
+
+bool BinaryRawFileInterpolator::getNearestNeighbor( const real_t x, const real_t y, const real_t z ) const
+{
+ uint_t xInt = uint_c( (x - aabb_.xMin()) / aabb_.xSize() * real_t( binaryRawFile_.size()[0] ) + real_t( 0.5 ) );
+ uint_t yInt = uint_c( (y - aabb_.yMin()) / aabb_.ySize() * real_t( binaryRawFile_.size()[1] ) + real_t( 0.5 ) );
+ uint_t zInt = uint_c( (z - aabb_.zMin()) / aabb_.zSize() * real_t( binaryRawFile_.size()[2] ) + real_t( 0.5 ) );
+
+ return binaryRawFile_.get( xInt, yInt, zInt );
+}
+
+} // namespace geometry
+} // namespace walberla
\ No newline at end of file
diff --git a/src/geometry/structured/extern/lodepng.cpp b/src/geometry/structured/extern/lodepng.cpp
index 2191deaa100ec04c2cf401625700ef89e51a1880..7bc8455778b4e6dd62e29c0ab0e3410d490efcfb 100644
--- a/src/geometry/structured/extern/lodepng.cpp
+++ b/src/geometry/structured/extern/lodepng.cpp
@@ -156,7 +156,7 @@ static void uivector_cleanup(void* p)
{
((uivector*)p)->size = ((uivector*)p)->allocsize = 0;
lodepng_free(((uivector*)p)->data);
- ((uivector*)p)->data = NULL;
+ ((uivector*)p)->data = nullptr;
}
/*returns 1 if success, 0 if failure ==> nothing done*/
@@ -189,7 +189,7 @@ static unsigned uivector_resizev(uivector* p, size_t size, unsigned value)
static void uivector_init(uivector* p)
{
- p->data = NULL;
+ p->data = nullptr;
p->size = p->allocsize = 0;
}
@@ -257,12 +257,12 @@ static void ucvector_cleanup(void* p)
{
((ucvector*)p)->size = ((ucvector*)p)->allocsize = 0;
lodepng_free(((ucvector*)p)->data);
- ((ucvector*)p)->data = NULL;
+ ((ucvector*)p)->data = nullptr;
}
static void ucvector_init(ucvector* p)
{
- p->data = NULL;
+ p->data = nullptr;
p->size = p->allocsize = 0;
}
@@ -312,13 +312,13 @@ static unsigned string_resize(char** out, size_t size)
data[size] = 0; /*null termination char*/
*out = data;
}
- return data != 0;
+ return data != nullptr;
}
/*init a {char*, size_t} pair for use as string*/
static void string_init(char** out)
{
- *out = NULL;
+ *out = nullptr;
string_resize(out, 0);
}
@@ -326,7 +326,7 @@ static void string_init(char** out)
static void string_cleanup(char** out)
{
lodepng_free(*out);
- *out = NULL;
+ *out = nullptr;
}
static void string_set(char** out, const char* in)
@@ -381,7 +381,7 @@ unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* fil
long size;
/*provide some proper output values if error will happen*/
- *out = 0;
+ *out = nullptr;
*outsize = 0;
file = fopen(filename, "rb");
@@ -536,9 +536,9 @@ static void HuffmanTree_draw(HuffmanTree* tree)
static void HuffmanTree_init(HuffmanTree* tree)
{
- tree->tree2d = 0;
- tree->tree1d = 0;
- tree->lengths = 0;
+ tree->tree2d = nullptr;
+ tree->tree1d = nullptr;
+ tree->lengths = nullptr;
}
static void HuffmanTree_cleanup(HuffmanTree* tree)
@@ -990,10 +990,10 @@ static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d,
size_t inbitlength = inlength * 8;
/*see comments in deflateDynamic for explanation of the context and these variables, it is analogous*/
- unsigned* bitlen_ll = 0; /*lit,len code lengths*/
- unsigned* bitlen_d = 0; /*dist code lengths*/
+ unsigned* bitlen_ll = nullptr; /*lit,len code lengths*/
+ unsigned* bitlen_d = nullptr; /*dist code lengths*/
/*code length code lengths ("clcl"), the bit lengths of the huffman tree used to compress bitlen_ll and bitlen_d*/
- unsigned* bitlen_cl = 0;
+ unsigned* bitlen_cl = nullptr;
HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree for compressed huffman trees)*/
if((*bp) >> 3 >= inlength - 2) return 49; /*error: the bit pointer is or will go past the memory*/
@@ -2162,7 +2162,7 @@ unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, const unsig
ucvector outv;
size_t i;
unsigned error;
- unsigned char* deflatedata = 0;
+ unsigned char* deflatedata = nullptr;
size_t deflatesize = 0;
unsigned ADLER32;
@@ -2250,12 +2250,12 @@ void lodepng_compress_settings_init(LodePNGCompressSettings* settings)
settings->nicematch = 128;
settings->lazymatching = 1;
- settings->custom_zlib = 0;
- settings->custom_deflate = 0;
- settings->custom_context = 0;
+ settings->custom_zlib = nullptr;
+ settings->custom_deflate = nullptr;
+ settings->custom_context = nullptr;
}
-const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, 0, 0, 0};
+const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, nullptr, nullptr, nullptr};
#endif /*LODEPNG_COMPILE_ENCODER*/
@@ -2266,12 +2266,12 @@ void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings)
{
settings->ignore_adler32 = 0;
- settings->custom_zlib = 0;
- settings->custom_inflate = 0;
- settings->custom_context = 0;
+ settings->custom_zlib = nullptr;
+ settings->custom_inflate = nullptr;
+ settings->custom_context = nullptr;
}
-const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0};
+const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, nullptr, nullptr, nullptr};
#endif /*LODEPNG_COMPILE_DECODER*/
@@ -2544,7 +2544,7 @@ void lodepng_color_mode_init(LodePNGColorMode* info)
info->key_r = info->key_g = info->key_b = 0;
info->colortype = LCT_RGBA;
info->bitdepth = 8;
- info->palette = 0;
+ info->palette = nullptr;
info->palettesize = 0;
}
@@ -2590,7 +2590,7 @@ static int lodepng_color_mode_equal(const LodePNGColorMode* a, const LodePNGColo
void lodepng_palette_clear(LodePNGColorMode* info)
{
if(info->palette) lodepng_free(info->palette);
- info->palette = 0;
+ info->palette = nullptr;
info->palettesize = 0;
}
@@ -2673,7 +2673,7 @@ size_t lodepng_get_raw_size_lct(unsigned w, unsigned h, LodePNGColorType colorty
static void LodePNGUnknownChunks_init(LodePNGInfo* info)
{
unsigned i;
- for(i = 0; i < 3; i++) info->unknown_chunks_data[i] = 0;
+ for(i = 0; i < 3; i++) info->unknown_chunks_data[i] = nullptr;
for(i = 0; i < 3; i++) info->unknown_chunks_size[i] = 0;
}
@@ -2709,8 +2709,8 @@ static unsigned LodePNGUnknownChunks_copy(LodePNGInfo* dest, const LodePNGInfo*
static void LodePNGText_init(LodePNGInfo* info)
{
info->text_num = 0;
- info->text_keys = NULL;
- info->text_strings = NULL;
+ info->text_keys = nullptr;
+ info->text_strings = nullptr;
}
static void LodePNGText_cleanup(LodePNGInfo* info)
@@ -2728,8 +2728,8 @@ static void LodePNGText_cleanup(LodePNGInfo* info)
static unsigned LodePNGText_copy(LodePNGInfo* dest, const LodePNGInfo* source)
{
size_t i = 0;
- dest->text_keys = 0;
- dest->text_strings = 0;
+ dest->text_keys = nullptr;
+ dest->text_strings = nullptr;
dest->text_num = 0;
for(i = 0; i < source->text_num; i++)
{
@@ -2772,10 +2772,10 @@ unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str)
static void LodePNGIText_init(LodePNGInfo* info)
{
info->itext_num = 0;
- info->itext_keys = NULL;
- info->itext_langtags = NULL;
- info->itext_transkeys = NULL;
- info->itext_strings = NULL;
+ info->itext_keys = nullptr;
+ info->itext_langtags = nullptr;
+ info->itext_transkeys = nullptr;
+ info->itext_strings = nullptr;
}
static void LodePNGIText_cleanup(LodePNGInfo* info)
@@ -2797,10 +2797,10 @@ static void LodePNGIText_cleanup(LodePNGInfo* info)
static unsigned LodePNGIText_copy(LodePNGInfo* dest, const LodePNGInfo* source)
{
size_t i = 0;
- dest->itext_keys = 0;
- dest->itext_langtags = 0;
- dest->itext_transkeys = 0;
- dest->itext_strings = 0;
+ dest->itext_keys = nullptr;
+ dest->itext_langtags = nullptr;
+ dest->itext_transkeys = nullptr;
+ dest->itext_strings = nullptr;
dest->itext_num = 0;
for(i = 0; i < source->itext_num; i++)
{
@@ -2921,7 +2921,7 @@ static void addColorBits(unsigned char* out, size_t index, unsigned bits, unsign
else out[index * bits / 8] |= in;
}
-typedef struct ColorTree ColorTree;
+using ColorTree = struct ColorTree;
/*
One node of a color tree
@@ -2938,7 +2938,7 @@ struct ColorTree
static void color_tree_init(ColorTree* tree)
{
int i;
- for(i = 0; i < 16; i++) tree->children[i] = 0;
+ for(i = 0; i < 16; i++) tree->children[i] = nullptr;
tree->index = -1;
}
@@ -3965,7 +3965,7 @@ unsigned lodepng_inspect(unsigned* w, unsigned* h, LodePNGState* state,
const unsigned char* in, size_t insize)
{
LodePNGInfo* info = &state->info_png;
- if(insize == 0 || in == 0)
+ if(insize == 0 || in == nullptr)
{
CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/
}
@@ -4103,7 +4103,7 @@ static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w
*/
unsigned y;
- unsigned char* prevline = 0;
+ unsigned char* prevline = nullptr;
/*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/
size_t bytewidth = (bpp + 7) / 8;
@@ -4361,7 +4361,7 @@ static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, siz
static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, size_t chunkLength)
{
unsigned error = 0;
- char *key = 0, *str = 0;
+ char *key = nullptr, *str = nullptr;
unsigned i;
while(!error) /*not really a while loop, only used to break on error*/
@@ -4408,7 +4408,7 @@ static unsigned readChunk_zTXt(LodePNGInfo* info, const LodePNGDecompressSetting
unsigned i;
unsigned length, string2_begin;
- char *key = 0;
+ char *key = nullptr;
ucvector decoded;
ucvector_init(&decoded);
@@ -4457,7 +4457,7 @@ static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecompressSetting
unsigned i;
unsigned length, begin, compressed;
- char *key = 0, *langtag = 0, *transkey = 0;
+ char *key = nullptr, *langtag = nullptr, *transkey = nullptr;
ucvector decoded;
ucvector_init(&decoded);
@@ -4588,7 +4588,7 @@ static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h,
#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
/*provide some proper output values if error will happen*/
- *out = 0;
+ *out = nullptr;
state->error = lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/
if(state->error) return;
@@ -4753,7 +4753,7 @@ unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h,
LodePNGState* state,
const unsigned char* in, size_t insize)
{
- *out = 0;
+ *out = nullptr;
decodeGeneric(out, w, h, state, in, insize);
if(state->error) return state->error;
if(!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color))
@@ -5015,7 +5015,7 @@ static unsigned addChunk_IDAT(ucvector* out, const unsigned char* data, size_t d
static unsigned addChunk_IEND(ucvector* out)
{
unsigned error = 0;
- error = addChunk(out, "IEND", 0, 0);
+ error = addChunk(out, "IEND", nullptr, 0);
return error;
}
@@ -5257,7 +5257,7 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w,
size_t linebytes = (w * bpp + 7) / 8;
/*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/
size_t bytewidth = (bpp + 7) / 8;
- const unsigned char* prevline = 0;
+ const unsigned char* prevline = nullptr;
unsigned x, y;
unsigned error = 0;
LodePNGFilterStrategy strategy = settings->filter_strategy;
@@ -5426,8 +5426,8 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w,
zlibsettings.btype = 1;
/*a custom encoder likely doesn't read the btype setting and is optimized for complete PNG
images only, so disable it*/
- zlibsettings.custom_zlib = 0;
- zlibsettings.custom_deflate = 0;
+ zlibsettings.custom_zlib = nullptr;
+ zlibsettings.custom_deflate = nullptr;
for(type = 0; type < 5; type++)
{
ucvector_init(&attempt[type]);
@@ -5442,7 +5442,7 @@ static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w,
filterScanline(attempt[type].data, &in[y * linebytes], prevline, linebytes, bytewidth, type);
size[type] = 0;
- dummy = 0;
+ dummy = nullptr;
zlib_compress(&dummy, &size[type], attempt[type].data, testsize, &zlibsettings);
lodepng_free(dummy);
/*check if this is smallest size (or if type == 0 it's the first case so always store the values)*/
@@ -5679,11 +5679,11 @@ unsigned lodepng_encode(unsigned char** out, size_t* outsize,
{
LodePNGInfo info;
ucvector outv;
- unsigned char* data = 0; /*uncompressed version of the IDAT chunk data*/
+ unsigned char* data = nullptr; /*uncompressed version of the IDAT chunk data*/
size_t datasize = 0;
/*provide some proper output values if error will happen*/
- *out = 0;
+ *out = nullptr;
*outsize = 0;
state->error = 0;
@@ -5922,7 +5922,7 @@ void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings)
settings->filter_strategy = LFS_MINSUM;
settings->auto_convert = LAC_AUTO;
settings->force_palette = 0;
- settings->predefined_filters = 0;
+ settings->predefined_filters = nullptr;
#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
settings->add_id = 0;
settings->text_compression = 1;
@@ -6069,7 +6069,7 @@ void load_file(std::vector<unsigned char>& buffer, const std::string& filename)
void save_file(const std::vector<unsigned char>& buffer, const std::string& filename)
{
std::ofstream file(filename.c_str(), std::ios::out|std::ios::binary);
- file.write(buffer.empty() ? 0 : (char*)&buffer[0], std::streamsize(buffer.size()));
+ file.write(buffer.empty() ? nullptr : (char*)&buffer[0], std::streamsize(buffer.size()));
}
#endif //LODEPNG_COMPILE_DISK
@@ -6078,7 +6078,7 @@ void save_file(const std::vector<unsigned char>& buffer, const std::string& file
unsigned decompress(std::vector<unsigned char>& out, const unsigned char* in, size_t insize,
const LodePNGDecompressSettings& settings)
{
- unsigned char* buffer = 0;
+ unsigned char* buffer = nullptr;
size_t buffersize = 0;
unsigned error = zlib_decompress(&buffer, &buffersize, in, insize, &settings);
if(buffer)
@@ -6092,7 +6092,7 @@ unsigned decompress(std::vector<unsigned char>& out, const unsigned char* in, si
unsigned decompress(std::vector<unsigned char>& out, const std::vector<unsigned char>& in,
const LodePNGDecompressSettings& settings)
{
- return decompress(out, in.empty() ? 0 : &in[0], in.size(), settings);
+ return decompress(out, in.empty() ? nullptr : &in[0], in.size(), settings);
}
#endif //LODEPNG_COMPILE_DECODER
@@ -6100,7 +6100,7 @@ unsigned decompress(std::vector<unsigned char>& out, const std::vector<unsigned
unsigned compress(std::vector<unsigned char>& out, const unsigned char* in, size_t insize,
const LodePNGCompressSettings& settings)
{
- unsigned char* buffer = 0;
+ unsigned char* buffer = nullptr;
size_t buffersize = 0;
unsigned error = zlib_compress(&buffer, &buffersize, in, insize, &settings);
if(buffer)
@@ -6114,7 +6114,7 @@ unsigned compress(std::vector<unsigned char>& out, const unsigned char* in, size
unsigned compress(std::vector<unsigned char>& out, const std::vector<unsigned char>& in,
const LodePNGCompressSettings& settings)
{
- return compress(out, in.empty() ? 0 : &in[0], in.size(), settings);
+ return compress(out, in.empty() ? nullptr : &in[0], in.size(), settings);
}
#endif //LODEPNG_COMPILE_ENCODER
#endif //LODEPNG_COMPILE_ZLIB
@@ -6166,7 +6166,7 @@ unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h, const
unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
const std::vector<unsigned char>& in, LodePNGColorType colortype, unsigned bitdepth)
{
- return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth);
+ return decode(out, w, h, in.empty() ? nullptr : &in[0], (unsigned)in.size(), colortype, bitdepth);
}
unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
@@ -6188,7 +6188,7 @@ unsigned decode(std::vector<unsigned char>& out, unsigned& w, unsigned& h,
State& state,
const std::vector<unsigned char>& in)
{
- return decode(out, w, h, state, in.empty() ? 0 : &in[0], in.size());
+ return decode(out, w, h, state, in.empty() ? nullptr : &in[0], in.size());
}
#ifdef LODEPNG_COMPILE_DISK
@@ -6222,7 +6222,7 @@ unsigned encode(std::vector<unsigned char>& out,
LodePNGColorType colortype, unsigned bitdepth)
{
if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84;
- return encode(out, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth);
+ return encode(out, in.empty() ? nullptr : &in[0], w, h, colortype, bitdepth);
}
unsigned encode(std::vector<unsigned char>& out,
@@ -6245,7 +6245,7 @@ unsigned encode(std::vector<unsigned char>& out,
State& state)
{
if(lodepng_get_raw_size(w, h, &state.info_raw) > in.size()) return 84;
- return encode(out, in.empty() ? 0 : &in[0], w, h, state);
+ return encode(out, in.empty() ? nullptr : &in[0], w, h, state);
}
#ifdef LODEPNG_COMPILE_DISK
@@ -6264,7 +6264,7 @@ unsigned encode(const std::string& filename,
LodePNGColorType colortype, unsigned bitdepth)
{
if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84;
- return encode(filename, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth);
+ return encode(filename, in.empty() ? nullptr : &in[0], w, h, colortype, bitdepth);
}
#endif //LODEPNG_COMPILE_DISK
#endif //LODEPNG_COMPILE_ENCODER
diff --git a/src/gui/Gui.cpp b/src/gui/Gui.cpp
index 57650f2d54ae1432ca589652ee7b9c753e69f47d..3a4f374128ed58a53f096514c200a6df3075dad6 100644
--- a/src/gui/Gui.cpp
+++ b/src/gui/Gui.cpp
@@ -158,7 +158,7 @@ DisplayAdaptor * GUI::findDisplayAdaptorForBlockID ( ConstBlockDataID bdId ) con
}
-void GUI::registerPropertyTree( const shared_ptr<PropertyTree> propertyTree ) {
+void GUI::registerPropertyTree( const shared_ptr<PropertyTree>& propertyTree ) {
pImpl->propertyTrees_.push_back( propertyTree );
}
@@ -212,7 +212,7 @@ void GUI::breakpoint( const std::string & comment, const std::string & file, int
namespace walberla {
namespace gui {
-GUI * GUI::lastInstance_ = NULL;
+GUI * GUI::lastInstance_ = nullptr;
GUI::GUI(timeloop::ITimeloop & timeloop, const shared_ptr<StructuredBlockForest> & blockForest, int& , char ** )
: timeloop_(timeloop),
@@ -220,13 +220,13 @@ GUI::GUI(timeloop::ITimeloop & timeloop, const shared_ptr<StructuredBlockForest>
{
}
-GUI::~GUI() {}
+GUI::~GUI() = default;
void GUI::run() {
timeloop_.run();
}
-void GUI::registerPropertyTree( const shared_ptr<PropertyTree> ) {}
+void GUI::registerPropertyTree( const shared_ptr<PropertyTree>& ) {}
const std::vector<shared_ptr<PropertyTree> > & GUI::getPropertyTrees() const {
throw( "Should not happen!" );
diff --git a/src/gui/Gui.h b/src/gui/Gui.h
index b66ddc3be5b4c722b3f5455f717e46955c5655b2..1332bb8dccda6574013f348140f941974ccd3ce8 100644
--- a/src/gui/Gui.h
+++ b/src/gui/Gui.h
@@ -50,7 +50,7 @@ namespace gui {
void run();
- void registerPropertyTree( const shared_ptr<PropertyTree> propertyTree );
+ void registerPropertyTree( const shared_ptr<PropertyTree>& propertyTree );
typedef std::function< DisplayAdaptor * ( const IBlock &, ConstBlockDataID ) > DisplayAdaptorCreatorFunc;
void registerDisplayAdaptorCreator( const DisplayAdaptorCreatorFunc & creatorFunc );
diff --git a/src/gui/PropertyTree.cpp b/src/gui/PropertyTree.cpp
index 562c73f7ed72db038dda872db422a388c0d77b9d..a6dd79d5c01650e95c2c7803edb1ff3a79203ad4 100644
--- a/src/gui/PropertyTree.cpp
+++ b/src/gui/PropertyTree.cpp
@@ -118,12 +118,12 @@ namespace gui {
namespace walberla {
namespace gui {
PropertyTree::PropertyTree()
- : model_(0), lastBlock_(0)
+ : model_(nullptr), lastBlock_(nullptr)
{}
PropertyTree::~PropertyTree()
- {}
+ = default;
void PropertyTree::setBlock( IBlock * a)
@@ -138,7 +138,7 @@ namespace gui {
PropertyTree::ItemID PropertyTree::addItem(const std::string & , ItemID )
{
- return 0;
+ return nullptr;
}
} // namespace gui
} // namespace walberla
diff --git a/src/lbm/BlockForestEvaluation.h b/src/lbm/BlockForestEvaluation.h
index 5a8ed59d7a9772dba7fbcf3a5ff65553ff50357c..f9b823696a8aa942545c73648de02bd03faa0d30 100644
--- a/src/lbm/BlockForestEvaluation.h
+++ b/src/lbm/BlockForestEvaluation.h
@@ -38,8 +38,8 @@
#include "field/CellCounter.h"
#include "field/FlagUID.h"
-#include <boost/bind.hpp>
+#include <functional>
#include <map>
#include <string>
#include <sstream>
diff --git a/src/lbm/boundary/factories/DefaultBoundaryHandlingCollection.h b/src/lbm/boundary/factories/DefaultBoundaryHandlingCollection.h
index e54c74bcabbc3f53b17579fa73142860243d0037..4bee0c6c165d99ce6c57d746ddef667106e8056f 100644
--- a/src/lbm/boundary/factories/DefaultBoundaryHandlingCollection.h
+++ b/src/lbm/boundary/factories/DefaultBoundaryHandlingCollection.h
@@ -26,6 +26,8 @@
#include "lbm/boundary/factories/DefaultBoundaryHandling.h"
#include "lbm/boundary/factories/DefaultDiffusionBoundaryHandling.h"
+#include <functional>
+
namespace walberla {
namespace lbm{
@@ -67,7 +69,7 @@ public:
static BlockDataID addDefaultBoundaryHandlingCollectionToStorage(
const shared_ptr< StructuredBlockStorage >& bs, const std::string & identifier, const BlockDataID& flagFieldID, const BlockDataID& handlingID, const BlockDataID& diffusionHandlingID )
{
- auto func = boost::bind( createDefaultBoundaryHandlingCollectionFactory, _1, _2, flagFieldID, handlingID, diffusionHandlingID );
+ auto func = std::bind( createDefaultBoundaryHandlingCollectionFactory, std::placeholders::_1, std::placeholders::_2, flagFieldID, handlingID, diffusionHandlingID );
return bs->addStructuredBlockData< BoundaryHandlingCollection_T >( func, identifier );
}
diff --git a/src/lbm/boundary/factories/DefaultDiffusionBoundaryHandling.h b/src/lbm/boundary/factories/DefaultDiffusionBoundaryHandling.h
index 3104c3f7efda83d4cc2410729b6b0ea3b37a624a..42e3c7536baaf15361049affebc016eb46f7664d 100644
--- a/src/lbm/boundary/factories/DefaultDiffusionBoundaryHandling.h
+++ b/src/lbm/boundary/factories/DefaultDiffusionBoundaryHandling.h
@@ -36,6 +36,8 @@
#include <boost/tuple/tuple.hpp>
+#include <functional>
+
namespace walberla {
namespace lbm{
@@ -136,7 +138,7 @@ public:
static BlockDataID addDefaultDiffusionBoundaryHandlingToStorage(
const shared_ptr< StructuredBlockStorage >& bs, const std::string & identifier, const BlockDataID& flagFieldID, const Set<FlagUID>& domainFlagUIDs, const BlockDataID& pdfFieldID, const Set<FlagUID>& initFlagUIDs )
{
- auto func = boost::bind( createDefaultDiffusionBoundaryHandlingFactory, _1, _2, flagFieldID, domainFlagUIDs, pdfFieldID, initFlagUIDs );
+ auto func = std::bind( createDefaultDiffusionBoundaryHandlingFactory, std::placeholders::_1, std::placeholders::_2, flagFieldID, domainFlagUIDs, pdfFieldID, initFlagUIDs );
return bs->addStructuredBlockData< BoundaryHandling_T >( func, identifier );
}
diff --git a/src/lbm/communication/PdfFieldPackInfo.h b/src/lbm/communication/PdfFieldPackInfo.h
index 20521c666fd2e1601cd4409092a60403ee1c2886..2f1419770e9a31b41fb74dbc1865a9e7675416e7 100644
--- a/src/lbm/communication/PdfFieldPackInfo.h
+++ b/src/lbm/communication/PdfFieldPackInfo.h
@@ -24,6 +24,7 @@
#pragma once
#include "lbm/field/PdfField.h"
+#include "field/communication/StencilRestrictedPackInfo.h"
#include "communication/UniformPackInfo.h"
#include "core/debug/Debug.h"
#include "stencil/Directions.h"
@@ -55,96 +56,8 @@ namespace lbm {
* \ingroup lbm
*/
template< typename LatticeModel_T >
-class PdfFieldPackInfo : public walberla::communication::UniformPackInfo
-{
-public:
-
- typedef PdfField<LatticeModel_T> PdfField_T;
- typedef typename LatticeModel_T::Stencil Stencil;
-
- PdfFieldPackInfo( const BlockDataID & pdfFieldId ) : pdfFieldId_( pdfFieldId ) {}
- virtual ~PdfFieldPackInfo() {}
-
- bool constantDataExchange() const { return true; }
- bool threadsafeReceiving() const { return true; }
-
- void unpackData( IBlock * receiver, stencil::Direction dir, mpi::RecvBuffer & buffer );
-
- void communicateLocal( const IBlock * sender, IBlock * receiver, stencil::Direction dir );
-
-protected:
-
- void packDataImpl( const IBlock * sender, stencil::Direction dir, mpi::SendBuffer & outBuffer ) const;
-
-
-
- const BlockDataID pdfFieldId_;
-};
-
-
-
-template< typename LatticeModel_T >
-void PdfFieldPackInfo< LatticeModel_T >::unpackData( IBlock * receiver, stencil::Direction dir, mpi::RecvBuffer & buffer )
-{
- if( Stencil::idx[ stencil::inverseDir[dir] ] >= Stencil::Size )
- return;
-
- PdfField_T * pdfField = receiver->getData< PdfField_T >( pdfFieldId_ );
- WALBERLA_ASSERT_NOT_NULLPTR( pdfField );
- WALBERLA_ASSERT_EQUAL( pdfField->nrOfGhostLayers(), 1 );
-
- stencil::Direction packerDirection = stencil::inverseDir[dir];
-
- for(auto i = pdfField->beginGhostLayerOnlyXYZ(dir); i != pdfField->end(); ++i )
- for(uint_t f = 0; f < Stencil::d_per_d_length[packerDirection]; ++f)
- buffer >> i.getF( Stencil::idx[ Stencil::d_per_d[packerDirection][f] ] );
-}
-
-
-
-template< typename LatticeModel_T >
-void PdfFieldPackInfo< LatticeModel_T >::communicateLocal( const IBlock * sender, IBlock * receiver, stencil::Direction dir )
-{
- if( Stencil::idx[dir] >= Stencil::Size )
- return;
-
- const PdfField_T * sf = sender ->getData< PdfField_T >( pdfFieldId_ );
- PdfField_T * rf = receiver->getData< PdfField_T >( pdfFieldId_ );
-
- WALBERLA_ASSERT_EQUAL( sf->xyzSize(), rf->xyzSize() );
-
- typename PdfField_T::const_iterator srcIter = sf->beginSliceBeforeGhostLayerXYZ(dir);
- typename PdfField_T::iterator dstIter = rf->beginGhostLayerOnlyXYZ(stencil::inverseDir[dir]);
-
- while( srcIter != sf->end() )
- {
- for( uint_t f = 0; f < Stencil::d_per_d_length[dir]; ++f )
- dstIter.getF( Stencil::idx[ Stencil::d_per_d[dir][f] ] ) = srcIter.getF( Stencil::idx[ Stencil::d_per_d[dir][f] ] );
-
- ++srcIter;
- ++dstIter;
- }
- WALBERLA_ASSERT( srcIter == sf->end() );
- WALBERLA_ASSERT( dstIter == rf->end() );
-}
-
-
-
-template< typename LatticeModel_T >
-void PdfFieldPackInfo< LatticeModel_T >::packDataImpl( const IBlock * sender, stencil::Direction dir, mpi::SendBuffer & outBuffer ) const
-{
- if( Stencil::idx[dir] >= Stencil::Size )
- return;
-
- const PdfField_T * pdfField = sender->getData< PdfField_T >( pdfFieldId_ );
- WALBERLA_ASSERT_NOT_NULLPTR( pdfField );
- WALBERLA_ASSERT_EQUAL( pdfField->nrOfGhostLayers(), 1 );
-
- for( auto i = pdfField->beginSliceBeforeGhostLayerXYZ(dir); i != pdfField->end(); ++i )
- for(uint_t f = 0; f < Stencil::d_per_d_length[dir]; ++f)
- outBuffer << i.getF( Stencil::idx[ Stencil::d_per_d[dir][f] ] );
-}
-
+using PdfFieldPackInfo = field::communication::StencilRestrictedPackInfo< PdfField<LatticeModel_T>,
+ typename LatticeModel_T::Stencil>;
} // namespace lbm
diff --git a/src/lbm/python/ExportBasic.impl.h b/src/lbm/python/ExportBasic.impl.h
index afae7a5a105fc0e4067d694eaa74e19b5817bb51..c0097f54eccce9d73217935797c41a37e9d3763e 100644
--- a/src/lbm/python/ExportBasic.impl.h
+++ b/src/lbm/python/ExportBasic.impl.h
@@ -165,7 +165,7 @@ namespace internal
using namespace boost::python;
LatticeModelCreator creator( compressible, equilibriumAccuracyOrder, stencil, collisionModel, forceModel );
- python_coupling::for_each_noncopyable_type<LatticeModels>( boost::ref(creator) );
+ python_coupling::for_each_noncopyable_type<LatticeModels>( std::ref(creator) );
if ( creator.getResult() == object() )
{
@@ -346,7 +346,7 @@ namespace internal
internal::AddPdfFieldToStorageExporter exporter( blocks, identifier, latticeModel, initialVelocity,
initialDensity, gl, layout, densityAdaptor, velocityAdaptor, shearRateAdaptor );
- python_coupling::for_each_noncopyable_type< LatticeModels > ( boost::ref(exporter) );
+ python_coupling::for_each_noncopyable_type< LatticeModels > ( std::ref(exporter) );
if ( ! exporter.successful() ) {
PyErr_SetString( PyExc_ValueError, "Adding Pdf Field failed.");
throw error_already_set();
diff --git a/src/lbm/python/ExportBoundary.impl.h b/src/lbm/python/ExportBoundary.impl.h
index 009bda5324524ea24c7c42ea8397b78b3f2ccd40..06845e35a29f9b4d9b5635944145766ea6e5e9f2 100644
--- a/src/lbm/python/ExportBoundary.impl.h
+++ b/src/lbm/python/ExportBoundary.impl.h
@@ -227,7 +227,7 @@ namespace internal
}
ExtendedBoundaryHandlingCreator creator( bs, name, pdfFieldID, flagFieldID );
- python_coupling::for_each_noncopyable_type<LatticeModels>( boost::ref( creator ) );
+ python_coupling::for_each_noncopyable_type<LatticeModels>( std::ref( creator ) );
if ( ! creator.successful() )
{
diff --git a/src/lbm/python/ExportSweeps.impl.h b/src/lbm/python/ExportSweeps.impl.h
index fa01bf969cc7d9acce88e5eac7bd042da93d8c33..5f9440114375038cd2c75a17e82ef13dcb45ae83 100644
--- a/src/lbm/python/ExportSweeps.impl.h
+++ b/src/lbm/python/ExportSweeps.impl.h
@@ -221,7 +221,7 @@ namespace internal
auto flagUidSet = python_coupling::uidSetFromStringContainer< FlagUID >( flagList );
CellwiseSweepCreator creator( bs, pdfFieldID, flagFieldStringID, velocityFieldStringID, flagUidSet );
- python_coupling::for_each_noncopyable_type<LatticeModel_FlagField_Pairs>( boost::ref( creator ) );
+ python_coupling::for_each_noncopyable_type<LatticeModel_FlagField_Pairs>( std::ref( creator ) );
if ( creator.getResult() == object() )
{
diff --git a/src/lbm/refinement/VorticityBasedLevelDetermination.h b/src/lbm/refinement/VorticityBasedLevelDetermination.h
new file mode 100644
index 0000000000000000000000000000000000000000..c3f4ee20d66f3840876c685a148af3d49d6b3156
--- /dev/null
+++ b/src/lbm/refinement/VorticityBasedLevelDetermination.h
@@ -0,0 +1,161 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file VorticityBasedLevelDetermination.h
+//! \ingroup lbm
+//! \author Florian Schornbaum <florian.schornbaum@fau.de>
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "blockforest/BlockForest.h"
+#include "core/math/Vector3.h"
+#include "domain_decomposition/BlockDataID.h"
+#include "field/GhostLayerField.h"
+
+#include <vector>
+
+namespace walberla {
+namespace lbm {
+namespace refinement {
+
+
+/*!\brief Level determination for refinement check based on (scaled) vorticity values
+ *
+ * If (scaled) vorticity magnitude is below lowerLimit in all cells of a block, that block could be coarsened.
+ * If the (scaled) vorticity value is above the upperLimit for at least one cell, that block gets marked for refinement.
+ * Else, the block remains on the current level.
+ *
+ * The scaling originates from neglecting the actual mesh size on the block to obtain different vorticity values for
+ * different mesh sizes.
+ */
+template< typename Filter_T, bool Pseudo2D = false >
+class VorticityBasedLevelDetermination // used as a 'BlockForest::RefreshMinTargetLevelDeterminationFunction'
+{
+
+public:
+
+ typedef GhostLayerField< Vector3<real_t>, 1 > VectorField_T;
+
+ VorticityBasedLevelDetermination( const ConstBlockDataID & fieldID, const Filter_T & filter,
+ const real_t upperLimit, const real_t lowerLimit, const uint_t maxLevel ) :
+ fieldID_( fieldID ), filter_( filter ),
+ upperLimit_( upperLimit * upperLimit ), lowerLimit_( lowerLimit * lowerLimit ), maxLevel_( maxLevel )
+ {}
+
+ void operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > & blocksAlreadyMarkedForRefinement,
+ const BlockForest & forest );
+
+private:
+
+ ConstBlockDataID fieldID_;
+
+ Filter_T filter_;
+
+ real_t upperLimit_;
+ real_t lowerLimit_;
+
+ uint_t maxLevel_;
+
+}; // class VorticityRefinement
+
+template< typename Filter_T, bool Pseudo2D >
+void VorticityBasedLevelDetermination< Filter_T, Pseudo2D >::operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > &, const BlockForest & )
+{
+ for( auto it = minTargetLevels.begin(); it != minTargetLevels.end(); ++it )
+ {
+ const Block * const block = it->first;
+ const VectorField_T * u = block->template getData< VectorField_T >( fieldID_ );
+
+ if( u == nullptr )
+ {
+ it->second = uint_t(0);
+ continue;
+ }
+
+ WALBERLA_ASSERT_GREATER_EQUAL(u->nrOfGhostLayers(), uint_t(1));
+
+ CellInterval interval = u->xyzSize();
+ Cell expand( cell_idx_c(-1), cell_idx_c(-1), Pseudo2D ? cell_idx_t(0) : cell_idx_c(-1) );
+ interval.expand( expand );
+
+ const cell_idx_t one( cell_idx_t(1) );
+ const real_t half( real_c(0.5) );
+
+ bool refine( false );
+ bool coarsen( true );
+
+ filter_( *block );
+
+ const cell_idx_t xSize = cell_idx_c( interval.xSize() );
+ const cell_idx_t ySize = cell_idx_c( interval.ySize() );
+ const cell_idx_t zSize = cell_idx_c( interval.zSize() );
+
+ for( cell_idx_t z = cell_idx_t(0); z < zSize; ++z ) {
+ for (cell_idx_t y = cell_idx_t(0); y < ySize; ++y) {
+ for (cell_idx_t x = cell_idx_t(0); x < xSize; ++x) {
+ if( filter_(x,y,z) && filter_(x+one,y,z) && filter_(x-one,y,z) && filter_(x,y+one,z) && filter_(x,y-one,z) &&
+ ( Pseudo2D || (filter_(x,y,z+one) && filter_(x,y,z-one)) ) )
+ {
+ const Vector3< real_t > xa = u->get(x+one,y,z);
+ const Vector3< real_t > xb = u->get(x-one,y,z);
+ const Vector3< real_t > ya = u->get(x,y+one,z);
+ const Vector3< real_t > yb = u->get(x,y-one,z);
+ const Vector3< real_t > za = Pseudo2D ? Vector3< real_t >(0) : u->get(x,y,z+one);
+ const Vector3< real_t > zb = Pseudo2D ? Vector3< real_t >(0) : u->get(x,y,z-one);
+
+ const real_t duzdy = half * ( ya[2] - yb[2] );
+ const real_t duydz = half * ( za[1] - zb[1] );
+ const real_t duxdz = half * ( za[0] - zb[0] );
+ const real_t duzdx = half * ( xa[2] - xb[2] );
+ const real_t duydx = half * ( xa[1] - xb[1] );
+ const real_t duxdy = half * ( ya[0] - yb[0] );
+
+ // since no dx was used in the gradient calculation, this value is actually curl * dx
+ // this is needed to have changing curl values on different grid levels
+ const Vector3< real_t > curl( duzdy - duydz, duxdz - duzdx, duydx - duxdy );
+ const auto curlSqr = curl.sqrLength();
+
+ if( curlSqr > lowerLimit_ )
+ {
+ coarsen = false;
+ if( curlSqr > upperLimit_ )
+ refine = true;
+ }
+ }
+ }
+ }
+ }
+
+ if( refine && block->getLevel() < maxLevel_ )
+ {
+ WALBERLA_ASSERT( !coarsen );
+ it->second = block->getLevel() + uint_t(1);
+ }
+ if( coarsen && block->getLevel() > uint_t(0) )
+ {
+ WALBERLA_ASSERT( !refine );
+ it->second = block->getLevel() - uint_t(1);
+ }
+ }
+}
+
+} // namespace refinement
+} // namespace lbm
+} // namespace walberla
diff --git a/src/lbm/refinement/all.h b/src/lbm/refinement/all.h
index a3a353488c9529dab22749a5735954a4551b0d1b..a63a1ba388c87af4a16b639e81ed7acd5ed3c8ab 100644
--- a/src/lbm/refinement/all.h
+++ b/src/lbm/refinement/all.h
@@ -29,3 +29,4 @@
#include "TimeStep.h"
#include "TimeStepPdfPackInfo.h"
#include "TimeTracker.h"
+#include "VorticityBasedLevelDetermination.h"
diff --git a/src/lbm/sweeps/SweepBase.h b/src/lbm/sweeps/SweepBase.h
index 1c7342a5120d56b5a2dac1cf646d4beac7639dd4..d3389cc60e612975851b885922f2dfd91279abb0 100644
--- a/src/lbm/sweeps/SweepBase.h
+++ b/src/lbm/sweeps/SweepBase.h
@@ -93,10 +93,10 @@ protected:
- const BlockDataID src_;
+ const BlockDataID src_ {};
const bool dstFromBlockData_;
- const BlockDataID dst_;
+ const BlockDataID dst_ {};
std::set< PdfField_T *, field::SwapableCompare< PdfField_T * > > dstFields_;
Filter_T filter_;
diff --git a/src/mesh/MeshOperations.h b/src/mesh/MeshOperations.h
index 1cbe3037cecfe42d9e039abbaa903a3f03295994..9c5033b28fb0e4f55c5f0563a73015c20caa624d 100644
--- a/src/mesh/MeshOperations.h
+++ b/src/mesh/MeshOperations.h
@@ -61,7 +61,7 @@ template< typename MeshType >
typename MeshType::Point computeCentroid( const MeshType & mesh );
template< typename MeshType >
-Matrix3<typename MeshType::Scalar> computeIntertiaTensor( const MeshType & mesh );
+Matrix3<typename MeshType::Scalar> computeInertiaTensor( const MeshType & mesh );
template< typename MeshType >
typename MeshType::Point computeCentroid( const MeshType & mesh, const typename MeshType::FaceHandle fh );
@@ -253,9 +253,9 @@ typename MeshType::Point computeCentroid( const MeshType & mesh )
template< typename MeshType >
-Matrix3<typename MeshType::Scalar> computeIntertiaTensor( const MeshType & mesh )
+Matrix3<typename MeshType::Scalar> computeInertiaTensor( const MeshType & mesh )
{
- static_assert( MeshType::IsTriMesh == 1, "computeIntertiaTensor only works with triangular meshes!" );
+ static_assert( MeshType::IsTriMesh == 1, "computeInertiaTensor only works with triangular meshes!" );
typedef typename MeshType::Point Point;
typedef typename MeshType::Scalar Scalar;
diff --git a/src/mesh/boundary/BoundarySetup.cpp b/src/mesh/boundary/BoundarySetup.cpp
index f0094a972fd390c1fb8cf1dc96a8e9dbb85c0a70..c0edcc1ed81ce102e05eefb1556825730d39b582 100644
--- a/src/mesh/boundary/BoundarySetup.cpp
+++ b/src/mesh/boundary/BoundarySetup.cpp
@@ -27,6 +27,21 @@
namespace walberla {
namespace mesh {
+
+BoundarySetup::BoundarySetup( const shared_ptr< StructuredBlockStorage > & structuredBlockStorage, const DistanceFunction & distanceFunction, const uint_t numGhostLayers )
+ : structuredBlockStorage_( structuredBlockStorage ), distanceFunction_( distanceFunction ), numGhostLayers_( numGhostLayers ), cellVectorChunkSize_( size_t(1000) )
+{
+ voxelize();
+
+ try {
+ auto & blockForest = dynamic_cast< StructuredBlockForest & >( *structuredBlockStorage_ );
+ if( !blockForest.storesUniformBlockGrid() )
+ refinementCorrection( blockForest );
+ }
+ catch( const std::bad_cast & ) {} // If it's not a BlockForest no refinement correction is done
+}
+
+
void BoundarySetup::divideAndPushCellInterval( const CellInterval & ci, std::queue< CellInterval > & outputQueue )
{
WALBERLA_ASSERT( !ci.empty() );
@@ -74,7 +89,7 @@ void BoundarySetup::allocateOrResetVoxelizationField()
}
else
{
- voxelizationFieldId_ = make_shared< BlockDataID >( field::addToStorage< VoxelizationField >( structuredBlockStorage_, "flag field", uint8_t(0), field::zyxf, numGhostLayers_ ) );
+ voxelizationFieldId_ = make_shared< BlockDataID >( field::addToStorage< VoxelizationField >( structuredBlockStorage_, "voxelization field", uint8_t(0), field::zyxf, numGhostLayers_ ) );
}
WALBERLA_ASSERT_NOT_NULLPTR( voxelizationFieldId_ );
@@ -163,6 +178,78 @@ void BoundarySetup::voxelize()
}
}
+void BoundarySetup::refinementCorrection( StructuredBlockForest & blockForest )
+{
+ if( blockForest.getNumberOfXCellsPerBlock() < uint_t( 16 )
+ || blockForest.getNumberOfYCellsPerBlock() < uint_t( 16 )
+ || blockForest.getNumberOfZCellsPerBlock() < uint_t( 16 ) )
+ {
+ WALBERLA_ABORT( "The mesh boundary setup requires a block size of at least 16 in each dimension, when refinement is used!" );
+ }
+
+ for( auto & iBlock : blockForest )
+ {
+ auto & block = dynamic_cast< blockforest::Block & >( iBlock );
+
+ const uint_t level = block.getLevel();
+
+ VoxelizationField * voxelizationField = block.getData< VoxelizationField >( *voxelizationFieldId_ );
+ const CellInterval cells = voxelizationField->xyzSize();
+
+ std::vector< CellInterval > coarseRegions;
+ for( auto dir = stencil::D3Q27::beginNoCenter(); dir != stencil::D3Q27::end(); ++dir )
+ {
+ const auto index = blockforest::getBlockNeighborhoodSectionIndex( dir.cx(), dir.cy(), dir.cz() );
+ if( block.neighborhoodSectionHasLargerBlock( index ) )
+ {
+ CellInterval coarseRegion( cells );
+ for( uint_t i = 0; i != 3; ++i )
+ {
+ const auto c = stencil::c[i][*dir];
+
+ if( c == -1 )
+ {
+ coarseRegion.min()[i] -= cell_idx_c( numGhostLayers_ );
+ coarseRegion.max()[i] = cells.min()[i] + cell_idx_c( 2 * numGhostLayers_ - 1 );
+ }
+ else if( c == 1 )
+ {
+ coarseRegion.min()[i] = cells.max()[i] - cell_idx_c( 2 * numGhostLayers_ - 1 );
+ coarseRegion.max()[i] += cell_idx_c( numGhostLayers_ );
+ }
+ }
+ coarseRegions.push_back( coarseRegion );
+ }
+ }
+
+ for( const CellInterval & coarseRegion : coarseRegions)
+ for( const Cell & cell : coarseRegion )
+ {
+ Cell globalCell( cell );
+ structuredBlockStorage_->transformBlockLocalToGlobalCell( globalCell, block );
+
+ Cell coarseCell( globalCell );
+ for( uint_t i = 0; i < 3; ++i )
+ {
+ if( coarseCell[i] < cell_idx_t(0) )
+ {
+ coarseCell[i] = -( ( cell_idx_t(1) - coarseCell[i] ) >> 1 );
+ }
+ else
+ {
+ coarseCell[i] >>= 1;
+ }
+ }
+
+ Vector3< real_t > coarseCenter;
+ structuredBlockStorage_->getCellCenter( coarseCenter, coarseCell, level - uint_t(1) );
+ structuredBlockStorage_->mapToPeriodicDomain( coarseCenter );
+
+ voxelizationField->get( cell ) = distanceFunction_( coarseCenter ) < real_t(0) ? uint8_t(1) : uint8_t(0);
+ }
+ }
+}
+
void BoundarySetup::writeVTKVoxelfile( const std::string & identifier, bool writeGhostLayers, const std::string & baseFolder, const std::string & executionFolder )
{
diff --git a/src/mesh/boundary/BoundarySetup.h b/src/mesh/boundary/BoundarySetup.h
index 2a54d688e65ba10b9b658fe0cdf24d649d4b714c..1512fe618a89281707dae40e6c6465b01fb0258d 100644
--- a/src/mesh/boundary/BoundarySetup.h
+++ b/src/mesh/boundary/BoundarySetup.h
@@ -23,6 +23,8 @@
#include "BoundaryInfo.h"
+#include "blockforest/StructuredBlockForest.h"
+
#include "core/DataTypes.h"
#include "core/cell/CellInterval.h"
@@ -50,11 +52,7 @@ public:
enum Location { INSIDE, OUTSIDE };
- BoundarySetup( const shared_ptr< StructuredBlockStorage > & structuredBlockStorage, const DistanceFunction & distanceFunction, const uint_t numGhostLayers )
- : structuredBlockStorage_( structuredBlockStorage ), distanceFunction_( distanceFunction ), numGhostLayers_( numGhostLayers ), cellVectorChunkSize_( size_t(1000) )
- {
- voxelize();
- }
+ BoundarySetup( const shared_ptr< StructuredBlockStorage > & structuredBlockStorage, const DistanceFunction & distanceFunction, const uint_t numGhostLayers );
~BoundarySetup() { deallocateVoxelizationField(); }
@@ -79,6 +77,7 @@ private:
void deallocateVoxelizationField();
void voxelize();
+ void refinementCorrection( StructuredBlockForest & blockForest );
shared_ptr< StructuredBlockStorage > structuredBlockStorage_;
shared_ptr< BlockDataID > voxelizationFieldId_;
diff --git a/src/mesh/pe/Types.h b/src/mesh/pe/Types.h
index 842ba1132befa7e72d0d09f7c50a4889406d693b..6d94fad9c463f5ee0ff1bd645bf8d7e16ec18834 100644
--- a/src/mesh/pe/Types.h
+++ b/src/mesh/pe/Types.h
@@ -19,6 +19,8 @@
//
//======================================================================================================================
+#include <memory>
+
namespace walberla {
namespace mesh {
namespace pe {
@@ -28,6 +30,7 @@ class ConvexPolyhedron;
typedef ConvexPolyhedron ConvexPolyhedronType; //!< Type of the convex polyhedron geometric primitive.
typedef ConvexPolyhedron* ConvexPolyhedronID; //!< Handle for a convexpolyhedron primitive.
typedef const ConvexPolyhedron* ConstConvexPolyhedronID; //!< Handle for a constant convex polyhedron primitive.
+using ConvexPolyhedronPtr = std::unique_ptr<ConvexPolyhedron>;
} // namespace pe
} // namespace mesh
diff --git a/src/mesh/pe/communication/ConvexPolyhedron.h b/src/mesh/pe/communication/ConvexPolyhedron.h
index ef9bbb21cf1b6f4f8883a867395dbee0b8f5080f..df14bb1762f9755225f004d2730a76be617ed236 100644
--- a/src/mesh/pe/communication/ConvexPolyhedron.h
+++ b/src/mesh/pe/communication/ConvexPolyhedron.h
@@ -69,16 +69,17 @@ namespace pe {
namespace communication {
template<>
-inline mesh::pe::ConvexPolyhedronID instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, mesh::pe::ConvexPolyhedronID& newBody )
+inline mesh::pe::ConvexPolyhedronPtr instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, mesh::pe::ConvexPolyhedronID& newBody )
{
mesh::pe::ConvexPolyhedronParameters subobjparam;
unmarshal( buffer, subobjparam );
correctBodyPosition(domain, block.center(), subobjparam.gpos_);
- newBody = new mesh::pe::ConvexPolyhedron( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.mesh_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
- newBody->setLinearVel( subobjparam.v_ );
- newBody->setAngularVel( subobjparam.w_ );
- newBody->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
- return newBody;
+ auto cp = std::make_unique<mesh::pe::ConvexPolyhedron>( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.mesh_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
+ cp->setLinearVel( subobjparam.v_ );
+ cp->setAngularVel( subobjparam.w_ );
+ cp->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
+ newBody = static_cast<mesh::pe::ConvexPolyhedronID>(cp.get());
+ return cp;
}
} // namespace communication
diff --git a/src/mesh/pe/raytracing/Intersects.h b/src/mesh/pe/raytracing/Intersects.h
new file mode 100644
index 0000000000000000000000000000000000000000..52761d65ef6be955d2d505ef6e4e114e2b9fec54
--- /dev/null
+++ b/src/mesh/pe/raytracing/Intersects.h
@@ -0,0 +1,83 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Intersects.h
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <mesh/MatrixVectorOperations.h>
+#include <mesh/pe/rigid_body/ConvexPolyhedron.h>
+#include <mesh/TriangleMeshes.h>
+#include <pe/raytracing/Intersects.h>
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+// Implemented following the description in
+// "FAST RAY - CONVEX POLYHEDRON INTERSECTION" by Eric Haines
+inline bool intersects(const mesh::pe::ConvexPolyhedronID poly, const Ray& ray, real_t& t_near, Vec3& n)
+{
+ Ray transformedRay = ray.transformedToBF(poly);
+
+ t_near = std::numeric_limits<real_t>::min();
+ real_t t_far = std::numeric_limits<real_t>::max();
+ const mesh::TriangleMesh& mesh = poly->getMesh();
+
+ for(auto fh : mesh.faces())
+ {
+ //plane equation x*Pn + d = 0
+ const Vector3<real_t> Pn = mesh::toWalberla(mesh.normal(fh)); // Plane normal
+ const real_t d = - Pn * mesh::toWalberla(mesh.point(mesh.to_vertex_handle(mesh.halfedge_handle(fh))));
+ const real_t vn = Pn * transformedRay.getOrigin() + d;
+ const real_t vd = Pn * transformedRay.getDirection();
+
+ if ( floatIsEqual(vd, real_t(0)) )
+ {
+ if (vn > real_t(0)) return false;
+ continue;
+ }
+
+ const real_t t = -vn / vd;
+
+ if (vd > real_t(0))
+ {
+ // back-facing
+ if (t < real_t(0)) return false;
+ if (t < t_far) t_far=t;
+ } else
+ {
+ // front-facing
+ if (t > t_near)
+ {
+ t_near = t;
+ n = Pn;
+ }
+ if (t_near > t_far) return false;
+ }
+ }
+
+ if (t_near < 0) return false;
+
+ n = poly->vectorFromBFtoWF(n);
+ return true;
+}
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp b/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp
index 85dab4d29ff4ec6ad359a463cb801e6d592ec301..eb3c3c3ee324c606dbb3210418031af23cfd3e83 100644
--- a/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp
+++ b/src/mesh/pe/rigid_body/ConvexPolyhedron.cpp
@@ -97,7 +97,7 @@ void ConvexPolyhedron::init( const Vec3& gpos, const Vec3& rpos, const Quat& q,
} else
{
// sets inverse mass and interatio tensor
- setMassAndInertia( getVolume() * Material::getDensity( getMaterial() ), mesh::computeIntertiaTensor( mesh_ ) );
+ setMassAndInertia( getVolume() * Material::getDensity( getMaterial() ), mesh::computeInertiaTensor( mesh_ ) );
}
setCommunicating( communicating );
setFinite( true );
@@ -299,8 +299,10 @@ bool ConvexPolyhedron::containsRelPointImpl( real_t px, real_t py, real_t pz ) c
for(auto fh : mesh_.faces())
{
- const TriangleMesh::Point & p = mesh_.normal(fh);
- if( p[0] * px + p[1] * py + p[2] * pz >= real_t(0) )
+ const TriangleMesh::Normal & n = mesh_.normal(fh); // Plane normal
+ const TriangleMesh::Point & pp = mesh_.point(mesh_.to_vertex_handle(mesh_.halfedge_handle(fh))); // Point on plane
+
+ if( n[0] * (px - pp[0]) + n[1] * (py - pp[1]) + n[2] * (pz - pp[2]) >= real_t(0) )
return false;
}
diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp b/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp
index 9919e2f6ab04481ede579ed7b4239b8d5dd0e3df..6f29a33cfa7e15cc5b2e14f0c1e6a84e647a16bf 100644
--- a/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp
+++ b/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.cpp
@@ -39,7 +39,7 @@ namespace mesh {
namespace pe {
ConvexPolyhedronID createConvexPolyhedron( BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID storageID,
- id_t uid, Vec3 gpos, const std::vector< Vec3 > & pointCloud,
+ id_t uid, const Vec3& gpos, const std::vector< Vec3 > & pointCloud,
MaterialID material,
bool global, bool communicating, bool infiniteMass )
{
@@ -65,7 +65,7 @@ ConvexPolyhedronID createConvexPolyhedron( BodyStorage& globalStorage, BlockStor
{
WALBERLA_ASSERT_UNEQUAL( ConvexPolyhedron::getStaticTypeID(), std::numeric_limits<id_t>::max(), "ConvexPolyhedron TypeID not initalized!");
- ConvexPolyhedronID poly = NULL;
+ ConvexPolyhedronID poly = nullptr;
Vec3 centroid = toWalberla( computeCentroid( mesh ) );
translate( mesh, -centroid );
@@ -78,25 +78,24 @@ ConvexPolyhedronID createConvexPolyhedron( BodyStorage& globalStorage, BlockStor
WALBERLA_CHECK_EQUAL(communicating, false, "Global bodies can not be communicating!" );
WALBERLA_CHECK_EQUAL(infiniteMass, true, "Global bodies must have infinite mass!" );
- poly = new ConvexPolyhedron(sid, uid, gpos, Vec3(0,0,0), Quat(), mesh, material, global, false, true);
- globalStorage.add(poly);
+ auto cp = std::make_unique<ConvexPolyhedron>(sid, uid, gpos, Vec3(0,0,0), Quat(), mesh, material, global, false, true);
+ poly = static_cast<ConvexPolyhedronID>(&globalStorage.add(std::move(cp)));
} else
{
- for (auto it = blocks.begin(); it != blocks.end(); ++it){
- IBlock* block = (&(*it));
- if (block->getAABB().contains(gpos))
+ for (auto& block : blocks){
+ if (block.getAABB().contains(gpos))
{
const id_t sid( UniqueID<RigidBody>::create() );
- Storage* bs = block->getData<Storage>(storageID);
- poly = new ConvexPolyhedron(sid, uid, gpos, Vec3(0,0,0), Quat(), mesh, material, global, communicating, infiniteMass);
- poly->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block->getId().getID()));
- (*bs)[0].add(poly);
+ BodyStorage& bs = (*block.getData<Storage>(storageID))[0];
+ auto cp = std::make_unique<ConvexPolyhedron>(sid, uid, gpos, Vec3(0,0,0), Quat(), mesh, material, global, communicating, infiniteMass);
+ cp->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block.getId().getID()));
+ poly = static_cast<ConvexPolyhedronID>(&bs.add( std::move(cp) ) );
}
}
}
- if (poly != NULL)
+ if (poly != nullptr)
{
// Logging the successful creation of the box
WALBERLA_LOG_DETAIL(
diff --git a/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.h b/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.h
index e8196c89184d85c741b0a275c1e795db30c38151..e0e2286dd1bb1b15f08bfd37ad35c9f6abfeeaca 100644
--- a/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.h
+++ b/src/mesh/pe/rigid_body/ConvexPolyhedronFactory.h
@@ -69,7 +69,7 @@ namespace pe {
*
*/
ConvexPolyhedronID createConvexPolyhedron( BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID storageID,
- id_t uid, Vec3 gpos, const std::vector< Vec3 > & pointCloud,
+ id_t uid, const Vec3& gpos, const std::vector< Vec3 > & pointCloud,
MaterialID material = Material::find("iron"),
bool global = false, bool communicating = true, bool infiniteMass = false );
//*************************************************************************************************
diff --git a/src/mesh/pe/vtk/CommonDataSources.h b/src/mesh/pe/vtk/CommonDataSources.h
index d2454c15cd6a59e836e6f97dba550b0d6696281e..bf86f2cddcde9b3283cf454cab882896212f0c42 100644
--- a/src/mesh/pe/vtk/CommonDataSources.h
+++ b/src/mesh/pe/vtk/CommonDataSources.h
@@ -189,6 +189,8 @@ public:
LinearVelocityFaceDataSource( const std::string & _name = "linearVelocity" )
: Base( _name ) { }
+ virtual ~LinearVelocityFaceDataSource() = default;
+
virtual uint_t numComponents() { return uint_t(3); }
virtual void getData( const MeshType & /*mesh*/, const Faces & faces, std::vector<value_type> & data, const BodyPointerFPropManager & bodyPointer )
@@ -249,6 +251,8 @@ public:
AngularVelocityFaceDataSource( const std::string & _name = "angularVelocity" )
: Base( _name ) { }
+ virtual ~AngularVelocityFaceDataSource() = default;
+
virtual uint_t numComponents() { return uint_t(3); }
virtual void getData( const MeshType & /*mesh*/, const Faces & faces, std::vector<value_type> & data, const BodyPointerFPropManager & bodyPointer )
@@ -279,6 +283,8 @@ public:
SurfaceVelocityVertexDataSource( const std::string & _name = "surfaceVelocity" )
: Base( _name ) { }
+ virtual ~SurfaceVelocityVertexDataSource() = default;
+
virtual uint_t numComponents() { return uint_t(3); }
virtual void getData( const MeshType & mesh, const Vertices & vertices, std::vector<value_type> & data, const BodyPointerVPropManager & bodyPointer )
diff --git a/src/mesh/pe/vtk/PeVTKMeshWriter.h b/src/mesh/pe/vtk/PeVTKMeshWriter.h
index 55721ae20d67cdad08ed468ab8fe7378a4818e47..72685c362bbd486418b9edd1002db50347f1c712 100644
--- a/src/mesh/pe/vtk/PeVTKMeshWriter.h
+++ b/src/mesh/pe/vtk/PeVTKMeshWriter.h
@@ -186,16 +186,16 @@ protected:
const walberla::pe::BodyStorage & bodyStorage = (*storage)[0];
for(auto bodyIt = bodyStorage.begin(); bodyIt != bodyStorage.end(); ++bodyIt)
{
- if (!bodyFilter_(**bodyIt)) continue;
+ if (!bodyFilter_(*bodyIt)) continue;
newVertices.clear();
newFaces.clear();
- tesselation_( **bodyIt, *mesh_, newVertices, newFaces );
+ tesselation_( *bodyIt, *mesh_, newVertices, newFaces );
for( const auto & fh: newFaces )
- faceBodyPointer_[fh] = *bodyIt;
+ faceBodyPointer_[fh] = bodyIt.getBodyID();
for( const auto & vh: newVertices )
- vertexBodyPointer_[vh] = *bodyIt;
+ vertexBodyPointer_[vh] = bodyIt.getBodyID();
}
}
diff --git a/src/mesh/vtk/VTKMeshWriter.h b/src/mesh/vtk/VTKMeshWriter.h
index cf01acf7e4c5451faa2459703a845228f9a9a8e0..129c456a1696a408484a67fb6b26a6933bfa6c6a 100644
--- a/src/mesh/vtk/VTKMeshWriter.h
+++ b/src/mesh/vtk/VTKMeshWriter.h
@@ -52,6 +52,7 @@ public:
{
public:
DataSource( const std::string & _name ) : name_( _name ) { }
+ virtual ~DataSource() = default;
typedef T value_type;
virtual uint_t numComponents() = 0;
const std::string & name() { return name_; }
@@ -67,6 +68,7 @@ public:
typedef typename VTKMeshWriter::Vertices Vertices;
VertexDataSource( const std::string & _name ) : DataSource<T>( _name ) { }
+ virtual ~VertexDataSource() = default;
virtual void getData( const MeshType &, const Vertices & vertices, std::vector<T> & ) = 0;
};
@@ -78,6 +80,7 @@ public:
typedef typename VTKMeshWriter::Faces Faces;
FaceDataSource( const std::string & _name ) : DataSource<T>( _name ) { }
+ virtual ~FaceDataSource() = default;
virtual void getData( const MeshType &, const Faces & faces, std::vector<T> & ) = 0;
};
diff --git a/src/pde/sweeps/RBGS.h b/src/pde/sweeps/RBGS.h
index 1f3404341379aea84ab26e4d514a8a5f9cc9ff58..69f7245fac91a5e77ec5bdddb2b25fa92d45d253 100644
--- a/src/pde/sweeps/RBGS.h
+++ b/src/pde/sweeps/RBGS.h
@@ -26,7 +26,7 @@
#include "stencil/Directions.h"
#include <map>
-
+#include <functional>
namespace walberla {
@@ -53,12 +53,12 @@ public:
std::function< void ( IBlock * const ) > getRedSweep()
{
- return boost::bind( &RBGS::update, this, _1, true );
+ return std::bind( &RBGS::update, this, std::placeholders::_1, true );
}
std::function< void ( IBlock * const ) > getBlackSweep()
{
- return boost::bind( &RBGS::update, this, _1, false );
+ return std::bind( &RBGS::update, this, std::placeholders::_1, false );
}
private:
diff --git a/src/pde/sweeps/RBGSFixedStencil.h b/src/pde/sweeps/RBGSFixedStencil.h
index 76df0005548e9df4126d30e017ce10bb1d75f750..75196987f18a941a716661f95873c8c960276904 100644
--- a/src/pde/sweeps/RBGSFixedStencil.h
+++ b/src/pde/sweeps/RBGSFixedStencil.h
@@ -26,7 +26,7 @@
#include "stencil/Directions.h"
#include <map>
-
+#include <functional>
namespace walberla {
@@ -52,12 +52,12 @@ public:
std::function< void ( IBlock * const ) > getRedSweep()
{
- return boost::bind( &RBGSFixedStencil::update, this, _1, true );
+ return std::bind( &RBGSFixedStencil::update, this, std::placeholders::_1, true );
}
std::function< void ( IBlock * const ) > getBlackSweep()
{
- return boost::bind( &RBGSFixedStencil::update, this, _1, false );
+ return std::bind( &RBGSFixedStencil::update, this, std::placeholders::_1, false );
}
private:
diff --git a/src/pde/sweeps/SOR.h b/src/pde/sweeps/SOR.h
index 90be98268340223cd6e22d750c7db6bee9d5105b..4997b40d6af610f7e995ae7229339dbb08e97b93 100644
--- a/src/pde/sweeps/SOR.h
+++ b/src/pde/sweeps/SOR.h
@@ -26,7 +26,7 @@
#include "stencil/Directions.h"
#include <map>
-
+#include <functional>
namespace walberla {
@@ -53,12 +53,12 @@ public:
std::function< void ( IBlock * const ) > getRedSweep()
{
- return boost::bind( &SOR::update, this, _1, true );
+ return std::bind( &SOR::update, this, std::placeholders::_1, true );
}
std::function< void ( IBlock * const ) > getBlackSweep()
{
- return boost::bind( &SOR::update, this, _1, false );
+ return std::bind( &SOR::update, this, std::placeholders::_1, false );
}
private:
diff --git a/src/pde/sweeps/SORFixedStencil.h b/src/pde/sweeps/SORFixedStencil.h
index 51535e0378b9ccaa5bcf1181442ed5ff7bdba5ec..d3983ab1861c856c388d7c2feb3601c654f0e58f 100644
--- a/src/pde/sweeps/SORFixedStencil.h
+++ b/src/pde/sweeps/SORFixedStencil.h
@@ -26,7 +26,7 @@
#include "stencil/Directions.h"
#include <map>
-
+#include <functional>
namespace walberla {
@@ -52,12 +52,12 @@ public:
std::function< void ( IBlock * const ) > getRedSweep()
{
- return boost::bind( &SORFixedStencil::update, this, _1, true );
+ return std::bind( &SORFixedStencil::update, this, std::placeholders::_1, true );
}
std::function< void ( IBlock * const ) > getBlackSweep()
{
- return boost::bind( &SORFixedStencil::update, this, _1, false );
+ return std::bind( &SORFixedStencil::update, this, std::placeholders::_1, false );
}
private:
diff --git a/src/pde/sweeps/SweepBase.h b/src/pde/sweeps/SweepBase.h
index a157d46dd1c95c38519c761837a7ffe0716f6055..031a3ee5917697b56697ca723d1bdb79406cc900 100644
--- a/src/pde/sweeps/SweepBase.h
+++ b/src/pde/sweeps/SweepBase.h
@@ -64,11 +64,11 @@ protected:
- const BlockDataID src_; // "u"
- const BlockDataID f_;
+ const BlockDataID src_ {}; // "u"
+ const BlockDataID f_ {};
const bool dstFromBlockData_;
- const BlockDataID dst_;
+ const BlockDataID dst_ {};
std::set< Field_T *, field::SwapableCompare< Field_T * > > dstFields_;
};
diff --git a/src/pe/BlockFunctions.h b/src/pe/BlockFunctions.h
index c1e8e466d6fb075480b289dbdc545b54013a9d25..8987f473882ae9c6b3c9494a81ddd2e42ff6ffa3 100644
--- a/src/pe/BlockFunctions.h
+++ b/src/pe/BlockFunctions.h
@@ -45,12 +45,20 @@ bool hasNeighborOwner(const BlockT& block, const Owner& owner)
* Looks through all neighboring blocks to find the one whose AABB contains \a pt.
* Also checks if \a pt is located in the block itself.
* Returns -1 if no valid block is found otherwise the process rank of the containing block is returned.
+ *
+ * \attention If periodic boundaries are used you have to make sure the point is mapped to the domain before calling this function!
*/
template <class BlockT>
-Owner findContainingProcess(const BlockT& block, math::Vector3<real_t> pt)
+Owner findContainingProcess(const BlockT& block, const math::Vector3<real_t> pt)
{
+ WALBERLA_DEBUG_SECTION()
+ {
+ auto pt2 = pt;
+ block.getBlockStorage().mapToPeriodicDomain(pt2);
+ WALBERLA_ASSERT_EQUAL(pt, pt2);
+ }
+
if (block.getAABB().contains(pt)) return Owner(int_c(block.getProcess()), block.getId().getID());
- if (!block.getBlockStorage().getDomain().contains(pt)) block.getBlockStorage().mapToPeriodicDomain(pt);
for( uint_t i = uint_t(0); i != block.getNeighborhoodSize(); ++i )
{
if (block.getNeighborAABB(i).contains(pt)) return Owner(int_c(block.getNeighborProcess(i)), block.getNeighborId(i).getID());
diff --git a/src/pe/CMakeLists.txt b/src/pe/CMakeLists.txt
index 1dd7edd80c06535b2df4798075355d75fa46cd90..dadbb9186bda2e10b45607705aa606da413a0ce0 100644
--- a/src/pe/CMakeLists.txt
+++ b/src/pe/CMakeLists.txt
@@ -5,27 +5,4 @@
#
###################################################################################################
-if(WALBERLA_DOUBLE_ACCURACY)
- set(CCD_DOUBLE ON)
- set(CCD_SINGLE OFF)
-else()
- set(CCD_DOUBLE OFF)
- set(CCD_SINGLE ON)
-endif()
-
-configure_file(extern/libccd/ccd/config.h.cmake.in extern/libccd/ccd/config.h)
-
-include_directories(extern/libccd)
-include_directories("${CMAKE_CURRENT_BINARY_DIR}/extern/libccd")
-
waLBerla_add_module( DEPENDS core blockforest domain_decomposition geometry stencil vtk )
-
-if( WALBERLA_CXX_COMPILER_IS_MSVC )
- SET_SOURCE_FILES_PROPERTIES( extern/libccd/ccd.c
- extern/libccd/mpr.c
- extern/libccd/polytope.c
- extern/libccd/support.c
- extern/libccd/vec3.c
- PROPERTIES LANGUAGE CXX )
-endif()
-
diff --git a/src/pe/Materials.cpp b/src/pe/Materials.cpp
index b66e115f041b49c74f9fdfc9356f37d16062e2b6..baa82126a69ca992cfccea9804b9d04be3d0ea95 100644
--- a/src/pe/Materials.cpp
+++ b/src/pe/Materials.cpp
@@ -162,13 +162,13 @@ MaterialID createMaterial( const std::string& name, real_t density, real_t cor,
real_t csf, real_t cdf, real_t poisson, real_t young,
real_t stiffness, real_t dampingN, real_t dampingT )
{
- typedef Material M;
+ using M = Material;
// Checking the material name
Materials::const_iterator begin( M::materials_.begin() );
Materials::const_iterator end ( M::materials_.end() );
for( ; begin!=end; ++begin ) {
- if( begin->getName().compare( name ) == 0 )
+ if( begin->getName() == name )
throw std::invalid_argument( "Material of that name already exists!" );
}
@@ -280,7 +280,7 @@ MaterialID createMaterial( real_t density, real_t cor, real_t csf, real_t cdf, r
MaterialID Material::find( const std::string& name )
{
for( Material::SizeType i=0; i<Material::materials_.size(); ++i ) {
- if( Material::materials_[i].getName().compare( name ) == 0 ) {
+ if( Material::materials_[i].getName() == name ) {
return i;
}
}
diff --git a/src/pe/Types.h b/src/pe/Types.h
index 764bf4bb70610b43ec54215b60c85a95219ae25f..c71ee80907fa5506206c58de904e21d2bebc4550 100644
--- a/src/pe/Types.h
+++ b/src/pe/Types.h
@@ -27,6 +27,7 @@
#include <boost/array.hpp>
+#include <memory>
#include <vector>
namespace walberla{
@@ -57,8 +58,6 @@ using math::AABB;
//
//=================================================================================================
-class Attachable;
-class BallJoint;
class BodyManager;
class BodyStorage;
class Box;
@@ -67,21 +66,11 @@ class Contact;
class Cylinder;
class Ellipsoid;
class CylindricalBoundary;
-class FixedJoint;
-class ForceGenerator;
class GeomPrimitive;
-class Gravity;
-class HingeJoint;
-class Joint;
-class Link;
class Material;
class MPISystem;
-class Node;
class Plane;
-class Process;
class RigidBody;
-class Section;
-class SliderJoint;
class Sphere;
class Spring;
class Squirmer;
@@ -92,6 +81,7 @@ class Union;
typedef RigidBody BodyType; //!< Type of the rigid bodies.
typedef RigidBody* BodyID; //!< Handle for a rigid body.
typedef const RigidBody* ConstBodyID; //!< Handle for a constant rigid body.
+using BodyPtr = std::unique_ptr<RigidBody>;
typedef GeomPrimitive* GeomID;
typedef const GeomPrimitive* ConstGeomID;
@@ -99,80 +89,52 @@ typedef const GeomPrimitive* ConstGeomID;
typedef Box BoxType; //!< Type of the box geometric primitive.
typedef Box* BoxID; //!< Handle for a box primitive.
typedef const Box* ConstBoxID; //!< Handle for a constant box primitive.
+using BoxPtr = std::unique_ptr<Box>;
typedef Capsule CapsuleType; //!< Type of the capsule geometric primitive.
typedef Capsule* CapsuleID; //!< Handle for a capsule primitive.
typedef const Capsule* ConstCapsuleID; //!< Handle for a constant capsule primitive.
+using CapsulePtr = std::unique_ptr<Capsule>;
typedef Cylinder CylinderType; //!< Type of the cylinder geometric primitive.
typedef Cylinder* CylinderID; //!< Handle for a cylinder primitive.
typedef const Cylinder* ConstCylinderID; //!< Handle for a constant cylinder primitive.
+using CylinderPtr = std::unique_ptr<Cylinder>;
typedef CylindricalBoundary CylindricalBoundaryType; //!< Type of the cylindrical boundary geometric primitive.
typedef CylindricalBoundary* CylindricalBoundaryID; //!< Handle for a cylindrical boundary primitive.
typedef const CylindricalBoundary* ConstCylindricalBoundaryID; //!< Handle for a constant cylindrical boundary primitive.
+using CylindricalBoundaryPtr = std::unique_ptr<CylindricalBoundary>;
typedef Ellipsoid EllipsoidType; //!< Type of the ellipsoid geometric primitive.
typedef Ellipsoid* EllipsoidID; //!< Handle for a ellipsoid primitive.
typedef const Ellipsoid* ConstEllipsoidID; //!< Handle for a constant ellipsoid primitive.
+using EllipsoidPtr = std::unique_ptr<Ellipsoid>;
typedef Plane PlaneType; //!< Type of the plane geometric primitive.
typedef Plane* PlaneID; //!< Handle for a plane primitive.
typedef const Plane* ConstPlaneID; //!< Handle for a constant plane primitive.
+using PlanePtr = std::unique_ptr<Plane>;
typedef Sphere SphereType; //!< Type of the sphere geometric primitive.
typedef Sphere* SphereID; //!< Handle for a sphere primitive.
typedef const Sphere* ConstSphereID; //!< Handle for a constant sphere primitive.
+using SpherePtr = std::unique_ptr<Sphere>;
typedef Squirmer SquirmerType; //!< Type of the squirmer geometric primitive.
typedef Squirmer* SquirmerID; //!< Handle for a squirmer primitive.
typedef const Squirmer* ConstSquirmerID; //!< Handle for a constant squirmer primitive.
+using SquirmerPtr = std::unique_ptr<Squirmer>;
typedef TriangleMesh MeshType; //!< Type of the triangle mesh geometric primitive.
typedef TriangleMesh* MeshID; //!< Handle for a triangle mesh primitive.
typedef const TriangleMesh* ConstMeshID; //!< Handle for a constant triangle mesh primitive.
-
-typedef Attachable AttachableType; //!< Type of the attachables.
-typedef Attachable* AttachableID; //!< Handle for an attachable.
-typedef const Attachable* ConstAttachableID; //!< Handle for a constant attachable.
-
-typedef Gravity GravityType; //!< Type of the gravity force generators.
-typedef Gravity* GravityID; //!< Handle for a gravity force generator.
-typedef const Gravity* ConstGravityID; //!< Handle for a constant gravity force generator.
-
-typedef Spring SpringType; //!< Type of the spring force generators.
-typedef Spring* SpringID; //!< Handle for a spring force generator.
-typedef const Spring* ConstSpringID; //!< Handle for a constant spring force generator.
+using TriangleMeshPtr = std::unique_ptr<TriangleMesh>;
typedef Contact ContactType; //!< Type of the contacts.
typedef Contact* ContactID; //!< Handle for a contact.
typedef const Contact* ConstContactID; //!< Handle for a constant contact.
-typedef Joint JointType; //!< Type of the joints.
-typedef Joint* JointID; //!< Handle for a joint.
-typedef const Joint* ConstJointID; //!< Handle for a constant joint.
-
-typedef SliderJoint SliderJointType; //!< Type of the slider joint.
-typedef SliderJoint* SldierJointID; //!< Handle for a slider joint.
-typedef const SliderJoint* ConstSliderJointID; //!< Handle for a constant slider joint.
-
-typedef HingeJoint HingeJointType; //!< Type of the hinge joint.
-typedef HingeJoint* HingeJointID; //!< Handle for a hinge joint.
-typedef const HingeJoint* ConstHingeJointID; //!< Handle for a constant hinge joint.
-
-typedef BallJoint BallJointType; //!< Type of the ball joint.
-typedef BallJoint* BallJointID; //!< Handle for a ball joint.
-typedef const BallJoint* ConstBallJointID; //!< Handle for a constant ball joint.
-
-typedef Node NodeType;
-typedef Node* NodeID; //!< Handle to a BodyTrait instance.
-typedef const Node* ConstNodeID; //!< Handle to a constant BodyTrait instance.
-
-typedef Process ProcessType; //!< Type of the remote processes.
-typedef Process* ProcessID; //!< Handle for a remote process.
-typedef const Process* ConstProcessID; //!< Handle for a constant remote process.
-
-
typedef BodyManager* ManagerID; //!< Handle for a BodyManager.
typedef const BodyManager* ConstManagerID; //!< Handle for a constant BodyManager.
diff --git a/src/pe/amr/weight_assignment/MetisAssignmentFunctor.h b/src/pe/amr/weight_assignment/MetisAssignmentFunctor.h
index 1c6a29dec33cdfa224ceeaa5f8a16fb5c2698e44..dd1fdac59c24ae7d751fc9014236109ccaedfca3 100644
--- a/src/pe/amr/weight_assignment/MetisAssignmentFunctor.h
+++ b/src/pe/amr/weight_assignment/MetisAssignmentFunctor.h
@@ -63,10 +63,11 @@ public:
{
const double dx(1.0);
info.setEdgeWeight( it->first->getNeighborId(nb),
+ static_cast<blockforest::DynamicParMetisBlockInfo::weight_t>(
domain_decomposition::periodicIntersectionVolume( periodic,
domain,
it->first->getAABB(),
- it->first->getNeighborAABB(nb).getExtended(dx)) );
+ it->first->getNeighborAABB(nb).getExtended(dx))) );
}
it->second = info;
continue;
diff --git a/src/pe/attachable/Attachable.cpp b/src/pe/attachable/Attachable.cpp
deleted file mode 100644
index 76056d6866479db8625431b72e49b7c87bcc06f8..0000000000000000000000000000000000000000
--- a/src/pe/attachable/Attachable.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file Attachable.cpp
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//! \brief Source file for the Attachable class
-//
-//======================================================================================================================
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <pe/attachable/Attachable.h>
-#include <pe/attachable/AttachableStorage.h>
-#include <core/DataTypes.h>
-
-namespace walberla {
-namespace pe {
-
-//=================================================================================================
-//
-// CONSTRUCTOR
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Constructor of the Attachable class.
- *
- * \param type The type of the rigid body.
- * \param sid The unique system-specific ID of the attachable.
- */
-Attachable::Attachable( AttachableType type, id_t sid )
- : type_(type)
- , sid_(sid)
- , bodies_()
-{}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// DESTRUCTOR
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Destructor for the Attachable class.
- */
-Attachable::~Attachable()
-{
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// MPI FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\fn bool Attachable::isRemote() const
- * \brief Returns whether the attachable is remote or not.
- *
- * \return \a true in case the attachable is remote, \a false if not.
- *
- * This function returns whether the attachable is remote or not. In case the attachable is
- * attached to at least a single local rigid body the function returns \a false. Otherwise
- * it returns \a true.
- */
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ATTACHABLE SETUP FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Detaches the given attachable.
- *
- * \param attachable The detachable to be detached.
- */
-WALBERLA_PUBLIC void detach( AttachableID attachable )
-{
- ///TDOD REVIEW
-// typedef AttachableStorage AS;
-
- // WARNING: Using friend relationship to get non-constant reference of attachable storage.
-// AS& attachablestorage( theCollisionSystem()->attachablestorage_ );
-
- // Removing the attachable from the attachable storage
-// const AS::Iterator pos( attachablestorage.find( attachable ) );
-// attachablestorage.remove( pos );
-
- delete attachable;
-}
-//*************************************************************************************************
-
-//*************************************************************************************************
-/*!\brief Global output operator for AttachableType.
- *
- * \param os Reference to the output stream.
- * \param type The AttachableType to be put into the stream.
- * \return Reference to the output stream.
- */
-std::ostream& operator<<( std::ostream& os, Attachable::AttachableType type )
-{
- switch( type )
- {
- case Attachable::gravityType: os << "gravity force generator"; break;
- case Attachable::springType: os << "spring force generator"; break;
- default: WALBERLA_ASSERT( false, "Unknown attachable type" ); break;
- }
-
- return os;
-}
-//*************************************************************************************************
-
-} // namespace pe
-} // namespace walberla
diff --git a/src/pe/attachable/Attachable.h b/src/pe/attachable/Attachable.h
deleted file mode 100644
index 9c7b2b368ad9d0377cd3284be39132122cfeb752..0000000000000000000000000000000000000000
--- a/src/pe/attachable/Attachable.h
+++ /dev/null
@@ -1,264 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file Attachable.h
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//! \brief Header file for the Attachable class
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <core/NonCopyable.h>
-#include <pe/Types.h>
-#include <core/ptrvector/policies/NoDelete.h>
-#include <core/ptrvector/PtrVector.h>
-#include <pe/Types.h>
-
-#include "core/UniqueID.h"
-
-namespace walberla {
-namespace pe {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Attachable interface class.
- *
- * The Attachable class is the base class for the Attachable concept of the physics engine.
- * Classes deriving from this interface class (which are simply called Attachables) can be
- * attached to rigid bodies and are notified in case the rigid body is destroyed. This
- * concept is for example used for all force generators (see the ForceGenerator class
- * description).
- */
-class Attachable : private NonCopyable
-{
-public:
- //*************************************************************************************************
- //! Type codes of the attachables.
- enum AttachableType {
- gravityType = 1, //!< Code for the Gravity force generator.
- springType = 2 //!< Code for the Spring force generator.
- };
- //*************************************************************************************************
-protected:
- //**Type definitions****************************************************************************
- typedef PtrVector<RigidBody,NoDelete> Bodies; //!< Vector for attached rigid bodies.
- //**********************************************************************************************
-
- //**Constructor*********************************************************************************
- /*!\name Constructor */
- //@{
- explicit Attachable( AttachableType type, id_t sid );
- //@}
- //**********************************************************************************************
-
- //**Destructor**********************************************************************************
- /*!\name Destructor */
- //@{
- virtual ~Attachable();
- //@}
- //**********************************************************************************************
-
-public:
-
- //**Type definitions****************************************************************************
- typedef Bodies::Iterator Iterator; //!< Iterator over the currently attached bodies.
- typedef Bodies::ConstIterator ConstIterator; //!< ConstIterator over the currently attached bodies.
- //**********************************************************************************************
-
- //**MPI functions*******************************************************************************
- /*!\name MPI functions */
- //@{
- virtual bool isRemote() const = 0;
- //@}
- //**********************************************************************************************
-
- //**Get functions*******************************************************************************
- /*!\name Get functions */
- //@{
- inline AttachableType getType() const;
- inline id_t getSystemID() const;
- //@}
- //**********************************************************************************************
-
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- inline Iterator begin();
- inline ConstIterator begin() const;
- inline Iterator end ();
- inline ConstIterator end () const;
- inline size_t size () const;
- //@}
- //**********************************************************************************************
-
-protected:
- //**Member variables****************************************************************************
- /*!\name Member variables */
- //@{
- const AttachableType type_; //!< The type code of the attachable.
- id_t sid_; //!< The unique system-specific attachable ID.
- Bodies bodies_; //!< Vector of attached rigid bodies.
- //@}
- //**********************************************************************************************
-
-private:
- //**Attachable setup functions******************************************************************
- /*! \cond internal */
- friend void detach( AttachableID attachable );
- /*! \endcond */
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ATTACHABLE SETUP FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\name Attachable setup functions */
-//@{
-void detach( AttachableID attachable );
-//@}
-//*************************************************************************************************
-
-//=================================================================================================
-//
-// GET FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns the type of the attachable.
- *
- * \return The type of the attachable.
- */
-inline Attachable::AttachableType Attachable::getType() const
-{
- return type_;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the unique system-specific ID of the attachable.
- *
- * \return The system-specific ID.
- */
-inline id_t Attachable::getSystemID() const
-{
- return sid_;
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first attached rigid body.
- *
- * \return Iterator to the first attached rigid body.
- */
-inline Attachable::Iterator Attachable::begin()
-{
- return bodies_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first attached rigid body.
- *
- * \return Iterator to the first attached rigid body.
- */
-inline Attachable::ConstIterator Attachable::begin() const
-{
- return bodies_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last attached rigid body.
- *
- * \return Iterator just past the last attached rigid body.
- */
-inline Attachable::Iterator Attachable::end()
-{
- return bodies_.end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last attached rigid body.
- *
- * \return Iterator just past the last attached rigid body.
- */
-inline Attachable::ConstIterator Attachable::end() const
-{
- return bodies_.end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the number of attached rigid bodies.
- *
- * \return The number of attached rigid bodies
- */
-inline size_t Attachable::size() const
-{
- return bodies_.size();
-}
-//*************************************************************************************************
-
-//=================================================================================================
-//
-// ATTACHABLE TYPE UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\name Attachable type utility functions */
-//@{
-std::ostream& operator<<( std::ostream& os, Attachable::AttachableType type );
-//@}
-//*************************************************************************************************
-
-} // namespace pe
-} // namespace walberla
diff --git a/src/pe/attachable/AttachableCast.h b/src/pe/attachable/AttachableCast.h
deleted file mode 100644
index bace6db7f1aa632f16c9d70de8f8ede1f8ffcd49..0000000000000000000000000000000000000000
--- a/src/pe/attachable/AttachableCast.h
+++ /dev/null
@@ -1,93 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file AttachableCast.h
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-#include <boost/type_traits/is_base_of.hpp>
-
-namespace walberla {
-namespace pe {
-
-//=================================================================================================
-//
-// ATTACHABLE CAST OPERATORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\name Attachable cast operators */
-//@{
-template< typename To, typename From > inline To* static_attachable_cast( From* attachable );
-template< typename To, typename From > inline To* dynamic_attachable_cast( From* attachable );
-//@}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Static cast for attachables.
- *
- * \param attachable The attachable to be cast.
- * \return The casted attachable.
- *
- * The static_attachable_cast function is used exactly as the built-in static_cast operator
- * but for attachables.
-
- \code
- SphereID sphere = createSphere ( 1, 0.0, 0.0, 0.0, 1.0, iron );
- AttachableID attachable = attachGravity( sphere, 0.0, 0.0, -9.81 );
- GravityID gravity = static_attachable_cast<Gravity>( attachable );
- \endcode
- */
-template< typename To, typename From >
-inline To* static_attachable_cast( From* attachable )
-{
- static_assert(boost::is_base_of<Attachable, From>::value, "From has to be derived from Attachable!");
- static_assert(boost::is_base_of<Attachable, To>::value, "To has to be derived from Attachable!");
- return static_cast<To*>( attachable );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Dynamic cast for attachables.
- *
- * \param attachable The attachable to be cast.
- * \return The casted attachable.
- *
- * The dynamic_attachable_cast function is used exactly as the built-in dynamic_cast operator
- * but for attachables.
-
- \code
- AttachableID attachable;
- GravityID gravity = dynamic_attachable_cast<Gravity>( attachable );
- \endcode
- */
-template< typename To, typename From >
-inline To* dynamic_attachable_cast( From* attachable )
-{
- static_assert(boost::is_base_of<Attachable, From>::value, "From has to be derived from Attachable!");
- static_assert(boost::is_base_of<Attachable, To>::value, "To has to be derived from Attachable!");
- return dynamic_cast<To*>( attachable );
-}
-//*************************************************************************************************
-
-} // namespace pe
-}
diff --git a/src/pe/attachable/AttachableStorage.h b/src/pe/attachable/AttachableStorage.h
deleted file mode 100644
index 009c3b087bef8d6556e071306846d210b548dd90..0000000000000000000000000000000000000000
--- a/src/pe/attachable/AttachableStorage.h
+++ /dev/null
@@ -1,356 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file AttachableStorage.h
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <algorithm>
-#include <functional>
-#include <pe/attachable/Attachable.h>
-#include <pe/Types.h>
-#include <core/ptrvector/policies/NoDelete.h>
-#include <core/ptrvector/PtrVector.h>
-#include <core/DataTypes.h>
-#include <core/debug/Debug.h>
-
-namespace walberla {
-namespace pe {
-
-//=================================================================================================
-//
-// CLASS DEFINITION
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Attachable storage of the rigid body simulation world.
- *
- * The AttachableStorage class stores all currently existing attachables in the simulation world
- * (see class World).
- */
-class AttachableStorage
-{
-private:
- //**Type definitions****************************************************************************
- //! Container for the attachables contained in the simulation world.
- typedef PtrVector<Attachable,NoDelete> Attachables;
- //**********************************************************************************************
-
-public:
- //**Type definitions****************************************************************************
- typedef Attachables::SizeType SizeType; //!< Size type of the attachable storage.
- typedef Attachables::Iterator Iterator; //!< Iterator over non-const attachables.
- typedef Attachables::ConstIterator ConstIterator; //!< Iterator over constant attachables.
- //**********************************************************************************************
-
- //**Constructors********************************************************************************
- /*!\name Constructors */
- //@{
- explicit inline AttachableStorage( SizeType initCapacity = 100 );
- //@}
- //**********************************************************************************************
-
- //**Utility functions***************************************************************************
- /*!\name Utility functions */
- //@{
- inline bool isEmpty() const;
- inline SizeType size () const;
- inline Iterator begin ();
- inline ConstIterator begin () const;
- inline Iterator end ();
- inline ConstIterator end () const;
- inline Iterator find ( id_t sid );
- inline ConstIterator find ( id_t sid ) const;
- inline Iterator find ( ConstAttachableID attachable );
- inline ConstIterator find ( ConstAttachableID attachable ) const;
- //@}
- //**********************************************************************************************
-
- //**Add/Remove functions************************************************************************
- /*!\name Add/Remove functions */
- //@{
- inline void add ( AttachableID attachable );
- inline Iterator remove( Iterator pos );
- //@}
- //**********************************************************************************************
-
-private:
- //**Member variables****************************************************************************
- /*!\name Member variables */
- //@{
- Attachables attachables_; //!< The currently existing attachables.
- //@}
- //**********************************************************************************************
-
- //**Private struct Compare**********************************************************************
- /*! \cond internal */
- /*!\brief Helper class for the find() function. */
- struct Compare : public std::binary_function<AttachableID,id_t,bool>
- {
- //**Binary function call operator************************************************************
- /*!\name Binary function call operator */
- //@{
- inline bool operator()( ConstAttachableID attachable, id_t sid ) const {
- return attachable->getSystemID() < sid;
- }
- inline bool operator()( id_t sid, ConstAttachableID attachable ) const {
- return sid < attachable->getSystemID();
- }
- inline bool operator()( ConstAttachableID attachable1, ConstAttachableID attachable2 ) const {
- return attachable1->getSystemID() < attachable2->getSystemID();
- }
- //@}
- //*******************************************************************************************
- };
- /*! \endcond */
- //**********************************************************************************************
-
- //**Friend declarations*************************************************************************
- /*! \cond internal */
- friend class Attachable;
- /*! \endcond */
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// CONSTRUCTORS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Standard constructor for the AttachableStorage.
- *
- * \param initCapacity The initial capacity of the attachable storage.
- */
-inline AttachableStorage::AttachableStorage( SizeType initCapacity )
- : attachables_( initCapacity )
-{}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// UTILITY FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns \a true if the attachable storage contains no attachables.
- *
- * \return \a true if the attachable storage is empty, \a false if it is not.
- */
-inline bool AttachableStorage::isEmpty() const
-{
- return attachables_.isEmpty();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the number of attachables contained in the attachable storage.
- *
- * \return The number of attachables.
- */
-inline AttachableStorage::SizeType AttachableStorage::size() const
-{
- return attachables_.size();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first contained attachable.
- *
- * \return Iterator to the first contained attachable.
- */
-inline AttachableStorage::Iterator AttachableStorage::begin()
-{
- return attachables_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a constant iterator to the first contained attachable.
- *
- * \return Constant iterator to the first contained attachable.
- */
-inline AttachableStorage::ConstIterator AttachableStorage::begin() const
-{
- return attachables_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last contained attachable.
- *
- * \return Iterator just past the last contained attachable.
- */
-inline AttachableStorage::Iterator AttachableStorage::end()
-{
- return attachables_.end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a constant iterator just past the last contained attachable.
- *
- * \return Constant iterator just past the last contained attachable.
- */
-inline AttachableStorage::ConstIterator AttachableStorage::end() const
-{
- return attachables_.end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Finding an attachable with a certain unique system-specific ID.
- *
- * \param sid The unique system-specific ID for the search.
- * \return Iterator to the attachable with system-specific ID \a sid or an iterator just past the end.
- *
- * This function finds the attachable with the system-specific ID \a sid. In case the attachable
- * is found, the function returns an iterator to the attachable. Otherwise, the function returns
- * an iterator just past the end of last attachable contained in the attachable storage.
- */
-inline AttachableStorage::Iterator AttachableStorage::find( id_t sid )
-{
- Iterator pos = std::lower_bound( begin(), end(), sid, Compare() );
- if( pos != end() && pos->getSystemID() == sid )
- return pos;
- else
- return end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Finding an attachable with a certain unique system-specific ID.
- *
- * \param sid The unique system-specific ID for the search.
- * \return Constant iterator to the attachable with system-specific ID \a sid or a constant iterator just past the end.
- *
- * This function finds the attachable with the system-specific ID \a sid. In case the attachable
- * is found, the function returns a constant iterator to the attachable. Otherwise, the function
- * returns a constant iterator just past the end of last attachable contained in the attachable
- * storage.
- */
-inline AttachableStorage::ConstIterator AttachableStorage::find( id_t sid ) const
-{
- ConstIterator pos = std::lower_bound( begin(), end(), sid, Compare() );
- if( pos != end() && pos->getSystemID() == sid )
- return pos;
- else
- return end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Finding a specific attachable in the attachable storage.
- *
- * \param attachable The given attachable for the search.
- * \return Iterator to the given attachable or an iterator just past the end.
- *
- * This function finds the attachable in the attachable storage. In case the attachable is found,
- * the function returns an iterator to the attachable. Otherwise, the function returns an iterator
- * just past the end of last attachable contained in the attachable storage.
- */
-inline AttachableStorage::Iterator AttachableStorage::find( ConstAttachableID attachable )
-{
- return find( attachable->getSystemID() );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Finding a specific attachable in the attachable storage.
- *
- * \param attachable The given attachable for the search.
- * \return Iterator to the given attachable or an iterator just past the end.
- *
- * This function finds the attachable in the attachable storage. In case the attachable is found,
- * the function returns an iterator to the attachable. Otherwise, the function returns an iterator
- * just past the end of last attachable contained in the attachable storage.
- */
-inline AttachableStorage::ConstIterator AttachableStorage::find( ConstAttachableID attachable ) const
-{
- return find( attachable->getSystemID() );
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ADD/REMOVE FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Adding an attachable to the attachable storage.
- *
- * \param attachable The new attachable to be added to the attachable storage.
- * \return void
- *
- * This function adds an attachable to the attachable storage.
- */
-inline void AttachableStorage::add( AttachableID attachable )
-{
- Iterator pos = std::lower_bound( begin(), end(), attachable->getSystemID(), Compare() );
- attachables_.insert( pos, attachable );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Removing an attachable from the attachable storage.
- *
- * \param pos The position of the attachable to be removed.
- * \return Iterator to the attachable after the erased attachable.
- *
- * This function removes an attachable from the attachable storage.
- */
-inline AttachableStorage::Iterator AttachableStorage::remove( Iterator pos )
-{
- WALBERLA_ASSERT( pos != end(), "Attachable is not contained in the attachable storage" );
-
- return attachables_.erase( pos );
-}
-//*************************************************************************************************
-
-} // namespace pe
-} // namespace walberla
diff --git a/src/pe/ccd/HashGrids.cpp b/src/pe/ccd/HashGrids.cpp
index 31d4c96cc8a84206298eab9ea2738a978aa3e5e3..b73a25548efae620d69f6310df736e3900d922e0 100644
--- a/src/pe/ccd/HashGrids.cpp
+++ b/src/pe/ccd/HashGrids.cpp
@@ -65,7 +65,7 @@ HashGrids::HashGrid::HashGrid( real_t cellSpan )
// Initialization of each cell - i.e., initially setting the pointer to the body container to
// NULL (=> no bodies are assigned to this hash grid yet!) and ...
for( Cell* c = cell_; c < cell_ + xyzCellCount_; ++c ) {
- c->bodies_ = NULL;
+ c->bodies_ = nullptr;
}
// ... setting up the neighborhood relationship (using the offset array).
initializeNeighborOffsets();
@@ -215,7 +215,7 @@ void HashGrids::HashGrid::clear()
{
for( auto cellIt = occupiedCells_.begin(); cellIt < occupiedCells_.end(); ++cellIt ) {
delete (*cellIt)->bodies_;
- (*cellIt)->bodies_ = NULL;
+ (*cellIt)->bodies_ = nullptr;
}
occupiedCells_.clear();
bodyCount_ = 0;
@@ -313,6 +313,21 @@ void HashGrids::HashGrid::initializeNeighborOffsets()
*
* \param body The body whose hash value is about to be calculated.
* \return The hash value (=cell association) of the body.
+ */
+size_t HashGrids::HashGrid::hash( BodyID body ) const
+{
+ const AABB& bodyAABB = body->getAABB();
+ return hashPoint(bodyAABB.xMin(), bodyAABB.yMin(), bodyAABB.zMin());
+}
+//*************************************************************************************************
+
+
+/*!\brief Computes the hash for a given point.
+ *
+ * \param x X value of the point.
+ * \param y Y value of the point.
+ * \param y Z value of the point.
+ * \return The hash value (=cell association) of the point.
*
* The hash calculation uses modulo operations in order to spatially map entire blocks of connected
* cells to the origin of the coordinate system. This block of cells at the origin of the coordinate
@@ -324,16 +339,11 @@ void HashGrids::HashGrid::initializeNeighborOffsets()
* Note that the modulo calculations are replaced with fast bitwise AND operations - hence, the
* spatial dimensions of the hash grid must be restricted to powers of two!
*/
-size_t HashGrids::HashGrid::hash( BodyID body ) const
-{
- real_t x = body->getAABB().xMin();
- real_t y = body->getAABB().yMin();
- real_t z = body->getAABB().zMin();
-
+size_t HashGrids::HashGrid::hashPoint(real_t x, real_t y, real_t z) const {
size_t xHash;
size_t yHash;
size_t zHash;
-
+
if( x < 0 ) {
real_t i = ( -x ) * inverseCellSpan_;
xHash = xCellCount_ - 1 - ( static_cast<size_t>( i ) & xHashMask_ );
@@ -342,7 +352,7 @@ size_t HashGrids::HashGrid::hash( BodyID body ) const
real_t i = x * inverseCellSpan_;
xHash = static_cast<size_t>( i ) & xHashMask_;
}
-
+
if( y < 0 ) {
real_t i = ( -y ) * inverseCellSpan_;
yHash = yCellCount_ - 1 - ( static_cast<size_t>( i ) & yHashMask_ );
@@ -351,7 +361,7 @@ size_t HashGrids::HashGrid::hash( BodyID body ) const
real_t i = y * inverseCellSpan_;
yHash = static_cast<size_t>( i ) & yHashMask_;
}
-
+
if( z < 0 ) {
real_t i = ( -z ) * inverseCellSpan_;
zHash = zCellCount_ - 1 - ( static_cast<size_t>( i ) & zHashMask_ );
@@ -360,11 +370,9 @@ size_t HashGrids::HashGrid::hash( BodyID body ) const
real_t i = z * inverseCellSpan_;
zHash = static_cast<size_t>( i ) & zHashMask_;
}
-
+
return xHash + yHash * xCellCount_ + zHash * xyCellCount_;
}
-//*************************************************************************************************
-
//*************************************************************************************************
/*!\brief Adds a body to a specific cell in this hash grid.
@@ -384,7 +392,7 @@ void HashGrids::HashGrid::add( BodyID body, Cell* cell )
// (i.e., allocated) and properly initialized (i.e., sufficient initial storage capacity must be
// reserved). Furthermore, the cell must be inserted into the grid-global vector 'occupiedCells_'
// in which all cells that are currently occupied by bodies are recorded.
- if( cell->bodies_ == NULL )
+ if( cell->bodies_ == nullptr )
{
cell->bodies_ = new BodyVector;
cell->bodies_->reserve( cellVectorSize );
@@ -428,7 +436,7 @@ void HashGrids::HashGrid::remove( BodyID body, Cell* cell )
// ... the cell's body container is destroyed and ...
delete cell->bodies_;
- cell->bodies_ = NULL;
+ cell->bodies_ = nullptr;
cell->lastNonFixedBody_ = -1;
// ... the cell is removed from the grid-global vector 'occupiedCells_' that records all
@@ -534,7 +542,7 @@ void HashGrids::HashGrid::enlarge()
// ... initialized, and finally ...
for( Cell* c = cell_; c < cell_ + xyzCellCount_; ++c ) {
- c->bodies_ = NULL;
+ c->bodies_ = nullptr;
c->lastNonFixedBody_ = -1;
}
initializeNeighborOffsets();
@@ -665,7 +673,7 @@ void HashGrids::add( BodyID body )
// The body is marked as being added to 'bodiesToAdd_' by setting the grid pointer to NULL and
// setting the cell-ID to '0'. Additionally, the hash value is used to memorize the body's
// index position in the 'bodiesToAdd_' vector.
- body->setGrid ( NULL );
+ body->setGrid ( nullptr );
body->setHash ( bodiesToAdd_.size() );
body->setCellId( 0 );
@@ -692,7 +700,7 @@ void HashGrids::remove( BodyID body )
HashGrid* grid = static_cast<HashGrid*>( body->getGrid() );
// The body is stored in a hash grid from which it must be removed.
- if( grid != NULL ) {
+ if( grid != nullptr ) {
grid->remove( body );
}
// The body's grid pointer is equal to NULL.
@@ -756,15 +764,15 @@ void HashGrids::reloadBodies()
{
clear();
- for (auto bodyIt = bodystorage_.begin(); bodyIt != bodystorage_.end(); ++bodyIt)
+ for (auto& body : bodystorage_)
{
- add( *bodyIt );
+ add( &body );
}
if( &bodystorage_ != &bodystorageShadowCopies_ )
{
- for (auto bodyIt = bodystorageShadowCopies_.begin(); bodyIt != bodystorageShadowCopies_.end(); ++bodyIt)
+ for (auto& body : bodystorageShadowCopies_)
{
- add( *bodyIt );
+ add( &body );
}
}
}
@@ -778,7 +786,7 @@ void HashGrids::update(WcTimingTree* tt)
{
// ----- UPDATE PHASE ----- //
- if (tt != NULL) tt->start("AddNewBodies");
+ if (tt != nullptr) tt->start("AddNewBodies");
// Finally add all bodies that were temporarily stored in 'bodiesToAdd_' to the data structure.
if( bodiesToAdd_.size() > 0 )
{
@@ -789,9 +797,9 @@ void HashGrids::update(WcTimingTree* tt)
}
bodiesToAdd_.clear();
}
- if (tt != NULL) tt->stop("AddNewBodies");
+ if (tt != nullptr) tt->stop("AddNewBodies");
- if (tt != NULL) tt->start("Update");
+ if (tt != nullptr) tt->start("Update");
// Update the data structure (=> adapt to the current body distribution) by taking care of
// moved, rotated and/or deformed bodies.
if( gridActive_ )
@@ -864,52 +872,48 @@ void HashGrids::update(WcTimingTree* tt)
// suitably sized cells (=> "addGrid()").
{
- const auto end( bodystorage_.end() );
- for( auto bIt = bodystorage_.begin(); bIt != end; ++bIt )
+ for( auto& body : bodystorage_ )
{
- BodyID body = *bIt;
- HashGrid* grid = static_cast<HashGrid*>( body->getGrid() );
+ HashGrid* grid = static_cast<HashGrid*>( body.getGrid() );
- if( grid != NULL )
+ if( grid != nullptr )
{
- real_t size = body->getAABBSize();
+ real_t size = body.getAABBSize();
real_t cellSpan = grid->getCellSpan();
if( size >= cellSpan || size < ( cellSpan / hierarchyFactor ) ) {
- grid->remove( body );
- addGrid( body );
+ grid->remove( &body );
+ addGrid( &body );
}
else {
- grid->update( body );
+ grid->update( &body );
}
}
}
}
if( &bodystorage_ != &bodystorageShadowCopies_ ) {
- const auto end( bodystorageShadowCopies_.end() );
- for( auto bIt = bodystorageShadowCopies_.begin(); bIt != end; ++bIt )
+ for( auto& body : bodystorageShadowCopies_ )
{
- BodyID body = *bIt;
- HashGrid* grid = static_cast<HashGrid*>( body->getGrid() );
+ HashGrid* grid = static_cast<HashGrid*>( body.getGrid() );
- if( grid != NULL )
+ if( grid != nullptr )
{
- real_t size = body->getAABBSize();
+ real_t size = body.getAABBSize();
real_t cellSpan = grid->getCellSpan();
if( size >= cellSpan || size < ( cellSpan / hierarchyFactor ) ) {
- grid->remove( body );
- addGrid( body );
+ grid->remove( &body );
+ addGrid( &body );
}
else {
- grid->update( body );
+ grid->update( &body );
}
}
}
}
}
- if (tt != NULL) tt->stop("Update");
+ if (tt != nullptr) tt->stop("Update");
}
//**Implementation of ICCD interface ********************************************************
@@ -923,7 +927,7 @@ void HashGrids::update(WcTimingTree* tt)
*/
PossibleContacts& HashGrids::generatePossibleContacts( WcTimingTree* tt )
{
- if (tt != NULL) tt->start("CCD");
+ if (tt != nullptr) tt->start("CCD");
contacts_.clear();
@@ -931,7 +935,7 @@ PossibleContacts& HashGrids::generatePossibleContacts( WcTimingTree* tt )
update(tt);
- if (tt != NULL) tt->start("Detection");
+ if (tt != nullptr) tt->start("Detection");
// ----- DETECTION STEP ----- //
// Contact generation by traversing through all hash grids (which are sorted in ascending order
@@ -939,7 +943,7 @@ PossibleContacts& HashGrids::generatePossibleContacts( WcTimingTree* tt )
for( auto gridIt = gridList_.begin(); gridIt != gridList_.end(); ++gridIt ) {
// Contact generation for all bodies stored in the currently processed grid 'grid'.
- BodyID* bodies = NULL;
+ BodyID* bodies = nullptr;
size_t bodyCount = (*gridIt)->process( &bodies, contacts_ );
if( bodyCount > 0 ) {
@@ -958,7 +962,7 @@ PossibleContacts& HashGrids::generatePossibleContacts( WcTimingTree* tt )
}
// Test all bodies stored in 'grid' against all bodies stored in 'globalStorage_'.
for( auto bIt = globalStorage_.begin(); bIt < globalStorage_.end(); ++bIt ) {
- collide( *a, *bIt, contacts_ );
+ collide( *a, &(*bIt), contacts_ );
}
}
}
@@ -974,10 +978,10 @@ PossibleContacts& HashGrids::generatePossibleContacts( WcTimingTree* tt )
// Pairwise test (=> contact generation) for all bodies that are stored in 'nonGridBodies_' with global bodies.
for( auto bIt = globalStorage_.begin(); bIt < globalStorage_.end(); ++bIt ) {
- collide( *aIt, *bIt, contacts_ );
+ collide( *aIt, &(*bIt), contacts_ );
}
}
- if (tt != NULL) tt->stop("Detection");
+ if (tt != nullptr) tt->stop("Detection");
WALBERLA_LOG_DETAIL_SECTION()
{
@@ -993,7 +997,7 @@ PossibleContacts& HashGrids::generatePossibleContacts( WcTimingTree* tt )
WALBERLA_LOG_DETAIL( log.str() );
}
- if (tt != NULL) tt->stop("CCD");
+ if (tt != nullptr) tt->stop("CCD");
return contacts_;
}
@@ -1021,7 +1025,7 @@ void HashGrids::addGrid( BodyID body )
// If the body is finite in size, it must be assigned to a grid with suitably sized cells.
if( size > 0 )
{
- HashGrid* grid = NULL;
+ HashGrid* grid = nullptr;
if( gridList_.empty() )
{
@@ -1073,7 +1077,7 @@ void HashGrids::addGrid( BodyID body )
// the grid pointer to NULL and setting the cell-ID to '1'. Additionally, the hash value is used
// to memorize the body's index position in the 'nonGridBodies_' vector.
- body->setGrid ( NULL );
+ body->setGrid ( nullptr );
body->setHash ( nonGridBodies_.size() );
body->setCellId( 1 );
@@ -1138,7 +1142,7 @@ void HashGrids::addList( BodyID body )
// setting the cell-ID to '1'. Additionally, the hash value is used to memorize the body's index
// position in the 'nonGridBodies_' vector.
- body->setGrid ( NULL );
+ body->setGrid ( nullptr );
body->setHash ( nonGridBodies_.size() );
body->setCellId( 1 );
@@ -1172,6 +1176,8 @@ bool HashGrids::powerOfTwo( size_t number )
//*************************************************************************************************
+uint64_t HashGrids::intersectionTestCount = 0; //ToDo remove again
+
//=================================================================================================
//
// CONSTANTS
diff --git a/src/pe/ccd/HashGrids.h b/src/pe/ccd/HashGrids.h
index b1ab8198be32c6ea707e58011b048b9e66a0304d..49c40b5ce0154261d9b7e3b9f714e6b957cc83f6 100644
--- a/src/pe/ccd/HashGrids.h
+++ b/src/pe/ccd/HashGrids.h
@@ -40,6 +40,12 @@
#include <sstream>
#include <vector>
+#include <unordered_set>
+#include <pe/raytracing/Ray.h>
+#include <pe/utility/BodyCast.h>
+#include <pe/raytracing/Intersects.h>
+
+#define BLOCKCELL_NORMAL_INDETERMINATE 3
namespace walberla{
namespace pe{
@@ -93,7 +99,9 @@ public:
static const size_t gridActivationThreshold;
static const real_t hierarchyFactor;
//**********************************************************************************************
-
+
+ static uint64_t intersectionTestCount; // ToDo remove again
+
private:
//**Type definitions****************************************************************************
//! Vector for storing (handles to) rigid bodies.
@@ -176,11 +184,23 @@ private:
template< typename Contacts >
void processBodies( BodyID* bodies, size_t bodyCount, Contacts& contacts ) const;
-
+
+ template<typename BodyTuple>
+ BodyID getRayIntersectingBody(const raytracing::Ray& ray, const AABB& blockAABB, real_t& t, Vec3& n,
+ std::function<bool (const BodyID body)> isBodyVisibleFunc) const;
+
+ template<typename BodyTuple>
+ BodyID getBodyIntersectionForBlockCell(const Vector3<int32_t>& blockCell,
+ const int8_t cellNormalAxis, const int8_t cellNormalDir,
+ const raytracing::Ray& ray,
+ real_t& t_closest, Vec3& n_closest,
+ std::function<bool (const BodyID body)> isBodyVisibleFunc) const;
+
void clear();
//@}
//*******************************************************************************************
+
private:
//**Utility functions************************************************************************
/*!\name Utility functions */
@@ -188,11 +208,13 @@ private:
void initializeNeighborOffsets();
size_t hash( BodyID body ) const;
+ size_t hashPoint(real_t x, real_t y, real_t z) const;
void add ( BodyID body, Cell* cell );
void remove( BodyID body, Cell* cell );
void enlarge();
+
//@}
//*******************************************************************************************
@@ -276,12 +298,17 @@ public:
//@}
//**********************************************************************************************
- void update(WcTimingTree* tt);
//**Implementation of ICCD interface ********************************************************
virtual PossibleContacts& generatePossibleContacts( WcTimingTree* tt = NULL );
-
+ void update(WcTimingTree* tt = NULL);
+
bool active() const { return gridActive_; }
-
+
+ template<typename BodyTuple>
+ BodyID getClosestBodyIntersectingWithRay(const raytracing::Ray& ray, const AABB& blockAABB,
+ real_t& t, Vec3& n,
+ std::function<bool (const BodyID body)> isBodyVisibleFunc) const;
+
protected:
//**Utility functions***************************************************************************
/*!\name Utility functions */
@@ -472,7 +499,308 @@ void HashGrids::HashGrid::processBodies( BodyID* bodies, size_t bodyCount, Conta
}
//*************************************************************************************************
+/*!\brief Computes closest ray-body intersection of cell with center at point x,y,z and neighboring ones.
+ *
+ * \param blockCell index of cell within block grid.
+ * \param blockAABB AABB of the block this grid corresponds to.
+ * \param ray Ray being casted trough grid.
+ * \param t_closest Distance of closest object from ray origin. Will be updated if closer body found.
+ * \param n_closest Normal of intersection point.
+ *
+ * \return BodyID of intersected body, NULL if no intersection found.
+ *
+ * Inserts bodies of specified cell into bodiesContainer and additionally considers bodies in neighboring cells
+ * in all negative coordinate direction to take bodies in consideration, which protrude from their
+ * cell into the intersected cell (and thus, possibly intersect with the ray as well).
+ */
+template<typename BodyTuple>
+BodyID HashGrids::HashGrid::getBodyIntersectionForBlockCell(const Vector3<int32_t>& blockCell,
+ const int8_t cellNormalAxis, const int8_t cellNormalDir,
+ const raytracing::Ray& ray,
+ real_t& t_closest, Vec3& n_closest,
+ std::function<bool (const BodyID body)> isBodyVisibleFunc) const {
+ real_t t_local;
+ Vec3 n_local;
+ BodyID body = NULL;
+
+ raytracing::IntersectsFunctor intersectsFunc(ray, t_local, n_local);
+
+ // calculate center coordinates of the cell in the block
+ real_t x = (real_c(blockCell[0]) + real_t(0.5)) * cellSpan_;
+ real_t y = (real_c(blockCell[1]) + real_t(0.5)) * cellSpan_;
+ real_t z = (real_c(blockCell[2]) + real_t(0.5)) * cellSpan_;
+
+ // hash of cell in the hashgrid
+ size_t cellHash = hashPoint(x, y, z);
+
+ const Cell& centerCell = cell_[cellHash];
+
+ std::vector<offset_t> relevantNeighborIndices;
+
+ if (cellNormalAxis == 0) {
+ if (cellNormalDir == -1) {
+ relevantNeighborIndices = {2,5,8, 11,14,17, 20,23,26};
+ } else {
+ relevantNeighborIndices = {0,3,6, 9,12,15, 18,21,24};
+ }
+ } else if (cellNormalAxis == 1) {
+ if (cellNormalDir == -1) {
+ relevantNeighborIndices = {6,7,8, 15,16,17, 24,25,26};
+ } else {
+ relevantNeighborIndices = {0,1,2, 9,10,11, 18,19,20};
+ }
+ } else if (cellNormalAxis == 2) {
+ if (cellNormalDir == -1) {
+ relevantNeighborIndices = {18,19,20,21,22,23,24,25,26};
+ } else {
+ relevantNeighborIndices = {0,1,2,3,4,5,6,7,8};
+ }
+ } else {
+ // cellNormalAxis == BLOCKCELL_NORMAL_INDETERMINATE
+ relevantNeighborIndices = {
+ 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, 26
+ };
+ }
+
+#ifdef HASHGRIDS_RAYTRACING_CHECK_ALL_NEIGHBORS
+ relevantNeighborIndices = {
+ 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, 26
+ };
+#endif
+
+ for (uint_t i = 0; i < relevantNeighborIndices.size(); ++i) {
+ const offset_t neighborIndex = relevantNeighborIndices[i];
+ const Cell* nbCell = ¢erCell + centerCell.neighborOffset_[neighborIndex];
+ const BodyVector* nbBodies = nbCell->bodies_;
+
+ if (nbBodies != NULL) {
+ for (const BodyID& cellBody: *nbBodies) {
+ if (cellBody->isRemote()) {
+ continue;
+ }
+ if (!isBodyVisibleFunc(cellBody)) {
+ continue;
+ }
+
+ HashGrids::intersectionTestCount++;
+ bool intersects = SingleCast<BodyTuple, raytracing::IntersectsFunctor, bool>::execute(cellBody, intersectsFunc);
+ if (intersects && t_local < t_closest) {
+ body = cellBody;
+ t_closest = t_local;
+ n_closest = n_local;
+ }
+ }
+ }
+ }
+
+ return body;
+}
+/*!\brief Calculates ray-cell intersections and determines the closest body to the ray origin.
+ *
+ * \param ray Ray getting shot through this grid.
+ * \param blockAABB AABB of the block this grid corresponds to.
+ * \param t Reference for the distance.
+ * \param n Reference for the intersetion normal.
+ * \return BodyID of closest body, NULL if none found.
+ *
+ * This function calculates ray-cell intersections and the closest body in those cells. Also, neighboring
+ * cells in all negative coordinate directions are regarded to take bodies in consideration, which
+ * protrude from their cell into the intersected cell (and thus, possibly intersect with the ray as well).
+ */
+template<typename BodyTuple>
+BodyID HashGrids::HashGrid::getRayIntersectingBody(const raytracing::Ray& ray, const AABB& blockAABB,
+ real_t& t_closest, Vec3& n_closest,
+ std::function<bool (const BodyID body)> isBodyVisibleFunc) const {
+ const real_t realMax = std::numeric_limits<real_t>::max();
+
+ BodyID body_local = NULL;
+ BodyID body_closest = NULL;
+
+ int32_t blockXCellCountMin = int32_c(blockAABB.xMin() * inverseCellSpan_) - 1;
+ int32_t blockXCellCountMax = int32_c(std::ceil(blockAABB.xMax() * inverseCellSpan_)) + 1;
+ int32_t blockYCellCountMin = int32_c(blockAABB.yMin() * inverseCellSpan_) - 1;
+ int32_t blockYCellCountMax = int32_c(std::ceil(blockAABB.yMax() * inverseCellSpan_)) + 1;
+ int32_t blockZCellCountMin = int32_c(blockAABB.zMin() * inverseCellSpan_) - 1;
+ int32_t blockZCellCountMax = int32_c(std::ceil(blockAABB.zMax() * inverseCellSpan_)) + 1;
+
+ Vec3 firstPoint;
+ Vec3 firstPointCenteredInCell;
+ real_t tRayOriginToGrid = 0;
+ if (blockAABB.contains(ray.getOrigin(), cellSpan_)) {
+ firstPoint = ray.getOrigin();
+ firstPointCenteredInCell = firstPoint;
+ } else {
+ real_t t_start;
+ Vec3 firstPointNormal;
+ if (intersects(blockAABB, ray, t_start, cellSpan_, &firstPointNormal)) {
+ firstPoint = ray.getOrigin() + ray.getDirection()*t_start;
+ firstPointCenteredInCell = firstPoint - firstPointNormal * (cellSpan_/real_t(2));
+ tRayOriginToGrid = (ray.getOrigin() - firstPoint).length();
+ } else {
+ return NULL;
+ }
+ }
+
+ Vector3<int32_t> firstCell(int32_c(std::floor(firstPointCenteredInCell[0]*inverseCellSpan_)),
+ int32_c(std::floor(firstPointCenteredInCell[1]*inverseCellSpan_)),
+ int32_c(std::floor(firstPointCenteredInCell[2]*inverseCellSpan_)));
+
+ const int8_t stepX = ray.xDir() >= 0 ? 1 : -1;
+ const int8_t stepY = ray.yDir() >= 0 ? 1 : -1;
+ const int8_t stepZ = ray.zDir() >= 0 ? 1 : -1;
+
+ Vec3 nearPoint((stepX >= 0) ? real_c(firstCell[0]+1)*cellSpan_-firstPoint[0] : firstPoint[0]-real_c(firstCell[0])*cellSpan_,
+ (stepY >= 0) ? real_c(firstCell[1]+1)*cellSpan_-firstPoint[1] : firstPoint[1]-real_c(firstCell[1])*cellSpan_,
+ (stepZ >= 0) ? real_c(firstCell[2]+1)*cellSpan_-firstPoint[2] : firstPoint[2]-real_c(firstCell[2])*cellSpan_);
+
+ // tMax: distance along the ray to the next cell change in the axis direction
+ real_t tMaxX = (!realIsEqual(ray.xDir(), 0)) ? std::abs(nearPoint[0]*ray.xInvDir()) : realMax;
+ real_t tMaxY = (!realIsEqual(ray.yDir(), 0)) ? std::abs(nearPoint[1]*ray.yInvDir()) : realMax;
+ real_t tMaxZ = (!realIsEqual(ray.zDir(), 0)) ? std::abs(nearPoint[2]*ray.zInvDir()) : realMax;
+
+ // tDelta: how far along the ray must be moved to encounter a new cell in the specified axis direction
+ real_t tDeltaX = (!realIsEqual(ray.xDir(), 0)) ? std::abs(cellSpan_*ray.xInvDir()) : realMax;
+ real_t tDeltaY = (!realIsEqual(ray.yDir(), 0)) ? std::abs(cellSpan_*ray.yInvDir()) : realMax;
+ real_t tDeltaZ = (!realIsEqual(ray.zDir(), 0)) ? std::abs(cellSpan_*ray.zInvDir()) : realMax;
+
+ Vector3<int32_t> currentCell = firstCell;
+
+ // First cell needs extra treatment, as it might lay out of the blocks upper bounds
+ // due to the nature of how it is calculated: If the first point lies on a upper border
+ // it maps to the cell "above" the grid.
+ if (currentCell[0] < blockXCellCountMax &&
+ currentCell[1] < blockYCellCountMax &&
+ currentCell[2] < blockZCellCountMax) {
+ body_local = getBodyIntersectionForBlockCell<BodyTuple>(currentCell, BLOCKCELL_NORMAL_INDETERMINATE, 0,
+ ray, t_closest, n_closest,
+ isBodyVisibleFunc);
+ if (body_local != NULL) {
+ body_closest = body_local;
+ }
+ }
+
+ int8_t blockCellNormalAxis;
+ int8_t blockCellNormalDir;
+
+ while (true) {
+ if (tMaxX < tMaxY) {
+ if (tMaxX < tMaxZ) {
+#if !defined(HASHGRIDS_DISABLE_EARLY_CUTOFF)
+ if (tRayOriginToGrid+tMaxX-tDeltaX > t_closest) {
+ break;
+ }
+#endif
+ tMaxX += tDeltaX;
+ currentCell[0] += stepX;
+ blockCellNormalAxis = 0;
+ blockCellNormalDir = int8_c(-stepX);
+ if (currentCell[0] >= blockXCellCountMax || currentCell[0] < blockXCellCountMin) {
+ break;
+ }
+ } else {
+#if !defined(HASHGRIDS_DISABLE_EARLY_CUTOFF)
+ if (tRayOriginToGrid+tMaxZ-tDeltaZ > t_closest) {
+ break;
+ }
+#endif
+ tMaxZ += tDeltaZ;
+ currentCell[2] += stepZ;
+ blockCellNormalAxis = 2;
+ blockCellNormalDir = int8_c(-stepZ);
+ if (currentCell[2] >= blockZCellCountMax || currentCell[2] < blockZCellCountMin) {
+ break;
+ }
+ }
+ } else {
+ if (tMaxY < tMaxZ) {
+#if !defined(HASHGRIDS_DISABLE_EARLY_CUTOFF)
+ if (tRayOriginToGrid+tMaxY-tDeltaY > t_closest) {
+ break;
+ }
+#endif
+ tMaxY += tDeltaY;
+ currentCell[1] += stepY;
+ blockCellNormalAxis = 1;
+ blockCellNormalDir = int8_c(-stepY);
+ if (currentCell[1] >= blockYCellCountMax || currentCell[1] < blockYCellCountMin) {
+ break;
+ }
+ } else {
+#if !defined(HASHGRIDS_DISABLE_EARLY_CUTOFF)
+ if (tRayOriginToGrid+tMaxZ-tDeltaZ > t_closest) {
+ break;
+ }
+#endif
+ tMaxZ += tDeltaZ;
+ currentCell[2] += stepZ;
+ blockCellNormalAxis = 2;
+ blockCellNormalDir = int8_c(-stepZ);
+ if (currentCell[2] >= blockZCellCountMax || currentCell[2] < blockZCellCountMin) {
+ break;
+ }
+ }
+ }
+
+ body_local = getBodyIntersectionForBlockCell<BodyTuple>(currentCell, blockCellNormalAxis, blockCellNormalDir,
+ ray, t_closest, n_closest,
+ isBodyVisibleFunc);
+ if (body_local != NULL) {
+ body_closest = body_local;
+ }
+ }
+
+ return body_closest;
+}
+
+/*!\brief Determines the closest intersecting body in the underlying hash grids.
+ *
+ * \param ray Ray getting shot through those grids.
+ * \param blockAABB AABB of the block the grids correspond to.
+ * \param t Reference for the distance.
+ * \param n Reference for the intersetion normal.
+ * \return BodyID of closest body, NULL if none found.
+ */
+template<typename BodyTuple>
+BodyID HashGrids::getClosestBodyIntersectingWithRay(const raytracing::Ray& ray, const AABB& blockAABB,
+ real_t& t, Vec3& n,
+ std::function<bool (const BodyID body)> isBodyVisibleFunc) const {
+ const real_t realMax = std::numeric_limits<real_t>::max();
+
+ BodyID body_closest = NULL;
+ real_t t_closest = realMax;
+ Vec3 n_closest;
+
+ BodyID body_local;
+ real_t t_local = realMax;
+ Vec3 n_local;
+
+ raytracing::IntersectsFunctor intersectsFunc(ray, t_local, n_local);
+ for(auto body: nonGridBodies_) {
+ bool intersects = SingleCast<BodyTuple, raytracing::IntersectsFunctor, bool>::execute(body, intersectsFunc);
+ if (intersects && t_local < t_closest) {
+ body_closest = body;
+ t_closest = t_local;
+ n_closest = n_local;
+ }
+ }
+
+ for(auto grid: gridList_) {
+ body_local = grid->getRayIntersectingBody<BodyTuple>(ray, blockAABB, t_closest, n_closest, isBodyVisibleFunc);
+ if (body_local != NULL){
+ body_closest = body_local;
+ }
+ }
+
+ t = t_closest;
+ n = n_closest;
+
+ return body_closest;
+}
//=================================================================================================
diff --git a/src/pe/ccd/SimpleCCD.cpp b/src/pe/ccd/SimpleCCD.cpp
index dee87d16b92bd0b26120cee2c63d61d7eac93636..9c992738a459d3731cc2e4c7d537fa4ac099dfc2 100644
--- a/src/pe/ccd/SimpleCCD.cpp
+++ b/src/pe/ccd/SimpleCCD.cpp
@@ -55,7 +55,7 @@ SimpleCCD::~SimpleCCD()
PossibleContacts& SimpleCCD::generatePossibleContacts( WcTimingTree* tt ){
contacts_.clear();
- if (tt != NULL) tt->start("SimpleCCD");
+ if (tt != nullptr) tt->start("SimpleCCD");
for (auto it1 = bodies_.begin(); it1 != bodies_.end(); ++it1){
for (auto it2 = it1 + 1; it2 !=bodies_.end(); ++it2)
{
@@ -70,16 +70,16 @@ PossibleContacts& SimpleCCD::generatePossibleContacts( WcTimingTree* tt ){
for (auto it2 = globalStorage_.begin(); it2 != globalStorage_.end(); ++it2)
{
- if (!((*it1)->hasInfiniteMass() && (*it2)->hasInfiniteMass()))
+ if (!((*it1)->hasInfiniteMass() && it2->hasInfiniteMass()))
{
- if ( (*it1)->getSystemID() > (*it2)->getSystemID() )
- contacts_.push_back(std::make_pair(*it2, *it1));
+ if ( (*it1)->getSystemID() > it2->getSystemID() )
+ contacts_.push_back(std::make_pair(it2.getBodyID(), *it1));
else
- contacts_.push_back(std::make_pair(*it1, *it2));
+ contacts_.push_back(std::make_pair(*it1, it2.getBodyID()));
}
}
}
- if (tt != NULL) tt->stop("SimpleCCD");
+ if (tt != nullptr) tt->stop("SimpleCCD");
return contacts_;
}
diff --git a/src/pe/collision/EPA.cpp b/src/pe/collision/EPA.cpp
index 415ef46d5f9b51f42f9d5c5b5e9480bf1401c72a..b2738d903fd6ca00d33047fbb9603c065fbadec5 100644
--- a/src/pe/collision/EPA.cpp
+++ b/src/pe/collision/EPA.cpp
@@ -93,7 +93,7 @@ inline EPA::EPA_Triangle::EPA_Triangle( size_t a, size_t b, size_t c,
sqrDist_ = closest_.sqrLength();
//adjoined triangles not set yet
- adjTriangle_[0] = adjTriangle_[1] = adjTriangle_[2] = NULL;
+ adjTriangle_[0] = adjTriangle_[1] = adjTriangle_[2] = nullptr;
adjEdges_[0] = adjEdges_[1] = adjEdges_[2] = 4;
obsolete_ = false;
@@ -269,7 +269,7 @@ bool EPA::doEPA( GeomPrimitive &geom1, GeomPrimitive &geom2, const GJK& gjk, Vec
}
std::make_heap(entryHeap.begin(), entryHeap.end(), EPA::EPA_TriangleComp());
- EPA_Triangle* current = NULL;
+ EPA_Triangle* current = nullptr;
numIterations_ = 0;
//EPA Main-Loop
@@ -715,7 +715,7 @@ inline bool EPA::originInTetrahedron( const Vec3& p0, const Vec3& p1, const Vec3
inline bool EPA::originInTetrahedronVolumeMethod( const Vec3& A, const Vec3& B, const Vec3& C,
const Vec3& D )
{
- Vec3 aoT = A;
+ const Vec3& aoT = A;
if((aoT * (B % C)) <= real_t(0.0)) {
//if volume of ABC and Origin <0.0 than the origin is on the wrong side of ABC
//http://mathworld.wolfram.com/Tetrahedron.html volume formula
diff --git a/src/pe/collision/GJK.cpp b/src/pe/collision/GJK.cpp
index b681b780507d51e1b72bd684f6805b07f122bd62..e25c62b5e5114fbde39d5e8ee127b12af18f21da 100644
--- a/src/pe/collision/GJK.cpp
+++ b/src/pe/collision/GJK.cpp
@@ -341,7 +341,7 @@ inline real_t GJK::calcDistance( Vec3& normal, Vec3& contactPoint )
//Vec3 ac= C - A;
//Vec3 bc= C - B;
Vec3& n = d_; //we already know the normal
- Vec3 nT = n;
+ const Vec3& nT = n;
real_t vc = nT * (A % B);
real_t va = nT * (B % C);
@@ -395,7 +395,7 @@ bool GJK::simplex2(Vec3& d)
const Vec3& A = simplex_[1]; //The Point last added to the simplex
const Vec3& B = simplex_[0]; //The Point that was already in the simplex
const Vec3 AO = -A; //The vector A->O with 0 the origin
- const Vec3 AOt = AO; //The transposed vector A->O with O the origin
+ const Vec3& AOt = AO; //The transposed vector A->O with O the origin
const Vec3 AB = B-A; //The vector A->B
if( sameDirection(AOt, AB) ) {
@@ -437,7 +437,7 @@ bool GJK::simplex3(Vec3& d)
//ABC is a conterclockwise triangle
const Vec3 AO = -A; //The vector A->O with 0 the origin
- const Vec3 AOt = AO; //The transposed vector A->O with O the origin
+ const Vec3& AOt = AO; //The transposed vector A->O with O the origin
const Vec3 AB = B-A; //The vector A->B
const Vec3 AC = C-A; //The vector A->C
const Vec3 ABC = AB%AC; //The the normal pointing towards the viewer if he sees a CCW triangle ABC
@@ -566,7 +566,7 @@ bool GJK::simplex4(Vec3& d)
//BCD is a clockwise triangle wenn seen from A
const Vec3 AO = -A; //The vector A->O with 0 the origin
- const Vec3 AOt = AO; //The transposed vector A->O with O the origin
+ const Vec3& AOt = AO; //The transposed vector A->O with O the origin
const Vec3 AB = B-A; //The vector A->B
const Vec3 AC = C-A; //The vector A->C
const Vec3 AD = D-A; //The vector A-D
diff --git a/src/pe/collision/GJKEPAHelper.cpp b/src/pe/collision/GJKEPAHelper.cpp
deleted file mode 100644
index d8316cd6db099983dc7b0772f6d506e9ac23cd3a..0000000000000000000000000000000000000000
--- a/src/pe/collision/GJKEPAHelper.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file GJKHelper.cpp
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include "GJKEPAHelper.h"
-
-#include "pe/rigidbody/GeomPrimitive.h"
-
-extern "C" {
- #include "pe/extern/libccd/ccd/ccd.h"
- #include "pe/extern/libccd/ccd/quat.h"
-}
-
-#include "core/logging/Logging.h"
-
-namespace walberla {
-namespace pe {
-
-Vec3 convertVec3(const ccd_vec3_t& vec) { return Vec3(real_c(vec.v[0]), real_c(vec.v[1]), real_c(vec.v[2])); }
-ccd_vec3_t convertVec3(const Vec3& vec) { ccd_vec3_t ret; ret.v[0] = vec[0]; ret.v[1] = vec[1]; ret.v[2] = vec[2]; return ret; }
-
-void support(const void *obj, const ccd_vec3_t *dir, ccd_vec3_t *vec)
-{
- ConstGeomID bd = reinterpret_cast<ConstGeomID> (obj);
- Vec3 d = convertVec3(*dir);
- Vec3 sup = bd->support( d );
- *vec = convertVec3(sup);
-}
-
-bool collideGJK( ConstGeomID bd1,
- ConstGeomID bd2,
- Vec3& contactPoint,
- Vec3& contactNormal,
- real_t& penetrationDepth,
- const unsigned long numIterations,
- const real_t epaTol )
-{
- ccd_t ccd;
- CCD_INIT(&ccd); // initialize ccd_t struct
-
- // set up ccd_t struct
- ccd.support1 = support; // support function for first object
- ccd.support2 = support; // support function for second object
- ccd.max_iterations = numIterations; // maximal number of iterations
- ccd.epa_tolerance = epaTol;
-
- ccd_vec3_t dir, pos;
- ccd_real_t penetrationDepthCCD;
- int intersect = ccdGJKPenetration(reinterpret_cast<const void*> (bd1), reinterpret_cast<const void*> (bd2), &ccd, &penetrationDepthCCD, &dir, &pos);
- penetrationDepth = real_c(penetrationDepthCCD);
- contactPoint = convertVec3(pos);
- contactNormal = -convertVec3(dir);
- penetrationDepth *= -1;
-
- return (intersect == 0);
-}
-
-} // namespace pe
-} // namespace walberla
diff --git a/src/pe/collision/GJKEPAHelper.h b/src/pe/collision/GJKEPAHelper.h
deleted file mode 100644
index b1d73b1a19584a53449034529163c9247a5f230c..0000000000000000000000000000000000000000
--- a/src/pe/collision/GJKEPAHelper.h
+++ /dev/null
@@ -1,87 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file GJKHelper.h
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include "pe/contact/Contact.h"
-#include "pe/Types.h"
-
-#include "core/math/Vector3.h"
-
-namespace walberla {
-namespace pe {
-
-static unsigned long maxGJKIterations = 100ul;
-static real_t epaTolerance = real_t(0.000001);
-
-inline
-void setMaxGJKIterations(const unsigned long& iter)
-{
- maxGJKIterations = iter;
-}
-inline
-unsigned long getMaxGJKIterations()
-{
- return maxGJKIterations;
-}
-
-inline
-void setEPATolerance(const real_t& tol)
-{
- epaTolerance = tol;
-}
-inline
-real_t getEPATolerance()
-{
- return epaTolerance;
-}
-
-bool collideGJK( ConstGeomID bd1,
- ConstGeomID bd2,
- Vec3& contactPoint,
- Vec3& contactNormal,
- real_t& penetrationDepth,
- const unsigned long numIterations = maxGJKIterations,
- const real_t epaTol = epaTolerance );
-
-template <typename Container>
-bool collideGJK( GeomID bd1,
- GeomID bd2,
- Container& container,
- const unsigned long numIterations = maxGJKIterations,
- const real_t epaTol = epaTolerance )
-{
- real_t penetrationDepth;
- Vec3 contactPoint;
- Vec3 contactNormal;
- bool retVal = collideGJK(bd1, bd2, contactPoint, contactNormal, penetrationDepth, numIterations, epaTol);
- if (retVal)
- {
- container.push_back( Contact(bd1, bd2, contactPoint, contactNormal, penetrationDepth) );
- }
- return retVal;
-}
-
-} // namespace pe
-} // namespace walberla
diff --git a/src/pe/communication/DynamicMarshalling.h b/src/pe/communication/DynamicMarshalling.h
index e2d2c4a6ceb2b4e35d1aad180c9b4700514bc03f..032708bff7ac44d5ece117697ea337097f6a1a66 100644
--- a/src/pe/communication/DynamicMarshalling.h
+++ b/src/pe/communication/DynamicMarshalling.h
@@ -91,7 +91,7 @@ private:
, block_(block) {}
template< typename BodyType >
- BodyID operator()( BodyType* bd) { return instantiate( buffer_, domain_, block_, bd ); }
+ BodyPtr operator()( BodyType* bd) { return instantiate( buffer_, domain_, block_, bd ); }
};
public:
@@ -105,10 +105,10 @@ public:
* The rigid body is casted dynamically to its original type and then marshalled. For recognition
* an identifying tag is prepended.
*/
- static BodyID execute(mpi::RecvBuffer& buffer, const id_t typeID, const math::AABB& domain, const math::AABB& block)
+ static BodyPtr execute(mpi::RecvBuffer& buffer, const id_t typeID, const math::AABB& domain, const math::AABB& block)
{
UnmarshalFunctor func(buffer, domain, block);
- return SingleCast<BodyTypeTuple, UnmarshalFunctor, BodyID>::execute (typeID, func);
+ return SingleCast<BodyTypeTuple, UnmarshalFunctor, BodyPtr>::execute (typeID, func);
}
};
diff --git a/src/pe/communication/Instantiate.h b/src/pe/communication/Instantiate.h
index 6096c6552d3e21e63ec29a99efbefcfc0cfb20c3..f10a27dddab2efb0a4a6b9ae375110fce368dd29 100644
--- a/src/pe/communication/Instantiate.h
+++ b/src/pe/communication/Instantiate.h
@@ -55,7 +55,7 @@ void correctBodyPosition(const math::AABB& domain, const Vec3& center, Vec3& pos
}
template < class BodyT >
-BodyT* instantiate( mpi::RecvBuffer& /*buffer*/, const math::AABB& /*domain*/, const math::AABB& /*block*/, BodyT*& /*newBody*/ )
+std::unique_ptr<BodyT> instantiate( mpi::RecvBuffer& /*buffer*/, const math::AABB& /*domain*/, const math::AABB& /*block*/, BodyT*& /*newBody*/ )
{
WALBERLA_ABORT( "Body instantiation not implemented! (" << demangle(typeid(BodyT).name()) << ")" );
}
diff --git a/src/pe/communication/ParseMessage.h b/src/pe/communication/ParseMessage.h
index 5735beb152fb332ae5d007ad56115d339b6f5194..deea7db9689387c9adcd3f8dc4edccca02a8488a 100644
--- a/src/pe/communication/ParseMessage.h
+++ b/src/pe/communication/ParseMessage.h
@@ -64,17 +64,18 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
WALBERLA_LOG_DETAIL( "Received " << objparam.geomType_ << " copy notification from neighboring process with rank " << sender );
- BodyID obj = UnmarshalDynamically<BodyTypeTuple>::execute(rb, objparam.geomType_, blockStorage.getDomain(), block.getAABB());
+ BodyPtr obj = UnmarshalDynamically<BodyTypeTuple>::execute(rb, objparam.geomType_, blockStorage.getDomain(), block.getAABB());
obj->setRemote( true );
+ obj->MPITrait.setBlockState( sender.blockID_ );
+
if (shadowStorage.find( obj->getSystemID() ) == shadowStorage.end())
{
- WALBERLA_LOG_DETAIL( "Adding new shadow copy with id " << obj->getSystemID() << " to domain " << block.getAABB() << ".\n" << obj);
- shadowStorage.add( obj );
+ WALBERLA_LOG_DETAIL( "Adding new shadow copy with id " << obj->getSystemID() << " to domain " << block.getAABB() << ".\n" << *obj);
+ shadowStorage.add( std::move(obj) );
} else
{
WALBERLA_LOG_DETAIL( "Shadow copy with id " << obj->getSystemID() << " already existend.");
}
- obj->MPITrait.setBlockState( sender.blockID_ );
WALBERLA_LOG_DETAIL( "Processed " << objparam.geomType_ << " copy notification." );
@@ -88,7 +89,7 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
auto bodyIt = shadowStorage.find( objparam.sid_ );
WALBERLA_ASSERT_UNEQUAL( bodyIt, shadowStorage.end() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
WALBERLA_ASSERT( b->MPITrait.getOwner().blockID_ == sender.blockID_, "Update notifications must be sent by owner.\n" << b->MPITrait.getOwner().blockID_ << " != "<< sender.blockID_ );
WALBERLA_ASSERT( b->isRemote(), "Update notification must only concern shadow copies." );
@@ -112,10 +113,9 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
auto bodyIt = shadowStorage.find( objparam.sid_ );
if ( bodyIt == shadowStorage.end() ) WALBERLA_ABORT( "Object with id: " << objparam.sid_ << " not found in shadowStorage! Cannot transfer ownership! \nlocal domain: " << block.getAABB() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
- shadowStorage.release( b );
- localStorage.add( b );
+ localStorage.add( shadowStorage.release( b ) );
WALBERLA_ASSERT( sender.blockID_ == b->MPITrait.getOwner().blockID_, "Migration notifications must be sent by previous owner.\n" << b->MPITrait.getOwner().blockID_ << " != "<< sender.blockID_ );
WALBERLA_ASSERT( b->isRemote(), "Bodies in migration notifications must be available as shadow copies in local process." );
@@ -143,7 +143,7 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
auto bodyIt = shadowStorage.find( objparam.sid_ );
WALBERLA_ASSERT_UNEQUAL( bodyIt, shadowStorage.end() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
WALBERLA_ASSERT( sender.blockID_ == b->MPITrait.getOwner().blockID_, "Remote migration notifications must be sent by previous owner.\n" << sender.blockID_ << " != " << b->MPITrait.getOwner().blockID_ );
WALBERLA_ASSERT( b->isRemote(), "Bodies in remote migration notifications must be available as shadow copies in local process." );
@@ -164,7 +164,7 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
// Remove shadow copy as prompted.
auto bodyIt = shadowStorage.find( objparam.sid_ );
WALBERLA_ASSERT_UNEQUAL( bodyIt, shadowStorage.end() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
// TODO assert that we indeed do not need the shadow copy anymore
WALBERLA_ASSERT( b->MPITrait.getOwner().blockID_ == sender.blockID_, "Only owner is allowed to send removal notifications.\n" << b->MPITrait.getOwner().blockID_ << " != "<< sender.blockID_ );
@@ -184,7 +184,7 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
// Remove invalid shadow copy.
auto bodyIt = shadowStorage.find( objparam.sid_ );
WALBERLA_ASSERT_UNEQUAL( bodyIt, shadowStorage.end() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
WALBERLA_ASSERT( b->MPITrait.getOwner().blockID_ == sender.blockID_, "Only owner is allowed to send deletion notifications.\n" << b->MPITrait.getOwner().blockID_ << " != "<< sender.blockID_ );
@@ -203,7 +203,7 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
// Remove invalid shadow copy.
auto bodyIt = localStorage.find( objparam.sid_ );
WALBERLA_ASSERT_UNEQUAL( bodyIt, localStorage.end() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
b->MPITrait.registerShadowOwner( objparam.newOwner_ );
@@ -221,7 +221,7 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
{
auto bodyIt = localStorage.find( objparam.sid_ );
WALBERLA_ASSERT_UNEQUAL( bodyIt, localStorage.end() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
b->MPITrait.deregisterShadowOwner( sender );
b->MPITrait.unsetBlockState( sender.blockID_ );
} else
@@ -229,7 +229,7 @@ void parseMessage(Owner sender, mpi::RecvBuffer& rb, const domain_decomposition:
auto bodyIt = shadowStorage.find( objparam.sid_ );
if (bodyIt != shadowStorage.end() )
{
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
b->MPITrait.unsetBlockState( sender.blockID_ );
}
}
@@ -260,7 +260,7 @@ void parseForceReduceMessage(Owner sender, mpi::RecvBuffer& rb, const domain_dec
auto bodyIt = localStorage.find( objparam.sid_ );
WALBERLA_ASSERT_UNEQUAL( bodyIt, localStorage.end() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
WALBERLA_ASSERT( !b->isRemote(), "Update notification must only concern local bodies." );
@@ -292,7 +292,7 @@ void parseForceDistributeMessage(Owner sender, mpi::RecvBuffer& rb, const domain
auto bodyIt = shadowStorage.find( objparam.sid_ );
WALBERLA_ASSERT_UNEQUAL( bodyIt, shadowStorage.end() );
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
WALBERLA_ASSERT( b->isRemote(), "Update notification must only concern shadow bodies." );
diff --git a/src/pe/communication/rigidbody/Box.h b/src/pe/communication/rigidbody/Box.h
index 3a4c35a20e31b259cddd3fc0cfea4bf1d87d95d8..77f543cbc9183348f40a08d07fd95981b9800fdc 100644
--- a/src/pe/communication/rigidbody/Box.h
+++ b/src/pe/communication/rigidbody/Box.h
@@ -59,16 +59,17 @@ void marshal( mpi::SendBuffer& buffer, const Box& obj );
*/
void unmarshal( mpi::RecvBuffer& buffer, BoxParameters& objparam );
//*************************************************************************************************
-inline BoxID instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, BoxID& newBody )
+inline BoxPtr instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, BoxID& newBody )
{
BoxParameters subobjparam;
unmarshal( buffer, subobjparam );
correctBodyPosition(domain, block.center(), subobjparam.gpos_);
- newBody = new Box( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.lengths_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
- newBody->setLinearVel( subobjparam.v_ );
- newBody->setAngularVel( subobjparam.w_ );
- newBody->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
- return newBody;
+ auto bx = std::make_unique<Box>( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.lengths_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
+ bx->setLinearVel( subobjparam.v_ );
+ bx->setAngularVel( subobjparam.w_ );
+ bx->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
+ newBody = bx.get();
+ return bx;
}
} // namespace communication
diff --git a/src/pe/communication/rigidbody/Capsule.h b/src/pe/communication/rigidbody/Capsule.h
index 7f99b1d1d47d7fb4e96713213f3ecababd718915..3ef02f07d1d4b95fbb3010be10e61eb158772cca 100644
--- a/src/pe/communication/rigidbody/Capsule.h
+++ b/src/pe/communication/rigidbody/Capsule.h
@@ -61,16 +61,17 @@ void unmarshal( mpi::RecvBuffer& buffer, CapsuleParameters& objparam );
//*************************************************************************************************
-inline CapsuleID instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, CapsuleID& newBody )
+inline CapsulePtr instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, CapsuleID& newBody )
{
CapsuleParameters subobjparam;
unmarshal( buffer, subobjparam );
correctBodyPosition(domain, block.center(), subobjparam.gpos_);
- newBody = new Capsule( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.radius_, subobjparam.length_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
- newBody->setLinearVel( subobjparam.v_ );
- newBody->setAngularVel( subobjparam.w_ );
- newBody->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
- return newBody;
+ auto cp = std::make_unique<Capsule>( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.radius_, subobjparam.length_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
+ cp->setLinearVel( subobjparam.v_ );
+ cp->setAngularVel( subobjparam.w_ );
+ cp->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
+ newBody = cp.get();
+ return cp;
}
} // namespace communication
diff --git a/src/pe/communication/rigidbody/Ellipsoid.h b/src/pe/communication/rigidbody/Ellipsoid.h
index 57916d268a30dbfea187071a18b4270ee63c83f3..a292c5b1dd1bc9bfbd2fb487260571fa26bc9756 100644
--- a/src/pe/communication/rigidbody/Ellipsoid.h
+++ b/src/pe/communication/rigidbody/Ellipsoid.h
@@ -61,16 +61,17 @@ void unmarshal( mpi::RecvBuffer& buffer, EllipsoidParameters& objparam );
//*************************************************************************************************
-inline EllipsoidID instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, EllipsoidID& newBody )
+inline EllipsoidPtr instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, EllipsoidID& newBody )
{
EllipsoidParameters subobjparam;
unmarshal( buffer, subobjparam );
correctBodyPosition(domain, block.center(), subobjparam.gpos_);
- newBody = new Ellipsoid( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.semiAxes_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
- newBody->setLinearVel( subobjparam.v_ );
- newBody->setAngularVel( subobjparam.w_ );
- newBody->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
- return newBody;
+ auto el = std::make_unique<Ellipsoid>( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.semiAxes_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
+ el->setLinearVel( subobjparam.v_ );
+ el->setAngularVel( subobjparam.w_ );
+ el->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
+ newBody = el.get();
+ return el;
}
} // namespace communication
diff --git a/src/pe/communication/rigidbody/Sphere.h b/src/pe/communication/rigidbody/Sphere.h
index 55881f65aa0e3c5e02cd0ea099093dd16ef45379..3e7da560142c29a93161b691975f403808f09fba 100644
--- a/src/pe/communication/rigidbody/Sphere.h
+++ b/src/pe/communication/rigidbody/Sphere.h
@@ -61,16 +61,17 @@ void unmarshal( mpi::RecvBuffer& buffer, SphereParameters& objparam );
//*************************************************************************************************
-inline SphereID instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, SphereID& newBody )
+inline SpherePtr instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, SphereID& newBody )
{
SphereParameters subobjparam;
unmarshal( buffer, subobjparam );
correctBodyPosition(domain, block.center(), subobjparam.gpos_);
- newBody = new Sphere( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.radius_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
- newBody->setLinearVel( subobjparam.v_ );
- newBody->setAngularVel( subobjparam.w_ );
- newBody->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
- return newBody;
+ auto sp = std::make_unique<Sphere>( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.radius_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
+ sp->setLinearVel( subobjparam.v_ );
+ sp->setAngularVel( subobjparam.w_ );
+ sp->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
+ newBody = sp.get();
+ return sp;
}
} // namespace communication
diff --git a/src/pe/communication/rigidbody/Squirmer.h b/src/pe/communication/rigidbody/Squirmer.h
index 9029c93586fa36c5d3b4e29d2aaefe74a4d5a4d1..3c9b3fbe094c6cef756168c6bfd63078825f001c 100644
--- a/src/pe/communication/rigidbody/Squirmer.h
+++ b/src/pe/communication/rigidbody/Squirmer.h
@@ -61,16 +61,17 @@ void unmarshal( mpi::RecvBuffer& buffer, SquirmerParameters& objparam );
//*************************************************************************************************
-inline SquirmerID instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, SquirmerID& newBody )
+inline SquirmerPtr instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, SquirmerID& newBody )
{
SquirmerParameters subobjparam;
unmarshal( buffer, subobjparam );
correctBodyPosition(domain, block.center(), subobjparam.gpos_);
- newBody = new Squirmer( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.radius_, subobjparam.squirmerVelocity_, subobjparam.squirmerBeta_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
- newBody->setLinearVel( subobjparam.v_ );
- newBody->setAngularVel( subobjparam.w_ );
- newBody->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
- return newBody;
+ auto sq = std::make_unique<Squirmer>( subobjparam.sid_, subobjparam.uid_, subobjparam.gpos_, subobjparam.rpos_, subobjparam.q_, subobjparam.radius_, subobjparam.squirmerVelocity_, subobjparam.squirmerBeta_, subobjparam.material_, false, subobjparam.communicating_, subobjparam.infiniteMass_ );
+ sq->setLinearVel( subobjparam.v_ );
+ sq->setAngularVel( subobjparam.w_ );
+ sq->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
+ newBody = sq.get();
+ return sq;
}
} // namespace communication
diff --git a/src/pe/communication/rigidbody/Union.h b/src/pe/communication/rigidbody/Union.h
index 69c2d6bb172ac8589b56f68e7ecc2946ac0b471f..67ba4db6d4679ec26e67766b20e370fa65aec99b 100644
--- a/src/pe/communication/rigidbody/Union.h
+++ b/src/pe/communication/rigidbody/Union.h
@@ -72,12 +72,12 @@ void marshal( mpi::SendBuffer& buffer, const Union<BodyTypeTuple>& obj )
buffer << static_cast<size_t> (obj.size()); // Encoding the number of contained bodies
// Encoding the contained primitives
- const typename Union<BodyTypeTuple>::ConstIterator begin( obj.begin() );
- const typename Union<BodyTypeTuple>::ConstIterator end ( obj.end() );
- for( typename Union<BodyTypeTuple>::ConstIterator body=begin; body!=end; ++body )
+ const typename Union<BodyTypeTuple>::const_iterator begin( obj.begin() );
+ const typename Union<BodyTypeTuple>::const_iterator end ( obj.end() );
+ for( typename Union<BodyTypeTuple>::const_iterator body=begin; body!=end; ++body )
{
buffer << body->getTypeID();
- MarshalDynamically<BodyTypeTuple>::execute( buffer, **body );
+ MarshalDynamically<BodyTypeTuple>::execute( buffer, *body );
}
}
@@ -110,34 +110,35 @@ void unmarshal( mpi::RecvBuffer& buffer, UnionParameters& objparam )
template <typename BodyTypeTuple>
-inline Union<BodyTypeTuple>* instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, Union<BodyTypeTuple>*& newBody )
+inline std::unique_ptr<Union<BodyTypeTuple>> instantiate( mpi::RecvBuffer& buffer, const math::AABB& domain, const math::AABB& block, Union<BodyTypeTuple>*& newBody )
{
UnionParameters subobjparam;
unmarshal( buffer, subobjparam );
correctBodyPosition(domain, block.center(), subobjparam.gpos_);
- newBody = new Union<BodyTypeTuple>( subobjparam.sid_,
- subobjparam.uid_,
- subobjparam.gpos_,
- subobjparam.rpos_,
- subobjparam.q_,
- false,
- subobjparam.communicating_,
- subobjparam.infiniteMass_ );
- newBody->setLinearVel( subobjparam.v_ );
- newBody->setAngularVel( subobjparam.w_ );
- newBody->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
+ auto un = std::make_unique<Union<BodyTypeTuple>>( subobjparam.sid_,
+ subobjparam.uid_,
+ subobjparam.gpos_,
+ subobjparam.rpos_,
+ subobjparam.q_,
+ false,
+ subobjparam.communicating_,
+ subobjparam.infiniteMass_ );
+
+ un->MPITrait.setOwner( subobjparam.mpiTrait_.owner_ );
// Decoding the contained primitives
for( size_t i = 0; i < subobjparam.size_; ++i )
{
decltype ( static_cast<BodyID>(nullptr)->getTypeID() ) type;
buffer >> type;
- BodyID obj = UnmarshalDynamically<BodyTypeTuple>::execute(buffer, type, domain, block);
+ BodyPtr obj( UnmarshalDynamically<BodyTypeTuple>::execute(buffer, type, domain, block) );
obj->setRemote( true );
- newBody->add(obj);
+ un->add(std::move(obj));
}
-
- return newBody;
+ un->setLinearVel( subobjparam.v_ );
+ un->setAngularVel( subobjparam.w_ );
+ newBody = un.get();
+ return un;
}
} // namespace communication
diff --git a/src/pe/contact/Contact.cpp b/src/pe/contact/Contact.cpp
index ed9e68e28cc7bff136a697d4b1716f3421f92a23..ce7c59ebeb4662606397cde1e3ea0cb72ef54123 100644
--- a/src/pe/contact/Contact.cpp
+++ b/src/pe/contact/Contact.cpp
@@ -62,17 +62,8 @@ Contact::Contact( GeomID g1, GeomID g2, const Vec3& gpos, const Vec3& normal, re
WALBERLA_ASSERT_FLOAT_EQUAL( normal.sqrLength(), real_c(1), "Invalid contact normal\n" << g1 << "\n" << g2 );
WALBERLA_ASSERT( !( b1_->hasInfiniteMass() && b2_->hasInfiniteMass() ), "Invalid contact between two rigid bodies with infinite masses" );
- // Registering the contact with both attached rigid bodies
-// if( !b1_->hasInfiniteMass() ) b1_->registerContact( this );
-// if( !b2_->hasInfiniteMass() ) b2_->registerContact( this );
-
- // Merging the contact graph
-// if( !b1_->hasInfiniteMass() && !b2_->hasInfiniteMass() )
-// mergeNodes( b1_, b2_ );
-
// Debugging output
WALBERLA_LOG_DETAIL( " => contact-id = " << id_ );
-
}
//*************************************************************************************************
@@ -86,7 +77,7 @@ Contact::Contact( GeomID g1, GeomID g2, const Vec3& gpos, const Vec3& normal, re
/*!\brief Destructor for the Contact class.
*/
Contact::~Contact()
-{}
+= default;
//*************************************************************************************************
//=================================================================================================
diff --git a/src/pe/contact/ContactFunctions.impl.h b/src/pe/contact/ContactFunctions.impl.h
index f48b0328124c735e4c003f50e7cec475449c6edf..2585eae0933ab139031d42dc066152585f14d836 100644
--- a/src/pe/contact/ContactFunctions.impl.h
+++ b/src/pe/contact/ContactFunctions.impl.h
@@ -148,10 +148,10 @@ inline real_t getFriction(ConstContactID c)
{
// Calculating the relative velocity
const Vec3 rvel( c->getBody1()->velFromWF( c->getPosition() ) - c->getBody2()->velFromWF( c->getPosition() ) ); // Relative velocity
- const real_t nvel( c->getNormal() * rvel ); // Normal relative velocity
- const real_t tvel( c->getNormal() * ( rvel - c->getNormal() * nvel ) ); // Tangential relative velocity
+ const Vec3 nvel( ( c->getNormal() * rvel ) * c->getNormal() ); // Normal relative velocity
+ const Vec3 tvel( rvel - nvel ); // Tangential relative velocity
- if( std::fabs( tvel ) > frictionThreshold )
+ if( std::fabs( tvel.length() ) > frictionThreshold )
return Material::getDynamicFriction( c->getBody1()->getMaterial(), c->getBody2()->getMaterial() );
else
return Material::getStaticFriction( c->getBody1()->getMaterial(), c->getBody2()->getMaterial() );
diff --git a/src/pe/cr/DEM.impl.h b/src/pe/cr/DEM.impl.h
index eb3a6b4e325616444808d21cf8d26db9fe9cc364..a3560e50fd94ba9daf71b71032deaa4ad3a9ec58 100644
--- a/src/pe/cr/DEM.impl.h
+++ b/src/pe/cr/DEM.impl.h
@@ -120,10 +120,6 @@ void DEMSolver<Integrator,ContactResolver>::timestep( real_t dt )
{
WALBERLA_LOG_DETAIL( "Time integration of body with system id " << bodyIt->getSystemID());// << "\n" << *bodyIt );
- // Resetting the contact node and removing all attached contacts
- // bodyIt->resetNode();
- bodyIt->clearContacts();
-
// Checking the state of the body
WALBERLA_ASSERT( bodyIt->checkInvariants(), "Invalid body state detected" );
WALBERLA_ASSERT( !bodyIt->hasSuperBody(), "Invalid superordinate body detected" );
@@ -131,7 +127,7 @@ void DEMSolver<Integrator,ContactResolver>::timestep( real_t dt )
// Moving the body according to the acting forces (don't move a sleeping body)
if( bodyIt->isAwake() && !bodyIt->hasInfiniteMass() )
{
- integrate_( *bodyIt, dt, *this );
+ integrate_( bodyIt.getBodyID(), dt, *this );
}
// Resetting the acting forces
@@ -147,9 +143,8 @@ void DEMSolver<Integrator,ContactResolver>::timestep( real_t dt )
if (tt_ != NULL) tt_->stop("Integration");
// Reset forces of shadow copies
- for( auto bodyIt = shadowStorage.begin(); bodyIt != shadowStorage.end(); ++bodyIt ) {
- bodyIt->clearContacts();
- bodyIt->resetForceAndTorque();
+ for( auto& body : shadowStorage ) {
+ body.resetForceAndTorque();
}
}
diff --git a/src/pe/cr/HCSITS.impl.h b/src/pe/cr/HCSITS.impl.h
index 457cd4c299c88731b6e35058e59706a34774ea59..314b3d1c1dae7313d706053d66011ebf62b7e540 100644
--- a/src/pe/cr/HCSITS.impl.h
+++ b/src/pe/cr/HCSITS.impl.h
@@ -154,6 +154,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
numContacts_ = 0;
numContactsTreated_ = 0;
+ maximumPenetration_ = 0;
if (tt_ != NULL) tt_->start("Simulation Step");
@@ -210,7 +211,6 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
contactCache.resize( numContactsMasked );
{
- maximumPenetration_ = 0;
size_t j = 0;
for( size_t i = 0; i < numContacts; ++i )
@@ -290,7 +290,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
body->index_ = j;
WALBERLA_CHECK( body->hasInfiniteMass(), "Global bodies need to have infinite mass as they are not communicated!" );
- initializeVelocityCorrections( *body, bodyCache.dv_[j], bodyCache.dw_[j], dt ); // use applied external forces to calculate starting velocity
+ initializeVelocityCorrections( body.getBodyID(), bodyCache.dv_[j], bodyCache.dw_[j], dt ); // use applied external forces to calculate starting velocity
bodyCache.v_[j] = body->getLinearVel();
bodyCache.w_[j] = body->getAngularVel();
@@ -300,7 +300,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
body->wake(); // BUGFIX: Force awaking of all bodies!
body->index_ = j;
- initializeVelocityCorrections( *body, bodyCache.dv_[j], bodyCache.dw_[j], dt ); // use applied external forces to calculate starting velocity
+ initializeVelocityCorrections( body.getBodyID(), bodyCache.dv_[j], bodyCache.dw_[j], dt ); // use applied external forces to calculate starting velocity
if( body->isAwake() && !body->hasInfiniteMass() ) {
bodyCache.v_[j] = body->getLinearVel() + getGlobalLinearAcceleration() * dt;
@@ -317,7 +317,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
body->wake(); // BUGFIX: Force awaking of all bodies!
body->index_ = j;
- initializeVelocityCorrections( *body, bodyCache.dv_[j], bodyCache.dw_[j], dt );
+ initializeVelocityCorrections( body.getBodyID(), bodyCache.dv_[j], bodyCache.dw_[j], dt );
// Velocities of shadow copies will be initialized by velocity synchronization.
#ifndef NDEBUG
@@ -349,7 +349,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
body->index_ = j;
WALBERLA_CHECK( body->hasInfiniteMass(), "Global bodies need to have infinite mass as they are not communicated!" );
- initializeVelocityCorrections( *body, bodyCache.dv_[j], bodyCache.dw_[j], dt ); // use applied external forces to calculate starting velocity
+ initializeVelocityCorrections( body.getBodyID(), bodyCache.dv_[j], bodyCache.dw_[j], dt ); // use applied external forces to calculate starting velocity
bodyCache.v_[j] = body->getLinearVel();
bodyCache.w_[j] = body->getAngularVel();
@@ -457,10 +457,10 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
WALBERLA_LOG_DETAIL( "Integrating position of global body " << *body << " with velocity " << body->getLinearVel() << "" );
if (body->hasInfiniteMass())
{
- integratePositions( *body, bodyCache.v_[j], bodyCache.w_[j], dt );
+ integratePositions( body.getBodyID(), bodyCache.v_[j], bodyCache.w_[j], dt );
} else
{
- integratePositions( *body, bodyCache.v_[j] + bodyCache.dv_[j], bodyCache.w_[j] + bodyCache.dw_[j], dt );
+ integratePositions( body.getBodyID(), bodyCache.v_[j] + bodyCache.dv_[j], bodyCache.w_[j] + bodyCache.dw_[j], dt );
}
WALBERLA_LOG_DETAIL( "Result:\n" << *body << "");
}
@@ -476,11 +476,11 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
BodyStorage& localStorage = (*storage)[0];
BodyStorage& shadowStorage = (*storage)[1];
- for( auto body = ConcatIterator<BodyStorage::Iterator>
+ for( auto body = ConcatIterator<BodyStorage::iterator>
(localStorage.begin(),
localStorage.end(),
shadowStorage.begin(),
- shadowStorage.end()); body != ConcatIterator<BodyStorage::Iterator>(); ++body )
+ shadowStorage.end()); body != ConcatIterator<BodyStorage::iterator>(); ++body )
{
if (!body->isCommunicating())
{
@@ -492,10 +492,10 @@ inline void HardContactSemiImplicitTimesteppingSolvers::timestep( const real_t d
WALBERLA_LOG_DETAIL( "Integrating position of body with infinite mass " << *body << " with velocity " << bodyCache.v_[j] << "" );
if( body->hasInfiniteMass() )
{
- integratePositions( *body, bodyCache.v_[j], bodyCache.w_[j], dt );
+ integratePositions( &(*body), bodyCache.v_[j], bodyCache.w_[j], dt );
} else
{
- integratePositions( *body, bodyCache.v_[j] + bodyCache.dv_[j], bodyCache.w_[j] + bodyCache.dw_[j], dt );
+ integratePositions( &(*body), bodyCache.v_[j] + bodyCache.dv_[j], bodyCache.w_[j] + bodyCache.dw_[j], dt );
}
WALBERLA_LOG_DETAIL( "Result:\n" << *body << "" );
}
@@ -1433,7 +1433,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::parseVelocityCorrection(
auto bodyIt = bodyStorage.find( objparam.sid_ );
WALBERLA_ASSERT(bodyIt != bodyStorage.end(), "Body not found!");
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
bodyCache.v_[b->index_] += relaxationParam_*objparam.dv_;
bodyCache.w_[b->index_] += relaxationParam_*objparam.dw_;
@@ -1462,7 +1462,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::parseVelocityCorrectionS
auto bodyIt = bodyStorage.find( objparam.sid_ );
WALBERLA_ASSERT(bodyIt != bodyStorage.end(), "Body not found!");
- BodyID b( *bodyIt );
+ BodyID b( bodyIt.getBodyID() );
WALBERLA_ASSERT( b->isRemote(), "Update notification must only concern shadow copies." );
bodyCache.v_[b->index_] = objparam.dv_;
@@ -1531,12 +1531,12 @@ inline void HardContactSemiImplicitTimesteppingSolvers::synchronizeVelocities( )
WALBERLA_LOG_DETAIL( "Sending velocity correction " << bodyCache.dv_[i] << ", " << bodyCache.dw_[i] << " of body " << body->getSystemID() << " to owner process " << body->MPITrait.getOwner() << ".");
- packNotificationWithoutSender(body->MPITrait.getOwner(), sb, RigidBodyVelocityCorrectionNotification( *(*body), bodyCache.dv_[i], bodyCache.dw_[i] ));
+ packNotificationWithoutSender(body->MPITrait.getOwner(), sb, RigidBodyVelocityCorrectionNotification( *body, bodyCache.dv_[i], bodyCache.dw_[i] ));
}
for( auto bodyIt = localStorage.begin(); bodyIt != localStorage.end(); ++bodyIt )
{
- BodyID b(*bodyIt);
+ BodyID b(bodyIt.getBodyID());
for (auto shadows = b->MPITrait.beginShadowOwners(); shadows != b->MPITrait.endShadowOwners(); ++shadows )
{
recvRanks.insert(shadows->rank_);
@@ -1630,7 +1630,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::synchronizeVelocities( )
mpi::SendBuffer& sb = syncVelBS.sendBuffer( shadow->rank_ );
if (sb.isEmpty()) sb << walberla::uint8_c(0);
- packNotificationWithoutSender(*shadow, sb, RigidBodyVelocityCorrectionNotification( *(*body), bodyCache.v_[i], bodyCache.w_[i] ));
+ packNotificationWithoutSender(*shadow, sb, RigidBodyVelocityCorrectionNotification( *body, bodyCache.v_[i], bodyCache.w_[i] ));
WALBERLA_LOG_DETAIL( "Sending velocity update " << bodyCache.v_[i] << ", " << bodyCache.w_[i] << " of body " << body->getSystemID() << " to process " << *shadow << " having a shadow copy.");
}
@@ -1638,7 +1638,7 @@ inline void HardContactSemiImplicitTimesteppingSolvers::synchronizeVelocities( )
for( auto bodyIt = shadowStorage.begin(); bodyIt != shadowStorage.end(); ++bodyIt )
{
- BodyID b(*bodyIt);
+ BodyID b(bodyIt.getBodyID());
recvRanks.insert(b->MPITrait.getOwner().rank_);
}
}
@@ -1795,10 +1795,6 @@ inline void HardContactSemiImplicitTimesteppingSolvers::integratePositions( Body
if ( body->isFixed() )
return;
- // Resetting the contact node and removing all attached contacts
- body->resetNode();
- body->clearContacts();
-
if( body->isAwake() )
{
if ( isSpeedLimiterActive() )
diff --git a/src/pe/cr/PlainIntegrator.impl.h b/src/pe/cr/PlainIntegrator.impl.h
index b96a6e2e0e46cac743062832c3ee4e8fc19f906b..e2a45b2f8eda5405f858db551101d17f545e6537 100644
--- a/src/pe/cr/PlainIntegrator.impl.h
+++ b/src/pe/cr/PlainIntegrator.impl.h
@@ -68,13 +68,9 @@ void PlainIntegratorSolver<Integrator>::timestep( const real_t dt )
WALBERLA_ASSERT( bd->checkInvariants(), "Invalid body state detected" );
WALBERLA_ASSERT( !bd->hasSuperBody(), "Invalid superordinate body detected" );
- // Resetting the contact node and removing all attached contacts
- // bd->resetNode();
- bd->clearContacts();
-
// Moving the body according to the acting forces (don't move a sleeping body)
if( bd->isAwake() && !bd->hasInfiniteMass() ) {
- integrate_( *bd, dt, *this );
+ integrate_( bd.getBodyID(), dt, *this );
}
// Resetting the acting forces
diff --git a/src/pe/debug/BodyData.cpp b/src/pe/debug/BodyData.cpp
index 881b65a0b03128adf8b6669ce9d03f43a6a57cfa..05e32e67815dab1e9fd5021964c38d5768bad560 100644
--- a/src/pe/debug/BodyData.cpp
+++ b/src/pe/debug/BodyData.cpp
@@ -37,7 +37,7 @@ namespace debug {
//
//=================================================================================================
-BodyData::BodyData() {}
+BodyData::BodyData() = default;
BodyData::BodyData(ConstBodyID rb)
: uid(rb->getID())
diff --git a/src/pe/extern/libccd/.gitignore b/src/pe/extern/libccd/.gitignore
deleted file mode 100644
index e3fa61345b7e1907936cb6042b7afbdb57c1ae68..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.o
-*.a
-ccd/config.h
-ccd/config.h.in
-
diff --git a/src/pe/extern/libccd/BSD-LICENSE b/src/pe/extern/libccd/BSD-LICENSE
deleted file mode 100644
index 1cb2dc53db0a2e70017314ee88fd59eb375920c5..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/BSD-LICENSE
+++ /dev/null
@@ -1,44 +0,0 @@
-libccd
--------
-
-Copyright (c)2010-2012 Daniel Fiser <danfis@danfis.cz>,
-Intelligent and Mobile Robotics Group, Department of Cybernetics,
-Faculty of Electrical Engineering, Czech Technical University in Prague.
-All rights reserved.
-
-
-This work was supported by SYMBRION and REPLICATOR projects.
-The SYMBRION project is funded by European Commission within the work
-"Future and Emergent Technologies Proactive" under grant agreement no.
-216342.
-The REPLICATOR project is funded within the work programme "Cognitive
-Systems, Interaction, Robotics" under grant agreement no. 216240.
-http://www.symbrion.eu/
-http://www.replicators.eu/
-
-
-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 name of the University 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.
diff --git a/src/pe/extern/libccd/alloc.h b/src/pe/extern/libccd/alloc.h
deleted file mode 100644
index 7cba3a4d71e81c399282cb2a0298a39acf407d51..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/alloc.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_ALLOC_H__
-#define __CCD_ALLOC_H__
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * Functions and macros required for memory allocation.
- */
-
-/* Memory allocation: */
-#define __CCD_ALLOC_MEMORY(type, ptr_old, size) \
- (type *)realloc((void *)ptr_old, (size))
-
-/** Allocate memory for one element of type. */
-#define CCD_ALLOC(type) \
- __CCD_ALLOC_MEMORY(type, NULL, sizeof(type))
-
-/** Allocate memory for array of elements of type type. */
-#define CCD_ALLOC_ARR(type, num_elements) \
- __CCD_ALLOC_MEMORY(type, NULL, sizeof(type) * (num_elements))
-
-#define CCD_REALLOC_ARR(ptr, type, num_elements) \
- __CCD_ALLOC_MEMORY(type, ptr, sizeof(type) * (num_elements))
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __CCD_ALLOC_H__ */
diff --git a/src/pe/extern/libccd/ccd.c b/src/pe/extern/libccd/ccd.c
deleted file mode 100644
index 79b2f42c91287df03239384228afe79aee6d6935..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/ccd.c
+++ /dev/null
@@ -1,1001 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2012 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#include <stdio.h>
-#include <float.h>
-#include <ccd/ccd.h>
-#include <ccd/vec3.h>
-#include "simplex.h"
-#include "polytope.h"
-#include "alloc.h"
-#include "dbg.h"
-
-
-/** Performs GJK algorithm. Returns 0 if intersection was found and simplex
- * is filled with resulting polytope. */
-static int __ccdGJK(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_simplex_t *simplex);
-
-/** Performs GJK+EPA algorithm. Returns 0 if intersection was found and
- * pt is filled with resulting polytope and nearest with pointer to
- * nearest element (vertex, edge, face) of polytope to origin. */
-static int __ccdGJKEPA(const void *obj1, const void *obj2,
- const ccd_t *ccd,
- ccd_pt_t *pt, ccd_pt_el_t **nearest);
-
-
-/** Returns true if simplex contains origin.
- * This function also alteres simplex and dir according to further
- * processing of GJK algorithm. */
-static int doSimplex(ccd_simplex_t *simplex, ccd_vec3_t *dir);
-static int doSimplex2(ccd_simplex_t *simplex, ccd_vec3_t *dir);
-static int doSimplex3(ccd_simplex_t *simplex, ccd_vec3_t *dir);
-static int doSimplex4(ccd_simplex_t *simplex, ccd_vec3_t *dir);
-
-/** d = a x b x c */
-_ccd_inline void tripleCross(const ccd_vec3_t *a, const ccd_vec3_t *b,
- const ccd_vec3_t *c, ccd_vec3_t *d);
-
-
-/** Transforms simplex to polytope. It is assumed that simplex has 4
- * vertices. */
-static int simplexToPolytope4(const void *obj1, const void *obj2,
- const ccd_t *ccd,
- ccd_simplex_t *simplex,
- ccd_pt_t *pt, ccd_pt_el_t **nearest);
-
-/** Transforms simplex to polytope, three vertices required */
-static int simplexToPolytope3(const void *obj1, const void *obj2,
- const ccd_t *ccd,
- const ccd_simplex_t *simplex,
- ccd_pt_t *pt, ccd_pt_el_t **nearest);
-
-/** Transforms simplex to polytope, two vertices required */
-static int simplexToPolytope2(const void *obj1, const void *obj2,
- const ccd_t *ccd,
- const ccd_simplex_t *simplex,
- ccd_pt_t *pt, ccd_pt_el_t **nearest);
-
-/** Expands polytope using new vertex v.
- * Return 0 on success, -2 on memory allocation failure.*/
-static int expandPolytope(ccd_pt_t *pt, ccd_pt_el_t *el,
- const ccd_support_t *newv);
-
-/** Finds next support point (at stores it in out argument).
- * Returns 0 on success, -1 otherwise */
-static int nextSupport(const void *obj1, const void *obj2, const ccd_t *ccd,
- const ccd_pt_el_t *el,
- ccd_support_t *out);
-
-
-
-void ccdFirstDirDefault(const void *o1, const void *o2, ccd_vec3_t *dir)
-{
- (void)(o1);
- (void)(o2);
-
- ccdVec3Set(dir, CCD_ONE, CCD_ZERO, CCD_ZERO);
-}
-
-int ccdGJKIntersect(const void *obj1, const void *obj2, const ccd_t *ccd)
-{
- ccd_simplex_t simplex;
- return __ccdGJK(obj1, obj2, ccd, &simplex) == 0;
-}
-
-int ccdGJKSeparate(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_vec3_t *sep)
-{
- ccd_pt_t polytope;
- ccd_pt_el_t *nearest;
- int ret;
-
- ccdPtInit(&polytope);
-
- ret = __ccdGJKEPA(obj1, obj2, ccd, &polytope, &nearest);
-
- // set separation vector
- if (nearest)
- ccdVec3Copy(sep, &nearest->witness);
-
- ccdPtDestroy(&polytope);
-
- return ret;
-}
-
-
-static int penEPAPosCmp(const void *a, const void *b)
-{
- ccd_pt_vertex_t *v1, *v2;
- v1 = *(ccd_pt_vertex_t **)a;
- v2 = *(ccd_pt_vertex_t **)b;
-
- if (ccdEq(v1->dist, v2->dist)){
- return 0;
- }else if (v1->dist < v2->dist){
- return -1;
- }else{
- return 1;
- }
-}
-
-static int penEPAPos(const ccd_pt_t *pt, const ccd_pt_el_t * nearest,
- ccd_vec3_t *pos)
-{
- (void)(nearest);
-
- ccd_pt_vertex_t *v;
- ccd_pt_vertex_t **vs;
- size_t i, len;
- ccd_real_t scale;
-
- // compute median
- len = 0;
- ccdListForEachEntry(&pt->vertices, v, ccd_pt_vertex_t, list){
- len++;
- }
-
- vs = CCD_ALLOC_ARR(ccd_pt_vertex_t *, len);
- if (vs == NULL)
- return -1;
-
- i = 0;
- ccdListForEachEntry(&pt->vertices, v, ccd_pt_vertex_t, list){
- vs[i++] = v;
- }
-
- qsort(vs, len, sizeof(ccd_pt_vertex_t *), penEPAPosCmp);
-
- ccdVec3Set(pos, CCD_ZERO, CCD_ZERO, CCD_ZERO);
- scale = CCD_ZERO;
- if (len % 2 == 1)
- len++;
-
- for (i = 0; i < len / 2; i++){
- ccdVec3Add(pos, &vs[i]->v.v1);
- ccdVec3Add(pos, &vs[i]->v.v2);
- scale += CCD_REAL(2.);
- }
- ccdVec3Scale(pos, CCD_ONE / scale);
-
- free(vs);
-
- return 0;
-}
-
-int ccdGJKPenetration(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_real_t *depth, ccd_vec3_t *dir, ccd_vec3_t *pos)
-{
- ccd_pt_t polytope;
- ccd_pt_el_t *nearest;
- int ret;
-
- ccdPtInit(&polytope);
-
- ret = __ccdGJKEPA(obj1, obj2, ccd, &polytope, &nearest);
-
- // set separation vector
- if (ret == 0 && nearest){
- // compute depth of penetration
- *depth = CCD_SQRT(nearest->dist);
-
- // store normalized direction vector
- ccdVec3Copy(dir, &nearest->witness);
- ccdVec3Normalize(dir);
-
- // compute position
- if (penEPAPos(&polytope, nearest, pos) != 0){
- ccdPtDestroy(&polytope);
- return -2;
- }
- }
-
- ccdPtDestroy(&polytope);
-
- return ret;
-}
-
-
-static int __ccdGJK(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_simplex_t *simplex)
-{
- unsigned long iterations;
- ccd_vec3_t dir; // direction vector
- ccd_support_t last; // last support point
- int do_simplex_res;
-
- // initialize simplex struct
- ccdSimplexInit(simplex);
-
- // get first direction
- ccd->first_dir(obj1, obj2, &dir);
- // get first support point
- __ccdSupport(obj1, obj2, &dir, ccd, &last);
- // and add this point to simplex as last one
- ccdSimplexAdd(simplex, &last);
-
- // set up direction vector to as (O - last) which is exactly -last
- ccdVec3Copy(&dir, &last.v);
- ccdVec3Scale(&dir, -CCD_ONE);
-
- // start iterations
- for (iterations = 0UL; iterations < ccd->max_iterations; ++iterations) {
- // obtain support point
- __ccdSupport(obj1, obj2, &dir, ccd, &last);
-
- // check if farthest point in Minkowski difference in direction dir
- // isn't somewhere before origin (the test on negative dot product)
- // - because if it is, objects are not intersecting at all.
- if (ccdVec3Dot(&last.v, &dir) < CCD_ZERO){
- return -1; // intersection not found
- }
-
- // add last support vector to simplex
- ccdSimplexAdd(simplex, &last);
-
- // if doSimplex returns 1 if objects intersect, -1 if objects don't
- // intersect and 0 if algorithm should continue
- do_simplex_res = doSimplex(simplex, &dir);
- if (do_simplex_res == 1){
- return 0; // intersection found
- }else if (do_simplex_res == -1){
- return -1; // intersection not found
- }
-
- if (ccdIsZero(ccdVec3Len2(&dir))){
- return -1; // intersection not found
- }
- }
-
- // intersection wasn't found
- return -1;
-}
-
-static int __ccdGJKEPA(const void *obj1, const void *obj2,
- const ccd_t *ccd,
- ccd_pt_t *polytope, ccd_pt_el_t **nearest)
-{
- ccd_simplex_t simplex;
- ccd_support_t supp; // support point
- int ret, size;
-
- *nearest = NULL;
-
- // run GJK and obtain terminal simplex
- ret = __ccdGJK(obj1, obj2, ccd, &simplex);
- if (ret != 0)
- return -1;
-
- // transform simplex to polytope - simplex won't be used anymore
- size = ccdSimplexSize(&simplex);
- if (size == 4){
- ret = simplexToPolytope4(obj1, obj2, ccd, &simplex, polytope, nearest);
- }else if (size == 3){
- ret = simplexToPolytope3(obj1, obj2, ccd, &simplex, polytope, nearest);
- }else{ // size == 2
- ret = simplexToPolytope2(obj1, obj2, ccd, &simplex, polytope, nearest);
- }
-
- if (ret == -1){
- // touching contact
- return 0;
- }else if (ret == -2){
- // failed memory allocation
- return -2;
- }
-
-
- while (1){
- // get triangle nearest to origin
- *nearest = ccdPtNearest(polytope);
-
- // get next support point
- if (nextSupport(obj1, obj2, ccd, *nearest, &supp) != 0)
- break;
-
- // expand nearest triangle using new point - supp
- if (expandPolytope(polytope, *nearest, &supp) != 0)
- return -2;
- }
-
- return 0;
-}
-
-
-
-static int doSimplex2(ccd_simplex_t *simplex, ccd_vec3_t *dir)
-{
- const ccd_support_t *A, *B;
- ccd_vec3_t AB, AO, tmp;
- ccd_real_t dot;
-
- // get last added as A
- A = ccdSimplexLast(simplex);
- // get the other point
- B = ccdSimplexPoint(simplex, 0);
- // compute AB oriented segment
- ccdVec3Sub2(&AB, &B->v, &A->v);
- // compute AO vector
- ccdVec3Copy(&AO, &A->v);
- ccdVec3Scale(&AO, -CCD_ONE);
-
- // dot product AB . AO
- dot = ccdVec3Dot(&AB, &AO);
-
- // check if origin doesn't lie on AB segment
- ccdVec3Cross(&tmp, &AB, &AO);
- if (ccdIsZero(ccdVec3Len2(&tmp)) && dot > CCD_ZERO){
- return 1;
- }
-
- // check if origin is in area where AB segment is
- if (ccdIsZero(dot) || dot < CCD_ZERO){
- // origin is in outside are of A
- ccdSimplexSet(simplex, 0, A);
- ccdSimplexSetSize(simplex, 1);
- ccdVec3Copy(dir, &AO);
- }else{
- // origin is in area where AB segment is
-
- // keep simplex untouched and set direction to
- // AB x AO x AB
- tripleCross(&AB, &AO, &AB, dir);
- }
-
- return 0;
-}
-
-static int doSimplex3(ccd_simplex_t *simplex, ccd_vec3_t *dir)
-{
- const ccd_support_t *A, *B, *C;
- ccd_vec3_t AO, AB, AC, ABC, tmp;
- ccd_real_t dot, dist;
-
- // get last added as A
- A = ccdSimplexLast(simplex);
- // get the other points
- B = ccdSimplexPoint(simplex, 1);
- C = ccdSimplexPoint(simplex, 0);
-
- // check touching contact
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &A->v, &B->v, &C->v, NULL);
- if (ccdIsZero(dist)){
- return 1;
- }
-
- // check if triangle is really triangle (has area > 0)
- // if not simplex can't be expanded and thus no itersection is found
- if (ccdVec3Eq(&A->v, &B->v) || ccdVec3Eq(&A->v, &C->v)){
- return -1;
- }
-
- // compute AO vector
- ccdVec3Copy(&AO, &A->v);
- ccdVec3Scale(&AO, -CCD_ONE);
-
- // compute AB and AC segments and ABC vector (perpendircular to triangle)
- ccdVec3Sub2(&AB, &B->v, &A->v);
- ccdVec3Sub2(&AC, &C->v, &A->v);
- ccdVec3Cross(&ABC, &AB, &AC);
-
- ccdVec3Cross(&tmp, &ABC, &AC);
- dot = ccdVec3Dot(&tmp, &AO);
- if (ccdIsZero(dot) || dot > CCD_ZERO){
- dot = ccdVec3Dot(&AC, &AO);
- if (ccdIsZero(dot) || dot > CCD_ZERO){
- // C is already in place
- ccdSimplexSet(simplex, 1, A);
- ccdSimplexSetSize(simplex, 2);
- tripleCross(&AC, &AO, &AC, dir);
- }else{
-ccd_do_simplex3_45:
- dot = ccdVec3Dot(&AB, &AO);
- if (ccdIsZero(dot) || dot > CCD_ZERO){
- ccdSimplexSet(simplex, 0, B);
- ccdSimplexSet(simplex, 1, A);
- ccdSimplexSetSize(simplex, 2);
- tripleCross(&AB, &AO, &AB, dir);
- }else{
- ccdSimplexSet(simplex, 0, A);
- ccdSimplexSetSize(simplex, 1);
- ccdVec3Copy(dir, &AO);
- }
- }
- }else{
- ccdVec3Cross(&tmp, &AB, &ABC);
- dot = ccdVec3Dot(&tmp, &AO);
- if (ccdIsZero(dot) || dot > CCD_ZERO){
- goto ccd_do_simplex3_45;
- }else{
- dot = ccdVec3Dot(&ABC, &AO);
- if (ccdIsZero(dot) || dot > CCD_ZERO){
- ccdVec3Copy(dir, &ABC);
- }else{
- ccd_support_t Ctmp;
- ccdSupportCopy(&Ctmp, C);
- ccdSimplexSet(simplex, 0, B);
- ccdSimplexSet(simplex, 1, &Ctmp);
-
- ccdVec3Copy(dir, &ABC);
- ccdVec3Scale(dir, -CCD_ONE);
- }
- }
- }
-
- return 0;
-}
-
-static int doSimplex4(ccd_simplex_t *simplex, ccd_vec3_t *dir)
-{
- const ccd_support_t *A, *B, *C, *D;
- ccd_vec3_t AO, AB, AC, AD, ABC, ACD, ADB;
- int B_on_ACD, C_on_ADB, D_on_ABC;
- int AB_O, AC_O, AD_O;
- ccd_real_t dist;
-
- // get last added as A
- A = ccdSimplexLast(simplex);
- // get the other points
- B = ccdSimplexPoint(simplex, 2);
- C = ccdSimplexPoint(simplex, 1);
- D = ccdSimplexPoint(simplex, 0);
-
- // check if tetrahedron is really tetrahedron (has volume > 0)
- // if it is not simplex can't be expanded and thus no intersection is
- // found
- dist = ccdVec3PointTriDist2(&A->v, &B->v, &C->v, &D->v, NULL);
- if (ccdIsZero(dist)){
- return -1;
- }
-
- // check if origin lies on some of tetrahedron's face - if so objects
- // intersect
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &A->v, &B->v, &C->v, NULL);
- if (ccdIsZero(dist))
- return 1;
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &A->v, &C->v, &D->v, NULL);
- if (ccdIsZero(dist))
- return 1;
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &A->v, &B->v, &D->v, NULL);
- if (ccdIsZero(dist))
- return 1;
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &B->v, &C->v, &D->v, NULL);
- if (ccdIsZero(dist))
- return 1;
-
- // compute AO, AB, AC, AD segments and ABC, ACD, ADB normal vectors
- ccdVec3Copy(&AO, &A->v);
- ccdVec3Scale(&AO, -CCD_ONE);
- ccdVec3Sub2(&AB, &B->v, &A->v);
- ccdVec3Sub2(&AC, &C->v, &A->v);
- ccdVec3Sub2(&AD, &D->v, &A->v);
- ccdVec3Cross(&ABC, &AB, &AC);
- ccdVec3Cross(&ACD, &AC, &AD);
- ccdVec3Cross(&ADB, &AD, &AB);
-
- // side (positive or negative) of B, C, D relative to planes ACD, ADB
- // and ABC respectively
- B_on_ACD = ccdSign(ccdVec3Dot(&ACD, &AB));
- C_on_ADB = ccdSign(ccdVec3Dot(&ADB, &AC));
- D_on_ABC = ccdSign(ccdVec3Dot(&ABC, &AD));
-
- // whether origin is on same side of ACD, ADB, ABC as B, C, D
- // respectively
- AB_O = ccdSign(ccdVec3Dot(&ACD, &AO)) == B_on_ACD;
- AC_O = ccdSign(ccdVec3Dot(&ADB, &AO)) == C_on_ADB;
- AD_O = ccdSign(ccdVec3Dot(&ABC, &AO)) == D_on_ABC;
-
- if (AB_O && AC_O && AD_O){
- // origin is in tetrahedron
- return 1;
-
- // rearrange simplex to triangle and call doSimplex3()
- }else if (!AB_O){
- // B is farthest from the origin among all of the tetrahedron's
- // points, so remove it from the list and go on with the triangle
- // case
-
- // D and C are in place
- ccdSimplexSet(simplex, 2, A);
- ccdSimplexSetSize(simplex, 3);
- }else if (!AC_O){
- // C is farthest
- ccdSimplexSet(simplex, 1, D);
- ccdSimplexSet(simplex, 0, B);
- ccdSimplexSet(simplex, 2, A);
- ccdSimplexSetSize(simplex, 3);
- }else{ // (!AD_O)
- ccdSimplexSet(simplex, 0, C);
- ccdSimplexSet(simplex, 1, B);
- ccdSimplexSet(simplex, 2, A);
- ccdSimplexSetSize(simplex, 3);
- }
-
- return doSimplex3(simplex, dir);
-}
-
-static int doSimplex(ccd_simplex_t *simplex, ccd_vec3_t *dir)
-{
- if (ccdSimplexSize(simplex) == 2){
- // simplex contains segment only one segment
- return doSimplex2(simplex, dir);
- }else if (ccdSimplexSize(simplex) == 3){
- // simplex contains triangle
- return doSimplex3(simplex, dir);
- }else{ // ccdSimplexSize(simplex) == 4
- // tetrahedron - this is the only shape which can encapsule origin
- // so doSimplex4() also contains test on it
- return doSimplex4(simplex, dir);
- }
-}
-
-
-_ccd_inline void tripleCross(const ccd_vec3_t *a, const ccd_vec3_t *b,
- const ccd_vec3_t *c, ccd_vec3_t *d)
-{
- ccd_vec3_t e;
- ccdVec3Cross(&e, a, b);
- ccdVec3Cross(d, &e, c);
-}
-
-
-
-/** Transforms simplex to polytope. It is assumed that simplex has 4
- * vertices! */
-static int simplexToPolytope4(const void *obj1, const void *obj2,
- const ccd_t *ccd,
- ccd_simplex_t *simplex,
- ccd_pt_t *pt, ccd_pt_el_t **nearest)
-{
- const ccd_support_t *a, *b, *c, *d;
- int use_polytope3;
- ccd_real_t dist;
- ccd_pt_vertex_t *v[4];
- ccd_pt_edge_t *e[6];
- size_t i;
-
- a = ccdSimplexPoint(simplex, 0);
- b = ccdSimplexPoint(simplex, 1);
- c = ccdSimplexPoint(simplex, 2);
- d = ccdSimplexPoint(simplex, 3);
-
- // check if origin lies on some of tetrahedron's face - if so use
- // simplexToPolytope3()
- use_polytope3 = 0;
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &a->v, &b->v, &c->v, NULL);
- if (ccdIsZero(dist)){
- use_polytope3 = 1;
- }
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &a->v, &c->v, &d->v, NULL);
- if (ccdIsZero(dist)){
- use_polytope3 = 1;
- ccdSimplexSet(simplex, 1, c);
- ccdSimplexSet(simplex, 2, d);
- }
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &a->v, &b->v, &d->v, NULL);
- if (ccdIsZero(dist)){
- use_polytope3 = 1;
- ccdSimplexSet(simplex, 2, d);
- }
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, &b->v, &c->v, &d->v, NULL);
- if (ccdIsZero(dist)){
- use_polytope3 = 1;
- ccdSimplexSet(simplex, 0, b);
- ccdSimplexSet(simplex, 1, c);
- ccdSimplexSet(simplex, 2, d);
- }
-
- if (use_polytope3){
- ccdSimplexSetSize(simplex, 3);
- return simplexToPolytope3(obj1, obj2, ccd, simplex, pt, nearest);
- }
-
- // no touching contact - simply create tetrahedron
- for (i = 0; i < 4; i++){
- v[i] = ccdPtAddVertex(pt, ccdSimplexPoint(simplex, (int)i));
- }
-
- e[0] = ccdPtAddEdge(pt, v[0], v[1]);
- e[1] = ccdPtAddEdge(pt, v[1], v[2]);
- e[2] = ccdPtAddEdge(pt, v[2], v[0]);
- e[3] = ccdPtAddEdge(pt, v[3], v[0]);
- e[4] = ccdPtAddEdge(pt, v[3], v[1]);
- e[5] = ccdPtAddEdge(pt, v[3], v[2]);
-
- // ccdPtAdd*() functions return NULL either if the memory allocation
- // failed of if any of the input pointers are NULL, so the bad
- // allocation can be checked by the last calls of ccdPtAddFace()
- // because the rest of the bad allocations eventually "bubble up" here
- if (ccdPtAddFace(pt, e[0], e[1], e[2]) == NULL
- || ccdPtAddFace(pt, e[3], e[4], e[0]) == NULL
- || ccdPtAddFace(pt, e[4], e[5], e[1]) == NULL
- || ccdPtAddFace(pt, e[5], e[3], e[2]) == NULL){
- return -2;
- }
-
- return 0;
-}
-
-/** Transforms simplex to polytope, three vertices required */
-static int simplexToPolytope3(const void *obj1, const void *obj2,
- const ccd_t *ccd,
- const ccd_simplex_t *simplex,
- ccd_pt_t *pt, ccd_pt_el_t **nearest)
-{
- const ccd_support_t *a, *b, *c;
- ccd_support_t d, d2;
- ccd_vec3_t ab, ac, dir;
- ccd_pt_vertex_t *v[5];
- ccd_pt_edge_t *e[9];
- ccd_real_t dist, dist2;
-
- *nearest = NULL;
-
- a = ccdSimplexPoint(simplex, 0);
- b = ccdSimplexPoint(simplex, 1);
- c = ccdSimplexPoint(simplex, 2);
-
- // If only one triangle left from previous GJK run origin lies on this
- // triangle. So it is necessary to expand triangle into two
- // tetrahedrons connected with base (which is exactly abc triangle).
-
- // get next support point in direction of normal of triangle
- ccdVec3Sub2(&ab, &b->v, &a->v);
- ccdVec3Sub2(&ac, &c->v, &a->v);
- ccdVec3Cross(&dir, &ab, &ac);
- __ccdSupport(obj1, obj2, &dir, ccd, &d);
- dist = ccdVec3PointTriDist2(&d.v, &a->v, &b->v, &c->v, NULL);
-
- // and second one take in opposite direction
- ccdVec3Scale(&dir, -CCD_ONE);
- __ccdSupport(obj1, obj2, &dir, ccd, &d2);
- dist2 = ccdVec3PointTriDist2(&d2.v, &a->v, &b->v, &c->v, NULL);
-
- // check if face isn't already on edge of minkowski sum and thus we
- // have touching contact
- if (ccdIsZero(dist) || ccdIsZero(dist2)){
- v[0] = ccdPtAddVertex(pt, a);
- v[1] = ccdPtAddVertex(pt, b);
- v[2] = ccdPtAddVertex(pt, c);
- e[0] = ccdPtAddEdge(pt, v[0], v[1]);
- e[1] = ccdPtAddEdge(pt, v[1], v[2]);
- e[2] = ccdPtAddEdge(pt, v[2], v[0]);
- *nearest = (ccd_pt_el_t *)ccdPtAddFace(pt, e[0], e[1], e[2]);
- if (*nearest == NULL)
- return -2;
-
- return -1;
- }
-
- // form polyhedron
- v[0] = ccdPtAddVertex(pt, a);
- v[1] = ccdPtAddVertex(pt, b);
- v[2] = ccdPtAddVertex(pt, c);
- v[3] = ccdPtAddVertex(pt, &d);
- v[4] = ccdPtAddVertex(pt, &d2);
-
- e[0] = ccdPtAddEdge(pt, v[0], v[1]);
- e[1] = ccdPtAddEdge(pt, v[1], v[2]);
- e[2] = ccdPtAddEdge(pt, v[2], v[0]);
-
- e[3] = ccdPtAddEdge(pt, v[3], v[0]);
- e[4] = ccdPtAddEdge(pt, v[3], v[1]);
- e[5] = ccdPtAddEdge(pt, v[3], v[2]);
-
- e[6] = ccdPtAddEdge(pt, v[4], v[0]);
- e[7] = ccdPtAddEdge(pt, v[4], v[1]);
- e[8] = ccdPtAddEdge(pt, v[4], v[2]);
-
- if (ccdPtAddFace(pt, e[3], e[4], e[0]) == NULL
- || ccdPtAddFace(pt, e[4], e[5], e[1]) == NULL
- || ccdPtAddFace(pt, e[5], e[3], e[2]) == NULL
-
- || ccdPtAddFace(pt, e[6], e[7], e[0]) == NULL
- || ccdPtAddFace(pt, e[7], e[8], e[1]) == NULL
- || ccdPtAddFace(pt, e[8], e[6], e[2]) == NULL){
- return -2;
- }
-
- return 0;
-}
-
-/** Transforms simplex to polytope, two vertices required */
-static int simplexToPolytope2(const void *obj1, const void *obj2,
- const ccd_t *ccd,
- const ccd_simplex_t *simplex,
- ccd_pt_t *pt, ccd_pt_el_t **nearest)
-{
- const ccd_support_t *a, *b;
- ccd_vec3_t ab, ac, dir;
- ccd_support_t supp[4];
- ccd_pt_vertex_t *v[6];
- ccd_pt_edge_t *e[12];
- size_t i;
- int found;
-
- a = ccdSimplexPoint(simplex, 0);
- b = ccdSimplexPoint(simplex, 1);
-
- // This situation is a bit tricky. If only one segment comes from
- // previous run of GJK - it means that either this segment is on
- // minkowski edge (and thus we have touch contact) or it it isn't and
- // therefore segment is somewhere *inside* minkowski sum and it *must*
- // be possible to fully enclose this segment with polyhedron formed by
- // at least 8 triangle faces.
-
- // get first support point (any)
- found = 0;
- for (i = 0; i < ccd_points_on_sphere_len; i++){
- __ccdSupport(obj1, obj2, &ccd_points_on_sphere[i], ccd, &supp[0]);
- if (!ccdVec3Eq(&a->v, &supp[0].v) && !ccdVec3Eq(&b->v, &supp[0].v)){
- found = 1;
- break;
- }
- }
- if (!found)
- goto simplexToPolytope2_touching_contact;
-
- // get second support point in opposite direction than supp[0]
- ccdVec3Copy(&dir, &supp[0].v);
- ccdVec3Scale(&dir, -CCD_ONE);
- __ccdSupport(obj1, obj2, &dir, ccd, &supp[1]);
- if (ccdVec3Eq(&a->v, &supp[1].v) || ccdVec3Eq(&b->v, &supp[1].v))
- goto simplexToPolytope2_touching_contact;
-
- // next will be in direction of normal of triangle a,supp[0],supp[1]
- ccdVec3Sub2(&ab, &supp[0].v, &a->v);
- ccdVec3Sub2(&ac, &supp[1].v, &a->v);
- ccdVec3Cross(&dir, &ab, &ac);
- __ccdSupport(obj1, obj2, &dir, ccd, &supp[2]);
- if (ccdVec3Eq(&a->v, &supp[2].v) || ccdVec3Eq(&b->v, &supp[2].v))
- goto simplexToPolytope2_touching_contact;
-
- // and last one will be in opposite direction
- ccdVec3Scale(&dir, -CCD_ONE);
- __ccdSupport(obj1, obj2, &dir, ccd, &supp[3]);
- if (ccdVec3Eq(&a->v, &supp[3].v) || ccdVec3Eq(&b->v, &supp[3].v))
- goto simplexToPolytope2_touching_contact;
-
- goto simplexToPolytope2_not_touching_contact;
-simplexToPolytope2_touching_contact:
- v[0] = ccdPtAddVertex(pt, a);
- v[1] = ccdPtAddVertex(pt, b);
- *nearest = (ccd_pt_el_t *)ccdPtAddEdge(pt, v[0], v[1]);
- if (*nearest == NULL)
- return -2;
-
- return -1;
-
-simplexToPolytope2_not_touching_contact:
- // form polyhedron
- v[0] = ccdPtAddVertex(pt, a);
- v[1] = ccdPtAddVertex(pt, &supp[0]);
- v[2] = ccdPtAddVertex(pt, b);
- v[3] = ccdPtAddVertex(pt, &supp[1]);
- v[4] = ccdPtAddVertex(pt, &supp[2]);
- v[5] = ccdPtAddVertex(pt, &supp[3]);
-
- e[0] = ccdPtAddEdge(pt, v[0], v[1]);
- e[1] = ccdPtAddEdge(pt, v[1], v[2]);
- e[2] = ccdPtAddEdge(pt, v[2], v[3]);
- e[3] = ccdPtAddEdge(pt, v[3], v[0]);
-
- e[4] = ccdPtAddEdge(pt, v[4], v[0]);
- e[5] = ccdPtAddEdge(pt, v[4], v[1]);
- e[6] = ccdPtAddEdge(pt, v[4], v[2]);
- e[7] = ccdPtAddEdge(pt, v[4], v[3]);
-
- e[8] = ccdPtAddEdge(pt, v[5], v[0]);
- e[9] = ccdPtAddEdge(pt, v[5], v[1]);
- e[10] = ccdPtAddEdge(pt, v[5], v[2]);
- e[11] = ccdPtAddEdge(pt, v[5], v[3]);
-
- if (ccdPtAddFace(pt, e[4], e[5], e[0]) == NULL
- || ccdPtAddFace(pt, e[5], e[6], e[1]) == NULL
- || ccdPtAddFace(pt, e[6], e[7], e[2]) == NULL
- || ccdPtAddFace(pt, e[7], e[4], e[3]) == NULL
-
- || ccdPtAddFace(pt, e[8], e[9], e[0]) == NULL
- || ccdPtAddFace(pt, e[9], e[10], e[1]) == NULL
- || ccdPtAddFace(pt, e[10], e[11], e[2]) == NULL
- || ccdPtAddFace(pt, e[11], e[8], e[3]) == NULL){
- return -2;
- }
-
- return 0;
-}
-
-/** Expands polytope's tri by new vertex v. Triangle tri is replaced by
- * three triangles each with one vertex in v. */
-static int expandPolytope(ccd_pt_t *pt, ccd_pt_el_t *el,
- const ccd_support_t *newv)
-{
- ccd_pt_vertex_t *v[5];
- ccd_pt_edge_t *e[8];
- ccd_pt_face_t *f[2];
-
-
- // element can be either segment or triangle
- if (el->type == CCD_PT_EDGE){
- // In this case, segment should be replaced by new point.
- // Simpliest case is when segment stands alone and in this case
- // this segment is replaced by two other segments both connected to
- // newv.
- // Segment can be also connected to max two faces and in that case
- // each face must be replaced by two other faces. To do this
- // correctly it is necessary to have correctly ordered edges and
- // vertices which is exactly what is done in following code.
- //
-
- ccdPtEdgeVertices((const ccd_pt_edge_t *)el, &v[0], &v[2]);
-
- ccdPtEdgeFaces((ccd_pt_edge_t *)el, &f[0], &f[1]);
-
- if (f[0]){
- ccdPtFaceEdges(f[0], &e[0], &e[1], &e[2]);
- if (e[0] == (ccd_pt_edge_t *)el){
- e[0] = e[2];
- }else if (e[1] == (ccd_pt_edge_t *)el){
- e[1] = e[2];
- }
- ccdPtEdgeVertices(e[0], &v[1], &v[3]);
- if (v[1] != v[0] && v[3] != v[0]){
- e[2] = e[0];
- e[0] = e[1];
- e[1] = e[2];
- if (v[1] == v[2])
- v[1] = v[3];
- }else{
- if (v[1] == v[0])
- v[1] = v[3];
- }
-
- if (f[1]){
- ccdPtFaceEdges(f[1], &e[2], &e[3], &e[4]);
- if (e[2] == (ccd_pt_edge_t *)el){
- e[2] = e[4];
- }else if (e[3] == (ccd_pt_edge_t *)el){
- e[3] = e[4];
- }
- ccdPtEdgeVertices(e[2], &v[3], &v[4]);
- if (v[3] != v[2] && v[4] != v[2]){
- e[4] = e[2];
- e[2] = e[3];
- e[3] = e[4];
- if (v[3] == v[0])
- v[3] = v[4];
- }else{
- if (v[3] == v[2])
- v[3] = v[4];
- }
- }
-
-
- v[4] = ccdPtAddVertex(pt, newv);
-
- ccdPtDelFace(pt, f[0]);
- if (f[1]){
- ccdPtDelFace(pt, f[1]);
- ccdPtDelEdge(pt, (ccd_pt_edge_t *)el);
- }
-
- e[4] = ccdPtAddEdge(pt, v[4], v[2]);
- e[5] = ccdPtAddEdge(pt, v[4], v[0]);
- e[6] = ccdPtAddEdge(pt, v[4], v[1]);
- if (f[1])
- e[7] = ccdPtAddEdge(pt, v[4], v[3]);
-
-
- if (ccdPtAddFace(pt, e[1], e[4], e[6]) == NULL
- || ccdPtAddFace(pt, e[0], e[6], e[5]) == NULL){
- return -2;
- }
-
- if (f[1]){
- if (ccdPtAddFace(pt, e[3], e[5], e[7]) == NULL
- || ccdPtAddFace(pt, e[4], e[7], e[2]) == NULL){
- return -2;
- }
- }else{
- if (ccdPtAddFace(pt, e[4], e[5], (ccd_pt_edge_t *)el) == NULL)
- return -2;
- }
- }
- }else{ // el->type == CCD_PT_FACE
- // replace triangle by tetrahedron without base (base would be the
- // triangle that will be removed)
-
- // get triplet of surrounding edges and vertices of triangle face
- ccdPtFaceEdges((const ccd_pt_face_t *)el, &e[0], &e[1], &e[2]);
- ccdPtEdgeVertices(e[0], &v[0], &v[1]);
- ccdPtEdgeVertices(e[1], &v[2], &v[3]);
-
- // following code sorts edges to have e[0] between vertices 0-1,
- // e[1] between 1-2 and e[2] between 2-0
- if (v[2] != v[1] && v[3] != v[1]){
- // swap e[1] and e[2]
- e[3] = e[1];
- e[1] = e[2];
- e[2] = e[3];
- }
- if (v[3] != v[0] && v[3] != v[1])
- v[2] = v[3];
-
- // remove triangle face
- ccdPtDelFace(pt, (ccd_pt_face_t *)el);
-
- // expand triangle to tetrahedron
- v[3] = ccdPtAddVertex(pt, newv);
- e[3] = ccdPtAddEdge(pt, v[3], v[0]);
- e[4] = ccdPtAddEdge(pt, v[3], v[1]);
- e[5] = ccdPtAddEdge(pt, v[3], v[2]);
-
- if (ccdPtAddFace(pt, e[3], e[4], e[0]) == NULL
- || ccdPtAddFace(pt, e[4], e[5], e[1]) == NULL
- || ccdPtAddFace(pt, e[5], e[3], e[2]) == NULL){
- return -2;
- }
- }
-
- return 0;
-}
-
-/** Finds next support point (and stores it in out argument).
- * Returns 0 on success, -1 otherwise */
-static int nextSupport(const void *obj1, const void *obj2, const ccd_t *ccd,
- const ccd_pt_el_t *el,
- ccd_support_t *out)
-{
- ccd_vec3_t *a, *b, *c;
- ccd_real_t dist;
-
- if (el->type == CCD_PT_VERTEX)
- return -1;
-
- // touch contact
- if (ccdIsZero(el->dist))
- return -1;
-
- __ccdSupport(obj1, obj2, &el->witness, ccd, out);
-
- // Compute dist of support point along element witness point direction
- // so we can determine whether we expanded a polytope surrounding the
- // origin a bit.
- dist = ccdVec3Dot(&out->v, &el->witness);
-
- if (dist - el->dist < ccd->epa_tolerance)
- return -1;
-
- if (el->type == CCD_PT_EDGE){
- // fetch end points of edge
- ccdPtEdgeVec3((ccd_pt_edge_t *)el, &a, &b);
-
- // get distance from segment
- dist = ccdVec3PointSegmentDist2(&out->v, a, b, NULL);
- }else{ // el->type == CCD_PT_FACE
- // fetch vertices of triangle face
- ccdPtFaceVec3((ccd_pt_face_t *)el, &a, &b, &c);
-
- // check if new point can significantly expand polytope
- dist = ccdVec3PointTriDist2(&out->v, a, b, c, NULL);
- }
-
- if (dist < ccd->epa_tolerance)
- return -1;
-
- return 0;
-}
diff --git a/src/pe/extern/libccd/ccd/ccd.h b/src/pe/extern/libccd/ccd/ccd.h
deleted file mode 100644
index fb8df75a081c6484c7f9445adb82c2b4f30fe786..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/ccd/ccd.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010,2011 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_H__
-#define __CCD_H__
-
-#include <ccd/vec3.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * Type of *support* function that takes pointer to 3D object and direction
- * and returns (via vec argument) furthest point from object in specified
- * direction.
- */
-typedef void (*ccd_support_fn)(const void *obj, const ccd_vec3_t *dir,
- ccd_vec3_t *vec);
-
-/**
- * Returns (via dir argument) first direction vector that will be used in
- * initialization of algorithm.
- */
-typedef void (*ccd_first_dir_fn)(const void *obj1, const void *obj2,
- ccd_vec3_t *dir);
-
-
-/**
- * Returns (via center argument) geometric center (some point near center)
- * of given object.
- */
-typedef void (*ccd_center_fn)(const void *obj1, ccd_vec3_t *center);
-
-/**
- * Main structure of CCD algorithm.
- */
-struct _ccd_t {
- ccd_first_dir_fn first_dir; //!< Returns initial direction where first
- //!< support point will be searched
- ccd_support_fn support1; //!< Function that returns support point of
- //!< first object
- ccd_support_fn support2; //!< Function that returns support point of
- //!< second object
-
- ccd_center_fn center1; //!< Function that returns geometric center of
- //!< first object
- ccd_center_fn center2; //!< Function that returns geometric center of
- //!< second object
-
- unsigned long max_iterations; //!< Maximal number of iterations
- ccd_real_t epa_tolerance;
- ccd_real_t mpr_tolerance; //!< Boundary tolerance for MPR algorithm
- ccd_real_t dist_tolerance;
-};
-typedef struct _ccd_t ccd_t;
-
-/**
- * Default first direction.
- */
-_ccd_export void ccdFirstDirDefault(const void *o1, const void *o2,
- ccd_vec3_t *dir);
-
-#define CCD_INIT(ccd) \
- do { \
- (ccd)->first_dir = ccdFirstDirDefault; \
- (ccd)->support1 = NULL; \
- (ccd)->support2 = NULL; \
- (ccd)->center1 = NULL; \
- (ccd)->center2 = NULL; \
- \
- (ccd)->max_iterations = (unsigned long)-1; \
- (ccd)->epa_tolerance = CCD_REAL(0.0001); \
- (ccd)->mpr_tolerance = CCD_REAL(0.0001); \
- (ccd)->dist_tolerance = CCD_REAL(1E-6); \
- } while(0)
-
-
-/**
- * Returns true if two given objects interest.
- */
-_ccd_export int ccdGJKIntersect(const void *obj1, const void *obj2,
- const ccd_t *ccd);
-
-/**
- * This function computes separation vector of two objects. Separation
- * vector is minimal translation of obj2 to get obj1 and obj2 speparated
- * (without intersection).
- * Returns 0 if obj1 and obj2 intersect and sep is filled with translation
- * vector. If obj1 and obj2 don't intersect -1 is returned.
- * If memory allocation fails -2 is returned.
- */
-_ccd_export int ccdGJKSeparate(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_vec3_t *sep);
-
-/**
- * Computes penetration of obj2 into obj1.
- * Depth of penetration, direction and position is returned. It means that
- * if obj2 is translated by distance depth in direction dir objects will
- * have touching contact, pos should be position in global coordinates
- * where force should take a place.
- *
- * CCD+EPA algorithm is used.
- *
- * Returns 0 if obj1 and obj2 intersect and depth, dir and pos are filled
- * if given non-NULL pointers.
- * If obj1 and obj2 don't intersect -1 is returned.
- * If memory allocation fails -2 is returned.
- */
-_ccd_export int ccdGJKPenetration(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_real_t *depth,
- ccd_vec3_t *dir, ccd_vec3_t *pos);
-
-/**
- * Returns true if two given objects intersect - MPR algorithm is used.
- */
-_ccd_export int ccdMPRIntersect(const void *obj1, const void *obj2,
- const ccd_t *ccd);
-
-/**
- * Computes penetration of obj2 into obj1.
- * Depth of penetration, direction and position is returned, i.e. if obj2
- * is translated by computed depth in resulting direction obj1 and obj2
- * would have touching contact. Position is point in global coordinates
- * where force should be take a place.
- *
- * Minkowski Portal Refinement algorithm is used (MPR, a.k.a. XenoCollide,
- * see Game Programming Gem 7).
- *
- * Returns 0 if obj1 and obj2 intersect, otherwise -1 is returned.
- */
-_ccd_export int ccdMPRPenetration(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_real_t *depth,
- ccd_vec3_t *dir, ccd_vec3_t *pos);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __CCD_H__ */
diff --git a/src/pe/extern/libccd/ccd/compiler.h b/src/pe/extern/libccd/ccd/compiler.h
deleted file mode 100644
index b022e26e47875e9f2392b82adfadbd430d5b69b6..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/ccd/compiler.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_COMPILER_H__
-#define __CCD_COMPILER_H__
-
-#include <stddef.h>
-
-#define ccd_offsetof(TYPE, MEMBER) offsetof(TYPE, MEMBER)
-
-#define ccd_container_of(ptr, type, member) \
- (type *)( (char *)ptr - ccd_offsetof(type, member))
-
-
-/**
- * Marks exported function.
- */
-//#ifdef _WIN32
-//# ifdef libccd_EXPORTS
-//# define _ccd_export __declspec(dllexport)
-//# else /* libccd_EXPORTS */
-//# define _ccd_export __declspec(dllimport)
-//# endif /* libccd_EXPORTS */
-//#else /* _WIN32 */
-//# define _ccd_export
-//#endif /* _WIN32 */
-
-#define _ccd_export
-
-
-/**
- * Marks inline function.
- */
-#ifdef __GNUC__
-# define _ccd_inline static inline __attribute__((always_inline))
-#else /* __GNUC__ */
-# define _ccd_inline static __inline
-#endif /* __GNUC__ */
-
-
-/**
- * __prefetch(x) - prefetches the cacheline at "x" for read
- * __prefetchw(x) - prefetches the cacheline at "x" for write
- */
-#ifdef __GNUC__
-# define _ccd_prefetch(x) __builtin_prefetch(x)
-# define _ccd_prefetchw(x) __builtin_prefetch(x,1)
-#else /* __GNUC__ */
-# define _ccd_prefetch(x) ((void)0)
-# define _ccd_prefetchw(x) ((void)0)
-#endif /* __GNUC__ */
-
-
-#ifdef __ICC
-// disable unused parameter warning
-# pragma warning(disable:869)
-// disable annoying "operands are evaluated in unspecified order" warning
-# pragma warning(disable:981)
-#endif /* __ICC */
-
-#ifdef _MSC_VER
-// disable unsafe function warning
-# ifndef _CRT_SECURE_NO_WARNINGS
-# define _CRT_SECURE_NO_WARNINGS
-# endif
-#endif /* _MSC_VER */
-
-#endif /* __CCD_COMPILER_H__ */
-
diff --git a/src/pe/extern/libccd/ccd/config.h.cmake.in b/src/pe/extern/libccd/ccd/config.h.cmake.in
deleted file mode 100644
index 0515009164d1c01f11f1728cb4913338bbe808e8..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/ccd/config.h.cmake.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __CCD_CONFIG_H__
-#define __CCD_CONFIG_H__
-
-#cmakedefine CCD_SINGLE
-#cmakedefine CCD_DOUBLE
-
-#endif /* __CCD_CONFIG_H__ */
diff --git a/src/pe/extern/libccd/ccd/config.h.m4 b/src/pe/extern/libccd/ccd/config.h.m4
deleted file mode 100644
index 4c11fbab0c11d9e9fd63ddd177fb262514732ee9..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/ccd/config.h.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __CCD_CONFIG_H__
-#define __CCD_CONFIG_H__
-
-ifdef(`USE_SINGLE', `#define CCD_SINGLE')
-ifdef(`USE_DOUBLE', `#define CCD_DOUBLE')
-
-#endif /* __CCD_CONFIG_H__ */
diff --git a/src/pe/extern/libccd/ccd/quat.h b/src/pe/extern/libccd/ccd/quat.h
deleted file mode 100644
index fc67532109560e904d7b90f02554c15b0f0a0ccf..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/ccd/quat.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_QUAT_H__
-#define __CCD_QUAT_H__
-
-#include <ccd/compiler.h>
-#include <ccd/vec3.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-struct _ccd_quat_t {
- ccd_real_t q[4]; //!< x, y, z, w
-};
-typedef struct _ccd_quat_t ccd_quat_t;
-
-#define CCD_QUAT(name, x, y, z, w) \
- ccd_quat_t name = { {x, y, z, w} }
-
-_ccd_inline ccd_real_t ccdQuatLen2(const ccd_quat_t *q);
-_ccd_inline ccd_real_t ccdQuatLen(const ccd_quat_t *q);
-
-_ccd_inline void ccdQuatSet(ccd_quat_t *q, ccd_real_t x, ccd_real_t y, ccd_real_t z, ccd_real_t w);
-_ccd_inline void ccdQuatCopy(ccd_quat_t *dest, const ccd_quat_t *src);
-
-_ccd_inline int ccdQuatNormalize(ccd_quat_t *q);
-
-_ccd_inline void ccdQuatSetAngleAxis(ccd_quat_t *q,
- ccd_real_t angle, const ccd_vec3_t *axis);
-
-_ccd_inline void ccdQuatScale(ccd_quat_t *q, ccd_real_t k);
-
-/**
- * q = q * q2
- */
-_ccd_inline void ccdQuatMul(ccd_quat_t *q, const ccd_quat_t *q2);
-
-/**
- * q = a * b
- */
-_ccd_inline void ccdQuatMul2(ccd_quat_t *q,
- const ccd_quat_t *a, const ccd_quat_t *b);
-
-/**
- * Inverts quaternion.
- * Returns 0 on success.
- */
-_ccd_inline int ccdQuatInvert(ccd_quat_t *q);
-_ccd_inline int ccdQuatInvert2(ccd_quat_t *dest, const ccd_quat_t *src);
-
-
-/**
- * Rotate vector v by quaternion q.
- */
-_ccd_inline void ccdQuatRotVec(ccd_vec3_t *v, const ccd_quat_t *q);
-
-
-/**** INLINES ****/
-_ccd_inline ccd_real_t ccdQuatLen2(const ccd_quat_t *q)
-{
- ccd_real_t len;
-
- len = q->q[0] * q->q[0];
- len += q->q[1] * q->q[1];
- len += q->q[2] * q->q[2];
- len += q->q[3] * q->q[3];
-
- return len;
-}
-
-_ccd_inline ccd_real_t ccdQuatLen(const ccd_quat_t *q)
-{
- return CCD_SQRT(ccdQuatLen2(q));
-}
-
-_ccd_inline void ccdQuatSet(ccd_quat_t *q, ccd_real_t x, ccd_real_t y, ccd_real_t z, ccd_real_t w)
-{
- q->q[0] = x;
- q->q[1] = y;
- q->q[2] = z;
- q->q[3] = w;
-}
-
-_ccd_inline void ccdQuatCopy(ccd_quat_t *dest, const ccd_quat_t *src)
-{
- *dest = *src;
-}
-
-
-_ccd_inline int ccdQuatNormalize(ccd_quat_t *q)
-{
- ccd_real_t len = ccdQuatLen(q);
- if (len < CCD_EPS)
- return 0;
-
- ccdQuatScale(q, CCD_ONE / len);
- return 1;
-}
-
-_ccd_inline void ccdQuatSetAngleAxis(ccd_quat_t *q,
- ccd_real_t angle, const ccd_vec3_t *axis)
-{
- ccd_real_t a, x, y, z, n, s;
-
- a = angle/2;
- x = ccdVec3X(axis);
- y = ccdVec3Y(axis);
- z = ccdVec3Z(axis);
- n = CCD_SQRT(x*x + y*y + z*z);
-
- // axis==0? (treat this the same as angle==0 with an arbitrary axis)
- if (n < CCD_EPS){
- q->q[0] = q->q[1] = q->q[2] = CCD_ZERO;
- q->q[3] = CCD_ONE;
- }else{
-#ifdef CCD_DOUBLE
- s = sin(a)/n;
-#else
- s = sinf(a)/n;
-#endif
-
-#ifdef CCD_DOUBLE
- q->q[3] = cos(a);
-#else
- q->q[3] = cosf(a);
-#endif
- q->q[0] = x*s;
- q->q[1] = y*s;
- q->q[2] = z*s;
-
- ccdQuatNormalize(q);
- }
-}
-
-
-_ccd_inline void ccdQuatScale(ccd_quat_t *q, ccd_real_t k)
-{
- size_t i;
- for (i = 0; i < 4; i++)
- q->q[i] *= k;
-}
-
-_ccd_inline void ccdQuatMul(ccd_quat_t *q, const ccd_quat_t *q2)
-{
- ccd_quat_t a;
- ccdQuatCopy(&a, q);
- ccdQuatMul2(q, &a, q2);
-}
-
-_ccd_inline void ccdQuatMul2(ccd_quat_t *q,
- const ccd_quat_t *a, const ccd_quat_t *b)
-{
- q->q[0] = a->q[3] * b->q[0]
- + a->q[0] * b->q[3]
- + a->q[1] * b->q[2]
- - a->q[2] * b->q[1];
- q->q[1] = a->q[3] * b->q[1]
- + a->q[1] * b->q[3]
- - a->q[0] * b->q[2]
- + a->q[2] * b->q[0];
- q->q[2] = a->q[3] * b->q[2]
- + a->q[2] * b->q[3]
- + a->q[0] * b->q[1]
- - a->q[1] * b->q[0];
- q->q[3] = a->q[3] * b->q[3]
- - a->q[0] * b->q[0]
- - a->q[1] * b->q[1]
- - a->q[2] * b->q[2];
-}
-
-_ccd_inline int ccdQuatInvert(ccd_quat_t *q)
-{
- ccd_real_t len2 = ccdQuatLen2(q);
- if (len2 < CCD_EPS)
- return -1;
-
- len2 = CCD_ONE / len2;
-
- q->q[0] = -q->q[0] * len2;
- q->q[1] = -q->q[1] * len2;
- q->q[2] = -q->q[2] * len2;
- q->q[3] = q->q[3] * len2;
-
- return 0;
-}
-_ccd_inline int ccdQuatInvert2(ccd_quat_t *dest, const ccd_quat_t *src)
-{
- ccdQuatCopy(dest, src);
- return ccdQuatInvert(dest);
-}
-
-_ccd_inline void ccdQuatRotVec(ccd_vec3_t *v, const ccd_quat_t *q)
-{
- // original version: 31 mul + 21 add
- // optimized version: 18 mul + 12 add
- // formula: v = v + 2 * cross(q.xyz, cross(q.xyz, v) + q.w * v)
- ccd_real_t cross1_x, cross1_y, cross1_z, cross2_x, cross2_y, cross2_z;
- ccd_real_t x, y, z, w;
- ccd_real_t vx, vy, vz;
-
- vx = ccdVec3X(v);
- vy = ccdVec3Y(v);
- vz = ccdVec3Z(v);
-
- w = q->q[3];
- x = q->q[0];
- y = q->q[1];
- z = q->q[2];
-
- cross1_x = y * vz - z * vy + w * vx;
- cross1_y = z * vx - x * vz + w * vy;
- cross1_z = x * vy - y * vx + w * vz;
- cross2_x = y * cross1_z - z * cross1_y;
- cross2_y = z * cross1_x - x * cross1_z;
- cross2_z = x * cross1_y - y * cross1_x;
- ccdVec3Set(v, vx + 2 * cross2_x, vy + 2 * cross2_y, vz + 2 * cross2_z);
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __CCD_QUAT_H__ */
diff --git a/src/pe/extern/libccd/ccd/vec3.h b/src/pe/extern/libccd/ccd/vec3.h
deleted file mode 100644
index b0c1b338f59cfc8e5c55903c1dae9d14463bb4dc..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/ccd/vec3.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010-2013 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_VEC3_H__
-#define __CCD_VEC3_H__
-
-#include <math.h>
-#include <float.h>
-#include <stdlib.h>
-#include <ccd/compiler.h>
-#include <ccd/config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#ifndef CCD_SINGLE
-# ifndef CCD_DOUBLE
-# error You must define CCD_SINGLE or CCD_DOUBLE
-# endif /* CCD_DOUBLE */
-#endif /* CCD_SINGLE */
-
-#ifdef WIN32
-# define CCD_FMIN(x, y) ((x) < (y) ? (x) : (y))
-#endif /* WIN32 */
-
-#ifdef CCD_SINGLE
-# ifdef CCD_DOUBLE
-# error You can define either CCD_SINGLE or CCD_DOUBLE, not both!
-# endif /* CCD_DOUBLE */
-
-typedef float ccd_real_t;
-
-//# define CCD_EPS 1E-6
-# define CCD_EPS FLT_EPSILON
-
-# define CCD_REAL_MAX FLT_MAX
-
-# define CCD_REAL(x) (x ## f) /*!< form a constant */
-# define CCD_SQRT(x) (sqrtf(x)) /*!< square root */
-# define CCD_FABS(x) (fabsf(x)) /*!< absolute value */
-# define CCD_FMAX(x, y) (fmaxf((x), (y))) /*!< maximum of two floats */
-
-# ifndef CCD_FMIN
-# define CCD_FMIN(x, y) (fminf((x), (y))) /*!< minimum of two floats */
-# endif /* CCD_FMIN */
-
-#endif /* CCD_SINGLE */
-
-#ifdef CCD_DOUBLE
-typedef double ccd_real_t;
-
-//# define CCD_EPS 1E-10
-# define CCD_EPS DBL_EPSILON
-
-# define CCD_REAL_MAX DBL_MAX
-
-# define CCD_REAL(x) (x) /*!< form a constant */
-# define CCD_SQRT(x) (sqrt(x)) /*!< square root */
-# define CCD_FABS(x) (fabs(x)) /*!< absolute value */
-# define CCD_FMAX(x, y) (fmax((x), (y))) /*!< maximum of two floats */
-
-# ifndef CCD_FMIN
-# define CCD_FMIN(x, y) (fmin((x), (y))) /*!< minimum of two floats */
-# endif /* CCD_FMIN */
-
-#endif /* CCD_DOUBLE */
-
-#define CCD_ONE CCD_REAL(1.)
-#define CCD_ZERO CCD_REAL(0.)
-
-struct _ccd_vec3_t {
- ccd_real_t v[3];
-};
-typedef struct _ccd_vec3_t ccd_vec3_t;
-
-
-/**
- * Holds origin (0,0,0) - this variable is meant to be read-only!
- */
-extern ccd_vec3_t *ccd_vec3_origin;
-
-/**
- * Array of points uniformly distributed on unit sphere.
- */
-extern ccd_vec3_t *ccd_points_on_sphere;
-extern size_t ccd_points_on_sphere_len;
-
-/** Returns sign of value. */
-_ccd_inline int ccdSign(ccd_real_t val);
-/** Returns true if val is zero. **/
-_ccd_inline int ccdIsZero(ccd_real_t val);
-/** Returns true if a and b equal. **/
-_ccd_inline int ccdEq(ccd_real_t a, ccd_real_t b);
-
-
-#define CCD_VEC3_STATIC(x, y, z) \
- { { (x), (y), (z) } }
-
-#define CCD_VEC3(name, x, y, z) \
- ccd_vec3_t name = CCD_VEC3_STATIC((x), (y), (z))
-
-_ccd_inline ccd_real_t ccdVec3X(const ccd_vec3_t *v);
-_ccd_inline ccd_real_t ccdVec3Y(const ccd_vec3_t *v);
-_ccd_inline ccd_real_t ccdVec3Z(const ccd_vec3_t *v);
-
-/**
- * Returns true if a and b equal.
- */
-_ccd_inline int ccdVec3Eq(const ccd_vec3_t *a, const ccd_vec3_t *b);
-
-/**
- * Returns squared length of vector.
- */
-_ccd_inline ccd_real_t ccdVec3Len2(const ccd_vec3_t *v);
-
-/**
- * Returns distance between a and b.
- */
-_ccd_inline ccd_real_t ccdVec3Dist2(const ccd_vec3_t *a, const ccd_vec3_t *b);
-
-
-_ccd_inline void ccdVec3Set(ccd_vec3_t *v, ccd_real_t x, ccd_real_t y, ccd_real_t z);
-
-/**
- * v = w
- */
-_ccd_inline void ccdVec3Copy(ccd_vec3_t *v, const ccd_vec3_t *w);
-
-/**
- * Substracts coordinates of vector w from vector v. v = v - w
- */
-_ccd_inline void ccdVec3Sub(ccd_vec3_t *v, const ccd_vec3_t *w);
-
-/**
- * Adds coordinates of vector w to vector v. v = v + w
- */
-_ccd_inline void ccdVec3Add(ccd_vec3_t *v, const ccd_vec3_t *w);
-
-/**
- * d = v - w
- */
-_ccd_inline void ccdVec3Sub2(ccd_vec3_t *d, const ccd_vec3_t *v, const ccd_vec3_t *w);
-
-/**
- * d = d * k;
- */
-_ccd_inline void ccdVec3Scale(ccd_vec3_t *d, ccd_real_t k);
-
-/**
- * Normalizes given vector to unit length.
- */
-_ccd_inline void ccdVec3Normalize(ccd_vec3_t *d);
-
-
-/**
- * Dot product of two vectors.
- */
-_ccd_inline ccd_real_t ccdVec3Dot(const ccd_vec3_t *a, const ccd_vec3_t *b);
-
-/**
- * Cross product: d = a x b.
- */
-_ccd_inline void ccdVec3Cross(ccd_vec3_t *d, const ccd_vec3_t *a, const ccd_vec3_t *b);
-
-
-/**
- * Returns distance^2 of point P to segment ab.
- * If witness is non-NULL it is filled with coordinates of point from which
- * was computed distance to point P.
- */
-_ccd_export ccd_real_t ccdVec3PointSegmentDist2(const ccd_vec3_t *P,
- const ccd_vec3_t *a,
- const ccd_vec3_t *b,
- ccd_vec3_t *witness);
-
-/**
- * Returns distance^2 of point P from triangle formed by triplet a, b, c.
- * If witness vector is provided it is filled with coordinates of point
- * from which was computed distance to point P.
- */
-_ccd_export ccd_real_t ccdVec3PointTriDist2(const ccd_vec3_t *P,
- const ccd_vec3_t *a,
- const ccd_vec3_t *b,
- const ccd_vec3_t *c,
- ccd_vec3_t *witness);
-
-
-/**** INLINES ****/
-_ccd_inline int ccdSign(ccd_real_t val)
-{
- if (ccdIsZero(val)){
- return 0;
- }else if (val < CCD_ZERO){
- return -1;
- }
- return 1;
-}
-
-_ccd_inline int ccdIsZero(ccd_real_t val)
-{
- return CCD_FABS(val) < CCD_EPS;
-}
-
-_ccd_inline int ccdEq(ccd_real_t _a, ccd_real_t _b)
-{
- ccd_real_t ab;
- ccd_real_t a, b;
-
- ab = CCD_FABS(_a - _b);
- if (CCD_FABS(ab) < CCD_EPS)
- return 1;
-
- a = CCD_FABS(_a);
- b = CCD_FABS(_b);
- if (b > a){
- return ab < CCD_EPS * b;
- }else{
- return ab < CCD_EPS * a;
- }
-}
-
-
-_ccd_inline ccd_real_t ccdVec3X(const ccd_vec3_t *v)
-{
- return v->v[0];
-}
-
-_ccd_inline ccd_real_t ccdVec3Y(const ccd_vec3_t *v)
-{
- return v->v[1];
-}
-
-_ccd_inline ccd_real_t ccdVec3Z(const ccd_vec3_t *v)
-{
- return v->v[2];
-}
-
-_ccd_inline int ccdVec3Eq(const ccd_vec3_t *a, const ccd_vec3_t *b)
-{
- return ccdEq(ccdVec3X(a), ccdVec3X(b))
- && ccdEq(ccdVec3Y(a), ccdVec3Y(b))
- && ccdEq(ccdVec3Z(a), ccdVec3Z(b));
-}
-
-_ccd_inline ccd_real_t ccdVec3Len2(const ccd_vec3_t *v)
-{
- return ccdVec3Dot(v, v);
-}
-
-_ccd_inline ccd_real_t ccdVec3Dist2(const ccd_vec3_t *a, const ccd_vec3_t *b)
-{
- ccd_vec3_t ab;
- ccdVec3Sub2(&ab, a, b);
- return ccdVec3Len2(&ab);
-}
-
-_ccd_inline void ccdVec3Set(ccd_vec3_t *v, ccd_real_t x, ccd_real_t y, ccd_real_t z)
-{
- v->v[0] = x;
- v->v[1] = y;
- v->v[2] = z;
-}
-
-_ccd_inline void ccdVec3Copy(ccd_vec3_t *v, const ccd_vec3_t *w)
-{
- *v = *w;
-}
-
-_ccd_inline void ccdVec3Sub(ccd_vec3_t *v, const ccd_vec3_t *w)
-{
- v->v[0] -= w->v[0];
- v->v[1] -= w->v[1];
- v->v[2] -= w->v[2];
-}
-_ccd_inline void ccdVec3Sub2(ccd_vec3_t *d, const ccd_vec3_t *v, const ccd_vec3_t *w)
-{
- d->v[0] = v->v[0] - w->v[0];
- d->v[1] = v->v[1] - w->v[1];
- d->v[2] = v->v[2] - w->v[2];
-}
-
-_ccd_inline void ccdVec3Add(ccd_vec3_t *v, const ccd_vec3_t *w)
-{
- v->v[0] += w->v[0];
- v->v[1] += w->v[1];
- v->v[2] += w->v[2];
-}
-
-_ccd_inline void ccdVec3Scale(ccd_vec3_t *d, ccd_real_t k)
-{
- d->v[0] *= k;
- d->v[1] *= k;
- d->v[2] *= k;
-}
-
-_ccd_inline void ccdVec3Normalize(ccd_vec3_t *d)
-{
- ccd_real_t k = CCD_ONE / CCD_SQRT(ccdVec3Len2(d));
- ccdVec3Scale(d, k);
-}
-
-_ccd_inline ccd_real_t ccdVec3Dot(const ccd_vec3_t *a, const ccd_vec3_t *b)
-{
- ccd_real_t dot;
-
- dot = a->v[0] * b->v[0];
- dot += a->v[1] * b->v[1];
- dot += a->v[2] * b->v[2];
- return dot;
-}
-
-_ccd_inline void ccdVec3Cross(ccd_vec3_t *d, const ccd_vec3_t *a, const ccd_vec3_t *b)
-{
- d->v[0] = (a->v[1] * b->v[2]) - (a->v[2] * b->v[1]);
- d->v[1] = (a->v[2] * b->v[0]) - (a->v[0] * b->v[2]);
- d->v[2] = (a->v[0] * b->v[1]) - (a->v[1] * b->v[0]);
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __CCD_VEC3_H__ */
diff --git a/src/pe/extern/libccd/dbg.h b/src/pe/extern/libccd/dbg.h
deleted file mode 100644
index f4852c1a06a5b852fc80fadf3fa56e5dfd00a973..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/dbg.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_DBG_H__
-#define __CCD_DBG_H__
-
-/**
- * Some macros which can be used for printing debug info to stderr if macro
- * NDEBUG not defined.
- *
- * DBG_PROLOGUE can be specified as string and this string will be
- * prepended to output text
- */
-#ifndef NDEBUG
-
-#include <stdio.h>
-
-#ifndef DBG_PROLOGUE
-# define DBG_PROLOGUE
-#endif
-
-# define DBG(format, ...) do { \
- fprintf(stderr, DBG_PROLOGUE "%s :: " format "\n", __func__, ## __VA_ARGS__); \
- fflush(stderr); \
- } while (0)
-
-# define DBG2(str) do { \
- fprintf(stderr, DBG_PROLOGUE "%s :: " str "\n", __func__); \
- fflush(stderr); \
- } while (0)
-
-# define DBG_VEC3(vec, prefix) do {\
- fprintf(stderr, DBG_PROLOGUE "%s :: %s[%lf %lf %lf]\n", \
- __func__, prefix, ccdVec3X(vec), ccdVec3Y(vec), ccdVec3Z(vec)); \
- fflush(stderr); \
- } while (0)
-/*
-# define DBG_VEC3(vec, prefix) do {\
- fprintf(stderr, DBG_PROLOGUE "%s :: %s[%.20lf %.20lf %.20lf]\n", \
- __func__, prefix, ccdVec3X(vec), ccdVec3Y(vec), ccdVec3Z(vec)); \
- fflush(stderr); \
- } while (0)
-*/
-
-#else
-# define DBG(format, ...)
-# define DBG2(str)
-# define DBG_VEC3(v, prefix)
-#endif
-
-#endif /* __CCD_DBG_H__ */
diff --git a/src/pe/extern/libccd/list.h b/src/pe/extern/libccd/list.h
deleted file mode 100644
index 40ea6328fa2633f430623662322ddd5cb65613a3..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/list.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_LIST_H__
-#define __CCD_LIST_H__
-
-#include <string.h>
-#include <ccd/compiler.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-struct _ccd_list_t {
- struct _ccd_list_t *next, *prev;
-};
-typedef struct _ccd_list_t ccd_list_t;
-
-
-
-/**
- * Get the struct for this entry.
- * @ptr: the &ccd_list_t pointer.
- * @type: the type of the struct this is embedded in.
- * @member: the name of the list_struct within the struct.
- */
-#define ccdListEntry(ptr, type, member) \
- ccd_container_of(ptr, type, member)
-
-/**
- * Iterates over list.
- */
-#define ccdListForEach(list, item) \
- for (item = (list)->next; \
- _ccd_prefetch((item)->next), item != (list); \
- item = (item)->next)
-
-/**
- * Iterates over list safe against remove of list entry
- */
-#define ccdListForEachSafe(list, item, tmp) \
- for (item = (list)->next, tmp = (item)->next; \
- item != (list); \
- item = tmp, tmp = (item)->next)
-
-/**
- * Iterates over list of given type.
- * @pos: the type * to use as a loop cursor.
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- */
-#define ccdListForEachEntry(head, pos, postype, member) \
- for (pos = ccdListEntry((head)->next, postype, member); \
- _ccd_prefetch(pos->member.next), &pos->member != (head); \
- pos = ccdListEntry(pos->member.next, postype, member))
-
-/**
- * Iterates over list of given type safe against removal of list entry
- * @pos: the type * to use as a loop cursor.
- * @n: another type * to use as temporary storage
- * @head: the head for your list.
- * @member: the name of the list_struct within the struct.
- */
-#define ccdListForEachEntrySafe(head, pos, postype, n, ntype, member) \
- for (pos = ccdListEntry((head)->next, postype, member), \
- n = ccdListEntry(pos->member.next, postype, member); \
- &pos->member != (head); \
- pos = n, n = ccdListEntry(n->member.next, ntype, member))
-
-
-/**
- * Initialize list.
- */
-_ccd_inline void ccdListInit(ccd_list_t *l);
-
-_ccd_inline ccd_list_t *ccdListNext(ccd_list_t *l);
-_ccd_inline ccd_list_t *ccdListPrev(ccd_list_t *l);
-
-/**
- * Returns true if list is empty.
- */
-_ccd_inline int ccdListEmpty(const ccd_list_t *head);
-
-/**
- * Appends item to end of the list l.
- */
-_ccd_inline void ccdListAppend(ccd_list_t *l, ccd_list_t *item);
-
-/**
- * Removes item from list.
- */
-_ccd_inline void ccdListDel(ccd_list_t *item);
-
-
-
-///
-/// INLINES:
-///
-
-_ccd_inline void ccdListInit(ccd_list_t *l)
-{
- l->next = l;
- l->prev = l;
-}
-
-_ccd_inline ccd_list_t *ccdListNext(ccd_list_t *l)
-{
- return l->next;
-}
-
-_ccd_inline ccd_list_t *ccdListPrev(ccd_list_t *l)
-{
- return l->prev;
-}
-
-_ccd_inline int ccdListEmpty(const ccd_list_t *head)
-{
- return head->next == head;
-}
-
-_ccd_inline void ccdListAppend(ccd_list_t *l, ccd_list_t *new_element)
-{
- new_element->prev = l->prev;
- new_element->next = l;
- l->prev->next = new_element;
- l->prev = new_element;
-}
-
-_ccd_inline void ccdListDel(ccd_list_t *item)
-{
- item->next->prev = item->prev;
- item->prev->next = item->next;
- item->next = item;
- item->prev = item;
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __CCD_LIST_H__ */
diff --git a/src/pe/extern/libccd/mpr.c b/src/pe/extern/libccd/mpr.c
deleted file mode 100644
index 5f5533a5bad9ba5a78be456f88e0ea0162af7b72..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/mpr.c
+++ /dev/null
@@ -1,547 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010,2011 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#include <stdlib.h>
-#include <ccd/ccd.h>
-#include "simplex.h"
-#include "dbg.h"
-
-/** Finds origin (center) of Minkowski difference (actually it can be any
- * interior point of Minkowski difference. */
-_ccd_inline void findOrigin(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_support_t *center);
-
-/** Discovers initial portal - that is tetrahedron that intersects with
- * origin ray (ray from center of Minkowski diff to (0,0,0).
- *
- * Returns -1 if already recognized that origin is outside Minkowski
- * portal.
- * Returns 1 if origin lies on v1 of simplex (only v0 and v1 are present
- * in simplex).
- * Returns 2 if origin lies on v0-v1 segment.
- * Returns 0 if portal was built.
- */
-static int discoverPortal(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_simplex_t *portal);
-
-
-/** Expands portal towards origin and determine if objects intersect.
- * Already established portal must be given as argument.
- * If intersection is found 0 is returned, -1 otherwise */
-static int refinePortal(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_simplex_t *portal);
-
-/** Finds penetration info by expanding provided portal. */
-static void findPenetr(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_simplex_t *portal,
- ccd_real_t *depth, ccd_vec3_t *dir, ccd_vec3_t *pos);
-
-/** Finds penetration info if origin lies on portal's v1 */
-static void findPenetrTouch(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_simplex_t *portal,
- ccd_real_t *depth, ccd_vec3_t *dir, ccd_vec3_t *pos);
-
-/** Find penetration info if origin lies on portal's segment v0-v1 */
-static void findPenetrSegment(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_simplex_t *portal,
- ccd_real_t *depth, ccd_vec3_t *dir, ccd_vec3_t *pos);
-
-/** Finds position vector from fully established portal */
-static void findPos(const void *obj1, const void *obj2, const ccd_t *ccd,
- const ccd_simplex_t *portal, ccd_vec3_t *pos);
-
-/** Extends portal with new support point.
- * Portal must have face v1-v2-v3 arranged to face outside portal. */
-_ccd_inline void expandPortal(ccd_simplex_t *portal,
- const ccd_support_t *v4);
-
-/** Fill dir with direction outside portal. Portal's v1-v2-v3 face must be
- * arranged in correct order! */
-_ccd_inline void portalDir(const ccd_simplex_t *portal, ccd_vec3_t *dir);
-
-/** Returns true if portal encapsules origin (0,0,0), dir is direction of
- * v1-v2-v3 face. */
-_ccd_inline int portalEncapsulesOrigin(const ccd_simplex_t *portal,
- const ccd_vec3_t *dir);
-
-/** Returns true if portal with new point v4 would reach specified
- * tolerance (i.e. returns true if portal can _not_ significantly expand
- * within Minkowski difference).
- *
- * v4 is candidate for new point in portal, dir is direction in which v4
- * was obtained. */
-_ccd_inline int portalReachTolerance(const ccd_simplex_t *portal,
- const ccd_support_t *v4,
- const ccd_vec3_t *dir,
- const ccd_t *ccd);
-
-/** Returns true if portal expanded by new point v4 could possibly contain
- * origin, dir is direction in which v4 was obtained. */
-_ccd_inline int portalCanEncapsuleOrigin(const ccd_simplex_t *portal,
- const ccd_support_t *v4,
- const ccd_vec3_t *dir);
-
-
-int ccdMPRIntersect(const void *obj1, const void *obj2, const ccd_t *ccd)
-{
- ccd_simplex_t portal;
- int res;
-
- // Phase 1: Portal discovery - find portal that intersects with origin
- // ray (ray from center of Minkowski diff to origin of coordinates)
- res = discoverPortal(obj1, obj2, ccd, &portal);
- if (res < 0)
- return 0;
- if (res > 0)
- return 1;
-
- // Phase 2: Portal refinement
- res = refinePortal(obj1, obj2, ccd, &portal);
- return (res == 0 ? 1 : 0);
-}
-
-int ccdMPRPenetration(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_real_t *depth, ccd_vec3_t *dir, ccd_vec3_t *pos)
-{
- ccd_simplex_t portal;
- int res;
-
- // Phase 1: Portal discovery
- res = discoverPortal(obj1, obj2, ccd, &portal);
- if (res < 0){
- // Origin isn't inside portal - no collision.
- return -1;
-
- }else if (res == 1){
- // Touching contact on portal's v1.
- findPenetrTouch(obj1, obj2, ccd, &portal, depth, dir, pos);
-
- }else if (res == 2){
- // Origin lies on v0-v1 segment.
- findPenetrSegment(obj1, obj2, ccd, &portal, depth, dir, pos);
-
- }else if (res == 0){
- // Phase 2: Portal refinement
- res = refinePortal(obj1, obj2, ccd, &portal);
- if (res < 0)
- return -1;
-
- // Phase 3. Penetration info
- findPenetr(obj1, obj2, ccd, &portal, depth, dir, pos);
- }
-
- return 0;
-}
-
-
-
-_ccd_inline void findOrigin(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_support_t *center)
-{
- ccd->center1(obj1, ¢er->v1);
- ccd->center2(obj2, ¢er->v2);
- ccdVec3Sub2(¢er->v, ¢er->v1, ¢er->v2);
-}
-
-static int discoverPortal(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_simplex_t *portal)
-{
- ccd_vec3_t dir, va, vb;
- ccd_real_t dot;
- int cont;
-
- // vertex 0 is center of portal
- findOrigin(obj1, obj2, ccd, ccdSimplexPointW(portal, 0));
- ccdSimplexSetSize(portal, 1);
-
- if (ccdVec3Eq(&ccdSimplexPoint(portal, 0)->v, ccd_vec3_origin)){
- // Portal's center lies on origin (0,0,0) => we know that objects
- // intersect but we would need to know penetration info.
- // So move center little bit...
- ccdVec3Set(&va, CCD_EPS * CCD_REAL(10.), CCD_ZERO, CCD_ZERO);
- ccdVec3Add(&ccdSimplexPointW(portal, 0)->v, &va);
- }
-
-
- // vertex 1 = support in direction of origin
- ccdVec3Copy(&dir, &ccdSimplexPoint(portal, 0)->v);
- ccdVec3Scale(&dir, CCD_REAL(-1.));
- ccdVec3Normalize(&dir);
- __ccdSupport(obj1, obj2, &dir, ccd, ccdSimplexPointW(portal, 1));
- ccdSimplexSetSize(portal, 2);
-
- // test if origin isn't outside of v1
- dot = ccdVec3Dot(&ccdSimplexPoint(portal, 1)->v, &dir);
- if (ccdIsZero(dot) || dot < CCD_ZERO)
- return -1;
-
-
- // vertex 2
- ccdVec3Cross(&dir, &ccdSimplexPoint(portal, 0)->v,
- &ccdSimplexPoint(portal, 1)->v);
- if (ccdIsZero(ccdVec3Len2(&dir))){
- if (ccdVec3Eq(&ccdSimplexPoint(portal, 1)->v, ccd_vec3_origin)){
- // origin lies on v1
- return 1;
- }else{
- // origin lies on v0-v1 segment
- return 2;
- }
- }
-
- ccdVec3Normalize(&dir);
- __ccdSupport(obj1, obj2, &dir, ccd, ccdSimplexPointW(portal, 2));
- dot = ccdVec3Dot(&ccdSimplexPoint(portal, 2)->v, &dir);
- if (ccdIsZero(dot) || dot < CCD_ZERO)
- return -1;
-
- ccdSimplexSetSize(portal, 3);
-
- // vertex 3 direction
- ccdVec3Sub2(&va, &ccdSimplexPoint(portal, 1)->v,
- &ccdSimplexPoint(portal, 0)->v);
- ccdVec3Sub2(&vb, &ccdSimplexPoint(portal, 2)->v,
- &ccdSimplexPoint(portal, 0)->v);
- ccdVec3Cross(&dir, &va, &vb);
- ccdVec3Normalize(&dir);
-
- // it is better to form portal faces to be oriented "outside" origin
- dot = ccdVec3Dot(&dir, &ccdSimplexPoint(portal, 0)->v);
- if (dot > CCD_ZERO){
- ccdSimplexSwap(portal, 1, 2);
- ccdVec3Scale(&dir, CCD_REAL(-1.));
- }
-
- while (ccdSimplexSize(portal) < 4){
- __ccdSupport(obj1, obj2, &dir, ccd, ccdSimplexPointW(portal, 3));
- dot = ccdVec3Dot(&ccdSimplexPoint(portal, 3)->v, &dir);
- if (ccdIsZero(dot) || dot < CCD_ZERO)
- return -1;
-
- cont = 0;
-
- // test if origin is outside (v1, v0, v3) - set v2 as v3 and
- // continue
- ccdVec3Cross(&va, &ccdSimplexPoint(portal, 1)->v,
- &ccdSimplexPoint(portal, 3)->v);
- dot = ccdVec3Dot(&va, &ccdSimplexPoint(portal, 0)->v);
- if (dot < CCD_ZERO && !ccdIsZero(dot)){
- ccdSimplexSet(portal, 2, ccdSimplexPoint(portal, 3));
- cont = 1;
- }
-
- if (!cont){
- // test if origin is outside (v3, v0, v2) - set v1 as v3 and
- // continue
- ccdVec3Cross(&va, &ccdSimplexPoint(portal, 3)->v,
- &ccdSimplexPoint(portal, 2)->v);
- dot = ccdVec3Dot(&va, &ccdSimplexPoint(portal, 0)->v);
- if (dot < CCD_ZERO && !ccdIsZero(dot)){
- ccdSimplexSet(portal, 1, ccdSimplexPoint(portal, 3));
- cont = 1;
- }
- }
-
- if (cont){
- ccdVec3Sub2(&va, &ccdSimplexPoint(portal, 1)->v,
- &ccdSimplexPoint(portal, 0)->v);
- ccdVec3Sub2(&vb, &ccdSimplexPoint(portal, 2)->v,
- &ccdSimplexPoint(portal, 0)->v);
- ccdVec3Cross(&dir, &va, &vb);
- ccdVec3Normalize(&dir);
- }else{
- ccdSimplexSetSize(portal, 4);
- }
- }
-
- return 0;
-}
-
-static int refinePortal(const void *obj1, const void *obj2,
- const ccd_t *ccd, ccd_simplex_t *portal)
-{
- ccd_vec3_t dir;
- ccd_support_t v4;
-
- while (1){
- // compute direction outside the portal (from v0 throught v1,v2,v3
- // face)
- portalDir(portal, &dir);
-
- // test if origin is inside the portal
- if (portalEncapsulesOrigin(portal, &dir))
- return 0;
-
- // get next support point
- __ccdSupport(obj1, obj2, &dir, ccd, &v4);
-
- // test if v4 can expand portal to contain origin and if portal
- // expanding doesn't reach given tolerance
- if (!portalCanEncapsuleOrigin(portal, &v4, &dir)
- || portalReachTolerance(portal, &v4, &dir, ccd)){
- return -1;
- }
-
- // v1-v2-v3 triangle must be rearranged to face outside Minkowski
- // difference (direction from v0).
- expandPortal(portal, &v4);
- }
-
- return -1;
-}
-
-
-static void findPenetr(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_simplex_t *portal,
- ccd_real_t *depth, ccd_vec3_t *pdir, ccd_vec3_t *pos)
-{
- ccd_vec3_t dir;
- ccd_support_t v4;
- unsigned long iterations;
-
- iterations = 0UL;
- while (1){
- // compute portal direction and obtain next support point
- portalDir(portal, &dir);
- __ccdSupport(obj1, obj2, &dir, ccd, &v4);
-
- // reached tolerance -> find penetration info
- if (portalReachTolerance(portal, &v4, &dir, ccd)
- || iterations > ccd->max_iterations){
- *depth = ccdVec3PointTriDist2(ccd_vec3_origin,
- &ccdSimplexPoint(portal, 1)->v,
- &ccdSimplexPoint(portal, 2)->v,
- &ccdSimplexPoint(portal, 3)->v,
- pdir);
- *depth = CCD_SQRT(*depth);
- ccdVec3Normalize(pdir);
-
- // barycentric coordinates:
- findPos(obj1, obj2, ccd, portal, pos);
-
- return;
- }
-
- expandPortal(portal, &v4);
-
- iterations++;
- }
-}
-
-static void findPenetrTouch(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_simplex_t *portal,
- ccd_real_t *depth, ccd_vec3_t *dir, ccd_vec3_t *pos)
-{
- (void)(obj1);
- (void)(obj2);
- (void)(ccd);
- // Touching contact on portal's v1 - so depth is zero and direction
- // is unimportant and pos can be guessed
- *depth = CCD_REAL(0.);
- ccdVec3Copy(dir, ccd_vec3_origin);
-
- ccdVec3Copy(pos, &ccdSimplexPoint(portal, 1)->v1);
- ccdVec3Add(pos, &ccdSimplexPoint(portal, 1)->v2);
- ccdVec3Scale(pos, 0.5);
-}
-
-static void findPenetrSegment(const void *obj1, const void *obj2, const ccd_t *ccd,
- ccd_simplex_t *portal,
- ccd_real_t *depth, ccd_vec3_t *dir, ccd_vec3_t *pos)
-{
- (void)(obj1);
- (void)(obj2);
- (void)(ccd);
-
- /*
- ccd_vec3_t vec;
- ccd_real_t k;
- */
-
- // Origin lies on v0-v1 segment.
- // Depth is distance to v1, direction also and position must be
- // computed
-
- ccdVec3Copy(pos, &ccdSimplexPoint(portal, 1)->v1);
- ccdVec3Add(pos, &ccdSimplexPoint(portal, 1)->v2);
- ccdVec3Scale(pos, CCD_REAL(0.5));
-
- /*
- ccdVec3Sub2(&vec, &ccdSimplexPoint(portal, 1)->v,
- &ccdSimplexPoint(portal, 0)->v);
- k = CCD_SQRT(ccdVec3Len2(&ccdSimplexPoint(portal, 0)->v));
- k /= CCD_SQRT(ccdVec3Len2(&vec));
- ccdVec3Scale(&vec, -k);
- ccdVec3Add(pos, &vec);
- */
-
- ccdVec3Copy(dir, &ccdSimplexPoint(portal, 1)->v);
- *depth = CCD_SQRT(ccdVec3Len2(dir));
- ccdVec3Normalize(dir);
-}
-
-
-static void findPos(const void *obj1, const void *obj2, const ccd_t *ccd,
- const ccd_simplex_t *portal, ccd_vec3_t *pos)
-{
- (void)(obj1);
- (void)(obj2);
- (void)(ccd);
-
- ccd_vec3_t dir;
- size_t i;
- ccd_real_t b[4], sum, inv;
- ccd_vec3_t vec, p1, p2;
-
- portalDir(portal, &dir);
-
- // use barycentric coordinates of tetrahedron to find origin
- ccdVec3Cross(&vec, &ccdSimplexPoint(portal, 1)->v,
- &ccdSimplexPoint(portal, 2)->v);
- b[0] = ccdVec3Dot(&vec, &ccdSimplexPoint(portal, 3)->v);
-
- ccdVec3Cross(&vec, &ccdSimplexPoint(portal, 3)->v,
- &ccdSimplexPoint(portal, 2)->v);
- b[1] = ccdVec3Dot(&vec, &ccdSimplexPoint(portal, 0)->v);
-
- ccdVec3Cross(&vec, &ccdSimplexPoint(portal, 0)->v,
- &ccdSimplexPoint(portal, 1)->v);
- b[2] = ccdVec3Dot(&vec, &ccdSimplexPoint(portal, 3)->v);
-
- ccdVec3Cross(&vec, &ccdSimplexPoint(portal, 2)->v,
- &ccdSimplexPoint(portal, 1)->v);
- b[3] = ccdVec3Dot(&vec, &ccdSimplexPoint(portal, 0)->v);
-
- sum = b[0] + b[1] + b[2] + b[3];
-
- if (ccdIsZero(sum) || sum < CCD_ZERO){
- b[0] = CCD_REAL(0.);
-
- ccdVec3Cross(&vec, &ccdSimplexPoint(portal, 2)->v,
- &ccdSimplexPoint(portal, 3)->v);
- b[1] = ccdVec3Dot(&vec, &dir);
- ccdVec3Cross(&vec, &ccdSimplexPoint(portal, 3)->v,
- &ccdSimplexPoint(portal, 1)->v);
- b[2] = ccdVec3Dot(&vec, &dir);
- ccdVec3Cross(&vec, &ccdSimplexPoint(portal, 1)->v,
- &ccdSimplexPoint(portal, 2)->v);
- b[3] = ccdVec3Dot(&vec, &dir);
-
- sum = b[1] + b[2] + b[3];
- }
-
- inv = CCD_REAL(1.) / sum;
-
- ccdVec3Copy(&p1, ccd_vec3_origin);
- ccdVec3Copy(&p2, ccd_vec3_origin);
- for (i = 0; i < 4; i++){
- ccdVec3Copy(&vec, &ccdSimplexPoint(portal, (int)i)->v1);
- ccdVec3Scale(&vec, b[i]);
- ccdVec3Add(&p1, &vec);
-
- ccdVec3Copy(&vec, &ccdSimplexPoint(portal, (int)i)->v2);
- ccdVec3Scale(&vec, b[i]);
- ccdVec3Add(&p2, &vec);
- }
- ccdVec3Scale(&p1, inv);
- ccdVec3Scale(&p2, inv);
-
- ccdVec3Copy(pos, &p1);
- ccdVec3Add(pos, &p2);
- ccdVec3Scale(pos, 0.5);
-}
-
-_ccd_inline void expandPortal(ccd_simplex_t *portal,
- const ccd_support_t *v4)
-{
- ccd_real_t dot;
- ccd_vec3_t v4v0;
-
- ccdVec3Cross(&v4v0, &v4->v, &ccdSimplexPoint(portal, 0)->v);
- dot = ccdVec3Dot(&ccdSimplexPoint(portal, 1)->v, &v4v0);
- if (dot > CCD_ZERO){
- dot = ccdVec3Dot(&ccdSimplexPoint(portal, 2)->v, &v4v0);
- if (dot > CCD_ZERO){
- ccdSimplexSet(portal, 1, v4);
- }else{
- ccdSimplexSet(portal, 3, v4);
- }
- }else{
- dot = ccdVec3Dot(&ccdSimplexPoint(portal, 3)->v, &v4v0);
- if (dot > CCD_ZERO){
- ccdSimplexSet(portal, 2, v4);
- }else{
- ccdSimplexSet(portal, 1, v4);
- }
- }
-}
-
-_ccd_inline void portalDir(const ccd_simplex_t *portal, ccd_vec3_t *dir)
-{
- ccd_vec3_t v2v1, v3v1;
-
- ccdVec3Sub2(&v2v1, &ccdSimplexPoint(portal, 2)->v,
- &ccdSimplexPoint(portal, 1)->v);
- ccdVec3Sub2(&v3v1, &ccdSimplexPoint(portal, 3)->v,
- &ccdSimplexPoint(portal, 1)->v);
- ccdVec3Cross(dir, &v2v1, &v3v1);
- ccdVec3Normalize(dir);
-}
-
-_ccd_inline int portalEncapsulesOrigin(const ccd_simplex_t *portal,
- const ccd_vec3_t *dir)
-{
- ccd_real_t dot;
- dot = ccdVec3Dot(dir, &ccdSimplexPoint(portal, 1)->v);
- return ccdIsZero(dot) || dot > CCD_ZERO;
-}
-
-_ccd_inline int portalReachTolerance(const ccd_simplex_t *portal,
- const ccd_support_t *v4,
- const ccd_vec3_t *dir,
- const ccd_t *ccd)
-{
- ccd_real_t dv1, dv2, dv3, dv4;
- ccd_real_t dot1, dot2, dot3;
-
- // find the smallest dot product of dir and {v1-v4, v2-v4, v3-v4}
-
- dv1 = ccdVec3Dot(&ccdSimplexPoint(portal, 1)->v, dir);
- dv2 = ccdVec3Dot(&ccdSimplexPoint(portal, 2)->v, dir);
- dv3 = ccdVec3Dot(&ccdSimplexPoint(portal, 3)->v, dir);
- dv4 = ccdVec3Dot(&v4->v, dir);
-
- dot1 = dv4 - dv1;
- dot2 = dv4 - dv2;
- dot3 = dv4 - dv3;
-
- dot1 = CCD_FMIN(dot1, dot2);
- dot1 = CCD_FMIN(dot1, dot3);
-
- return ccdEq(dot1, ccd->mpr_tolerance) || dot1 < ccd->mpr_tolerance;
-}
-
-_ccd_inline int portalCanEncapsuleOrigin(const ccd_simplex_t *portal,
- const ccd_support_t *v4,
- const ccd_vec3_t *dir)
-{
- (void)(portal);
-
- ccd_real_t dot;
- dot = ccdVec3Dot(&v4->v, dir);
- return ccdIsZero(dot) || dot > CCD_ZERO;
-}
diff --git a/src/pe/extern/libccd/polytope.c b/src/pe/extern/libccd/polytope.c
deleted file mode 100644
index 527016cdee360a5eba62e8063720b63c3b010a81..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/polytope.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#include <stdio.h>
-#include <float.h>
-#include "polytope.h"
-#include "alloc.h"
-
-_ccd_inline void _ccdPtNearestUpdate(ccd_pt_t *pt, ccd_pt_el_t *el)
-{
- if (ccdEq(pt->nearest_dist, el->dist)){
- if (el->type < pt->nearest_type){
- pt->nearest = el;
- pt->nearest_dist = el->dist;
- pt->nearest_type = el->type;
- }
- }else if (el->dist < pt->nearest_dist){
- pt->nearest = el;
- pt->nearest_dist = el->dist;
- pt->nearest_type = el->type;
- }
-}
-
-static void _ccdPtNearestRenew(ccd_pt_t *pt)
-{
- ccd_pt_vertex_t *v;
- ccd_pt_edge_t *e;
- ccd_pt_face_t *f;
-
- pt->nearest_dist = CCD_REAL_MAX;
- pt->nearest_type = 3;
- pt->nearest = NULL;
-
- ccdListForEachEntry(&pt->vertices, v, ccd_pt_vertex_t, list){
- _ccdPtNearestUpdate(pt, (ccd_pt_el_t *)v);
- }
-
- ccdListForEachEntry(&pt->edges, e, ccd_pt_edge_t, list){
- _ccdPtNearestUpdate(pt, (ccd_pt_el_t *)e);
- }
-
- ccdListForEachEntry(&pt->faces, f, ccd_pt_face_t, list){
- _ccdPtNearestUpdate(pt, (ccd_pt_el_t *)f);
- }
-}
-
-
-
-void ccdPtInit(ccd_pt_t *pt)
-{
- ccdListInit(&pt->vertices);
- ccdListInit(&pt->edges);
- ccdListInit(&pt->faces);
-
- pt->nearest = NULL;
- pt->nearest_dist = CCD_REAL_MAX;
- pt->nearest_type = 3;
-}
-
-void ccdPtDestroy(ccd_pt_t *pt)
-{
- ccd_pt_face_t *f, *f2;
- ccd_pt_edge_t *e, *e2;
- ccd_pt_vertex_t *v, *v2;
-
- // first delete all faces
- ccdListForEachEntrySafe(&pt->faces, f, ccd_pt_face_t, f2, ccd_pt_face_t, list){
- ccdPtDelFace(pt, f);
- }
-
- // delete all edges
- ccdListForEachEntrySafe(&pt->edges, e, ccd_pt_edge_t, e2, ccd_pt_edge_t, list){
- ccdPtDelEdge(pt, e);
- }
-
- // delete all vertices
- ccdListForEachEntrySafe(&pt->vertices, v, ccd_pt_vertex_t, v2, ccd_pt_vertex_t, list){
- ccdPtDelVertex(pt, v);
- }
-}
-
-
-ccd_pt_vertex_t *ccdPtAddVertex(ccd_pt_t *pt, const ccd_support_t *v)
-{
- ccd_pt_vertex_t *vert;
-
- vert = CCD_ALLOC(ccd_pt_vertex_t);
- if (vert == NULL)
- return NULL;
-
- vert->type = CCD_PT_VERTEX;
- ccdSupportCopy(&vert->v, v);
-
- vert->dist = ccdVec3Len2(&vert->v.v);
- ccdVec3Copy(&vert->witness, &vert->v.v);
-
- ccdListInit(&vert->edges);
-
- // add vertex to list
- ccdListAppend(&pt->vertices, &vert->list);
-
- // update position in .nearest array
- _ccdPtNearestUpdate(pt, (ccd_pt_el_t *)vert);
-
- return vert;
-}
-
-ccd_pt_edge_t *ccdPtAddEdge(ccd_pt_t *pt, ccd_pt_vertex_t *v1,
- ccd_pt_vertex_t *v2)
-{
- const ccd_vec3_t *a, *b;
- ccd_pt_edge_t *edge;
-
- if (v1 == NULL || v2 == NULL)
- return NULL;
-
- edge = CCD_ALLOC(ccd_pt_edge_t);
- if (edge == NULL)
- return NULL;
-
- edge->type = CCD_PT_EDGE;
- edge->vertex[0] = v1;
- edge->vertex[1] = v2;
- edge->faces[0] = edge->faces[1] = NULL;
-
- a = &edge->vertex[0]->v.v;
- b = &edge->vertex[1]->v.v;
- edge->dist = ccdVec3PointSegmentDist2(ccd_vec3_origin, a, b, &edge->witness);
-
- ccdListAppend(&edge->vertex[0]->edges, &edge->vertex_list[0]);
- ccdListAppend(&edge->vertex[1]->edges, &edge->vertex_list[1]);
-
- ccdListAppend(&pt->edges, &edge->list);
-
- // update position in .nearest array
- _ccdPtNearestUpdate(pt, (ccd_pt_el_t *)edge);
-
- return edge;
-}
-
-ccd_pt_face_t *ccdPtAddFace(ccd_pt_t *pt, ccd_pt_edge_t *e1,
- ccd_pt_edge_t *e2,
- ccd_pt_edge_t *e3)
-{
- const ccd_vec3_t *a, *b, *c;
- ccd_pt_face_t *face;
- ccd_pt_edge_t *e;
- size_t i;
-
- if (e1 == NULL || e2 == NULL || e3 == NULL)
- return NULL;
-
- face = CCD_ALLOC(ccd_pt_face_t);
- if (face == NULL)
- return NULL;
-
- face->type = CCD_PT_FACE;
- face->edge[0] = e1;
- face->edge[1] = e2;
- face->edge[2] = e3;
-
- // obtain triplet of vertices
- a = &face->edge[0]->vertex[0]->v.v;
- b = &face->edge[0]->vertex[1]->v.v;
- e = face->edge[1];
- if (e->vertex[0] != face->edge[0]->vertex[0]
- && e->vertex[0] != face->edge[0]->vertex[1]){
- c = &e->vertex[0]->v.v;
- }else{
- c = &e->vertex[1]->v.v;
- }
- face->dist = ccdVec3PointTriDist2(ccd_vec3_origin, a, b, c, &face->witness);
-
-
- for (i = 0; i < 3; i++){
- if (face->edge[i]->faces[0] == NULL){
- face->edge[i]->faces[0] = face;
- }else{
- face->edge[i]->faces[1] = face;
- }
- }
-
- ccdListAppend(&pt->faces, &face->list);
-
- // update position in .nearest array
- _ccdPtNearestUpdate(pt, (ccd_pt_el_t *)face);
-
- return face;
-}
-
-
-void ccdPtRecomputeDistances(ccd_pt_t *pt)
-{
- ccd_pt_vertex_t *v;
- ccd_pt_edge_t *e;
- ccd_pt_face_t *f;
- const ccd_vec3_t *a, *b, *c;
- ccd_real_t dist;
-
- ccdListForEachEntry(&pt->vertices, v, ccd_pt_vertex_t, list){
- dist = ccdVec3Len2(&v->v.v);
- v->dist = dist;
- ccdVec3Copy(&v->witness, &v->v.v);
- }
-
- ccdListForEachEntry(&pt->edges, e, ccd_pt_edge_t, list){
- a = &e->vertex[0]->v.v;
- b = &e->vertex[1]->v.v;
- dist = ccdVec3PointSegmentDist2(ccd_vec3_origin, a, b, &e->witness);
- e->dist = dist;
- }
-
- ccdListForEachEntry(&pt->faces, f, ccd_pt_face_t, list){
- // obtain triplet of vertices
- a = &f->edge[0]->vertex[0]->v.v;
- b = &f->edge[0]->vertex[1]->v.v;
- e = f->edge[1];
- if (e->vertex[0] != f->edge[0]->vertex[0]
- && e->vertex[0] != f->edge[0]->vertex[1]){
- c = &e->vertex[0]->v.v;
- }else{
- c = &e->vertex[1]->v.v;
- }
-
- dist = ccdVec3PointTriDist2(ccd_vec3_origin, a, b, c, &f->witness);
- f->dist = dist;
- }
-}
-
-ccd_pt_el_t *ccdPtNearest(ccd_pt_t *pt)
-{
- if (!pt->nearest){
- _ccdPtNearestRenew(pt);
- }
- return pt->nearest;
-}
-
-
-void ccdPtDumpSVT(ccd_pt_t *pt, const char *fn)
-{
- FILE *fout;
-
- fout = fopen(fn, "a");
- if (fout == NULL)
- return;
-
- ccdPtDumpSVT2(pt, fout);
-
- fclose(fout);
-}
-
-void ccdPtDumpSVT2(ccd_pt_t *pt, FILE *fout)
-{
- ccd_pt_vertex_t *v, *a, *b, *c;
- ccd_pt_edge_t *e;
- ccd_pt_face_t *f;
- size_t i;
-
- fprintf(fout, "-----\n");
-
- fprintf(fout, "Points:\n");
- i = 0;
- ccdListForEachEntry(&pt->vertices, v, ccd_pt_vertex_t, list){
- v->id = (int)(i++);
- fprintf(fout, "%lf %lf %lf\n",
- ccdVec3X(&v->v.v), ccdVec3Y(&v->v.v), ccdVec3Z(&v->v.v));
- }
-
- fprintf(fout, "Edges:\n");
- ccdListForEachEntry(&pt->edges, e, ccd_pt_edge_t, list){
- fprintf(fout, "%d %d\n", e->vertex[0]->id, e->vertex[1]->id);
- }
-
- fprintf(fout, "Faces:\n");
- ccdListForEachEntry(&pt->faces, f, ccd_pt_face_t, list){
- a = f->edge[0]->vertex[0];
- b = f->edge[0]->vertex[1];
- c = f->edge[1]->vertex[0];
- if (c == a || c == b){
- c = f->edge[1]->vertex[1];
- }
- fprintf(fout, "%d %d %d\n", a->id, b->id, c->id);
- }
-}
diff --git a/src/pe/extern/libccd/polytope.h b/src/pe/extern/libccd/polytope.h
deleted file mode 100644
index b671224ebf904208fe7b9b3aee7267fcf7aec696..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/polytope.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_POLYTOPE_H__
-#define __CCD_POLYTOPE_H__
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "support.h"
-#include "list.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#define CCD_PT_VERTEX 1
-#define CCD_PT_EDGE 2
-#define CCD_PT_FACE 3
-
-
-#define __CCD_PT_EL \
- int type; /*! type of element */ \
- ccd_real_t dist; /*! distance from origin */ \
- ccd_vec3_t witness; /*! witness point of projection of origin */ \
- ccd_list_t list; /*! list of elements of same type */
-
-/**
- * General polytope element.
- * Could be vertex, edge or triangle.
- */
-struct _ccd_pt_el_t {
- __CCD_PT_EL
-};
-typedef struct _ccd_pt_el_t ccd_pt_el_t;
-
-struct _ccd_pt_edge_t;
-struct _ccd_pt_face_t;
-
-/**
- * Polytope's vertex.
- */
-struct _ccd_pt_vertex_t {
- __CCD_PT_EL
-
- int id;
- ccd_support_t v;
- ccd_list_t edges; //!< List of edges
-};
-typedef struct _ccd_pt_vertex_t ccd_pt_vertex_t;
-
-/**
- * Polytope's edge.
- */
-struct _ccd_pt_edge_t {
- __CCD_PT_EL
-
- ccd_pt_vertex_t *vertex[2]; //!< Reference to vertices
- struct _ccd_pt_face_t *faces[2]; //!< Reference to faces
-
- ccd_list_t vertex_list[2]; //!< List items in vertices' lists
-};
-typedef struct _ccd_pt_edge_t ccd_pt_edge_t;
-
-/**
- * Polytope's triangle faces.
- */
-struct _ccd_pt_face_t {
- __CCD_PT_EL
-
- ccd_pt_edge_t *edge[3]; //!< Reference to surrounding edges
-};
-typedef struct _ccd_pt_face_t ccd_pt_face_t;
-
-
-/**
- * Struct containing polytope.
- */
-struct _ccd_pt_t {
- ccd_list_t vertices; //!< List of vertices
- ccd_list_t edges; //!< List of edges
- ccd_list_t faces; //!< List of faces
-
- ccd_pt_el_t *nearest;
- ccd_real_t nearest_dist;
- int nearest_type;
-};
-typedef struct _ccd_pt_t ccd_pt_t;
-
-
-void ccdPtInit(ccd_pt_t *pt);
-void ccdPtDestroy(ccd_pt_t *pt);
-
-/**
- * Returns vertices surrounding given triangle face.
- */
-_ccd_inline void ccdPtFaceVec3(const ccd_pt_face_t *face,
- ccd_vec3_t **a,
- ccd_vec3_t **b,
- ccd_vec3_t **c);
-_ccd_inline void ccdPtFaceVertices(const ccd_pt_face_t *face,
- ccd_pt_vertex_t **a,
- ccd_pt_vertex_t **b,
- ccd_pt_vertex_t **c);
-_ccd_inline void ccdPtFaceEdges(const ccd_pt_face_t *f,
- ccd_pt_edge_t **a,
- ccd_pt_edge_t **b,
- ccd_pt_edge_t **c);
-
-_ccd_inline void ccdPtEdgeVec3(const ccd_pt_edge_t *e,
- ccd_vec3_t **a,
- ccd_vec3_t **b);
-_ccd_inline void ccdPtEdgeVertices(const ccd_pt_edge_t *e,
- ccd_pt_vertex_t **a,
- ccd_pt_vertex_t **b);
-_ccd_inline void ccdPtEdgeFaces(const ccd_pt_edge_t *e,
- ccd_pt_face_t **f1,
- ccd_pt_face_t **f2);
-
-
-/**
- * Adds vertex to polytope and returns pointer to newly created vertex.
- */
-ccd_pt_vertex_t *ccdPtAddVertex(ccd_pt_t *pt, const ccd_support_t *v);
-_ccd_inline ccd_pt_vertex_t *ccdPtAddVertexCoords(ccd_pt_t *pt,
- ccd_real_t x, ccd_real_t y, ccd_real_t z);
-
-/**
- * Adds edge to polytope.
- */
-ccd_pt_edge_t *ccdPtAddEdge(ccd_pt_t *pt, ccd_pt_vertex_t *v1,
- ccd_pt_vertex_t *v2);
-
-/**
- * Adds face to polytope.
- */
-ccd_pt_face_t *ccdPtAddFace(ccd_pt_t *pt, ccd_pt_edge_t *e1,
- ccd_pt_edge_t *e2,
- ccd_pt_edge_t *e3);
-
-/**
- * Deletes vertex from polytope.
- * Returns 0 on success, -1 otherwise.
- */
-_ccd_inline int ccdPtDelVertex(ccd_pt_t *pt, ccd_pt_vertex_t *);
-_ccd_inline int ccdPtDelEdge(ccd_pt_t *pt, ccd_pt_edge_t *);
-_ccd_inline int ccdPtDelFace(ccd_pt_t *pt, ccd_pt_face_t *);
-
-
-/**
- * Recompute distances from origin for all elements in pt.
- */
-void ccdPtRecomputeDistances(ccd_pt_t *pt);
-
-/**
- * Returns nearest element to origin.
- */
-ccd_pt_el_t *ccdPtNearest(ccd_pt_t *pt);
-
-
-void ccdPtDumpSVT(ccd_pt_t *pt, const char *fn);
-void ccdPtDumpSVT2(ccd_pt_t *pt, FILE *);
-
-
-/**** INLINES ****/
-_ccd_inline ccd_pt_vertex_t *ccdPtAddVertexCoords(ccd_pt_t *pt,
- ccd_real_t x, ccd_real_t y, ccd_real_t z)
-{
- ccd_support_t s;
- ccdVec3Set(&s.v, x, y, z);
- return ccdPtAddVertex(pt, &s);
-}
-
-_ccd_inline int ccdPtDelVertex(ccd_pt_t *pt, ccd_pt_vertex_t *v)
-{
- // test if any edge is connected to this vertex
- if (!ccdListEmpty(&v->edges))
- return -1;
-
- // delete vertex from main list
- ccdListDel(&v->list);
-
- if ((void *)pt->nearest == (void *)v){
- pt->nearest = NULL;
- }
-
- free(v);
- return 0;
-}
-
-_ccd_inline int ccdPtDelEdge(ccd_pt_t *pt, ccd_pt_edge_t *e)
-{
- // text if any face is connected to this edge (faces[] is always
- // aligned to lower indices)
- if (e->faces[0] != NULL)
- return -1;
-
- // disconnect edge from lists of edges in vertex struct
- ccdListDel(&e->vertex_list[0]);
- ccdListDel(&e->vertex_list[1]);
-
- // disconnect edge from main list
- ccdListDel(&e->list);
-
- if ((void *)pt->nearest == (void *)e){
- pt->nearest = NULL;
- }
-
- free(e);
- return 0;
-}
-
-_ccd_inline int ccdPtDelFace(ccd_pt_t *pt, ccd_pt_face_t *f)
-{
- ccd_pt_edge_t *e;
- size_t i;
-
- // remove face from edges' recerence lists
- for (i = 0; i < 3; i++){
- e = f->edge[i];
- if (e->faces[0] == f){
- e->faces[0] = e->faces[1];
- }
- e->faces[1] = NULL;
- }
-
- // remove face from list of all faces
- ccdListDel(&f->list);
-
- if ((void *)pt->nearest == (void *)f){
- pt->nearest = NULL;
- }
-
- free(f);
- return 0;
-}
-
-_ccd_inline void ccdPtFaceVec3(const ccd_pt_face_t *face,
- ccd_vec3_t **a,
- ccd_vec3_t **b,
- ccd_vec3_t **c)
-{
- *a = &face->edge[0]->vertex[0]->v.v;
- *b = &face->edge[0]->vertex[1]->v.v;
-
- if (face->edge[1]->vertex[0] != face->edge[0]->vertex[0]
- && face->edge[1]->vertex[0] != face->edge[0]->vertex[1]){
- *c = &face->edge[1]->vertex[0]->v.v;
- }else{
- *c = &face->edge[1]->vertex[1]->v.v;
- }
-}
-
-_ccd_inline void ccdPtFaceVertices(const ccd_pt_face_t *face,
- ccd_pt_vertex_t **a,
- ccd_pt_vertex_t **b,
- ccd_pt_vertex_t **c)
-{
- *a = face->edge[0]->vertex[0];
- *b = face->edge[0]->vertex[1];
-
- if (face->edge[1]->vertex[0] != face->edge[0]->vertex[0]
- && face->edge[1]->vertex[0] != face->edge[0]->vertex[1]){
- *c = face->edge[1]->vertex[0];
- }else{
- *c = face->edge[1]->vertex[1];
- }
-}
-
-_ccd_inline void ccdPtFaceEdges(const ccd_pt_face_t *f,
- ccd_pt_edge_t **a,
- ccd_pt_edge_t **b,
- ccd_pt_edge_t **c)
-{
- *a = f->edge[0];
- *b = f->edge[1];
- *c = f->edge[2];
-}
-
-_ccd_inline void ccdPtEdgeVec3(const ccd_pt_edge_t *e,
- ccd_vec3_t **a,
- ccd_vec3_t **b)
-{
- *a = &e->vertex[0]->v.v;
- *b = &e->vertex[1]->v.v;
-}
-
-_ccd_inline void ccdPtEdgeVertices(const ccd_pt_edge_t *e,
- ccd_pt_vertex_t **a,
- ccd_pt_vertex_t **b)
-{
- *a = e->vertex[0];
- *b = e->vertex[1];
-}
-
-_ccd_inline void ccdPtEdgeFaces(const ccd_pt_edge_t *e,
- ccd_pt_face_t **f1,
- ccd_pt_face_t **f2)
-{
- *f1 = e->faces[0];
- *f2 = e->faces[1];
-}
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __CCD_POLYTOPE_H__ */
diff --git a/src/pe/extern/libccd/simplex.h b/src/pe/extern/libccd/simplex.h
deleted file mode 100644
index 8ae09c7123b32d709baace7f8eb0ad7872f9d7c0..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/simplex.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_SIMPLEX_H__
-#define __CCD_SIMPLEX_H__
-
-#include <ccd/compiler.h>
-#include "support.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-struct _ccd_simplex_t {
- ccd_support_t ps[4];
- int last; //!< index of last added point
-};
-typedef struct _ccd_simplex_t ccd_simplex_t;
-
-
-_ccd_inline void ccdSimplexInit(ccd_simplex_t *s);
-_ccd_inline int ccdSimplexSize(const ccd_simplex_t *s);
-_ccd_inline const ccd_support_t *ccdSimplexLast(const ccd_simplex_t *s);
-_ccd_inline const ccd_support_t *ccdSimplexPoint(const ccd_simplex_t *s, int idx);
-_ccd_inline ccd_support_t *ccdSimplexPointW(ccd_simplex_t *s, int idx);
-
-_ccd_inline void ccdSimplexAdd(ccd_simplex_t *s, const ccd_support_t *v);
-_ccd_inline void ccdSimplexSet(ccd_simplex_t *s, size_t pos, const ccd_support_t *a);
-_ccd_inline void ccdSimplexSetSize(ccd_simplex_t *s, int size);
-_ccd_inline void ccdSimplexSwap(ccd_simplex_t *s, size_t pos1, size_t pos2);
-
-
-/**** INLINES ****/
-
-_ccd_inline void ccdSimplexInit(ccd_simplex_t *s)
-{
- s->last = -1;
-}
-
-_ccd_inline int ccdSimplexSize(const ccd_simplex_t *s)
-{
- return s->last + 1;
-}
-
-_ccd_inline const ccd_support_t *ccdSimplexLast(const ccd_simplex_t *s)
-{
- return ccdSimplexPoint(s, s->last);
-}
-
-_ccd_inline const ccd_support_t *ccdSimplexPoint(const ccd_simplex_t *s, int idx)
-{
- // here is no check on boundaries
- return &s->ps[idx];
-}
-_ccd_inline ccd_support_t *ccdSimplexPointW(ccd_simplex_t *s, int idx)
-{
- return &s->ps[idx];
-}
-
-_ccd_inline void ccdSimplexAdd(ccd_simplex_t *s, const ccd_support_t *v)
-{
- // here is no check on boundaries in sake of speed
- ++s->last;
- ccdSupportCopy(s->ps + s->last, v);
-}
-
-_ccd_inline void ccdSimplexSet(ccd_simplex_t *s, size_t pos, const ccd_support_t *a)
-{
- ccdSupportCopy(s->ps + pos, a);
-}
-
-_ccd_inline void ccdSimplexSetSize(ccd_simplex_t *s, int size)
-{
- s->last = size - 1;
-}
-
-_ccd_inline void ccdSimplexSwap(ccd_simplex_t *s, size_t pos1, size_t pos2)
-{
- ccd_support_t supp;
-
- ccdSupportCopy(&supp, &s->ps[pos1]);
- ccdSupportCopy(&s->ps[pos1], &s->ps[pos2]);
- ccdSupportCopy(&s->ps[pos2], &supp);
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __CCD_SIMPLEX_H__ */
diff --git a/src/pe/extern/libccd/support.c b/src/pe/extern/libccd/support.c
deleted file mode 100644
index 6c7f1cc65863be3c974aed1a37df2c9bd3623c50..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/support.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#include "support.h"
-
-void __ccdSupport(const void *obj1, const void *obj2,
- const ccd_vec3_t *_dir, const ccd_t *ccd,
- ccd_support_t *supp)
-{
- ccd_vec3_t dir;
-
- ccdVec3Copy(&dir, _dir);
-
- ccd->support1(obj1, &dir, &supp->v1);
-
- ccdVec3Scale(&dir, -CCD_ONE);
- ccd->support2(obj2, &dir, &supp->v2);
-
- ccdVec3Sub2(&supp->v, &supp->v1, &supp->v2);
-}
diff --git a/src/pe/extern/libccd/support.h b/src/pe/extern/libccd/support.h
deleted file mode 100644
index 3372f5ef216e6d2c2e834e3dd45b2ec368a88913..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/support.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#ifndef __CCD_SUPPORT_H__
-#define __CCD_SUPPORT_H__
-
-#include <ccd/ccd.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-struct _ccd_support_t {
- ccd_vec3_t v; //!< Support point in minkowski sum
- ccd_vec3_t v1; //!< Support point in obj1
- ccd_vec3_t v2; //!< Support point in obj2
-};
-typedef struct _ccd_support_t ccd_support_t;
-
-_ccd_inline void ccdSupportCopy(ccd_support_t *, const ccd_support_t *s);
-
-/**
- * Computes support point of obj1 and obj2 in direction dir.
- * Support point is returned via supp.
- */
-void __ccdSupport(const void *obj1, const void *obj2,
- const ccd_vec3_t *dir, const ccd_t *ccd,
- ccd_support_t *supp);
-
-
-/**** INLINES ****/
-_ccd_inline void ccdSupportCopy(ccd_support_t *d, const ccd_support_t *s)
-{
- *d = *s;
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* __CCD_SUPPORT_H__ */
diff --git a/src/pe/extern/libccd/vec3.c b/src/pe/extern/libccd/vec3.c
deleted file mode 100644
index f0a331f4fd486a8919dcc23902568cfa3b903540..0000000000000000000000000000000000000000
--- a/src/pe/extern/libccd/vec3.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/***
- * libccd
- * ---------------------------------
- * Copyright (c)2010 Daniel Fiser <danfis@danfis.cz>
- *
- *
- * This file is part of libccd.
- *
- * Distributed under the OSI-approved BSD License (the "License");
- * see accompanying file BDS-LICENSE for details or see
- * <http://www.opensource.org/licenses/bsd-license.php>.
- *
- * This software is distributed WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the License for more information.
- */
-
-#include <stdio.h>
-#include <ccd/vec3.h>
-#include "dbg.h"
-
-static CCD_VEC3(__ccd_vec3_origin, CCD_ZERO, CCD_ZERO, CCD_ZERO);
-ccd_vec3_t *ccd_vec3_origin = &__ccd_vec3_origin;
-
-static ccd_vec3_t points_on_sphere[] = {
- CCD_VEC3_STATIC(CCD_REAL( 0.000000), CCD_REAL(-0.000000), CCD_REAL(-1.000000)),
- CCD_VEC3_STATIC(CCD_REAL( 0.723608), CCD_REAL(-0.525725), CCD_REAL(-0.447219)),
- CCD_VEC3_STATIC(CCD_REAL(-0.276388), CCD_REAL(-0.850649), CCD_REAL(-0.447219)),
- CCD_VEC3_STATIC(CCD_REAL(-0.894426), CCD_REAL(-0.000000), CCD_REAL(-0.447216)),
- CCD_VEC3_STATIC(CCD_REAL(-0.276388), CCD_REAL( 0.850649), CCD_REAL(-0.447220)),
- CCD_VEC3_STATIC(CCD_REAL( 0.723608), CCD_REAL( 0.525725), CCD_REAL(-0.447219)),
- CCD_VEC3_STATIC(CCD_REAL( 0.276388), CCD_REAL(-0.850649), CCD_REAL( 0.447220)),
- CCD_VEC3_STATIC(CCD_REAL(-0.723608), CCD_REAL(-0.525725), CCD_REAL( 0.447219)),
- CCD_VEC3_STATIC(CCD_REAL(-0.723608), CCD_REAL( 0.525725), CCD_REAL( 0.447219)),
- CCD_VEC3_STATIC(CCD_REAL( 0.276388), CCD_REAL( 0.850649), CCD_REAL( 0.447219)),
- CCD_VEC3_STATIC(CCD_REAL( 0.894426), CCD_REAL( 0.000000), CCD_REAL( 0.447216)),
- CCD_VEC3_STATIC(CCD_REAL(-0.000000), CCD_REAL( 0.000000), CCD_REAL( 1.000000)),
- CCD_VEC3_STATIC(CCD_REAL( 0.425323), CCD_REAL(-0.309011), CCD_REAL(-0.850654)),
- CCD_VEC3_STATIC(CCD_REAL(-0.162456), CCD_REAL(-0.499995), CCD_REAL(-0.850654)),
- CCD_VEC3_STATIC(CCD_REAL( 0.262869), CCD_REAL(-0.809012), CCD_REAL(-0.525738)),
- CCD_VEC3_STATIC(CCD_REAL( 0.425323), CCD_REAL( 0.309011), CCD_REAL(-0.850654)),
- CCD_VEC3_STATIC(CCD_REAL( 0.850648), CCD_REAL(-0.000000), CCD_REAL(-0.525736)),
- CCD_VEC3_STATIC(CCD_REAL(-0.525730), CCD_REAL(-0.000000), CCD_REAL(-0.850652)),
- CCD_VEC3_STATIC(CCD_REAL(-0.688190), CCD_REAL(-0.499997), CCD_REAL(-0.525736)),
- CCD_VEC3_STATIC(CCD_REAL(-0.162456), CCD_REAL( 0.499995), CCD_REAL(-0.850654)),
- CCD_VEC3_STATIC(CCD_REAL(-0.688190), CCD_REAL( 0.499997), CCD_REAL(-0.525736)),
- CCD_VEC3_STATIC(CCD_REAL( 0.262869), CCD_REAL( 0.809012), CCD_REAL(-0.525738)),
- CCD_VEC3_STATIC(CCD_REAL( 0.951058), CCD_REAL( 0.309013), CCD_REAL( 0.000000)),
- CCD_VEC3_STATIC(CCD_REAL( 0.951058), CCD_REAL(-0.309013), CCD_REAL( 0.000000)),
- CCD_VEC3_STATIC(CCD_REAL( 0.587786), CCD_REAL(-0.809017), CCD_REAL( 0.000000)),
- CCD_VEC3_STATIC(CCD_REAL( 0.000000), CCD_REAL(-1.000000), CCD_REAL( 0.000000)),
- CCD_VEC3_STATIC(CCD_REAL(-0.587786), CCD_REAL(-0.809017), CCD_REAL( 0.000000)),
- CCD_VEC3_STATIC(CCD_REAL(-0.951058), CCD_REAL(-0.309013), CCD_REAL(-0.000000)),
- CCD_VEC3_STATIC(CCD_REAL(-0.951058), CCD_REAL( 0.309013), CCD_REAL(-0.000000)),
- CCD_VEC3_STATIC(CCD_REAL(-0.587786), CCD_REAL( 0.809017), CCD_REAL(-0.000000)),
- CCD_VEC3_STATIC(CCD_REAL(-0.000000), CCD_REAL( 1.000000), CCD_REAL(-0.000000)),
- CCD_VEC3_STATIC(CCD_REAL( 0.587786), CCD_REAL( 0.809017), CCD_REAL(-0.000000)),
- CCD_VEC3_STATIC(CCD_REAL( 0.688190), CCD_REAL(-0.499997), CCD_REAL( 0.525736)),
- CCD_VEC3_STATIC(CCD_REAL(-0.262869), CCD_REAL(-0.809012), CCD_REAL( 0.525738)),
- CCD_VEC3_STATIC(CCD_REAL(-0.850648), CCD_REAL( 0.000000), CCD_REAL( 0.525736)),
- CCD_VEC3_STATIC(CCD_REAL(-0.262869), CCD_REAL( 0.809012), CCD_REAL( 0.525738)),
- CCD_VEC3_STATIC(CCD_REAL( 0.688190), CCD_REAL( 0.499997), CCD_REAL( 0.525736)),
- CCD_VEC3_STATIC(CCD_REAL( 0.525730), CCD_REAL( 0.000000), CCD_REAL( 0.850652)),
- CCD_VEC3_STATIC(CCD_REAL( 0.162456), CCD_REAL(-0.499995), CCD_REAL( 0.850654)),
- CCD_VEC3_STATIC(CCD_REAL(-0.425323), CCD_REAL(-0.309011), CCD_REAL( 0.850654)),
- CCD_VEC3_STATIC(CCD_REAL(-0.425323), CCD_REAL( 0.309011), CCD_REAL( 0.850654)),
- CCD_VEC3_STATIC(CCD_REAL( 0.162456), CCD_REAL( 0.499995), CCD_REAL( 0.850654))
-};
-ccd_vec3_t *ccd_points_on_sphere = points_on_sphere;
-size_t ccd_points_on_sphere_len = sizeof(points_on_sphere) / sizeof(ccd_vec3_t);
-
-
-_ccd_inline ccd_real_t __ccdVec3PointSegmentDist2(const ccd_vec3_t *P,
- const ccd_vec3_t *x0,
- const ccd_vec3_t *b,
- ccd_vec3_t *witness)
-{
- // The computation comes from solving equation of segment:
- // S(t) = x0 + t.d
- // where - x0 is initial point of segment
- // - d is direction of segment from x0 (|d| > 0)
- // - t belongs to <0, 1> interval
- //
- // Than, distance from a segment to some point P can be expressed:
- // D(t) = |x0 + t.d - P|^2
- // which is distance from any point on segment. Minimization
- // of this function brings distance from P to segment.
- // Minimization of D(t) leads to simple quadratic equation that's
- // solving is straightforward.
- //
- // Bonus of this method is witness point for free.
-
- ccd_real_t dist, t;
- ccd_vec3_t d, a;
-
- // direction of segment
- ccdVec3Sub2(&d, b, x0);
-
- // precompute vector from P to x0
- ccdVec3Sub2(&a, x0, P);
-
- t = -CCD_REAL(1.) * ccdVec3Dot(&a, &d);
- t /= ccdVec3Len2(&d);
-
- if (t < CCD_ZERO || ccdIsZero(t)){
- dist = ccdVec3Dist2(x0, P);
- if (witness)
- ccdVec3Copy(witness, x0);
- }else if (t > CCD_ONE || ccdEq(t, CCD_ONE)){
- dist = ccdVec3Dist2(b, P);
- if (witness)
- ccdVec3Copy(witness, b);
- }else{
- if (witness){
- ccdVec3Copy(witness, &d);
- ccdVec3Scale(witness, t);
- ccdVec3Add(witness, x0);
- dist = ccdVec3Dist2(witness, P);
- }else{
- // recycling variables
- ccdVec3Scale(&d, t);
- ccdVec3Add(&d, &a);
- dist = ccdVec3Len2(&d);
- }
- }
-
- return dist;
-}
-
-ccd_real_t ccdVec3PointSegmentDist2(const ccd_vec3_t *P,
- const ccd_vec3_t *x0, const ccd_vec3_t *b,
- ccd_vec3_t *witness)
-{
- return __ccdVec3PointSegmentDist2(P, x0, b, witness);
-}
-
-ccd_real_t ccdVec3PointTriDist2(const ccd_vec3_t *P,
- const ccd_vec3_t *x0, const ccd_vec3_t *B,
- const ccd_vec3_t *C,
- ccd_vec3_t *witness)
-{
- // Computation comes from analytic expression for triangle (x0, B, C)
- // T(s, t) = x0 + s.d1 + t.d2, where d1 = B - x0 and d2 = C - x0 and
- // Then equation for distance is:
- // D(s, t) = | T(s, t) - P |^2
- // This leads to minimization of quadratic function of two variables.
- // The solution from is taken only if s is between 0 and 1, t is
- // between 0 and 1 and t + s < 1, otherwise distance from segment is
- // computed.
-
- ccd_vec3_t d1, d2, a;
- ccd_real_t u, v, w, p, q, r;
- ccd_real_t s, t, dist, dist2;
- ccd_vec3_t witness2;
-
- ccdVec3Sub2(&d1, B, x0);
- ccdVec3Sub2(&d2, C, x0);
- ccdVec3Sub2(&a, x0, P);
-
- u = ccdVec3Dot(&a, &a);
- v = ccdVec3Dot(&d1, &d1);
- w = ccdVec3Dot(&d2, &d2);
- p = ccdVec3Dot(&a, &d1);
- q = ccdVec3Dot(&a, &d2);
- r = ccdVec3Dot(&d1, &d2);
-
- s = (q * r - w * p) / (w * v - r * r);
- t = (-s * r - q) / w;
-
- if ((ccdIsZero(s) || s > CCD_ZERO)
- && (ccdEq(s, CCD_ONE) || s < CCD_ONE)
- && (ccdIsZero(t) || t > CCD_ZERO)
- && (ccdEq(t, CCD_ONE) || t < CCD_ONE)
- && (ccdEq(t + s, CCD_ONE) || t + s < CCD_ONE)){
-
- if (witness){
- ccdVec3Scale(&d1, s);
- ccdVec3Scale(&d2, t);
- ccdVec3Copy(witness, x0);
- ccdVec3Add(witness, &d1);
- ccdVec3Add(witness, &d2);
-
- dist = ccdVec3Dist2(witness, P);
- }else{
- dist = s * s * v;
- dist += t * t * w;
- dist += CCD_REAL(2.) * s * t * r;
- dist += CCD_REAL(2.) * s * p;
- dist += CCD_REAL(2.) * t * q;
- dist += u;
- }
- }else{
- dist = __ccdVec3PointSegmentDist2(P, x0, B, witness);
-
- dist2 = __ccdVec3PointSegmentDist2(P, x0, C, &witness2);
- if (dist2 < dist){
- dist = dist2;
- if (witness)
- ccdVec3Copy(witness, &witness2);
- }
-
- dist2 = __ccdVec3PointSegmentDist2(P, B, C, &witness2);
- if (dist2 < dist){
- dist = dist2;
- if (witness)
- ccdVec3Copy(witness, &witness2);
- }
- }
-
- return dist;
-}
diff --git a/src/pe/fcd/AnalyticCollisionDetection.h b/src/pe/fcd/AnalyticCollisionDetection.h
index 8b6fa28538b785034d8a1e94bf371f6940aeb403..2bf9513ba51cbf17b395ffbc3cba9b475fd05cf1 100644
--- a/src/pe/fcd/AnalyticCollisionDetection.h
+++ b/src/pe/fcd/AnalyticCollisionDetection.h
@@ -818,7 +818,9 @@ bool collide( BoxID b1, BoxID b2, Container& container )
for( unsigned int i=0; i<3; ++i ) {
sign[i] = ( sign[i]>0 ) ? ( hl1[i] ) : ( -hl1[i] );
}
+ #ifdef WALBERLA_LOGLEVEL_DETAIL
const Vec3 tmp1( sign );
+ #endif
pB1 += R1 * sign;
Vec3 pB2 = b2->getPosition();
@@ -826,7 +828,9 @@ bool collide( BoxID b1, BoxID b2, Container& container )
for( size_t i=0; i<3; ++i ) {
sign[i] = ( sign[i]>0 ) ? ( -hl2[i] ) : ( hl2[i] );
}
+ #ifdef WALBERLA_LOGLEVEL_DETAIL
const Vec3 tmp2( sign );
+ #endif
pB2 += R2 * sign;
Vec3 ua, ub;
@@ -2124,7 +2128,7 @@ bool collide( Union<BodyTypeTuple>* bd1, BodyB* bd2, Container& container )
bool collision = false;
for( auto it=bd1->begin(); it!=bd1->end(); ++it )
{
- collision |= SingleCast<BodyTypeTuple, AnalyticSingleCollideFunctor<BodyB, Container>, bool>::execute(*it, func);
+ collision |= SingleCast<BodyTypeTuple, AnalyticSingleCollideFunctor<BodyB, Container>, bool>::execute(it.getBodyID(), func);
}
return collision;
}
@@ -2146,7 +2150,7 @@ bool collide( Union<BodyTypeTupleA>* bd1, Union<BodyTypeTupleB>* bd2, Container&
{
for( auto it2=bd2->begin(); it2!=bd2->end(); ++it2 )
{
- collision |= DoubleCast<BodyTypeTupleA, BodyTypeTupleB, AnalyticCollideFunctor<Container>, bool>::execute(*it1, *it2, func);
+ collision |= DoubleCast<BodyTypeTupleA, BodyTypeTupleB, AnalyticCollideFunctor<Container>, bool>::execute(it1.getBodyID(), it2.getBodyID(), func);
}
}
return collision;
diff --git a/src/pe/fcd/GJKEPACollideFunctor.h b/src/pe/fcd/GJKEPACollideFunctor.h
index 35a72fcac6b958447dbcd04a30fb25349898e1d8..051d5bcbcace3bb1b99aeb497b789ae4f7895c42 100644
--- a/src/pe/fcd/GJKEPACollideFunctor.h
+++ b/src/pe/fcd/GJKEPACollideFunctor.h
@@ -169,7 +169,7 @@ namespace gjkepa{
bool collision = false;
for( auto it=a->begin(); it!=a->end(); ++it )
{
- collision |= SingleCast<BodyTupleA, GJKEPASingleCollideFunctor<BodyB, Container>, bool>::execute(*it, func);
+ collision |= SingleCast<BodyTupleA, GJKEPASingleCollideFunctor<BodyB, Container>, bool>::execute(it.getBodyID(), func);
}
return collision;
}
@@ -187,7 +187,7 @@ namespace gjkepa{
{
for( auto it2=b->begin(); it2!=b->end(); ++it2 )
{
- collision |= DoubleCast<BodyTupleA, BodyTupleB, GJKEPACollideFunctor<Container>, bool>::execute(*it1, *it2, func);
+ collision |= DoubleCast<BodyTupleA, BodyTupleB, GJKEPACollideFunctor<Container>, bool>::execute(it1.getBodyID(), it2.getBodyID(), func);
}
}
return collision;
@@ -200,7 +200,7 @@ namespace gjkepa{
bool collision = false;
for( auto it=a->begin(); it!=a->end(); ++it )
{
- collision |= SingleCast<BodyTupleA, GJKEPASingleCollideFunctor<Plane, Container>, bool>::execute(*it, func);
+ collision |= SingleCast<BodyTupleA, GJKEPASingleCollideFunctor<Plane, Container>, bool>::execute(it.getBodyID(), func);
}
return collision;
}
diff --git a/src/pe/raytracing/Color.cpp b/src/pe/raytracing/Color.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4e9deab3f029827d88226d6ab353d144e33bc165
--- /dev/null
+++ b/src/pe/raytracing/Color.cpp
@@ -0,0 +1,80 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Color.cpp
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#include "Color.h"
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+/*!\brief Create a Color object from HSV values.
+ * \param hue Hue value in degrees from 0-360
+ * \param saturation Saturation value from 0-1
+ * \param value Value from 0-1
+ */
+Color Color::colorFromHSV(real_t hue, real_t saturation, real_t value) {
+ // based on Max K. Agoston: Computer Graphics and Geometric Modeling - Implementation and Algorithms
+ real_t r, g, b;
+
+ if (realIsEqual(hue, real_t(360))) {
+ hue = real_t(0);
+ } else {
+ hue /= real_t(60);
+ }
+ real_t fract = hue - std::floor(hue);
+
+ real_t P = value*(real_t(1) - saturation);
+ real_t Q = value*(real_t(1) - saturation*fract);
+ real_t T = value*(real_t(1) - saturation*(real_t(1) - fract));
+
+ if (real_t(0) <= hue && hue < real_t(1)) {
+ r = value;
+ g = T;
+ b = P;
+ } else if (real_t(1) <= hue && hue < real_t(2)) {
+ r = Q;
+ g = value,
+ b = P;
+ } else if (real_t(2) <= hue && hue < real_t(3)) {
+ r = P;
+ g = value;
+ b = T;
+ } else if (real_t(3) <= hue && hue < real_t(4)) {
+ r = P;
+ g = Q;
+ b = value;
+ } else if (real_t(4) <= hue && hue < real_t(5)) {
+ r = T;
+ g = P;
+ b = value;
+ } else if (real_t(5) <= hue && hue < real_t(6)) {
+ r = value;
+ g = P;
+ b = Q;
+ } else {
+ r = g = b = real_t(0);
+ }
+
+ return Color(r, g, b);
+}
+
+}
+}
+}
diff --git a/src/pe/raytracing/Color.h b/src/pe/raytracing/Color.h
new file mode 100644
index 0000000000000000000000000000000000000000..cf599930460172403014367436679d9304d194f3
--- /dev/null
+++ b/src/pe/raytracing/Color.h
@@ -0,0 +1,83 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Color.h
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <pe/Types.h>
+#include "core/math/Vector3.h"
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+class Color: public Vector3<real_t> {
+public:
+ /*!\name Constructors */
+ //@{
+ /*!\brief Instantiation constructor for the Color class. Defaults to white.
+ */
+ Color () : Color(1, 1, 1) {
+
+ }
+
+ /*!\brief Instantiation constructor for the Color class.
+ * \param r Red component
+ * \param g Green component
+ * \param b Blue component
+ * Instantiation constructor for the Color class with RGB components. Each value should be between 0 and 1 (soft limits)
+ */
+ Color (real_t r, real_t g, real_t b) : Vector3<real_t>(r, g, b) {
+
+ }
+
+ /*!\brief Instantiation constructor for the Color class.
+ * \param r Red component
+ * \param g Green component
+ * \param b Blue component
+ * Instantiation constructor for the Color class with RGB components. Each value should be between 0 and 1 (soft limits)
+ */
+ Color (const Vec3& vector) : Color(vector[0], vector[1], vector[2]) {
+
+ }
+ //@}
+
+ /*!\brief Multiply this color with another component wise.
+ * \return Color with components of this and other multiplied.
+ */
+ inline Color mulComponentWise(const Color& other) const {
+ return Color((*this)[0]*other[0],
+ (*this)[1]*other[1],
+ (*this)[2]*other[2]);
+ }
+
+ /*!\brief Clamps this colors component values between 0 and 1.
+ */
+ inline void clamp() {
+ (*this)[0] = std::min(std::max((*this)[0], real_t(0)), real_t(1));
+ (*this)[1] = std::min(std::max((*this)[1], real_t(0)), real_t(1));
+ (*this)[2] = std::min(std::max((*this)[2], real_t(0)), real_t(1));
+ }
+
+ static Color colorFromHSV(real_t hue, real_t saturation, real_t value);
+};
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/pe/raytracing/Intersects.h b/src/pe/raytracing/Intersects.h
new file mode 100644
index 0000000000000000000000000000000000000000..836ee8dc6af313d2b3b25841900cf61d1a927abc
--- /dev/null
+++ b/src/pe/raytracing/Intersects.h
@@ -0,0 +1,468 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Intersects.h
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <pe/Types.h>
+#include "pe/rigidbody/Box.h"
+#include "pe/rigidbody/Capsule.h"
+#include "pe/rigidbody/CylindricalBoundary.h"
+#include "pe/rigidbody/Plane.h"
+#include "pe/rigidbody/Sphere.h"
+#include "pe/rigidbody/Ellipsoid.h"
+#include "pe/rigidbody/Union.h"
+#include "pe/utility/BodyCast.h"
+#include <core/math/Utility.h>
+#include <boost/tuple/tuple.hpp>
+
+#include <pe/raytracing/Ray.h>
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+inline bool intersects(const SphereID sphere, const Ray& ray, real_t& t, Vec3& n);
+inline bool intersects(const PlaneID plane, const Ray& ray, real_t& t, Vec3& n);
+inline bool intersects(const BoxID box, const Ray& ray, real_t& t, Vec3& n);
+inline bool intersects(const CapsuleID capsule, const Ray& ray, real_t& t, Vec3& n);
+inline bool intersects(const EllipsoidID ellipsoid, const Ray& ray, real_t& t, Vec3& n);
+
+inline bool intersects(const BodyID body, const Ray& ray, real_t& t, Vec3& n);
+
+inline bool intersects(const AABB& aabb, const Ray& ray, real_t& t, real_t padding = real_t(0.0), Vec3* n = NULL);
+inline bool intersectsSphere(const Vec3& gpos, real_t radius, const Ray& ray, real_t& t0, real_t& t1);
+
+struct IntersectsFunctor
+{
+ const Ray& ray_;
+ real_t& t_;
+ Vec3& n_;
+
+ IntersectsFunctor(const Ray& ray, real_t& t, Vec3& n) : ray_(ray), t_(t), n_(n) {}
+
+ template< typename BodyType >
+ bool operator()( BodyType* bd1 ) {
+ return intersects( bd1, ray_, t_, n_);
+ }
+};
+
+const real_t discriminantEps = real_t(1e-4);
+
+inline bool intersects(const SphereID sphere, const Ray& ray, real_t& t, Vec3& n) {
+ const real_t realMax = std::numeric_limits<real_t>::max();
+
+ real_t t0, t1;
+ if (!intersectsSphere(sphere->getPosition(), sphere->getRadius(), ray, t0, t1)) {
+ t = realMax;
+ return false;
+ }
+
+ t = (t0 < t1) ? t0 : t1; // assign the closest hit point to t
+ if (t < 0) {
+ t = t1; // if t0 < 0, t1 is > 0 (else intersectsSphere would have returned false)
+ }
+
+ Vec3 intersectionPoint = ray.getOrigin() + ray.getDirection()*t;
+ n = (intersectionPoint - sphere->getPosition()).getNormalized();
+
+ return true;
+}
+
+inline bool intersects(const PlaneID plane, const Ray& ray, real_t& t, Vec3& n) {
+ const real_t realMax = std::numeric_limits<real_t>::max();
+ const Vec3& direction = ray.getDirection();
+ const Vec3& origin = ray.getOrigin();
+ const Vec3& planeNormal = plane->getNormal();
+ real_t denominator = planeNormal * direction;
+ if (std::abs(denominator) > discriminantEps) {
+ real_t t_;
+ t_ = ((plane->getPosition() - origin) * planeNormal) / denominator;
+ if (t_ > 0) {
+ t = t_;
+ n = planeNormal * walberla::math::sign(-denominator);
+ return true;
+ } else {
+ t = realMax;
+ }
+ }
+ t = realMax;
+ return false;
+}
+
+inline bool intersects(const BoxID box, const Ray& ray, real_t& t, Vec3& n) {
+ Ray transformedRay = ray.transformedToBF(box);
+
+ const Vec3& lengths = box->getLengths();
+ const Vec3 lengthsHalved = lengths/real_t(2);
+
+ const Vec3 bounds[2] = {
+ -lengthsHalved,
+ lengthsHalved
+ };
+
+ const Vector3<int8_t>& sign = transformedRay.getInvDirectionSigns();
+ const Vec3& invDirection = transformedRay.getInvDirection();
+ const Vec3& origin = transformedRay.getOrigin();
+
+ const real_t realMax = std::numeric_limits<real_t>::max();
+
+ size_t tminAxis = 0, tmaxAxis = 0;
+ real_t txmin, txmax;
+ real_t tmin = txmin = (bounds[sign[0]][0] - origin[0]) * invDirection[0];
+ real_t tmax = txmax = (bounds[1-sign[0]][0] - origin[0]) * invDirection[0];
+ real_t tymin = (bounds[sign[1]][1] - origin[1]) * invDirection[1];
+ real_t tymax = (bounds[1-sign[1]][1] - origin[1]) * invDirection[1];
+ if (tmin > tymax || tymin > tmax) {
+ t = realMax;
+ return false;
+ }
+ if (tymin > tmin) {
+ tminAxis = 1;
+ tmin = tymin;
+ }
+ if (tymax < tmax) {
+ tmaxAxis = 1;
+ tmax = tymax;
+ }
+ real_t tzmin = (bounds[sign[2]][2] - origin[2]) * invDirection[2];
+ real_t tzmax = (bounds[1-sign[2]][2] - origin[2]) * invDirection[2];
+ if (tmin > tzmax || tzmin > tmax) {
+ t = realMax;
+ return false;
+ }
+ if (tzmin > tmin) {
+ tminAxis = 2;
+ tmin = tzmin;
+ }
+ if (tzmax < tmax) {
+ tmaxAxis = 2;
+ tmax = tzmax;
+ }
+
+ n[0] = n[1] = n[2] = real_t(0);
+ real_t t_;
+ if (tmin > 0) {
+ // ray hit box from outside
+ t_ = tmin;
+ n[tminAxis] = real_t(1);
+ } else if (tmax < 0) {
+ // tmin and tmax are smaller than 0 -> box is in rays negative direction
+ t = realMax;
+ return false;
+ } else {
+ // ray origin within box
+ t_ = tmax;
+ n[tmaxAxis] = real_t(1);
+ }
+
+ if (transformedRay.getDirection() * n > 0) {
+ n = -n;
+ }
+ n = box->vectorFromBFtoWF(n);
+
+ t = t_;
+ return true;
+}
+
+inline bool intersects(const CapsuleID capsule, const Ray& ray, real_t& t, Vec3& n) {
+ const Ray transformedRay = ray.transformedToBF(capsule);
+ const Vec3& direction = transformedRay.getDirection();
+ const Vec3& origin = transformedRay.getOrigin();
+ real_t halfLength = capsule->getLength()/real_t(2);
+
+ const real_t realMax = std::numeric_limits<real_t>::max();
+ t = realMax;
+
+ bool t0hit = false, t1hit = false;
+ size_t intersectedPrimitive = 0; // 1 for capsule, 2 for left half sphere, 3 for right half sphere
+
+ real_t a = direction[2]*direction[2] + direction[1]*direction[1];
+ real_t b = real_t(2)*origin[2]*direction[2] + real_t(2)*origin[1]*direction[1];
+ real_t c = origin[2]*origin[2] + origin[1]*origin[1] - capsule->getRadius()*capsule->getRadius();
+ real_t discriminant = b*b - real_t(4.)*a*c;
+ if (std::abs(discriminant) >= discriminantEps) {
+ // With discriminant smaller than 0, cylinder is not hit by ray (no solution for quadratic equation).
+ // Thus only enter this section if the equation is actually solvable.
+
+ real_t root = real_t(std::sqrt(discriminant));
+ real_t t0 = (-b - root) / (real_t(2) * a); // Distance to point where the ray enters the cylinder
+ real_t t1 = (-b + root) / (real_t(2) * a); // Distance to point where the ray leaves the cylinder
+
+ real_t tx0 = origin[0] + direction[0]*t0;
+ real_t tx1 = origin[0] + direction[0]*t1;
+
+ if (t0 > 0 && tx0 >= -halfLength && tx0 <= halfLength) {
+ t0hit = true;
+ intersectedPrimitive = 1;
+ t = t0;
+ }
+ if (t1 > 0 && tx1 >= -halfLength && tx1 <= halfLength && t1 < t) {
+ t1hit = true;
+ if (t1 < t) {
+ intersectedPrimitive = 1;
+ t = t1;
+ }
+ }
+ }
+
+ // Check now for end capping half spheres.
+ // Only check them if the ray didnt both enter and leave the cylinder part of the capsule already (t0hit && t1hit).
+ if (!t0hit || !t1hit) {
+ real_t t0_left, t1_left;
+ Vec3 leftSpherePos(-halfLength, 0, 0);
+ if (intersectsSphere(leftSpherePos, capsule->getRadius(), transformedRay, t0_left, t1_left)) {
+ // at least one of t0_left and t1_left are not behind the rays origin
+ real_t t0x_left = origin[0] + direction[0]*t0_left;
+ real_t t1x_left = origin[0] + direction[0]*t1_left;
+
+ real_t t_left = realMax;
+ if (t0_left > 0 && t0x_left < -halfLength) {
+ t_left = t0_left;
+ }
+ if (t1_left > 0 && t1x_left < -halfLength && t1_left < t_left) {
+ t_left = t1_left;
+ }
+ if (t_left < t) {
+ intersectedPrimitive = 2;
+ t = t_left;
+ }
+ }
+
+ real_t t0_right, t1_right;
+ Vec3 rightSpherePos(halfLength, 0, 0);
+ if (intersectsSphere(rightSpherePos, capsule->getRadius(), transformedRay, t0_right, t1_right)) {
+ // At least one of t0_right and t1_right are not behind the rays origin
+ real_t t0x_right = origin[0] + direction[0]*t0_right;
+ real_t t1x_right = origin[0] + direction[0]*t1_right;
+
+ real_t t_right = realMax;
+ if (t0_right > 0 && t0x_right > halfLength) {
+ t_right = t0_right;
+ }
+ if (t1_right > 0 && t1x_right > halfLength && t1_right < t_right) {
+ t_right = t1_right;
+ }
+ if (t_right < t) {
+ intersectedPrimitive = 3;
+ t = t_right;
+ }
+ }
+
+ if (realIsIdentical(t, realMax)) {
+ return false;
+ }
+
+ Vec3 intersectionPoint = origin + direction*t;
+ if (intersectedPrimitive == 2) {
+ n = (intersectionPoint - leftSpherePos).getNormalized();
+ } else if (intersectedPrimitive == 3) {
+ n = (intersectionPoint - rightSpherePos).getNormalized();
+ }
+ }
+
+ WALBERLA_ASSERT(intersectedPrimitive != 0);
+
+ if (intersectedPrimitive == 1) {
+ Vec3 intersectionPoint = origin + direction*t;
+ Vec3 intersectionPointOnXAxis(intersectionPoint[0], real_t(0), real_t(0));
+ n = (intersectionPoint - intersectionPointOnXAxis).getNormalized();
+ }
+
+ n = capsule->vectorFromBFtoWF(n);
+
+ return true;
+}
+
+inline bool intersects(const EllipsoidID ellipsoid, const Ray& ray, real_t& t, Vec3& n) {
+ const real_t realMax = std::numeric_limits<real_t>::max();
+
+ const Ray transformedRay = ray.transformedToBF(ellipsoid);
+ const Vec3& semiAxes = ellipsoid->getSemiAxes();
+
+ const Mat3 M = Mat3::makeDiagonalMatrix(real_t(1)/semiAxes[0], real_t(1)/semiAxes[1], real_t(1)/semiAxes[2]);
+
+ const Vec3 d_M = M*transformedRay.getDirection();
+ const Vec3 P_M = M*transformedRay.getOrigin();
+
+ const real_t a = d_M*d_M;
+ const real_t b = real_t(2)*P_M*d_M;
+ const real_t c = P_M*P_M - 1;
+
+ const real_t discriminant = b*b - real_t(4.)*a*c;
+ if (discriminant < 0) {
+ // with discriminant smaller than 0, sphere is not hit by ray
+ // (no solution for quadratic equation)
+ t = realMax;
+ return false;
+ }
+
+ const real_t root = real_t(std::sqrt(discriminant));
+ const real_t t0 = (-b - root) / (real_t(2.) * a); // distance to point where the ray enters the sphere
+ const real_t t1 = (-b + root) / (real_t(2.) * a); // distance to point where the ray leaves the sphere
+
+ if (t0 < 0 && t1 < 0) {
+ return false;
+ }
+ t = (t0 < t1) ? t0 : t1; // assign the closest distance to t
+ if (t < 0) {
+ // at least one of the calculated distances is behind the rays origin
+ if (t1 < 0) {
+ // both of the points are behind the origin (ray does not hit sphere)
+ return false;
+ } else {
+ t = t1;
+ }
+ }
+
+ const Vec3 transformedN = transformedRay.getOrigin() + t*transformedRay.getDirection();
+ const Mat3 M_inv = M.getInverse();
+ n = ellipsoid->vectorFromBFtoWF((M_inv*transformedN).getNormalized());
+
+ return true;
+}
+
+inline bool intersects(const BodyID body, const Ray& ray, real_t& t, Vec3& n) {
+ WALBERLA_UNUSED(body);
+ WALBERLA_UNUSED(ray);
+ WALBERLA_UNUSED(t);
+ WALBERLA_UNUSED(n);
+ WALBERLA_ABORT("This ray - body intersection test is not implemented yet!");
+ return false;
+}
+
+inline bool intersectsSphere(const Vec3& gpos, real_t radius, const Ray& ray, real_t& t0, real_t& t1) {
+ const real_t realMax = std::numeric_limits<real_t>::max();
+
+ const Vec3& direction = ray.getDirection();
+ Vec3 displacement = ray.getOrigin() - gpos;
+
+ real_t a = direction * direction;
+ real_t b = real_t(2.) * (displacement * direction);
+ real_t c = (displacement * displacement) - (radius * radius);
+ real_t discriminant = b*b - real_t(4.)*a*c;
+ if (discriminant < 0) {
+ // with discriminant smaller than 0, sphere is not hit by ray
+ // (no solution for quadratic equation)
+ t0 = realMax;
+ t1 = realMax;
+ return false;
+ }
+
+ real_t root = real_t(std::sqrt(discriminant));
+ t0 = (-b - root) / (real_t(2.) * a); // distance to point where the ray enters the sphere
+ t1 = (-b + root) / (real_t(2.) * a); // distance to point where the ray leaves the sphere
+
+ if (t0 < 0 && t1 < 0) {
+ return false;
+ }
+ real_t t = (t0 < t1) ? t0 : t1; // assign the closest distance to t
+ if (t < 0) {
+ // at least one of the calculated distances is behind the rays origin
+ if (t1 < 0) {
+ // both of the points are behind the origin (ray does not hit sphere)
+ return false;
+ }
+ }
+
+ return true;
+}
+
+inline bool intersects(const AABB& aabb, const Ray& ray, real_t& t, real_t padding, Vec3* n) {
+ // An Efficient and Robust Ray–Box Intersection Algorithm: http://people.csail.mit.edu/amy/papers/box-jgt.pdf
+ const Vec3 paddingVector(padding, padding, padding);
+ Vec3 bounds[2] = {
+ aabb.min() - paddingVector,
+ aabb.max() + paddingVector
+ };
+
+ const Vector3<int8_t>& sign = ray.getInvDirectionSigns();
+ const Vec3& invDirection = ray.getInvDirection();
+ const Vec3& origin = ray.getOrigin();
+
+ const real_t realMax = std::numeric_limits<real_t>::max();
+
+ size_t tminAxis = 0, tmaxAxis = 0;
+ real_t txmin, txmax;
+ real_t tmin = txmin = (bounds[sign[0]][0] - origin[0]) * invDirection[0];
+ real_t tmax = txmax = (bounds[1-sign[0]][0] - origin[0]) * invDirection[0];
+ real_t tymin = (bounds[sign[1]][1] - origin[1]) * invDirection[1];
+ real_t tymax = (bounds[1-sign[1]][1] - origin[1]) * invDirection[1];
+ if (tmin > tymax || tymin > tmax) {
+ t = realMax;
+ return false;
+ }
+ if (tymin > tmin) {
+ tminAxis = 1;
+ tmin = tymin;
+ }
+ if (tymax < tmax) {
+ tmaxAxis = 1;
+ tmax = tymax;
+ }
+ real_t tzmin = (bounds[sign[2]][2] - origin[2]) * invDirection[2];
+ real_t tzmax = (bounds[1-sign[2]][2] - origin[2]) * invDirection[2];
+ if (tmin > tzmax || tzmin > tmax) {
+ t = realMax;
+ return false;
+ }
+ if (tzmin > tmin) {
+ tminAxis = 2;
+ tmin = tzmin;
+ }
+ if (tzmax < tmax) {
+ tmaxAxis = 2;
+ tmax = tzmax;
+ }
+
+ if (n != NULL) {
+ (*n)[0] = (*n)[1] = (*n)[2] = real_t(0);
+ }
+ real_t t_;
+ if (tmin > 0) {
+ // ray hit box from outside
+ t_ = tmin;
+ if (n != NULL) {
+ (*n)[tminAxis] = real_t(1);
+ }
+ } else if (tmax < 0) {
+ // tmin and tmax are smaller than 0 -> box is in rays negative direction
+ t = realMax;
+ return false;
+ } else {
+ // ray origin within box
+ t_ = tmax;
+ if (n != NULL) {
+ (*n)[tmaxAxis] = real_t(1);
+ }
+ }
+
+ if (n != NULL) {
+ if (ray.getDirection() * (*n) > 0) {
+ *n = -(*n);
+ }
+ }
+
+ t = t_;
+ return true;
+}
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/pe/raytracing/Lighting.h b/src/pe/raytracing/Lighting.h
new file mode 100644
index 0000000000000000000000000000000000000000..451cfe3357ca80dad10613a79251ed75da366898
--- /dev/null
+++ b/src/pe/raytracing/Lighting.h
@@ -0,0 +1,78 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Lighting.h
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <pe/basic.h>
+#include <pe/Types.h>
+#include <core/math/Vector3.h>
+#include <pe/raytracing/Color.h>
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+/*!\brief The Lighting struct defines the properties of a point light in the scene.
+ */
+struct Lighting {
+ Vec3 pointLightOrigin;
+ Color diffuseColor;
+ Color specularColor;
+ Color ambientColor;
+
+ /*!\brief Instantiation constructor for the Lighting struct.
+ */
+ Lighting () {
+
+ }
+
+ /*!\brief Instantiation constructor for the Lighting struct.
+ * \param pointLightOrigin Origin of the point light.
+ * \param diffuseColor Diffuse color (base color of the light).
+ * \param specularColor Specular color (color of light refractions on an objects surface).
+ * \param ambientColor Color of the ambient light in the scene.
+ */
+ Lighting (const Vec3& _pointLightOrigin,
+ const Color& _diffuseColor, const Color& _specularColor, const Color& _ambientColor)
+ : pointLightOrigin(_pointLightOrigin),
+ diffuseColor(_diffuseColor), specularColor(_specularColor), ambientColor(_ambientColor) {
+
+ }
+
+ /*!\brief Instantiation constructor for the Lighting struct.
+ * \param config Config handle.
+ *
+ * The config block has to contain a pointLightOrigin parameter (Vec3).
+ * Optional are ambientColor (Vec3), diffuseColor (Vec3), specularColor (Vec3).
+ * Colors are Vec3's with values from 0 to 1.
+ */
+ Lighting (const Config::BlockHandle& config) {
+ WALBERLA_CHECK(config.isValid(), "No valid config passed to raytracer lighting.");
+
+ pointLightOrigin = config.getParameter<Vec3>("pointLightOrigin");
+ diffuseColor = config.getParameter<Color>("diffuseColor", Color(1,1,1));
+ specularColor = config.getParameter<Color>("specularColor", Color(1,1,1));
+ ambientColor = config.getParameter<Color>("ambientColor", Color(0.5,0.5,0.5));
+ }
+};
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/pe/raytracing/Ray.cpp b/src/pe/raytracing/Ray.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c3f0a977684c1ffa0e2171503942572e49460949
--- /dev/null
+++ b/src/pe/raytracing/Ray.cpp
@@ -0,0 +1,41 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Ray.h
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#include <pe/raytracing/Ray.h>
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+/*!\brief Global output operator for rays.
+ *
+ * \param os Reference to the output stream.
+ * \param ray Reference to a constant ray object.
+ * \return Reference to the output stream.
+ */
+std::ostream& operator<<(std::ostream& os, const Ray& ray) {
+ return os << "<o: " << ray.getOrigin()
+ << ", d: " << ray.getDirection()
+ << ", c: (" << ray.getImageX() << "/" << ray.getImageY() << ")>";
+}
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/pe/raytracing/Ray.h b/src/pe/raytracing/Ray.h
new file mode 100644
index 0000000000000000000000000000000000000000..052ee87bf4cd11398d9e3229808068600741eb24
--- /dev/null
+++ b/src/pe/raytracing/Ray.h
@@ -0,0 +1,225 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Ray.h
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "core/DataTypes.h"
+#include "core/math/Vector3.h"
+#include <pe/rigidbody/RigidBody.h>
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+class Ray {
+public:
+ /*!\name Constructors */
+ //@{
+ /*!\brief Instantiation constructor for the Raytracer class.
+ */
+ Ray () {
+ Ray (Vec3(0,0,0), Vec3(1,0,0));
+ }
+
+ /*!\brief Instantiation constructor for the Raytracer class.
+ * \param origin Origin of the ray. ()
+ * \param direction Normalized direction of the ray.
+ */
+ Ray (Vec3 origin, Vec3 direction) {
+ setDirection(direction);
+ setOrigin(origin);
+ }
+ //@}
+
+private:
+ /*!\name Member variables */
+ //@{
+ Vec3 origin_; //!< Origin of the ray.
+ Vec3 direction_; //!< The normalized direction of the ray.
+ Vec3 inv_direction_; //!< The inverted direction of the ray.
+ Vector3<int8_t> sign_; /*!< The signs of the inverted direction of the ray.
+ (Required for Ray-Box intersection code.)*/
+ size_t imageX_; //!< Y value of the pixel coordinate this ray intersects.
+ size_t imageY_; //!< X value of the pixel coordinate this ray intersects.
+ //@}
+
+public:
+ /*!\name Get functions */
+ //@{
+ /*!\brief Returns the origin point of the ray.
+ */
+ inline const Vec3& getOrigin () const {
+ return origin_;
+ }
+
+ /*!\brief Returns the normalized direction vector of the ray.
+ */
+ inline const Vec3& getDirection () const {
+ return direction_;
+ }
+
+ /*!\brief Returns the normalized direction vector of the ray for a given axis.
+ */
+ inline real_t getDirection (size_t axis) const {
+ WALBERLA_ASSERT(axis <= 2, "No valid axis index passed.");
+ return direction_[axis];
+ }
+
+ /*!\brief Returns the x component of the ray direction.
+ */
+ inline real_t xDir () const {
+ return direction_[0];
+ }
+
+ /*!\brief Returns the y component of the ray direction.
+ */
+ inline real_t yDir () const {
+ return direction_[1];
+ }
+
+ /*!\brief Returns the z component of the ray direction.
+ */
+ inline real_t zDir () const {
+ return direction_[2];
+ }
+
+ /*!\brief Returns the inverse of the direction vector of the ray.
+ */
+ inline const Vec3& getInvDirection () const {
+ return inv_direction_;
+ }
+
+ /*!\brief Returns the inverse of the direction vector of the ray for a given axis.
+ */
+ inline real_t getInvDirection (size_t axis) const {
+ WALBERLA_ASSERT(axis <= 2, "No valid axis index passed.");
+ return inv_direction_[axis];
+ }
+
+ /*!\brief Returns the x component of the inverse ray direction.
+ */
+ inline real_t xInvDir () const {
+ return inv_direction_[0];
+ }
+
+ /*!\brief Returns the y component of the inverse ray direction.
+ */
+ inline real_t yInvDir () const {
+ return inv_direction_[1];
+ }
+
+ /*!\brief Returns the z component of the inverse ray direction.
+ */
+ inline real_t zInvDir () const {
+ return inv_direction_[2];
+ }
+
+ /*!\brief Returns the signs of the inverted direction vector of the ray.
+ *
+ * Returns the signs of the inverted direction vector of the ray as required for the ray-box intersection algorithm.
+ */
+ inline const Vector3<int8_t>& getInvDirectionSigns () const {
+ return sign_;
+ }
+
+ /*!\brief Returns the X value of the pixel coordinate this ray intersects.
+ *
+ * \return X value of pixel coordinate.
+ */
+ inline size_t getImageX () const {
+ return imageX_;
+ }
+
+ /*!\brief Returns the Y value of the pixel coordinate this ray intersects.
+ *
+ * \return Y value of pixel coordinate.
+ */
+ inline size_t getImageY () const {
+ return imageY_;
+ }
+ //@}
+
+ /*!\name Set functions */
+ //@{
+ /*!\brief Set the origin point of the ray.
+ * \param origin Origin point
+ */
+ inline void setOrigin (const Vec3& origin) {
+ origin_ = origin;
+ }
+
+ /*!\brief Set the _normalized_ direction vector of the ray.
+ * \param direction Normalized direction vector
+ */
+ inline void setDirection (const Vec3& direction) {
+ // im kommentar verweis auf normalisierung
+ WALBERLA_CHECK_FLOAT_EQUAL(direction.length(), real_t(1));
+ direction_ = direction;
+ calcInvDirection();
+ }
+
+ /*!\brief Sets the X and Y values of the image pixel coordinate this ray intersects.
+ * \param x X value of the pixel coordinate
+ * \param y Y value of the pixel coordinate
+ */
+ inline void setImageCoordinate (size_t x, size_t y) {
+ imageX_ = x;
+ imageY_ = y;
+ }
+
+ /*!\brief Sets the X value of the image pixel coordinate this ray intersects.
+ * \param x X value of the pixel coordinate
+ */
+ inline void setImageX (size_t x) {
+ imageX_ = x;
+ }
+
+ /*!\brief Sets the Y value of the image pixel coordinate this ray intersects.
+ * \param y Y value of the pixel coordinate
+ */
+ inline void setImageY (size_t y) {
+ imageY_ = y;
+ }
+ //@}
+
+ /*!\name Utility functions */
+ //@{
+ /*!\brief Calculates the inverse of the direction vector and saves its signs.
+ */
+ inline void calcInvDirection () {
+ inv_direction_ = Vec3(1/direction_[0], 1/direction_[1], 1/direction_[2]);
+ sign_[0] = (inv_direction_[0] < 0) ? int8_t(1) : int8_t(0);
+ sign_[1] = (inv_direction_[1] < 0) ? int8_t(1) : int8_t(0);
+ sign_[2] = (inv_direction_[2] < 0) ? int8_t(1) : int8_t(0);
+ }
+
+ /*!\brief Transforms the ray to the body frame.
+ *
+ * \return Ray transformed to the body frame.
+ */
+ inline Ray transformedToBF(const BodyID body) const {
+ return Ray(body->pointFromWFtoBF(getOrigin()), body->vectorFromWFtoBF(getDirection()));
+ }
+ //@}
+};
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/pe/raytracing/Raytracer.cpp b/src/pe/raytracing/Raytracer.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d7eef3e6551d42bfa6bc13a460dbc22c6c6f27d1
--- /dev/null
+++ b/src/pe/raytracing/Raytracer.cpp
@@ -0,0 +1,431 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Raytracer.cpp
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#include "Raytracer.h"
+
+#include <core/mpi/Gatherv.h>
+#include <core/mpi/MPIManager.h>
+#include <core/mpi/RecvBuffer.h>
+#include <core/mpi/SendBuffer.h>
+
+#include "geometry/structured/extern/lodepng.h"
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+void BodyIntersectionInfo_Comparator_MPI_OP( BodyIntersectionInfo *in, BodyIntersectionInfo *inout, int *len, MPI_Datatype *dptr) {
+ WALBERLA_UNUSED(dptr);
+ for (int i = 0; i < *len; ++i) {
+ if (in->bodySystemID != 0 && inout->bodySystemID != 0) {
+ WALBERLA_ASSERT(in->imageX == inout->imageX && in->imageY == inout->imageY, "coordinates of infos do not match: " << in->imageX << "/" << in->imageY << " and " << inout->imageX << "/" << inout->imageY);
+ }
+
+ if ((in->t < inout->t && in->bodySystemID != 0) || (inout->bodySystemID == 0 && in->bodySystemID != 0)) {
+ // info in "in" is closer than the one in "inout" -> update inout to values of in
+ inout->imageX = in->imageX;
+ inout->imageY = in->imageY;
+ inout->bodySystemID = in->bodySystemID;
+ inout->t = in->t;
+ inout->r = in->r;
+ inout->g = in->g;
+ inout->b = in->b;
+ }
+
+ in++;
+ inout++;
+ }
+}
+
+/*!\brief Instantiation constructor for the Raytracer class.
+ *
+ * \param forest BlockForest the raytracer operates on.
+ * \param storageID Block data ID for the storage the raytracer operates on.
+ * \param globalBodyStorage Pointer to the global body storage.
+ * \param ccdID Block data ID for HashGrids.
+ * \param pixelsHorizontal Horizontal amount of pixels of the generated image.
+ * \param pixelsVertical Vertical amount of pixels of the generated image.
+ * \param fov_vertical Vertical field-of-view of the camera.
+ * \param cameraPosition Position of the camera in the global world frame.
+ * \param lookAtPoint Point the camera looks at in the global world frame.
+ * \param upVector Vector indicating the upwards direction of the camera.
+ * \param backgroundColor Background color of the scene.
+ * \param bodyToShadingParamsFunc A function mapping a BodyID to ShadingParameters for this body.
+ * This can be used to customize the color and shading of bodies.
+ * \param isBodyVisibleFunc A function which returns a boolean indicating if a given body should be visible
+ * in the final image.
+ */
+Raytracer::Raytracer(const shared_ptr<BlockStorage>& forest, const BlockDataID storageID,
+ const shared_ptr<BodyStorage>& globalBodyStorage,
+ const BlockDataID ccdID,
+ uint16_t pixelsHorizontal, uint16_t pixelsVertical,
+ real_t fov_vertical, uint16_t antiAliasFactor,
+ const Vec3& cameraPosition, const Vec3& lookAtPoint, const Vec3& upVector,
+ const Lighting& lighting,
+ const Color& backgroundColor,
+ const std::function<ShadingParameters (const BodyID)>& bodyToShadingParamsFunc,
+ const std::function<bool (const BodyID)>& isBodyVisibleFunc)
+ : forest_(forest), storageID_(storageID), globalBodyStorage_(globalBodyStorage), ccdID_(ccdID),
+ pixelsHorizontal_(pixelsHorizontal), pixelsVertical_(pixelsVertical),
+ fov_vertical_(fov_vertical), antiAliasFactor_(antiAliasFactor),
+ cameraPosition_(cameraPosition), lookAtPoint_(lookAtPoint), upVector_(upVector),
+ lighting_(lighting),
+ backgroundColor_(backgroundColor),
+ imageOutputEnabled_(true),
+ localImageOutputEnabled_(false),
+ imageOutputDirectory_("."),
+ filenameTimestepWidth_(5),
+ confinePlanesToDomain_(true),
+ bodyToShadingParamsFunc_(bodyToShadingParamsFunc),
+ isBodyVisibleFunc_(isBodyVisibleFunc),
+ raytracingAlgorithm_(RAYTRACE_HASHGRIDS),
+ reductionMethod_(MPI_REDUCE) {
+
+ setupView_();
+ setupFilenameRankWidth_();
+ WALBERLA_MPI_SECTION() {
+ setupMPI_();
+ }
+}
+
+/*!\brief Instantiation constructor for the Raytracer class using a config object for view setup.
+ *
+ * \param forest BlockForest the raytracer operates on.
+ * \param storageID Storage ID of the block data storage the raytracer operates on.
+ * \param globalBodyStorage Pointer to the global body storage.
+ * \param ccdID Block data ID for HashGrids.
+ * \param config Config block for the raytracer.
+ * \param bodyToShadingParamsFunc A function mapping a BodyID to ShadingParameters for this body.
+ * This can be used to customize the color and shading of bodies.
+ * \param isBodyVisibleFunc A function which returns a boolean indicating if a given body should be visible
+ * in the final image.
+ *
+ * The config block has to contain image_x (int), image_y (int) and fov_vertical (real, in degrees).
+ * Additionally a vector of reals for each of cameraPosition, lookAt and the upVector for the view setup are required.
+ * Optional is antiAliasFactor (uint, usually between 1 and 4) for supersampling and backgroundColor (Vec3).
+ * For image output after raytracing, set image_output_directory (string); for local image output additionally set
+ * local_image_output_enabled (bool) to true. outputFilenameTimestepZeroPadding (int) sets the zero padding
+ * for timesteps in output filenames.
+ * For the lighting a config block within the Raytracer config block named Lighting has to be defined,
+ * information about its contents is in the Lighting class.
+ */
+Raytracer::Raytracer(const shared_ptr<BlockStorage>& forest, const BlockDataID storageID,
+ const shared_ptr<BodyStorage>& globalBodyStorage,
+ const BlockDataID ccdID,
+ const Config::BlockHandle& config,
+ const std::function<ShadingParameters (const BodyID)>& bodyToShadingParamsFunc,
+ const std::function<bool (const BodyID)>& isBodyVisibleFunc)
+ : forest_(forest), storageID_(storageID), globalBodyStorage_(globalBodyStorage), ccdID_(ccdID),
+ bodyToShadingParamsFunc_(bodyToShadingParamsFunc),
+ isBodyVisibleFunc_(isBodyVisibleFunc),
+ raytracingAlgorithm_(RAYTRACE_HASHGRIDS),
+ reductionMethod_(MPI_REDUCE) {
+ WALBERLA_CHECK(config.isValid(), "No valid config passed to raytracer");
+
+ pixelsHorizontal_ = config.getParameter<uint16_t>("image_x");
+ pixelsVertical_ = config.getParameter<uint16_t>("image_y");
+ fov_vertical_ = config.getParameter<real_t>("fov_vertical");
+ antiAliasFactor_ = config.getParameter<uint16_t>("antiAliasFactor", 1);
+
+ setLocalImageOutputEnabled(config.getParameter<bool>("local_image_output_enabled", false));
+
+ if (config.isDefined("image_output_directory")) {
+ setImageOutputEnabled(true);
+ setImageOutputDirectory(config.getParameter<std::string>("image_output_directory", "."));
+ WALBERLA_LOG_INFO_ON_ROOT("Images will be written to " << getImageOutputDirectory() << ".");
+ } else if (getLocalImageOutputEnabled()) {
+ WALBERLA_ABORT("Cannot enable local image output without image_output_directory parameter being set.");
+ }
+
+ filenameTimestepWidth_ = config.getParameter<uint8_t>("filenameTimestepWidth", uint8_t(5));
+ confinePlanesToDomain_ = config.getParameter<bool>("confinePlanesToDomain", true);
+
+ cameraPosition_ = config.getParameter<Vec3>("cameraPosition");
+ lookAtPoint_ = config.getParameter<Vec3>("lookAt");
+ upVector_ = config.getParameter<Vec3>("upVector");
+ lighting_ = Lighting(config.getBlock("Lighting"));
+ backgroundColor_ = config.getParameter<Color>("backgroundColor", Vec3(real_t(0.1), real_t(0.1), real_t(0.1)));
+
+ std::string raytracingAlgorithm = config.getParameter<std::string>("raytracingAlgorithm", "RAYTRACE_HASHGRIDS");
+ if (raytracingAlgorithm == "RAYTRACE_HASHGRIDS") {
+ setRaytracingAlgorithm(RAYTRACE_HASHGRIDS);
+ } else if (raytracingAlgorithm == "RAYTRACE_NAIVE") {
+ setRaytracingAlgorithm(RAYTRACE_NAIVE);
+ } else if (raytracingAlgorithm == "RAYTRACE_COMPARE_BOTH") {
+ setRaytracingAlgorithm(RAYTRACE_COMPARE_BOTH);
+ }
+
+ std::string reductionMethod = config.getParameter<std::string>("reductionMethod", "MPI_REDUCE");
+ if (reductionMethod == "MPI_REDUCE") {
+ setReductionMethod(MPI_REDUCE);
+ } else if (reductionMethod == "MPI_GATHER") {
+ setReductionMethod(MPI_GATHER);
+ }
+
+ setupView_();
+ setupFilenameRankWidth_();
+ WALBERLA_MPI_SECTION() {
+ setupMPI_();
+ }
+}
+
+/*!\brief Utility function for setting up the view plane and calculating required variables.
+ */
+void Raytracer::setupView_() {
+ // eye coordinate system setup
+ n_ = (cameraPosition_ - lookAtPoint_).getNormalized();
+ u_ = (upVector_ % n_).getNormalized();
+ v_ = n_ % u_;
+
+ // viewing plane setup
+ d_ = (cameraPosition_ - lookAtPoint_).length();
+ aspectRatio_ = real_t(pixelsHorizontal_) / real_t(pixelsVertical_);
+ real_t fov_vertical_rad = fov_vertical_ * math::M_PI / real_t(180.0);
+ viewingPlaneHeight_ = real_c(tan(fov_vertical_rad/real_t(2.))) * real_t(2.) * d_;
+ viewingPlaneWidth_ = viewingPlaneHeight_ * aspectRatio_;
+ viewingPlaneOrigin_ = lookAtPoint_ - u_*viewingPlaneWidth_/real_t(2.) - v_*viewingPlaneHeight_/real_t(2.);
+
+ pixelWidth_ = viewingPlaneWidth_ / real_c(pixelsHorizontal_*antiAliasFactor_);
+ pixelHeight_ = viewingPlaneHeight_ / real_c(pixelsVertical_*antiAliasFactor_);
+}
+
+/*!\brief Utility function for initializing the attribute filenameRankWidth.
+ */
+void Raytracer::setupFilenameRankWidth_() {
+ int numProcesses = mpi::MPIManager::instance()->numProcesses();
+ filenameRankWidth_ = uint8_c(log10(numProcesses)+1);
+}
+
+/*!\brief Utility function for setting up the MPI datatype and operation.
+ */
+void Raytracer::setupMPI_() {
+ MPI_Op_create((MPI_User_function *)BodyIntersectionInfo_Comparator_MPI_OP, true, &bodyIntersectionInfo_reduction_op);
+
+ const int nblocks = 7;
+ const int blocklengths[nblocks] = {1,1,1,1,1,1,1};
+ MPI_Datatype types[nblocks] = {
+ MPI_UNSIGNED, // for coordinate
+ MPI_UNSIGNED, // for coordinate
+ MPI_UNSIGNED_LONG_LONG, // for id
+ MPI_DOUBLE, // for distance
+ MPI_DOUBLE, // for color
+ MPI_DOUBLE, // for color
+ MPI_DOUBLE // for color
+ };
+ MPI_Aint displacements[nblocks];
+ displacements[0] = offsetof(BodyIntersectionInfo, imageX);
+ displacements[1] = offsetof(BodyIntersectionInfo, imageY);
+ displacements[2] = offsetof(BodyIntersectionInfo, bodySystemID);
+ displacements[3] = offsetof(BodyIntersectionInfo, t);
+ displacements[4] = offsetof(BodyIntersectionInfo, r);
+ displacements[5] = offsetof(BodyIntersectionInfo, g);
+ displacements[6] = offsetof(BodyIntersectionInfo, b);
+
+ MPI_Datatype tmp_type;
+ MPI_Type_create_struct(nblocks, blocklengths, displacements, types, &tmp_type);
+
+ MPI_Aint lb, extent;
+ MPI_Type_get_extent( tmp_type, &lb, &extent );
+ MPI_Type_create_resized( tmp_type, lb, extent, &bodyIntersectionInfo_mpi_type );
+
+ MPI_Type_commit(&bodyIntersectionInfo_mpi_type);
+}
+
+/*!\brief Generates the filename for output files.
+ * \param base String that precedes the timestap and rank info.
+ * \param timestep Timestep this image is from.
+ * \param isGlobalImage Whether this image is the fully stitched together one.
+ */
+std::string Raytracer::getOutputFilename(const std::string& base, size_t timestep, bool isGlobalImage) const {
+ uint_t maxTimestep = uint_c(pow(10, filenameTimestepWidth_));
+ WALBERLA_CHECK(timestep < maxTimestep, "Raytracer only supports outputting " << (maxTimestep-1) << " timesteps for the configured filename timestep width.");
+ mpi::MPIRank rank = mpi::MPIManager::instance()->rank();
+ std::stringstream fileNameStream;
+ fileNameStream << base << "_";
+ fileNameStream << std::setfill('0') << std::setw(int_c(filenameTimestepWidth_)) << timestep; // add timestep
+ WALBERLA_MPI_SECTION() {
+ // Appending the rank to the filename only makes sense if actually using MPI.
+ fileNameStream << "+";
+ if (isGlobalImage) {
+ fileNameStream << "global";
+ } else {
+ fileNameStream << std::setfill('0') << std::setw(int_c(filenameRankWidth_)) << std::to_string(rank); // add rank
+ }
+ }
+ fileNameStream << ".png"; // add extension
+ return fileNameStream.str();
+}
+
+/*!\brief Writes the image of the current intersection buffer to a file in the image output directory.
+ * \param intersectionsBuffer Buffer with intersection info for each pixel.
+ * \param timestep Timestep this image is from.
+ * \param isGlobalImage Whether this image is the fully stitched together one.
+ */
+void Raytracer::writeImageToFile(const std::vector<BodyIntersectionInfo>& intersectionsBuffer, size_t timestep,
+ bool isGlobalImage) const {
+ writeImageToFile(intersectionsBuffer, getOutputFilename("image", timestep, isGlobalImage));
+}
+
+/*!\brief Writes the image of the current intersection buffer to a file in the image output directory.
+ * \param intersectionsBuffer Buffer with intersection info for each pixel.
+ * \param fileName Name of the output file.
+ */
+void Raytracer::writeImageToFile(const std::vector<BodyIntersectionInfo>& intersectionsBuffer,
+ const std::string& fileName) const {
+ filesystem::path dir = getImageOutputDirectory();
+ filesystem::path file (fileName);
+ filesystem::path fullPath = dir / file;
+
+ std::vector<uint8_t> lodeImageBuffer(pixelsHorizontal_*pixelsVertical_*3);
+
+ uint32_t l = 0;
+ real_t patchSize = real_c(antiAliasFactor_*antiAliasFactor_);
+ for (int y = pixelsVertical_-1; y >= 0; y--) {
+ for (uint32_t x = 0; x < pixelsHorizontal_; x++) {
+ real_t r_sum = 0, g_sum = 0, b_sum = 0;
+ for (uint32_t ay = uint32_c(y)*antiAliasFactor_; ay < (uint32_c(y+1))*antiAliasFactor_; ay++) {
+ for (uint32_t ax = x*antiAliasFactor_; ax < (x+1)*antiAliasFactor_; ax++) {
+ size_t i = coordinateToArrayIndex(ax, ay);
+ r_sum += real_c(intersectionsBuffer[i].r);
+ g_sum += real_c(intersectionsBuffer[i].g);
+ b_sum += real_c(intersectionsBuffer[i].b);
+ }
+ }
+ uint8_t r = (uint8_t)(255 * (r_sum/patchSize));
+ uint8_t g = (uint8_t)(255 * (g_sum/patchSize));
+ uint8_t b = (uint8_t)(255 * (b_sum/patchSize));
+
+ lodeImageBuffer[l] = r;
+ lodeImageBuffer[l+1] = g;
+ lodeImageBuffer[l+2] = b;
+ l+=3;
+ }
+ }
+
+ uint32_t error = lodepng::encode(fullPath.string(), lodeImageBuffer, getPixelsHorizontal(), getPixelsVertical(), LCT_RGB);
+ if(error) {
+ WALBERLA_LOG_WARNING("lodePNG error " << error << " when trying to save image file to " << fullPath.string() << ": " << lodepng_error_text(error));
+ }
+}
+
+
+/*!\brief Conflate the intersectionsBuffer of each process onto the root process using MPI_Reduce.
+ * \param intersectionsBuffer Buffer containing all intersections for entire image (including non-hits).
+ * \param tt Optional TimingTree.
+ *
+ * This function conflates the intersectionsBuffer of each process onto the root process using the MPI_Reduce
+ * routine. It requires sending intersection info structs for the entire image instead of only the ones of the hits.
+ *
+ * \attention This function only works on MPI builds due to the explicit usage of MPI routines.
+ */
+void Raytracer::syncImageUsingMPIReduce(std::vector<BodyIntersectionInfo>& intersectionsBuffer, WcTimingTree* tt) {
+ WALBERLA_NON_MPI_SECTION() {
+ WALBERLA_UNUSED(intersectionsBuffer);
+ WALBERLA_UNUSED(tt);
+ WALBERLA_ABORT("Cannot call MPI reduce on a non-MPI build due to usage of MPI-specific code.");
+ }
+
+ WALBERLA_MPI_BARRIER();
+ if (tt != nullptr) tt->start("Reduction");
+ int rank = mpi::MPIManager::instance()->rank();
+
+ const int recvRank = 0;
+ if( rank == recvRank ) {
+ MPI_Reduce(MPI_IN_PLACE,
+ &intersectionsBuffer[0], int_c(intersectionsBuffer.size()),
+ bodyIntersectionInfo_mpi_type, bodyIntersectionInfo_reduction_op,
+ recvRank, MPI_COMM_WORLD);
+ } else {
+ MPI_Reduce(&intersectionsBuffer[0], nullptr, int_c(intersectionsBuffer.size()),
+ bodyIntersectionInfo_mpi_type, bodyIntersectionInfo_reduction_op,
+ recvRank, MPI_COMM_WORLD);
+ }
+
+ WALBERLA_MPI_BARRIER();
+ if (tt != nullptr) tt->stop("Reduction");
+}
+
+/*!\brief Conflate the intersectionsBuffer of each process onto the root process using MPI_Gather.
+ * \param intersectionsBuffer Buffer containing intersections.
+ * \param tt Optional TimingTree.
+ *
+ * This function conflates the intersectionsBuffer of each process onto the root process using the MPI_Gather
+ * routine. It only sends information for hits.
+ */
+void Raytracer::syncImageUsingMPIGather(std::vector<BodyIntersectionInfo>& intersections, std::vector<BodyIntersectionInfo>& intersectionsBuffer, WcTimingTree* tt) {
+ WALBERLA_MPI_BARRIER();
+ if (tt != nullptr) tt->start("Reduction");
+
+ mpi::SendBuffer sendBuffer;
+ for (auto& info: intersections) {
+ sendBuffer << info.imageX << info.imageY
+ << info.bodySystemID << info.t
+ << info.r << info.g << info.b;
+ }
+
+ mpi::RecvBuffer recvBuffer;
+ mpi::gathervBuffer(sendBuffer, recvBuffer, 0);
+
+ WALBERLA_ROOT_SECTION() {
+ BodyIntersectionInfo info;
+ while (!recvBuffer.isEmpty()) {
+ recvBuffer >> info.imageX;
+ recvBuffer >> info.imageY;
+ recvBuffer >> info.bodySystemID;
+ recvBuffer >> info.t;
+ recvBuffer >> info.r;
+ recvBuffer >> info.g;
+ recvBuffer >> info.b;
+
+ size_t i = coordinateToArrayIndex(info.imageX, info.imageY);
+
+ if (intersectionsBuffer[i].bodySystemID == 0 || info.t < intersectionsBuffer[i].t) {
+ intersectionsBuffer[i] = info;
+ }
+ }
+ }
+
+ WALBERLA_MPI_BARRIER();
+ if (tt != nullptr) tt->stop("Reduction");
+}
+
+void Raytracer::localOutput(const std::vector<BodyIntersectionInfo>& intersectionsBuffer, size_t timestep, WcTimingTree* tt) {
+ if (getImageOutputEnabled()) {
+ if (getLocalImageOutputEnabled()) {
+ if (tt != nullptr) tt->start("Local Output");
+ writeImageToFile(intersectionsBuffer, timestep);
+ if (tt != nullptr) tt->stop("Local Output");
+ }
+ }
+}
+
+void Raytracer::output(const std::vector<BodyIntersectionInfo>& intersectionsBuffer, size_t timestep, WcTimingTree* tt) {
+ if (tt != nullptr) tt->start("Output");
+ WALBERLA_ROOT_SECTION() {
+ if (getImageOutputEnabled()) {
+ writeImageToFile(intersectionsBuffer, timestep, true);
+ }
+ }
+ if (tt != nullptr) tt->stop("Output");
+}
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/pe/raytracing/Raytracer.h b/src/pe/raytracing/Raytracer.h
new file mode 100644
index 0000000000000000000000000000000000000000..39c42aa213a0af99570f9faccb64d2b5e33ee57c
--- /dev/null
+++ b/src/pe/raytracing/Raytracer.h
@@ -0,0 +1,709 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Raytracer.h
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <core/config/Config.h>
+#include <core/Filesystem.h>
+#include <core/math/Vector3.h>
+#include <core/mpi/Datatype.h>
+#include <core/timing/TimingTree.h>
+
+#include <pe/ccd/ICCD.h>
+#include <pe/ccd/HashGrids.h>
+#include <pe/raytracing/Ray.h>
+#include <pe/raytracing/Intersects.h>
+#include <pe/raytracing/Lighting.h>
+#include <pe/raytracing/ShadingFunctions.h>
+#include <pe/Types.h>
+
+#include <cstddef>
+#include <functional>
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+/*!\brief Contains information about a ray-body intersection.
+ */
+struct BodyIntersectionInfo {
+ unsigned int imageX; //!< Viewing plane x pixel coordinate the ray belongs to. -> MPI_UNSIGNED
+ unsigned int imageY; //!< Viewing plane y pixel coordinate the ray belongs to. -> MPI_UNSIGNED
+ walberla::id_t bodySystemID; //!< System ID of body which was hit. -> MPI_UNSIGNED_LONG_LONG
+ double t; //!< Distance from camera to intersection point on body. -> MPI_DOUBLE
+ double r; //!< Red value for the pixel. -> MPI_DOUBLE
+ double g; //!< Green value for the pixel. -> MPI_DOUBLE
+ double b; //!< Blue value for the pixel. -> MPI_DOUBLE
+};
+
+inline bool defaultIsBodyVisible(const BodyID body) {
+ WALBERLA_UNUSED(body);
+ return true;
+}
+
+class Raytracer {
+public:
+ /*!\brief Which method to use when reducing the process-local image to a global one.
+ */
+ enum ReductionMethod {
+ MPI_REDUCE, //!< Reduce info from all processes onto root (assembling happens during reduction).
+ MPI_GATHER //!< Gather info from all processes onto root process and assemble global image there.
+ };
+ /*!\brief Which algorithm to use when doing ray-object intersection finding.
+ */
+ enum Algorithm {
+ RAYTRACE_HASHGRIDS, //!< Use hashgrids to find ray-body intersections.
+ RAYTRACE_NAIVE, //!< Use the brute force approach of checking all objects for intersection testing.
+ RAYTRACE_COMPARE_BOTH, //!< Compare both methods and check for pixel errors.
+ RAYTRACE_COMPARE_BOTH_STRICTLY //!< Same as RAYTRACE_COMPARE_BOTH but abort if errors found.
+ };
+
+ /*!\name Constructors */
+ //@{
+ explicit Raytracer(const shared_ptr<BlockStorage>& forest, const BlockDataID storageID,
+ const shared_ptr<BodyStorage>& globalBodyStorage,
+ const BlockDataID ccdID,
+ uint16_t pixelsHorizontal, uint16_t pixelsVertical,
+ real_t fov_vertical, uint16_t antiAliasFactor,
+ const Vec3& cameraPosition, const Vec3& lookAtPoint, const Vec3& upVector,
+ const Lighting& lighting,
+ const Color& backgroundColor = Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ const std::function<ShadingParameters (const BodyID)>& bodyToShadingParamsFunc = defaultBodyTypeDependentShadingParams,
+ const std::function<bool (const BodyID)>& isBodyVisibleFunc = defaultIsBodyVisible);
+
+ explicit Raytracer(const shared_ptr<BlockStorage>& forest, const BlockDataID storageID,
+ const shared_ptr<BodyStorage>& globalBodyStorage,
+ const BlockDataID ccdID,
+ const Config::BlockHandle& config,
+ const std::function<ShadingParameters (const BodyID)>& bodyToShadingParamsFunction = defaultBodyTypeDependentShadingParams,
+ const std::function<bool (const BodyID)>& isBodyVisibleFunc = defaultIsBodyVisible);
+ //@}
+
+private:
+ /*!\name Member variables */
+ //@{
+ const shared_ptr<BlockStorage> forest_; //!< The BlockForest the raytracer operates on.
+ const BlockDataID storageID_; //!< The storage ID of the block data storage the raytracer operates on.
+ const shared_ptr<BodyStorage> globalBodyStorage_; //!< The global body storage the raytracer operates on.
+ const BlockDataID ccdID_; //!< The ID of the hash grids block data.
+
+ uint16_t pixelsHorizontal_; //!< The horizontal amount of pixels of the generated image.
+ uint16_t pixelsVertical_; //!< The vertical amount of pixels of the generated image.
+ real_t fov_vertical_; //!< The vertical field-of-view of the camera.
+ uint16_t antiAliasFactor_; /*!< Factor used for oversampling. Should be between 1 (fast, but jagged edges)
+ * and 4 (16 times slower, very smooth edges).*/
+ Vec3 cameraPosition_; //!< The position of the camera in the global world frame.
+ Vec3 lookAtPoint_; /*!< The point the camera looks at in the global world frame,
+ marks the center of the view plane.*/
+ Vec3 upVector_; //!< The vector indicating the upwards direction of the camera.
+ Lighting lighting_; //!< The lighting of the scene.
+ Color backgroundColor_; //!< Background color of the scene.
+
+ bool imageOutputEnabled_; //!< Enable / disable writing images to file.
+ bool localImageOutputEnabled_; //!< Enable / disable writing images of the local process to file.
+ std::string imageOutputDirectory_; //!< Path to the image output directory.
+
+ uint8_t filenameTimestepWidth_; /*!< Width of the timestep number in output filenames.
+ * Use e.g. 5 for ranges from 1 to 99 999: Will result in
+ * filenames like image_00001.png up to image_99999.png. */
+ uint8_t filenameRankWidth_; //!< Width of the mpi rank part in a filename.
+ bool confinePlanesToDomain_; //!< Enable to render only the parts of planes within the simulation domain.
+ std::function<ShadingParameters (const BodyID)> bodyToShadingParamsFunc_; /*!< Function which returns a
+ * ShadingParameters struct for the
+ * specified body. */
+ std::function<bool (const BodyID)> isBodyVisibleFunc_; /*!< Function which returns a boolean indicating if
+ * a given body should be visible in the final image. */
+ Algorithm raytracingAlgorithm_; //!< Algorithm to use while intersection testing.
+ ReductionMethod reductionMethod_; //!< Reduction method used for assembling the image from all processes.
+ //@}
+
+ /*!\name Member variables for raytracing geometry */
+ //@{
+ Vec3 n_; //!< The normal vector of the viewing plane.
+ Vec3 u_; //!< The vector spanning the viewing plane in the "right direction".
+ Vec3 v_; //!< The vector spanning the viewing plane in the "up direction".
+ real_t d_; //!< The the distance from camera to viewing plane.
+ real_t aspectRatio_; //!< The aspect ratio of the generated image and viewing plane.
+ real_t viewingPlaneHeight_; //!< The viewing plane height in the world frame.
+ real_t viewingPlaneWidth_; //!< The viewing plane width in the world frame.
+ Vec3 viewingPlaneOrigin_; //!< The origin of the viewing plane.
+ real_t pixelWidth_; //!< The width of a pixel of the generated image in the viewing plane.
+ real_t pixelHeight_; //!< The height of a pixel of the generated image in the viewing plane.
+ //@}
+
+ MPI_Op bodyIntersectionInfo_reduction_op;
+ MPI_Datatype bodyIntersectionInfo_mpi_type;
+
+public:
+ /*!\name Get functions */
+ //@{
+ inline uint16_t getPixelsHorizontal() const;
+ inline uint16_t getPixelsVertical() const;
+ inline real_t getFOVVertical() const;
+ inline const Vec3& getCameraPosition() const;
+ inline const Vec3& getLookAtPoint() const;
+ inline const Vec3& getUpVector() const;
+ inline const Color& getBackgroundColor() const;
+ inline bool getImageOutputEnabled() const;
+ inline bool getLocalImageOutputEnabled() const;
+ inline const std::string& getImageOutputDirectory() const;
+ inline uint8_t getFilenameTimestepWidth() const;
+ inline bool getConfinePlanesToDomain() const;
+ //@}
+
+ /*!\name Set functions */
+ //@{
+ inline void setBackgroundColor(const Color& color);
+ inline void setImageOutputEnabled(const bool enabled);
+ inline void setLocalImageOutputEnabled(const bool enabled);
+ inline void setImageOutputDirectory(const std::string& path);
+ inline void setFilenameTimestepWidth(uint8_t width);
+ inline void setRaytracingAlgorithm(Algorithm algorithm);
+ inline void setReductionMethod(ReductionMethod reductionMethod);
+ inline void setConfinePlanesToDomain(bool confinePlanesToOrigin);
+ //@}
+
+ /*!\name Functions */
+ //@{
+ template <typename BodyTypeTuple>
+ void generateImage(const size_t timestep, WcTimingTree* tt = NULL );
+
+ void setupView_();
+ void setupFilenameRankWidth_();
+ void setupMPI_();
+
+private:
+ void localOutput(const std::vector<BodyIntersectionInfo>& intersectionsBuffer, size_t timestep,
+ WcTimingTree* tt = NULL);
+ void output(const std::vector<BodyIntersectionInfo>& intersectionsBuffer, size_t timestep,
+ WcTimingTree* tt = NULL);
+
+ std::string getOutputFilename(const std::string& base, size_t timestep, bool isGlobalImage) const;
+ void writeImageToFile(const std::vector<BodyIntersectionInfo>& intersectionsBuffer,
+ size_t timestep, bool isGlobalImage = false) const;
+ void writeImageToFile(const std::vector<BodyIntersectionInfo>& intersectionsBuffer,
+ const std::string& fileName) const;
+
+ void syncImageUsingMPIReduce(std::vector<BodyIntersectionInfo>& intersectionsBuffer, WcTimingTree* tt = NULL);
+ void syncImageUsingMPIGather(std::vector<BodyIntersectionInfo>& intersections,
+ std::vector<BodyIntersectionInfo>& intersectionsBuffer, WcTimingTree* tt = NULL);
+
+ inline bool isPlaneVisible(const PlaneID plane, const Ray& ray) const;
+ inline size_t coordinateToArrayIndex(size_t x, size_t y) const;
+
+ template <typename BodyTypeTuple>
+ inline void traceRayInGlobalBodyStorage(const Ray& ray, BodyID& body_closest, real_t& t_closest, Vec3& n_closest) const;
+ template <typename BodyTypeTuple>
+ inline void traceRayNaively(const Ray& ray, BodyID& body_closest, real_t& t_closest, Vec3& n_closest) const;
+ template <typename BodyTypeTuple>
+ inline void traceRayInHashGrids(const Ray& ray, BodyID& body_closest, real_t& t_closest, Vec3& n_closest) const;
+
+ inline Color getColor(const BodyID body, const Ray& ray, real_t t, const Vec3& n) const;
+ //@}
+};
+
+/*!\brief Returns the horizontal amount of pixels of the generated image.
+ *
+ * \return The horizontal amount of pixels of the generated image.
+ */
+inline uint16_t Raytracer::getPixelsHorizontal() const {
+ return pixelsHorizontal_;
+}
+
+/*!\brief Returns the vertical amount of pixels of the generated image.
+ *
+ * \return The vertical amount of pixels of the generated image.
+ */
+inline uint16_t Raytracer::getPixelsVertical() const {
+ return pixelsVertical_;
+}
+
+/*!\brief Returns the vertical field-of-view of the camera.
+ *
+ * \return The vertical field-of-view of the camera.
+ */
+inline real_t Raytracer::getFOVVertical() const {
+ return fov_vertical_;
+}
+
+/*!\brief Returns the position of the camera in the global world frame.
+ *
+ * \return The position of the camera.
+ *
+ * Returns the position of the camera in the global world frame.
+ */
+inline const Vec3& Raytracer::getCameraPosition() const {
+ return cameraPosition_;
+}
+
+/*!\brief Returns the point the camera looks at in the global world frame.
+ *
+ * \return The looked at point.
+ *
+ * Returns the point the camera looks at in the global world frame, which also marks the center of
+ * the view plane.
+ */
+inline const Vec3& Raytracer::getLookAtPoint() const {
+ return lookAtPoint_;
+}
+
+/*!\brief Returns the vector indicating the upwards direction of the camera.
+ *
+ * \return The upwards vector of the camera.
+ *
+ * Returns the vector indicating the upwards direction of the camera.
+ */
+inline const Vec3& Raytracer::getUpVector() const {
+ return upVector_;
+}
+
+/*!\brief Returns the background color of the scene.
+ *
+ * \return Color.
+ *
+ * Returns the background color of the scene.
+ */
+inline const Color& Raytracer::getBackgroundColor() const {
+ return backgroundColor_;
+}
+
+/*!\brief Returns true if image output to a file is enabled.
+ *
+ * \return True if image output enabled, otherwise false.
+ */
+inline bool Raytracer::getImageOutputEnabled() const {
+ return imageOutputEnabled_;
+}
+
+/*!\brief Returns true if local image output to a file is enabled.
+ *
+ * \return True if local image output enabled, otherwise false.
+ */
+inline bool Raytracer::getLocalImageOutputEnabled() const {
+ return localImageOutputEnabled_;
+}
+
+/*!\brief Returns the directory where the images will be saved in.
+ *
+ * \return Path to the image output directory.
+ */
+inline const std::string& Raytracer::getImageOutputDirectory() const {
+ return imageOutputDirectory_;
+}
+
+/*!\brief Returns width of the timestep number in output filenames.
+ * \return Width of the timestep part in filenames.
+ */
+inline uint8_t Raytracer::getFilenameTimestepWidth() const {
+ return filenameTimestepWidth_;
+}
+
+/*!\brief Returns whether the rendering of planes gets confined in the simulation domain.
+ * \return True if the rendering of planes gets confined in the simulation domain.
+ */
+inline bool Raytracer::getConfinePlanesToDomain() const {
+ return confinePlanesToDomain_;
+}
+
+/*!\brief Set the background color of the scene.
+ *
+ * \param color New background color.
+ */
+inline void Raytracer::setBackgroundColor(const Color& color) {
+ backgroundColor_ = color;
+}
+
+/*!\brief Enable / disable outputting images in the specified directory.
+ * \param enabled Set to true / false to enable / disable image output.
+ */
+inline void Raytracer::setImageOutputEnabled(const bool enabled) {
+ imageOutputEnabled_ = enabled;
+}
+
+/*!\brief Enable / disable outputting local images in the specified directory.
+ * \param enabled Set to true / false to enable / disable image output.
+ */
+inline void Raytracer::setLocalImageOutputEnabled(const bool enabled) {
+ localImageOutputEnabled_ = enabled;
+}
+
+/*!\brief Enable / disable outputting images in the specified directory.
+ * \param enabled Set to true / false to enable / disable image output.
+ */
+inline void Raytracer::setImageOutputDirectory(const std::string& path) {
+ filesystem::path dir (path);
+ WALBERLA_CHECK(filesystem::exists(dir) && filesystem::is_directory(dir), "Image output directory " << path << " is invalid.");
+
+ imageOutputDirectory_ = path;
+}
+
+/*!\brief Set width of timestep number in output filenames.
+ * \param width Width of timestep part in a filename.
+ */
+inline void Raytracer::setFilenameTimestepWidth(uint8_t width) {
+ filenameTimestepWidth_ = width;
+}
+
+/*!\brief Set the algorithm to use while ray tracing.
+ * \param algorithm One of RAYTRACE_HASHGRIDS, RAYTRACE_NAIVE, RAYTRACE_COMPARE_BOTH, RAYTRACE_COMPARE_BOTH_STRICTLY (abort on errors).
+ */
+inline void Raytracer::setRaytracingAlgorithm(Algorithm algorithm) {
+ raytracingAlgorithm_ = algorithm;
+}
+
+/*!\brief Set the algorithm to use while reducing.
+ * \param reductionMethod One of MPI_GATHER or MPI_REDUCE (latter one only works on MPI builds).
+ */
+inline void Raytracer::setReductionMethod(ReductionMethod reductionMethod) {
+ reductionMethod_ = reductionMethod;
+}
+
+/*!\brief Set if the rendering of planes should get confined to the simulation domain.
+ * \param confinePlanesToOrigin True if the rendering of planes should get confined to the simulation domain.
+ */
+inline void Raytracer::setConfinePlanesToDomain(bool confinePlanesToDomain) {
+ confinePlanesToDomain_ = confinePlanesToDomain;
+}
+
+/*!\brief Checks if a plane should get rendered.
+ * \param plane Plane to check for visibility.
+ * \param ray Ray which is intersected with plane.
+ *
+ * Checks if a plane should get rendered by comparing the planes normal and the ray direction.
+ * If the rays direction vectors projection on the planes normal is positive, the plane is considered invisible.
+ */
+inline bool Raytracer::isPlaneVisible(const PlaneID plane, const Ray& ray) const {
+ return plane->getNormal() * ray.getDirection() < 0;
+}
+
+/*!\brief Converts a coordinate to an array index.
+ * \param x X component of the coordinate.
+ * \param y Y component of the coordinate.
+ * \return Array index.
+ */
+inline size_t Raytracer::coordinateToArrayIndex(size_t x, size_t y) const {
+ return y*pixelsHorizontal_*antiAliasFactor_ + x;
+}
+
+/*!\brief Traces a ray in the global body storage and finds the closest ray-body intersection.
+ * \param ray Ray which is shot.
+ * \param body_closest Reference where the closest body will be stored in.
+ * \param t_closest Reference where the distance of the currently closest body is stored in,
+ will get updated if closer intersection found.
+ * \param n_closest Reference where the intersection normal will be stored in.
+ */
+template <typename BodyTypeTuple>
+inline void Raytracer::traceRayInGlobalBodyStorage(const Ray& ray, BodyID& body_closest, real_t& t_closest, Vec3& n_closest) const {
+ WALBERLA_ROOT_SECTION(){
+ real_t t = std::numeric_limits<real_t>::max();
+ Vec3 n;
+
+ IntersectsFunctor func(ray, t, n);
+
+ for(auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt)
+ {
+ if (!isBodyVisibleFunc_(bodyIt.getBodyID()))
+ {
+ continue;
+ }
+
+ bool isPlane = (bodyIt->getTypeID() == Plane::getStaticTypeID());
+ if (isPlane)
+ {
+ PlaneID plane = (PlaneID)bodyIt.getBodyID();
+ if (!isPlaneVisible(plane, ray))
+ {
+ continue;
+ }
+ }
+
+ bool intersects = SingleCast<BodyTypeTuple, IntersectsFunctor, bool>::execute(bodyIt.getBodyID(), func);
+ if (intersects && t < t_closest)
+ {
+ if (isPlane && confinePlanesToDomain_)
+ {
+ Vec3 intersectionPoint = ray.getOrigin()+ray.getDirection()*t;
+ if (!forest_->getDomain().contains(intersectionPoint, real_t(1e-8)))
+ {
+ continue;
+ }
+ }
+ // body was shot by ray and is currently closest to camera
+ t_closest = t;
+ body_closest = bodyIt.getBodyID();
+ n_closest = n;
+ }
+ }
+ }
+}
+
+/*!\brief Traces a ray naively and finds the closest ray-body intersection.
+ * \param ray Ray which is shot.
+ * \param body_closest Reference where the closest body will be stored in.
+ * \param t_closest Reference where the distance of the currently closest body is stored in,
+ will get updated if closer intersection found.
+ * \param n_closest Reference where the intersection normal will be stored in.
+ */
+template <typename BodyTypeTuple>
+inline void Raytracer::traceRayNaively(const Ray& ray, BodyID& body_closest, real_t& t_closest, Vec3& n_closest) const {
+ real_t t = std::numeric_limits<real_t>::max();
+ Vec3 n;
+
+ IntersectsFunctor func(ray, t, n);
+
+ for (auto blockIt = forest_->begin(); blockIt != forest_->end(); ++blockIt) {
+ for (auto bodyIt = LocalBodyIterator::begin(*blockIt, storageID_); bodyIt != LocalBodyIterator::end(); ++bodyIt) {
+ if (!isBodyVisibleFunc_(bodyIt.getBodyID())) {
+ continue;
+ }
+
+ bool intersects = SingleCast<BodyTypeTuple, IntersectsFunctor, bool>::execute(bodyIt.getBodyID(), func);
+ if (intersects && t < t_closest) {
+ // body was shot by ray and is currently closest to camera
+ t_closest = t;
+ body_closest = bodyIt.getBodyID();
+ n_closest = n;
+ }
+ }
+ }
+}
+
+/*!\brief Traces a ray in the global body storage and finds the closest ray-body intersection.
+ * \param ray Ray which is shot.
+ * \param body_closest Reference where the closest body will be stored in.
+ * \param t_closest Reference where the distance of the currently closest body is stored in,
+ will get updated if closer intersection found.
+ * \param n_closest Reference where the intersection normal will be stored in.
+ */
+template <typename BodyTypeTuple>
+inline void Raytracer::traceRayInHashGrids(const Ray& ray, BodyID& body_closest, real_t& t_closest, Vec3& n_closest) const {
+ real_t t = std::numeric_limits<real_t>::max();
+ Vec3 n;
+
+ for (auto blockIt = forest_->begin(); blockIt != forest_->end(); ++blockIt) {
+ const AABB& blockAABB = blockIt->getAABB();
+ const ccd::HashGrids* hashgrids = blockIt->uncheckedFastGetData<ccd::HashGrids>(ccdID_);
+ BodyID body = hashgrids->getClosestBodyIntersectingWithRay<BodyTypeTuple>(ray, blockAABB, t, n,
+ isBodyVisibleFunc_);
+ if (body != NULL && t < t_closest) {
+ t_closest = t;
+ body_closest = body;
+ n_closest = n;
+ }
+ }
+}
+
+/*!\brief Does one raytracing step.
+ *
+ * \param timestep The timestep after which the raytracing starts.
+ *
+ * \attention Planes will not get rendered if their normal and the rays direction point in the approximately
+ * same direction. See Raytracer::isPlaneVisible() for further information.
+ */
+template <typename BodyTypeTuple>
+void Raytracer::generateImage(const size_t timestep, WcTimingTree* tt) {
+ if (tt != NULL) tt->start("Raytracing");
+ const real_t realMax = std::numeric_limits<real_t>::max();
+
+ std::vector<BodyIntersectionInfo> intersections;
+ // contains for each pixel information about an intersection:
+ size_t bufferSize = (pixelsVertical_*antiAliasFactor_)*(pixelsHorizontal_*antiAliasFactor_);
+ std::vector<BodyIntersectionInfo> intersectionsBuffer(bufferSize);
+
+ if (raytracingAlgorithm_ == RAYTRACE_HASHGRIDS || raytracingAlgorithm_ == RAYTRACE_COMPARE_BOTH
+ || raytracingAlgorithm_ == RAYTRACE_COMPARE_BOTH_STRICTLY) {
+ if (tt != NULL) tt->start("HashGrids Update");
+ for (auto blockIt = forest_->begin(); blockIt != forest_->end(); ++blockIt) {
+ ccd::HashGrids* hashgrids = blockIt->getData<ccd::HashGrids>(ccdID_);
+ hashgrids->update();
+ }
+ if (tt != NULL) tt->stop("HashGrids Update");
+ }
+
+ real_t t, t_closest;
+ Vec3 n;
+ Vec3 n_closest;
+ BodyID body_closest = NULL;
+ Ray ray(cameraPosition_, Vec3(1,0,0));
+ IntersectsFunctor func(ray, t, n);
+ bool isErrorneousPixel = false;
+ uint_t pixelErrors = 0;
+ std::map<BodyID, std::unordered_set<BodyID>> correctToIncorrectBodyIDsMap;
+
+ if (tt != NULL) tt->start("Intersection Testing");
+ for (size_t x = 0; x < pixelsHorizontal_*antiAliasFactor_; x++) {
+ for (size_t y = 0; y < pixelsVertical_*antiAliasFactor_; y++) {
+ Vec3 pixelLocation = viewingPlaneOrigin_ + u_*(real_c(x)+real_t(0.5))*pixelWidth_ + v_*(real_c(y)+real_t(0.5))*pixelHeight_;
+ Vec3 direction = (pixelLocation - cameraPosition_).getNormalized();
+ ray.setDirection(direction);
+
+ n.reset();
+ t_closest = realMax;
+ body_closest = NULL;
+
+ if (raytracingAlgorithm_ == RAYTRACE_HASHGRIDS) {
+ traceRayInHashGrids<BodyTypeTuple>(ray, body_closest, t_closest, n_closest);
+ } else if (raytracingAlgorithm_ == RAYTRACE_NAIVE) {
+ traceRayNaively<BodyTypeTuple>(ray, body_closest, t_closest, n_closest);
+ } else {
+ traceRayInHashGrids<BodyTypeTuple>(ray, body_closest, t_closest, n_closest);
+ BodyID hashgrids_body_closest = body_closest;
+
+ t_closest = realMax;
+ body_closest = NULL;
+ traceRayNaively<BodyTypeTuple>(ray, body_closest, t_closest, n_closest);
+
+ if (body_closest != hashgrids_body_closest) {
+ correctToIncorrectBodyIDsMap[body_closest].insert(hashgrids_body_closest);
+ isErrorneousPixel = true;
+ ++pixelErrors;
+ }
+ }
+
+ traceRayInGlobalBodyStorage<BodyTypeTuple>(ray, body_closest, t_closest, n_closest);
+
+ BodyIntersectionInfo& intersectionInfo = intersectionsBuffer[coordinateToArrayIndex(x, y)];
+ intersectionInfo.imageX = uint32_t(x);
+ intersectionInfo.imageY = uint32_t(y);
+
+ if (!realIsIdentical(t_closest, realMax) && body_closest != NULL) {
+ Color color = getColor(body_closest, ray, t_closest, n_closest);
+ if (isErrorneousPixel) {
+ color = Color(1,0,0);
+ isErrorneousPixel = false;
+ }
+
+ intersectionInfo.bodySystemID = body_closest->getSystemID();
+ intersectionInfo.t = t_closest;
+ intersectionInfo.r = color[0];
+ intersectionInfo.g = color[1];
+ intersectionInfo.b = color[2];
+
+ intersections.push_back(intersectionInfo);
+ } else {
+ intersectionInfo.bodySystemID = 0;
+ intersectionInfo.t = realMax;
+ intersectionInfo.r = backgroundColor_[0];
+ intersectionInfo.g = backgroundColor_[1];
+ intersectionInfo.b = backgroundColor_[2];
+ }
+ }
+ }
+ if (tt != NULL) tt->stop("Intersection Testing");
+
+ if (raytracingAlgorithm_ == RAYTRACE_COMPARE_BOTH || raytracingAlgorithm_ == RAYTRACE_COMPARE_BOTH_STRICTLY) {
+ if (pixelErrors > 0) {
+ WALBERLA_LOG_WARNING(pixelErrors << " pixel errors found!");
+
+ std::stringstream ss;
+ for (auto it: correctToIncorrectBodyIDsMap) {
+ const BodyID correctBody = it.first;
+ if (it.first != NULL) {
+ ss << " correct body: " << correctBody->getID() << "(" << correctBody->getHash() << ")";
+ } else {
+ ss << " no body naively found";
+ }
+ ss << ", hashgrids found:";
+ for (auto incorrectBody: it.second) {
+ ss << " ";
+ if (incorrectBody != NULL) {
+ ss << incorrectBody->getID() << "(" << incorrectBody->getHash();
+ } else {
+ ss << "NULL";
+ }
+ }
+ ss << std::endl;
+ ss << " minCorner: " << correctBody->getAABB().minCorner() << ", maxCorner: " << correctBody->getAABB().maxCorner();
+ ss << std::endl;
+ }
+ WALBERLA_LOG_WARNING("Problematic bodies: " << std::endl << ss.str());
+
+ if (raytracingAlgorithm_ == RAYTRACE_COMPARE_BOTH_STRICTLY) {
+ WALBERLA_ABORT("Pixel errors found, aborting due to strict comparison option.");
+ }
+ } else {
+ WALBERLA_LOG_INFO("No pixel errors found.");
+ }
+ }
+
+ localOutput(intersectionsBuffer, timestep, tt);
+
+ // Reduction with different methods only makes sense if actually using MPI.
+ // Besides that, the MPI reduce routine does not compile without MPI.
+ WALBERLA_MPI_SECTION() {
+ switch(reductionMethod_) {
+ case MPI_REDUCE:
+ syncImageUsingMPIReduce(intersectionsBuffer, tt);
+ break;
+ case MPI_GATHER:
+ syncImageUsingMPIGather(intersections, intersectionsBuffer, tt);
+ break;
+ }
+ } else {
+ syncImageUsingMPIGather(intersections, intersectionsBuffer, tt);
+ }
+
+ output(intersectionsBuffer, timestep, tt);
+
+ if (tt != NULL) tt->stop("Raytracing");
+}
+
+/*!\brief Computes the color for a certain intersection.
+ *
+ * \param body Intersected body.
+ * \param Ray Ray which intersected the body.
+ * \param t Distance from eye to intersection point.
+ * \param n Intersection normal at the intersection point.
+ *
+ * \return Computed color.
+ */
+inline Color Raytracer::getColor(const BodyID body, const Ray& ray, real_t t, const Vec3& n) const {
+ const ShadingParameters shadingParams = bodyToShadingParamsFunc_(body);
+
+ const Vec3 intersectionPoint = ray.getOrigin() + ray.getDirection() * t;
+ Vec3 lightDirection = lighting_.pointLightOrigin - intersectionPoint;
+ lightDirection = lightDirection.getNormalized();
+
+ real_t lambertian = std::max(real_t(0), lightDirection * n);
+
+ real_t specular = real_t(0);
+
+ if (lambertian > 0 || realIsEqual(lambertian, real_t(0))) {
+ // Blinn-Phong
+ Vec3 viewDirection = -ray.getDirection();
+ Vec3 halfDirection = (lightDirection + viewDirection).getNormalized();
+ real_t specularAngle = std::max(halfDirection * n, real_t(0));
+ specular = real_c(pow(specularAngle, shadingParams.shininess));
+ }
+
+ Color color = lighting_.ambientColor.mulComponentWise(shadingParams.ambientColor)
+ + lighting_.diffuseColor.mulComponentWise(shadingParams.diffuseColor)*lambertian
+ + lighting_.specularColor.mulComponentWise(shadingParams.specularColor)*specular;
+
+ // Capping of color channels to 1.
+ // Capping instead of scaling will make specular highlights stronger.
+ color.clamp();
+
+ return color;
+}
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/pe/raytracing/ShadingFunctions.h b/src/pe/raytracing/ShadingFunctions.h
new file mode 100644
index 0000000000000000000000000000000000000000..65675bb21aaee1f85688341e064457c5bdfb6954
--- /dev/null
+++ b/src/pe/raytracing/ShadingFunctions.h
@@ -0,0 +1,176 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Shading.h
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <pe/basic.h>
+#include <pe/Types.h>
+#include <pe/raytracing/Color.h>
+#include <pe/raytracing/ShadingParameters.h>
+#include <core/mpi/MPIWrapper.h>
+#include <core/mpi/MPIManager.h>
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+inline ShadingParameters defaultBodyTypeDependentShadingParams (const BodyID body);
+inline ShadingParameters processRankDependentShadingParams (const BodyID body);
+inline ShadingParameters defaultShadingParams (const BodyID body);
+inline ShadingParameters blackShadingParams (const BodyID body);
+inline ShadingParameters whiteShadingParams (const BodyID body);
+inline ShadingParameters lightGreyShadingParams (const BodyID body);
+inline ShadingParameters greyShadingParams (const BodyID body);
+inline ShadingParameters darkGreyShadingParams (const BodyID body);
+inline ShadingParameters redShadingParams (const BodyID body);
+inline ShadingParameters greenShadingParams (const BodyID body);
+inline ShadingParameters blueShadingParams (const BodyID body);
+inline ShadingParameters violetShadingParams (const BodyID body);
+inline ShadingParameters yellowShadingParams (const BodyID body);
+
+inline ShadingParameters defaultBodyTypeDependentShadingParams (const BodyID body) {
+ auto bodyTypeID = body->getTypeID();
+
+ if (bodyTypeID == Plane::getStaticTypeID()) {
+ return lightGreyShadingParams(body).makeMatte();
+ } else if (bodyTypeID == Sphere::getStaticTypeID()) {
+ return redShadingParams(body).makeGlossy();
+ } else if (bodyTypeID == Capsule::getStaticTypeID()) {
+ return blueShadingParams(body).makeGlossy();
+ } else if (bodyTypeID == Box::getStaticTypeID()) {
+ return violetShadingParams(body);
+ } else if (bodyTypeID == Ellipsoid::getStaticTypeID()) {
+ return yellowShadingParams(body).makeGlossy(60);
+ } else {
+ return defaultShadingParams(body);
+ }
+}
+
+inline ShadingParameters processRankDependentShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ int numProcesses = mpi::MPIManager::instance()->numProcesses();
+ int rank = mpi::MPIManager::instance()->rank();
+
+ real_t hue = real_t(360) * real_t(rank)/real_t(numProcesses);
+ Color color = Color::colorFromHSV(hue, real_t(1), real_t(0.9));
+
+ return ShadingParameters(color,
+ color*real_t(0.5),
+ Color(0,0,0),
+ real_t(0));
+}
+
+inline ShadingParameters defaultShadingParams (const BodyID body) {
+ return greyShadingParams(body);
+}
+
+inline ShadingParameters whiteShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(1), real_t(1), real_t(1)),
+ Color(real_t(0.9), real_t(0.9), real_t(0.9)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters blackShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(0), real_t(0), real_t(0)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters lightGreyShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(0.82), real_t(0.82), real_t(0.82)),
+ Color(real_t(0.5), real_t(0.5), real_t(0.5)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters greyShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(0.5), real_t(0.5), real_t(0.5)),
+ Color(real_t(0.4), real_t(0.4), real_t(0.4)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters darkGreyShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(0.2), real_t(0.2), real_t(0.2)),
+ Color(real_t(0.06), real_t(0.06), real_t(0.06)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters redShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(1), real_t(0), real_t(0)),
+ Color(real_t(0.5), real_t(0), real_t(0)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters greenShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(0), real_t(0.72), real_t(0)),
+ Color(real_t(0), real_t(0.41), real_t(0)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters blueShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(0.15), real_t(0.44), real_t(0.91)),
+ Color(real_t(0), real_t(0), real_t(0.4)),
+ Color(real_t(0.1), real_t(0.1), real_t(0.1)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters yellowShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(1), real_t(0.96), real_t(0)),
+ Color(real_t(0.5), real_t(0.48), real_t(0)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ real_t(0));
+ return s;
+}
+
+inline ShadingParameters violetShadingParams (const BodyID body) {
+ WALBERLA_UNUSED(body);
+ ShadingParameters s(Color(real_t(0.6), real_t(0), real_t(0.9)),
+ Color(real_t(0.5), real_t(0), real_t(0.8)),
+ Color(real_t(0), real_t(0), real_t(0)),
+ real_t(0));
+ return s;
+}
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
diff --git a/src/pe/raytracing/ShadingParameters.h b/src/pe/raytracing/ShadingParameters.h
new file mode 100644
index 0000000000000000000000000000000000000000..7e476527d1bd665c4017780f8858dbd39aff8876
--- /dev/null
+++ b/src/pe/raytracing/ShadingParameters.h
@@ -0,0 +1,88 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Shading.h
+//! \author Lukas Werner
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <pe/basic.h>
+#include <pe/Types.h>
+#include <pe/raytracing/Color.h>
+
+namespace walberla {
+namespace pe {
+namespace raytracing {
+
+struct ShadingParameters {
+ Color diffuseColor; //!< Primary color of the material.
+ Color ambientColor; //!< Color the material has even when its not directly lit.
+ Color specularColor; //!< Color the specular highlight has.
+ real_t shininess; //!< How shiny a material is (approximate range is between 1 and 100).
+
+ /*!\brief Instantiation constructor for the Shading struct.
+ */
+ ShadingParameters () {
+
+ }
+
+ /*!\brief Instantiation constructor for the Shading struct.
+ * \param diffuseColor Primary color of the material.
+ * \param ambientColor Color the material has even when its not directly lit.
+ * \param specularColor Color this material contributes to on its specular highlights.
+ * \param shininess Shininess of the material.
+ */
+ ShadingParameters (const Color& _diffuseColor, const Color& _ambientColor, const Color& _specularColor, real_t _shininess)
+ : diffuseColor(_diffuseColor), ambientColor(_ambientColor), specularColor(_specularColor), shininess(_shininess) {
+
+ }
+
+ /*!\brief Instantiation constructor for the Shading struct.
+ * \param config Config handle.
+ *
+ * Config has to contain diffuseColor (Color), ambientColor (Color), specularColor (Color), shininess (real_t).
+ * Colors are Vec3's with values from 0 to 1.
+ */
+ ShadingParameters (const Config::BlockHandle& config) {
+ diffuseColor = config.getParameter<Color>("diffuseColor");
+ ambientColor = config.getParameter<Color>("ambientColor");
+ specularColor = config.getParameter<Color>("specularColor");
+ shininess = config.getParameter<real_t>("shininess");
+ }
+
+ /*!\brief Makes a rendered object shiny by setting the shininess and adjusting the specularColor.
+ * \param _shininess Shininess
+ */
+ ShadingParameters& makeGlossy(real_t _shininess = 30) {
+ shininess = _shininess;
+ specularColor.set(real_t(1), real_t(1), real_t(1));
+ return *this;
+ }
+
+ /*!\brief Makes the rendered object matte by setting the shininess attribute to zero and adjusting the specularColor.
+ */
+ ShadingParameters& makeMatte() {
+ shininess = 0;
+ specularColor.set(real_t(0.1), real_t(0.1), real_t(0.1));
+ return *this;
+ }
+};
+
+} //namespace raytracing
+} //namespace pe
+} //namespace walberla
+
diff --git a/src/pe/rigidbody/BodyIterators.h b/src/pe/rigidbody/BodyIterators.h
index aaf7d7daf55ea5698822197817db048bdebee7a4..5f4ef40fc5bc9be40788c60af43cff52dea9972e 100644
--- a/src/pe/rigidbody/BodyIterators.h
+++ b/src/pe/rigidbody/BodyIterators.h
@@ -33,104 +33,109 @@ class BodyIterator
{
public:
- template< typename T >
- class iterator : public std::iterator< std::input_iterator_tag, typename T::value_type, typename T::difference_type, typename T::pointer, typename T::reference >
- {
- friend class BodyIterator;
- public:
- iterator & operator++() { ++it_; checkStateAndAdapt(); return *this; } // prefix ++X
- iterator operator++(int) { iterator it( *this ); operator++(); return it; }; // postfix X++
-
- bool operator==( const iterator & rhs ) const
- {
- if (ended_ || rhs.ended_)
+ template< typename T >
+ class iterator : public std::iterator< std::input_iterator_tag, typename T::value_type, typename T::difference_type, typename T::pointer, typename T::reference >
+ {
+ friend class BodyIterator;
+ public:
+ iterator & operator++() { ++it_; checkStateAndAdapt(); return *this; } // prefix ++X
+ iterator operator++(int) { iterator it( *this ); operator++(); return it; }; // postfix X++
+
+ bool operator==( const iterator & rhs ) const
+ {
+ if (ended_ || rhs.ended_)
+ {
+ if (ended_ == rhs.ended_)
{
- if (ended_ == rhs.ended_)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return true;
}
-
- return it_ == rhs.it_;
- }
- bool operator!=( const iterator & rhs ) const { return !(*this == rhs); }
-
- typename T::value_type operator*() { return *it_; }
- typename T::pointer operator->() { return *it_; }
-
- private:
-
- iterator( const T& begin,
- const T& localEnd,
- const T& shadowBegin,
- const T& shadowEnd )
- : it_(begin)
- , itLocalEnd_(localEnd)
- , itShadowBegin_(shadowBegin)
- , itShadowEnd_(shadowEnd)
- , local_(true)
- , ended_(false)
- {
- checkStateAndAdapt();
- }
-
- iterator( )
- : ended_( true )
- {}
-
- void checkStateAndAdapt()
- {
- if( local_ && it_ == itLocalEnd_ )
+ else
{
- it_ = itShadowBegin_;
- local_ = false;
+ return false;
}
+ }
- if( it_ == itShadowEnd_ )
- {
- ended_ = true;
- }
- }
-
- T it_;
- T itLocalEnd_;
- T itShadowBegin_;
- T itShadowEnd_;
-
- bool local_;
-
- bool ended_;
- };
-
- static inline iterator<pe::BodyStorage::Bodies::Iterator> begin( IBlock & block,
- const BlockDataID & bodyStorageId)
- {
- pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
- return iterator<pe::BodyStorage::Bodies::Iterator> ( (*storage)[0].begin(), (*storage)[0].end(), (*storage)[1].begin(), (*storage)[1].end() );
- }
-
- template< typename C >
- static inline iterator<pe::BodyStorage::Bodies::CastIterator<C> > begin( IBlock & block,
- const BlockDataID & bodyStorageId)
- {
- pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
- return iterator<pe::BodyStorage::Bodies::CastIterator<C> > ( (*storage)[0].begin<C>(), (*storage)[0].end<C>(), (*storage)[1].begin<C>(), (*storage)[1].end<C>() );
- }
-
-
- static inline iterator<pe::BodyStorage::Bodies::Iterator> end()
- {
- return iterator<pe::BodyStorage::Bodies::Iterator> ( );
- }
- template< typename C >
- static inline iterator<pe::BodyStorage::Bodies::CastIterator<C> > end()
- {
- return iterator<pe::BodyStorage::Bodies::CastIterator<C> > ( );
- }
+ //std::vector::iterator cannot be compared between different instances (assert!)
+ if (local_ == rhs.local_)
+ return it_ == rhs.it_;
+ else
+ return false;
+ }
+ bool operator!=( const iterator & rhs ) const { return !(*this == rhs); }
+
+ typename T::reference operator*() { return *it_; }
+ typename T::pointer operator->() { return it_.operator->(); }
+ typename T::pointer getBodyID() { return it_.getBodyID(); }
+
+ private:
+
+ iterator( const T& begin,
+ const T& localEnd,
+ const T& shadowBegin,
+ const T& shadowEnd )
+ : it_(begin)
+ , itLocalEnd_(localEnd)
+ , itShadowBegin_(shadowBegin)
+ , itShadowEnd_(shadowEnd)
+ , local_(true)
+ , ended_(false)
+ {
+ checkStateAndAdapt();
+ }
+
+ iterator( )
+ : ended_( true )
+ {}
+
+ void checkStateAndAdapt()
+ {
+ if( local_ && it_ == itLocalEnd_ )
+ {
+ it_ = itShadowBegin_;
+ local_ = false;
+ }
+
+ if( !local_ && it_ == itShadowEnd_ )
+ {
+ ended_ = true;
+ }
+ }
+
+ T it_;
+ T itLocalEnd_;
+ T itShadowBegin_;
+ T itShadowEnd_;
+
+ bool local_; //!< still in local storage?
+
+ bool ended_;
+ };
+
+ static inline iterator<pe::BodyStorage::iterator> begin( IBlock & block,
+ const BlockDataID & bodyStorageId)
+ {
+ pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
+ return iterator<pe::BodyStorage::iterator> ( (*storage)[0].begin(), (*storage)[0].end(), (*storage)[1].begin(), (*storage)[1].end() );
+ }
+
+ template< typename C >
+ static inline iterator<pe::BodyStorage::cast_iterator<C> > begin( IBlock & block,
+ const BlockDataID & bodyStorageId)
+ {
+ pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
+ return iterator<pe::BodyStorage::cast_iterator<C> > ( (*storage)[0].begin<C>(), (*storage)[0].end<C>(), (*storage)[1].begin<C>(), (*storage)[1].end<C>() );
+ }
+
+
+ static inline iterator<pe::BodyStorage::iterator> end()
+ {
+ return iterator<pe::BodyStorage::iterator> ( );
+ }
+ template< typename C >
+ static inline iterator<pe::BodyStorage::cast_iterator<C> > end()
+ {
+ return iterator<pe::BodyStorage::cast_iterator<C> > ( );
+ }
}; // class BodyIterator
@@ -140,87 +145,88 @@ class LocalBodyIterator
{
public:
- template< typename T >
- class iterator : public std::iterator< std::input_iterator_tag, typename T::value_type, typename T::difference_type, typename T::pointer, typename T::reference >
- {
- friend class LocalBodyIterator;
- public:
- iterator & operator++() { ++it_; checkStateAndAdapt(); return *this; } // prefix ++X
- iterator operator++(int) { iterator it( *this ); operator++(); return it; }; // postfix X++
-
- bool operator==( const iterator & rhs ) const
- {
- if (ended_ || rhs.ended_)
+ template< typename T >
+ class iterator : public std::iterator< std::input_iterator_tag, typename T::value_type, typename T::difference_type, typename T::pointer, typename T::reference >
+ {
+ friend class LocalBodyIterator;
+ public:
+ iterator & operator++() { ++it_; checkStateAndAdapt(); return *this; } // prefix ++X
+ iterator operator++(int) { iterator it( *this ); operator++(); return it; }; // postfix X++
+
+ bool operator==( const iterator & rhs ) const
+ {
+ if (ended_ || rhs.ended_)
+ {
+ if (ended_ == rhs.ended_)
{
- if (ended_ == rhs.ended_)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return true;
}
-
- return it_ == rhs.it_;
- }
- bool operator!=( const iterator & rhs ) const { return !(*this == rhs); }
-
- typename T::value_type operator*() { return *it_; }
- typename T::pointer operator->() { return *it_; }
-
- private:
-
- iterator( const T& begin,
- const T& end )
- : it_(begin), itEnd_(end), ended_( false )
- {
- checkStateAndAdapt();
- }
-
- iterator( )
- : ended_( true )
- {}
-
- void checkStateAndAdapt()
- {
- if( it_ == itEnd_ )
+ else
{
- ended_ = true;
+ return false;
}
- }
-
- T it_;
- T itEnd_;
-
- bool ended_;
- };
-
- static inline iterator<pe::BodyStorage::Bodies::Iterator> begin( IBlock & block,
- const BlockDataID & bodyStorageId)
- {
- pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
- return iterator<pe::BodyStorage::Bodies::Iterator> ( (*storage)[0].begin(), (*storage)[0].end() );
- }
-
- template< typename C >
- static inline iterator<pe::BodyStorage::Bodies::CastIterator<C> > begin( IBlock & block,
- const BlockDataID & bodyStorageId)
- {
- pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
- return iterator<pe::BodyStorage::Bodies::CastIterator<C> > ( (*storage)[0].begin<C>(), (*storage)[0].end<C>() );
- }
-
-
- static inline iterator<pe::BodyStorage::Bodies::Iterator> end()
- {
- return iterator<pe::BodyStorage::Bodies::Iterator> ( );
- }
- template< typename C >
- static inline iterator<pe::BodyStorage::Bodies::CastIterator<C> > end()
- {
- return iterator<pe::BodyStorage::Bodies::CastIterator<C> > ( );
- }
+ }
+
+ return it_ == rhs.it_;
+ }
+ bool operator!=( const iterator & rhs ) const { return !(*this == rhs); }
+
+ typename T::reference operator*() { return *it_; }
+ typename T::pointer operator->() { return it_.operator->(); }
+ typename T::pointer getBodyID() { return it_.getBodyID(); }
+
+ private:
+
+ iterator( const T& begin,
+ const T& end )
+ : it_(begin), itEnd_(end), ended_( false )
+ {
+ checkStateAndAdapt();
+ }
+
+ iterator( )
+ : ended_( true )
+ {}
+
+ void checkStateAndAdapt()
+ {
+ if( it_ == itEnd_ )
+ {
+ ended_ = true;
+ }
+ }
+
+ T it_;
+ T itEnd_;
+
+ bool ended_;
+ };
+
+ static inline iterator<pe::BodyStorage::iterator> begin( IBlock & block,
+ const BlockDataID & bodyStorageId)
+ {
+ pe::BodyStorage& storage = (*block.getData< pe::Storage >( bodyStorageId ))[0];
+ return iterator<pe::BodyStorage::iterator> ( storage.begin(), storage.end() );
+ }
+
+ template< typename C >
+ static inline iterator<pe::BodyStorage::cast_iterator<C> > begin( IBlock & block,
+ const BlockDataID & bodyStorageId)
+ {
+ pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
+ return iterator<pe::BodyStorage::cast_iterator<C> > ( (*storage)[0].begin<C>(), (*storage)[0].end<C>() );
+ }
+
+
+ static inline iterator<pe::BodyStorage::iterator> end()
+ {
+ return iterator<pe::BodyStorage::iterator> ( );
+ }
+ template< typename C >
+ static inline iterator<pe::BodyStorage::cast_iterator<C> > end()
+ {
+ return iterator<pe::BodyStorage::cast_iterator<C> > ( );
+ }
}; // class LocalBodyIterator
@@ -229,87 +235,88 @@ class ShadowBodyIterator
{
public:
- template< typename T >
- class iterator : public std::iterator< std::input_iterator_tag, typename T::value_type, typename T::difference_type, typename T::pointer, typename T::reference >
- {
- friend class ShadowBodyIterator;
- public:
- iterator & operator++() { ++it_; checkStateAndAdapt(); return *this; } // prefix ++X
- iterator operator++(int) { iterator it( *this ); operator++(); return it; }; // postfix X++
-
- bool operator==( const iterator & rhs ) const
- {
- if (ended_ || rhs.ended_)
+ template< typename T >
+ class iterator : public std::iterator< std::input_iterator_tag, typename T::value_type, typename T::difference_type, typename T::pointer, typename T::reference >
+ {
+ friend class ShadowBodyIterator;
+ public:
+ iterator & operator++() { ++it_; checkStateAndAdapt(); return *this; } // prefix ++X
+ iterator operator++(int) { iterator it( *this ); operator++(); return it; }; // postfix X++
+
+ bool operator==( const iterator & rhs ) const
+ {
+ if (ended_ || rhs.ended_)
+ {
+ if (ended_ == rhs.ended_)
{
- if (ended_ == rhs.ended_)
- {
- return true;
- }
- else
- {
- return false;
- }
+ return true;
}
-
- return it_ == rhs.it_;
- }
- bool operator!=( const iterator & rhs ) const { return !(*this == rhs); }
-
- typename T::value_type operator*() { return *it_; }
- typename T::pointer operator->() { return *it_; }
-
- private:
-
- iterator( const T& begin,
- const T& end )
- : it_(begin), itEnd_(end), ended_( false )
- {
- checkStateAndAdapt();
- }
-
- iterator( )
- : ended_( true )
- {}
-
- void checkStateAndAdapt()
- {
- if( it_ == itEnd_ )
+ else
{
- ended_ = true;
+ return false;
}
- }
-
- T it_;
- T itEnd_;
-
- bool ended_;
- };
-
- static inline iterator<pe::BodyStorage::Bodies::Iterator> begin( IBlock & block,
- const BlockDataID & bodyStorageId)
- {
- pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
- return iterator<pe::BodyStorage::Bodies::Iterator> ( (*storage)[1].begin(), (*storage)[1].end() );
- }
-
- template< typename C >
- static inline iterator<pe::BodyStorage::Bodies::CastIterator<C> > begin( IBlock & block,
- const BlockDataID & bodyStorageId)
- {
- pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
- return iterator<pe::BodyStorage::Bodies::CastIterator<C> > ( (*storage)[1].begin<C>(), (*storage)[1].end<C>() );
- }
-
-
- static inline iterator<pe::BodyStorage::Bodies::Iterator> end()
- {
- return iterator<pe::BodyStorage::Bodies::Iterator> ( );
- }
- template< typename C >
- static inline iterator<pe::BodyStorage::Bodies::CastIterator<C> > end()
- {
- return iterator<pe::BodyStorage::Bodies::CastIterator<C> > ( );
- }
+ }
+
+ return it_ == rhs.it_;
+ }
+ bool operator!=( const iterator & rhs ) const { return !(*this == rhs); }
+
+ typename T::reference operator*() { return *it_; }
+ typename T::pointer operator->() { return it_.operator->(); }
+ typename T::pointer getBodyID() { return it_.getBodyID(); }
+
+ private:
+
+ iterator( const T& begin,
+ const T& end )
+ : it_(begin), itEnd_(end), ended_( false )
+ {
+ checkStateAndAdapt();
+ }
+
+ iterator( )
+ : ended_( true )
+ {}
+
+ void checkStateAndAdapt()
+ {
+ if( it_ == itEnd_ )
+ {
+ ended_ = true;
+ }
+ }
+
+ T it_;
+ T itEnd_;
+
+ bool ended_;
+ };
+
+ static inline iterator<pe::BodyStorage::iterator> begin( IBlock & block,
+ const BlockDataID & bodyStorageId)
+ {
+ pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
+ return iterator<pe::BodyStorage::iterator> ( (*storage)[1].begin(), (*storage)[1].end() );
+ }
+
+ template< typename C >
+ static inline iterator<pe::BodyStorage::cast_iterator<C> > begin( IBlock & block,
+ const BlockDataID & bodyStorageId)
+ {
+ pe::Storage * storage = block.getData< pe::Storage >( bodyStorageId );
+ return iterator<pe::BodyStorage::cast_iterator<C> > ( (*storage)[1].begin<C>(), (*storage)[1].end<C>() );
+ }
+
+
+ static inline iterator<pe::BodyStorage::iterator> end()
+ {
+ return iterator<pe::BodyStorage::iterator> ( );
+ }
+ template< typename C >
+ static inline iterator<pe::BodyStorage::cast_iterator<C> > end()
+ {
+ return iterator<pe::BodyStorage::cast_iterator<C> > ( );
+ }
}; // class ShadowBodyIterator
diff --git a/src/pe/rigidbody/BodyStorage.h b/src/pe/rigidbody/BodyStorage.h
index 0ab0ef40b58ab71e2712d2de3132e2ad388baa66..d8c91adf339abaa0adcc3be355e4bc96dc3d49f0 100644
--- a/src/pe/rigidbody/BodyStorage.h
+++ b/src/pe/rigidbody/BodyStorage.h
@@ -26,25 +26,22 @@
// Includes
//*************************************************************************************************
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <vector>
#include <core/NonCopyable.h>
#include <core/debug/Debug.h>
-#include <core/ptrvector/policies/PtrDelete.h>
-#include <core/ptrvector/PtrVector.h>
#include <pe/rigidbody/RigidBody.h>
+#include <pe/rigidbody/RigidBodyCastIterator.h>
+#include <pe/rigidbody/RigidBodyIterator.h>
#include <pe/Types.h>
+#include <algorithm>
#include <functional>
+#include <map>
+#include <memory>
+#include <vector>
namespace walberla {
namespace pe {
-
-
-
//=================================================================================================
//
// CLASS DEFINITION
@@ -62,13 +59,18 @@ class BodyStorage : private NonCopyable
public:
//**Type definitions****************************************************************************
//! Container for the bodies contained in the simulation world.
- typedef PtrVector<BodyType, PtrDelete> Bodies;
+ using VectorContainer = std::vector< std::unique_ptr<RigidBody> >;
+ using ConstVectorContainer = std::vector< std::unique_ptr<const RigidBody> >;
//**********************************************************************************************
//**Type definitions****************************************************************************
- typedef Bodies::SizeType SizeType; //!< Size type of the body storage.
- typedef Bodies::Iterator Iterator; //!< Iterator over non-const bodies.
- typedef Bodies::ConstIterator ConstIterator; //!< Iterator over constant bodies.
+ using size_type = VectorContainer::size_type; //!< Size type of the body storage.
+ using iterator = RigidBodyIterator; //!< Iterator over non-const bodies.
+ using const_iterator = ConstRigidBodyIterator; //!< Iterator over constant bodies.
+ template <typename C> //cast type
+ using cast_iterator = RigidBodyCastIterator<C>;
+ template <typename C> //cast type
+ using const_cast_iterator = ConstRigidBodyCastIterator<C>;
//**********************************************************************************************
//**Constructors********************************************************************************
@@ -88,45 +90,58 @@ public:
//**Utility functions***************************************************************************
/*!\name Utility functions */
//@{
- inline bool isEmpty () const;
- inline SizeType size () const;
- template< typename T >
- inline SizeType size () const;
- inline Iterator begin ();
- inline ConstIterator begin () const;
- template< typename T >
- inline typename Bodies::template CastIterator<T> begin();
- template< typename T >
- inline typename Bodies::template ConstCastIterator<T> begin() const;
- inline Iterator end ();
- inline ConstIterator end () const;
- template< typename T >
- inline typename Bodies::template CastIterator<T> end();
- template< typename T >
- inline typename Bodies::template ConstCastIterator<T> end() const;
- inline BodyID at ( SizeType index );
- inline ConstBodyID at ( SizeType index ) const;
- inline Iterator find ( id_t sid );
- inline ConstIterator find ( id_t sid ) const;
- inline Iterator find ( ConstBodyID body );
- inline ConstIterator find ( ConstBodyID body ) const;
- inline void validate();
+ inline bool isEmpty () const;
+ inline size_type size () const;
+
+ inline iterator begin ();
+ inline const_iterator begin () const;
+ inline const_iterator cbegin () const;
+ inline iterator end ();
+ inline const_iterator end () const;
+ inline const_iterator cend () const;
+
+ template< typename C >
+ inline cast_iterator<C> begin();
+ template< typename C >
+ inline const_cast_iterator<C> begin() const;
+ template< typename C >
+ inline const_cast_iterator<C> cbegin() const;
+ template< typename C >
+ inline cast_iterator<C> end();
+ template< typename C >
+ inline const_cast_iterator<C> end() const;
+ template< typename C >
+ inline const_cast_iterator<C> cend() const;
+
+ inline RigidBody& front();
+ inline const RigidBody& front() const;
+ inline RigidBody& back();
+ inline const RigidBody& back() const;
+
+ inline BodyID at ( size_type index );
+ inline ConstBodyID at ( size_type index ) const;
+ inline iterator find ( id_t sid );
+ inline const_iterator find ( id_t sid ) const;
+ inline iterator find ( ConstBodyID body );
+ inline const_iterator find ( ConstBodyID body ) const;
+ inline void validate();
//@}
//**********************************************************************************************
//**Add/Remove functions************************************************************************
/*!\name Add/Remove functions */
//@{
- inline void add ( BodyID body );
- inline void remove ( const id_t sid );
- inline void remove ( BodyID body );
- inline ConstIterator remove ( ConstIterator pos );
- inline Iterator remove ( Iterator pos );
- inline void release ( const id_t sid );
- inline void release ( BodyID body );
- inline ConstIterator release ( ConstIterator pos );
- inline Iterator release ( Iterator pos );
- inline void clear ();
+ [[deprecated]] inline RigidBody& add ( BodyID body );
+ inline RigidBody& add ( std::unique_ptr<RigidBody>&& body );
+ inline iterator remove ( const id_t sid );
+ inline iterator remove ( BodyID body );
+ inline const_iterator remove ( const_iterator pos );
+ inline iterator remove ( iterator pos );
+ inline std::unique_ptr<RigidBody> release ( const id_t sid );
+ inline std::unique_ptr<RigidBody> release ( BodyID body );
+ inline std::unique_ptr<RigidBody> release ( const_iterator& pos );
+ inline std::unique_ptr<RigidBody> release ( iterator& pos );
+ inline void clear ();
//@}
//**********************************************************************************************
@@ -147,8 +162,8 @@ private:
//**Member variables****************************************************************************
/*!\name Member variables */
//@{
- Bodies bodies_; //!< The rigid bodies contained in the simulation world.
- std::map<id_t, SizeType> bodyIDs_; //!< The association of system IDs to rigid bodies.
+ VectorContainer bodies_; //!< The rigid bodies contained in the simulation world.
+ std::map<id_t, size_type> bodyIDs_; //!< The association of system IDs to rigid bodies.
std::map< std::string, std::function<void (BodyID)> > addCallbacks_;
std::map< std::string, std::function<void (BodyID)> > removeCallbacks_;
@@ -170,9 +185,9 @@ private:
/*!\brief The standard constructor.
*/
inline BodyStorage::BodyStorage()
- : bodies_( 1000 )
- , bodyIDs_()
+ : bodyIDs_()
{
+ bodies_.reserve(1000);
}
//*************************************************************************************************
@@ -195,7 +210,7 @@ inline BodyStorage::~BodyStorage()
{
WALBERLA_ASSERT_EQUAL(addCallbacks_.size(), 0, "Still add callbacks registered!");
WALBERLA_ASSERT_EQUAL(removeCallbacks_.size(), 0, "Still remove callbacks registered!");
- clear();
+ clear();
}
//*************************************************************************************************
@@ -216,7 +231,7 @@ inline BodyStorage::~BodyStorage()
inline bool BodyStorage::isEmpty() const
{
- return bodies_.isEmpty();
+ return bodies_.empty();
}
//*************************************************************************************************
@@ -227,7 +242,7 @@ inline bool BodyStorage::isEmpty() const
* \return The number of rigid bodies.
*/
-inline BodyStorage::SizeType BodyStorage::size() const
+inline BodyStorage::size_type BodyStorage::size() const
{
return bodies_.size();
}
@@ -235,33 +250,27 @@ inline BodyStorage::SizeType BodyStorage::size() const
//*************************************************************************************************
-/*!\brief Returns the number of rigid bodies of type \a T contained in the body storage.
- *
- * \return The number of rigid bodies of type \a T.
+/*!\brief Returns an iterator to the first contained rigid body.
*
- * \b Note: The total number of objects of type \a T is not cached but recalculated each time the
- * function is called. Using the templated version of size() to calculate the total number objects
- * of type \a T is therefore more expensive than using the non-template version of size() to get
- * the total number of pointers in the vector!
+ * \return Iterator to the first contained rigid body.
*/
-template< typename T > // Cast type
-inline BodyStorage::SizeType BodyStorage::size() const
+inline BodyStorage::iterator BodyStorage::begin()
{
- return bodies_.template size<T>();
+ return BodyStorage::iterator(bodies_.begin());
}
//*************************************************************************************************
//*************************************************************************************************
-/*!\brief Returns an iterator to the first contained rigid body.
+/*!\brief Returns a constant iterator to the first contained rigid body.
*
- * \return Iterator to the first contained rigid body.
+ * \return Constant iterator to the first contained rigid body.
*/
-inline BodyStorage::Iterator BodyStorage::begin()
+inline BodyStorage::const_iterator BodyStorage::begin() const
{
- return bodies_.begin();
+ return cbegin();
}
//*************************************************************************************************
@@ -272,9 +281,48 @@ inline BodyStorage::Iterator BodyStorage::begin()
* \return Constant iterator to the first contained rigid body.
*/
-inline BodyStorage::ConstIterator BodyStorage::begin() const
+inline BodyStorage::const_iterator BodyStorage::cbegin() const
+{
+ return BodyStorage::const_iterator(bodies_.cbegin());
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Returns an iterator just past the last contained rigid body.
+ *
+ * \return Iterator just past the last contained rigid body.
+ */
+
+inline BodyStorage::iterator BodyStorage::end()
+{
+ return BodyStorage::iterator(bodies_.end());
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Returns a constant iterator just past the last contained rigid body.
+ *
+ * \return Constant iterator just past the last contained rigid body.
+ */
+
+inline BodyStorage::const_iterator BodyStorage::end() const
+{
+ return cend();
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Returns a constant iterator just past the last contained rigid body.
+ *
+ * \return Constant iterator just past the last contained rigid body.
+ */
+
+inline BodyStorage::const_iterator BodyStorage::cend() const
{
- return bodies_.begin();
+ return BodyStorage::const_iterator(bodies_.cend());
}
//*************************************************************************************************
@@ -285,10 +333,10 @@ inline BodyStorage::ConstIterator BodyStorage::begin() const
* \return Iterator to the first contained rigid body.
*/
-template< typename T > // Cast Type
-inline BodyStorage::Bodies::template CastIterator<T> BodyStorage::begin()
+template< typename C > // Cast Type
+inline BodyStorage::cast_iterator<C> BodyStorage::begin()
{
- return bodies_.template begin<T>();
+ return BodyStorage::cast_iterator<C>(bodies_.begin(), bodies_.end());
}
//*************************************************************************************************
@@ -299,50 +347,52 @@ inline BodyStorage::Bodies::template CastIterator<T> BodyStorage::begin()
* \return Constant iterator to the first contained rigid body.
*/
-template< typename T > // Cast Type
-inline BodyStorage::Bodies::template ConstCastIterator<T> BodyStorage::begin() const
+template< typename C > // Cast Type
+inline BodyStorage::const_cast_iterator<C> BodyStorage::begin() const
{
- return bodies_.template begin<T>();
+ return cbegin<C>();
}
//*************************************************************************************************
//*************************************************************************************************
-/*!\brief Returns an iterator just past the last contained rigid body.
+/*!\brief Returns a constant iterator to the first contained rigid body.
*
- * \return Iterator just past the last contained rigid body.
+ * \return Constant iterator to the first contained rigid body.
*/
-inline BodyStorage::Iterator BodyStorage::end()
+template< typename C > // Cast Type
+inline BodyStorage::const_cast_iterator<C> BodyStorage::cbegin() const
{
- return bodies_.end();
+ return BodyStorage::const_cast_iterator<C>(bodies_.begin(), bodies_.end());
}
//*************************************************************************************************
//*************************************************************************************************
-/*!\brief Returns a constant iterator just past the last contained rigid body.
+/*!\brief Returns an iterator just past the last contained rigid body.
*
- * \return Constant iterator just past the last contained rigid body.
+ * \return Iterator just past the last contained rigid body.
*/
-inline BodyStorage::ConstIterator BodyStorage::end() const
+template< typename C > // Cast Type
+inline BodyStorage::cast_iterator<C> BodyStorage::end()
{
- return bodies_.end();
+ return BodyStorage::cast_iterator<C>(bodies_.end(), bodies_.end());
}
//*************************************************************************************************
//*************************************************************************************************
-/*!\brief Returns an iterator just past the last contained rigid body.
+/*!\brief Returns a constant iterator just past the last contained rigid body.
*
- * \return Iterator just past the last contained rigid body.
+ * \return Constant iterator just past the last contained rigid body.
*/
-template< typename T > // Cast Type
-inline BodyStorage::Bodies::template CastIterator<T> BodyStorage::end()
+template< typename C > // Cast Type
+inline BodyStorage::const_cast_iterator<C> BodyStorage::end() const
{
- return bodies_.template end<T>();
+ return cend<C>();
}
//*************************************************************************************************
@@ -353,13 +403,30 @@ inline BodyStorage::Bodies::template CastIterator<T> BodyStorage::end()
* \return Constant iterator just past the last contained rigid body.
*/
-template< typename T > // Cast Type
-inline BodyStorage::Bodies::template ConstCastIterator<T> BodyStorage::end() const
+template< typename C > // Cast Type
+inline BodyStorage::const_cast_iterator<C> BodyStorage::cend() const
{
- return bodies_.template end<T>();
+ return BodyStorage::const_cast_iterator<C>(bodies_.end(), bodies_.end());
}
//*************************************************************************************************
+inline RigidBody& BodyStorage::front()
+{
+ return *bodies_.front();
+}
+inline const RigidBody& BodyStorage::front() const
+{
+ return *bodies_.front();
+}
+inline RigidBody& BodyStorage::back()
+{
+ return *bodies_.back();
+}
+inline const RigidBody& BodyStorage::back() const
+{
+ return *bodies_.back();
+}
+
//*************************************************************************************************
/*!\brief Returns a handle to the indexed rigid body.
@@ -370,10 +437,10 @@ inline BodyStorage::Bodies::template ConstCastIterator<T> BodyStorage::end() con
* \b Note: No runtime check is performed to ensure the validity of the access index.
*/
-inline BodyID BodyStorage::at( SizeType index )
+inline BodyID BodyStorage::at( size_type index )
{
WALBERLA_ASSERT( index < size(), "Invalid body index" );
- return bodies_[index];
+ return bodies_[index].get();
}
//*************************************************************************************************
@@ -387,10 +454,10 @@ inline BodyID BodyStorage::at( SizeType index )
* \b Note: No runtime check is performed to ensure the validity of the access index.
*/
-inline ConstBodyID BodyStorage::at( SizeType index ) const
+inline ConstBodyID BodyStorage::at( size_type index ) const
{
WALBERLA_ASSERT( index < size(), "Invalid body index" );
- return bodies_[index];
+ return bodies_[index].get();
}
//*************************************************************************************************
@@ -406,13 +473,13 @@ inline ConstBodyID BodyStorage::at( SizeType index ) const
* iterator just past the end of the last body contained in the body storage.
*/
-inline BodyStorage::Iterator BodyStorage::find( id_t sid )
+inline BodyStorage::iterator BodyStorage::find( id_t sid )
{
- std::map<id_t, SizeType>::const_iterator pos = bodyIDs_.find( sid );
+ std::map<id_t, size_type>::const_iterator pos = bodyIDs_.find( sid );
if( pos == bodyIDs_.end() )
- return bodies_.end();
+ return BodyStorage::iterator(bodies_.end());
- return bodies_.begin() + static_cast<Bodies::Iterator::difference_type>(pos->second);
+ return BodyStorage::iterator(bodies_.begin() + static_cast<VectorContainer::iterator::difference_type>(pos->second));
}
//*************************************************************************************************
@@ -428,13 +495,13 @@ inline BodyStorage::Iterator BodyStorage::find( id_t sid )
* a constant iterator just past the end of the last body contained in the body storage.
*/
-inline BodyStorage::ConstIterator BodyStorage::find( id_t sid ) const
+inline BodyStorage::const_iterator BodyStorage::find( id_t sid ) const
{
- std::map<id_t, SizeType>::const_iterator pos = bodyIDs_.find( sid );
+ std::map<id_t, size_type>::const_iterator pos = bodyIDs_.find( sid );
if( pos == bodyIDs_.end() )
- return bodies_.end();
+ return BodyStorage::const_iterator(bodies_.end());
- return bodies_.begin() + static_cast<Bodies::Iterator::difference_type>(pos->second);
+ return BodyStorage::const_iterator(bodies_.begin() + static_cast<VectorContainer::iterator::difference_type>(pos->second));
}
//*************************************************************************************************
@@ -450,9 +517,9 @@ inline BodyStorage::ConstIterator BodyStorage::find( id_t sid ) const
* just past the end of the last body contained in the body storage.
*/
-inline BodyStorage::Iterator BodyStorage::find( ConstBodyID body )
+inline BodyStorage::iterator BodyStorage::find( ConstBodyID body )
{
- return find( body->getSystemID() );
+ return BodyStorage::iterator(find( body->getSystemID() ));
}
//*************************************************************************************************
@@ -468,9 +535,9 @@ inline BodyStorage::Iterator BodyStorage::find( ConstBodyID body )
* constant iterator just past the end of the last body contained in the body storage.
*/
-inline BodyStorage::ConstIterator BodyStorage::find( ConstBodyID body ) const
+inline BodyStorage::const_iterator BodyStorage::find( ConstBodyID body ) const
{
- return find( body->getSystemID() );
+ return BodyStorage::const_iterator(find( body->getSystemID() ));
}
//*************************************************************************************************
@@ -494,16 +561,45 @@ inline BodyStorage::ConstIterator BodyStorage::find( ConstBodyID body ) const
* logarithmic unless reallocation occurs.
*/
-inline void BodyStorage::add( BodyID body )
+inline RigidBody& BodyStorage::add( BodyID body )
{
WALBERLA_ASSERT( bodyIDs_.find( body->getSystemID() ) == bodyIDs_.end(), "Body with same system ID already added." );
bodyIDs_[ body->getSystemID() ] = bodies_.size();
- bodies_.pushBack( body );
+ bodies_.push_back( std::unique_ptr<RigidBody>(body) );
for (auto it = addCallbacks_.begin(); it != addCallbacks_.end(); ++it)
{
- it->second(body);
+ it->second(bodies_.back().get());
}
+
+ return *bodies_.back();
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Adding a rigid body to the body storage.
+ *
+ * \param body The new rigid body to be added to the body storage.
+ * \return void
+ *
+ * This function adds a rigid body to the body storage. Adding bodies with non-unique system ID or
+ * adding the same body multiple times results in undefined behaviour. The time complexity is
+ * logarithmic unless reallocation occurs.
+ */
+
+inline RigidBody& BodyStorage::add( std::unique_ptr<RigidBody>&& body )
+{
+ WALBERLA_ASSERT( bodyIDs_.find( body->getSystemID() ) == bodyIDs_.end(), "Body with same system ID already added." );
+ bodyIDs_[ body->getSystemID() ] = bodies_.size();
+ bodies_.push_back( std::move(body) );
+
+ for (auto it = addCallbacks_.begin(); it != addCallbacks_.end(); ++it)
+ {
+ it->second(bodies_.back().get());
+ }
+
+ return *bodies_.back();
}
//*************************************************************************************************
@@ -520,23 +616,25 @@ inline void BodyStorage::add( BodyID body )
* The last element is swapped to the actual position and the length is reduced by one.
*/
-inline void BodyStorage::remove( const id_t sid )
+inline
+BodyStorage::iterator BodyStorage::remove( const id_t sid )
{
- std::map<id_t, SizeType>::iterator it = bodyIDs_.find( sid );
+ std::map<id_t, size_type>::iterator it = bodyIDs_.find( sid );
WALBERLA_ASSERT( it != bodyIDs_.end(), "The body's system ID was not registered." );
// Move last element to deleted place and update the system ID to index mapping.
- SizeType i = it->second;
+ size_type i = it->second;
for (auto cb = removeCallbacks_.begin(); cb != removeCallbacks_.end(); ++cb)
{
- cb->second( bodies_[i] );
+ cb->second( bodies_[i].get() );
}
bodyIDs_[ bodies_.back()->getSystemID() ] = i;
std::swap( bodies_[i], bodies_.back() );
bodyIDs_.erase( it );
- bodies_.popBack();
+ bodies_.pop_back();
+ return iterator(bodies_.begin() + int_c(i));
}
//*************************************************************************************************
@@ -552,10 +650,9 @@ inline void BodyStorage::remove( const id_t sid )
* the element to be removed. The time complexity is logarithmic unless reallocation occurs.
*/
-inline BodyStorage::ConstIterator BodyStorage::remove( ConstIterator pos )
+inline BodyStorage::const_iterator BodyStorage::remove( const_iterator pos )
{
- remove( (*pos)->getSystemID() );
- return pos;
+ return remove( pos->getSystemID() );
}
//*************************************************************************************************
@@ -571,10 +668,9 @@ inline BodyStorage::ConstIterator BodyStorage::remove( ConstIterator pos )
* the element to be removed. The time complexity is logarithmic unless reallocation occurs.
*/
-inline BodyStorage::Iterator BodyStorage::remove( Iterator pos )
+inline BodyStorage::iterator BodyStorage::remove( iterator pos )
{
- remove( (*pos)->getSystemID() );
- return pos;
+ return remove( pos->getSystemID() );
}
//*************************************************************************************************
@@ -590,9 +686,10 @@ inline BodyStorage::Iterator BodyStorage::remove( Iterator pos )
* the element to be removed. The time complexity is logarithmic unless reallocation occurs.
*/
-inline void BodyStorage::remove( BodyID body )
+inline
+BodyStorage::iterator BodyStorage::remove( BodyID body )
{
- remove( body->getSystemID() );
+ return remove( body->getSystemID() );
}
//*************************************************************************************************
@@ -609,23 +706,22 @@ inline void BodyStorage::remove( BodyID body )
* Last element is swapped to the actual position and length is reduced by 1.
*/
-inline void BodyStorage::release( const id_t sid )
+inline std::unique_ptr<RigidBody> BodyStorage::release( const id_t sid )
{
- std::map<id_t, SizeType>::iterator it = bodyIDs_.find( sid );
+ std::map<id_t, size_type>::iterator it = bodyIDs_.find( sid );
WALBERLA_ASSERT( it != bodyIDs_.end(), "The body's system ID was not registered." );
// Move last element to deleted place and update the system ID to index mapping.
- SizeType i = it->second;
+ size_type i = it->second;
- for (auto cb = removeCallbacks_.begin(); cb != removeCallbacks_.end(); ++cb)
- {
- cb->second( bodies_[i] );
- }
+ std::for_each(removeCallbacks_.begin(), removeCallbacks_.end(), [&](auto& cb){cb.second( bodies_[i].get() );});
bodyIDs_[ bodies_.back()->getSystemID() ] = i;
std::swap( bodies_[i], bodies_.back() );
bodyIDs_.erase( it );
- bodies_.releaseBack();
+ auto tmp = std::move(bodies_.back());
+ bodies_.pop_back();
+ return tmp;
}
//*************************************************************************************************
@@ -641,10 +737,12 @@ inline void BodyStorage::release( const id_t sid )
* the element to be released. The time complexity is logarithmic unless reallocation occurs.
*/
-inline BodyStorage::ConstIterator BodyStorage::release( ConstIterator pos )
+inline std::unique_ptr<RigidBody> BodyStorage::release( const_iterator& pos )
{
- release( (*pos)->getSystemID() );
- return pos;
+ auto diff = std::distance(bodies_.cbegin(), pos.get());
+ auto tmp = release( pos->getSystemID() );
+ pos = const_iterator(bodies_.begin() + diff);
+ return tmp;
}
//*************************************************************************************************
@@ -661,10 +759,12 @@ inline BodyStorage::ConstIterator BodyStorage::release( ConstIterator pos )
* the element to be released. The time complexity is logarithmic unless reallocation occurs.
*/
-inline BodyStorage::Iterator BodyStorage::release( Iterator pos )
+inline std::unique_ptr<RigidBody> BodyStorage::release( iterator& pos )
{
- release( (*pos)->getSystemID() );
- return pos;
+ auto diff = std::distance(bodies_.begin(), pos.get());
+ auto tmp = release( pos->getSystemID() );
+ pos = iterator(bodies_.begin() + diff);
+ return tmp;
}
//*************************************************************************************************
@@ -681,9 +781,9 @@ inline BodyStorage::Iterator BodyStorage::release( Iterator pos )
* the element to be released. The time complexity is logarithmic unless reallocation occurs.
*/
-inline void BodyStorage::release( BodyID body )
+inline std::unique_ptr<RigidBody> BodyStorage::release( BodyID body )
{
- release( body->getSystemID() );
+ return release( body->getSystemID() );
}
//*************************************************************************************************
@@ -704,7 +804,7 @@ inline void BodyStorage::clear()
{
for (auto cb = removeCallbacks_.begin(); cb != removeCallbacks_.end(); ++cb)
{
- cb->second( *bodyIt );
+ cb->second( bodyIt->get() );
}
}
@@ -766,7 +866,7 @@ inline void BodyStorage::clearRemoveCallbacks ( )
inline void BodyStorage::validate()
{
std::vector<bool> tmp(bodies_.size());
- std::map<id_t, SizeType>::iterator it = bodyIDs_.begin();
+ std::map<id_t, size_type>::iterator it = bodyIDs_.begin();
while( it != bodyIDs_.end() ) {
WALBERLA_ASSERT(tmp[it->second] == false, "Two system IDs point to the same storage index.");
tmp[it->second] = true;
diff --git a/src/pe/rigidbody/BoxFactory.cpp b/src/pe/rigidbody/BoxFactory.cpp
index 6473eaa18e60f971b71d31614cdd3cb13b82889e..6f471ba55ee6fbf1a9838eef6b2da5ec91255958 100644
--- a/src/pe/rigidbody/BoxFactory.cpp
+++ b/src/pe/rigidbody/BoxFactory.cpp
@@ -26,6 +26,9 @@
#include "pe/rigidbody/BodyStorage.h"
#include "pe/rigidbody/Box.h"
+#include <core/logging/Logging.h>
+#include <core/UniqueID.h>
+
namespace walberla {
namespace pe {
@@ -40,32 +43,31 @@ BoxID createBox( BodyStorage& globalStorage, BlockStorage& blocks, BlockDa
if( lengths[0] <= real_t(0) || lengths[1] <= real_t(0) || lengths[2] <= real_t(0) )
throw std::invalid_argument( "Invalid side length" );
- BoxID box = NULL;
+ BoxID box = nullptr;
if (global)
{
const id_t sid = UniqueID<RigidBody>::createGlobal();
WALBERLA_ASSERT_EQUAL(communicating, false);
WALBERLA_ASSERT_EQUAL(infiniteMass, true);
- box = new Box(sid, uid, gpos, Vec3(0,0,0), Quat(), lengths, material, global, false, true);
- globalStorage.add(box);
+ BoxPtr bx = std::make_unique<Box>(sid, uid, gpos, Vec3(0,0,0), Quat(), lengths, material, global, false, true);
+ box = static_cast<BoxID>(&globalStorage.add(std::move(bx)));
} else
{
- for (auto it = blocks.begin(); it != blocks.end(); ++it){
- IBlock* block = (&(*it));
- if (block->getAABB().contains(gpos))
+ for (auto& block : blocks){
+ if (block.getAABB().contains(gpos))
{
const id_t sid( UniqueID<RigidBody>::create() );
- Storage* bs = block->getData<Storage>(storageID);
- box = new Box(sid, uid, gpos, Vec3(0,0,0), Quat(), lengths, material, global, communicating, infiniteMass);
- box->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block->getId().getID()));
- (*bs)[0].add(box);
+ BodyStorage& bs = (*block.getData<Storage>(storageID))[0];
+ BoxPtr bx = std::make_unique<Box>(sid, uid, gpos, Vec3(0,0,0), Quat(), lengths, material, global, communicating, infiniteMass);
+ bx->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block.getId().getID()));
+ box = static_cast<BoxID>(&bs.add(std::move(bx)));
}
}
}
- if (box != NULL)
+ if (box != nullptr)
{
// Logging the successful creation of the box
WALBERLA_LOG_DETAIL(
diff --git a/src/pe/rigidbody/CapsuleFactory.cpp b/src/pe/rigidbody/CapsuleFactory.cpp
index 44b7839d11d8587d6415f9d0d52d3c885a4e6b23..325af9701f1c78bcf1497f2717fa586372d3e80b 100644
--- a/src/pe/rigidbody/CapsuleFactory.cpp
+++ b/src/pe/rigidbody/CapsuleFactory.cpp
@@ -26,6 +26,9 @@
#include "pe/rigidbody/BodyStorage.h"
#include "pe/rigidbody/Capsule.h"
+#include <core/logging/Logging.h>
+#include <core/UniqueID.h>
+
namespace walberla {
namespace pe {
@@ -40,32 +43,31 @@ CapsuleID createCapsule( BodyStorage& globalStorage, BlockStorage& blocks, Blo
WALBERLA_ASSERT_GREATER( radius, real_t(0), "Invalid capsule radius" );
WALBERLA_ASSERT_GREATER( length, real_t(0), "Invalid capsule length" );
- CapsuleID capsule = NULL;
+ CapsuleID capsule = nullptr;
if (global)
{
const id_t sid = UniqueID<RigidBody>::createGlobal();
WALBERLA_ASSERT_EQUAL(communicating, false);
WALBERLA_ASSERT_EQUAL(infiniteMass, true);
- capsule = new Capsule(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, length, material, global, false, true);
- globalStorage.add(capsule);
+ CapsulePtr cp = std::make_unique<Capsule>(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, length, material, global, false, true);
+ capsule = static_cast<CapsuleID>(&globalStorage.add(std::move(cp)));
} else
{
- for (auto it = blocks.begin(); it != blocks.end(); ++it){
- IBlock* block = (&(*it));
- if (block->getAABB().contains(gpos))
+ for (auto& block : blocks){
+ if (block.getAABB().contains(gpos))
{
const id_t sid( UniqueID<RigidBody>::create() );
- Storage* bs = block->getData<Storage>(storageID);
- capsule = new Capsule(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, length, material, global, communicating, infiniteMass);
- capsule->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block->getId().getID()));
- (*bs)[0].add(capsule);
+ BodyStorage& bs = (*block.getData<Storage>(storageID))[0];
+ CapsulePtr cp = std::make_unique<Capsule>(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, length, material, global, communicating, infiniteMass);
+ cp->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block.getId().getID()));
+ capsule = static_cast<CapsuleID>(&bs.add( std::move(cp) ));
}
}
}
- if (capsule != NULL)
+ if (capsule != nullptr)
{
// Logging the successful creation of the box
WALBERLA_LOG_DETAIL(
diff --git a/src/pe/rigidbody/CylindricalBoundaryFactory.cpp b/src/pe/rigidbody/CylindricalBoundaryFactory.cpp
index a82ea0c684ad7dbc7f60c2d02b99fb7eb6ded2f2..6cbf752cb9bb0c29f576e34c7ce336b2077ec4b1 100644
--- a/src/pe/rigidbody/CylindricalBoundaryFactory.cpp
+++ b/src/pe/rigidbody/CylindricalBoundaryFactory.cpp
@@ -24,7 +24,8 @@
#include "pe/rigidbody/BodyStorage.h"
#include "pe/rigidbody/CylindricalBoundary.h"
-#include "core/logging/Logging.h"
+#include <core/logging/Logging.h>
+#include <core/UniqueID.h>
namespace walberla {
namespace pe {
@@ -37,9 +38,9 @@ CylindricalBoundaryID createCylindricalBoundary( BodyStorage& globalStorage,
const id_t sid( UniqueID<RigidBody>::createGlobal() );
- CylindricalBoundaryID cb = new CylindricalBoundary( sid, uid, gpos, radius, material );
+ CylindricalBoundaryPtr cbPtr = std::make_unique<CylindricalBoundary>( sid, uid, gpos, radius, material );
- globalStorage.add(cb);
+ CylindricalBoundaryID cb = static_cast<CylindricalBoundaryID>(&globalStorage.add(std::move(cbPtr)));
// Logging the successful creation of the plane
WALBERLA_LOG_DETAIL( "Created cylindrical boundary " << sid << "\n" << cb);
diff --git a/src/pe/rigidbody/EllipsoidFactory.cpp b/src/pe/rigidbody/EllipsoidFactory.cpp
index e848dd28527d9c763c55bab2b7e02467c82b05a3..a5e46b3506115d67c011917c9109eab6f5556bf5 100644
--- a/src/pe/rigidbody/EllipsoidFactory.cpp
+++ b/src/pe/rigidbody/EllipsoidFactory.cpp
@@ -25,54 +25,56 @@
#include "pe/rigidbody/BodyStorage.h"
#include "pe/rigidbody/Ellipsoid.h"
+#include <core/logging/Logging.h>
+#include <core/UniqueID.h>
+
namespace walberla {
namespace pe {
EllipsoidID createEllipsoid( BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID storageID,
- id_t uid, const Vec3& gpos, const Vec3& semiAxes,
- MaterialID material,
- bool global, bool communicating, bool infiniteMass )
+ id_t uid, const Vec3& gpos, const Vec3& semiAxes,
+ MaterialID material,
+ bool global, bool communicating, bool infiniteMass )
{
WALBERLA_ASSERT_UNEQUAL( Ellipsoid::getStaticTypeID(), std::numeric_limits<id_t>::max(), "Ellipsoid TypeID not initalized!");
// Checking the semiAxes
if( semiAxes[0] <= real_c(0) || semiAxes[1] <= real_c(0) || semiAxes[2] <= real_c(0) )
throw std::invalid_argument( "Invalid Ellipsoid semi-axes" );
- EllipsoidID ellipsoid = NULL;
+ EllipsoidID ellipsoid = nullptr;
if (global)
{
const id_t sid = UniqueID<RigidBody>::createGlobal();
WALBERLA_ASSERT_EQUAL(communicating, false);
WALBERLA_ASSERT_EQUAL(infiniteMass, true);
- ellipsoid = new Ellipsoid(sid, uid, gpos, Vec3(0,0,0), Quat(), semiAxes, material, global, false, true);
- globalStorage.add(ellipsoid);
+ EllipsoidPtr el = std::make_unique<Ellipsoid>(sid, uid, gpos, Vec3(0,0,0), Quat(), semiAxes, material, global, false, true);
+ ellipsoid = static_cast<EllipsoidID>(&globalStorage.add(std::move(el)));
} else
{
- for (auto it = blocks.begin(); it != blocks.end(); ++it){
- IBlock* block = (&(*it));
- if (block->getAABB().contains(gpos))
+ for (auto& block : blocks){
+ if (block.getAABB().contains(gpos))
{
const id_t sid( UniqueID<RigidBody>::create() );
- Storage* bs = block->getData<Storage>(storageID);
- ellipsoid = new Ellipsoid(sid, uid, gpos, Vec3(0,0,0), Quat(), semiAxes, material, global, communicating, infiniteMass);
- ellipsoid->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block->getId().getID()));
- (*bs)[0].add(ellipsoid);
+ BodyStorage& bs = (*block.getData<Storage>(storageID))[0];
+ EllipsoidPtr el = std::make_unique<Ellipsoid>(sid, uid, gpos, Vec3(0,0,0), Quat(), semiAxes, material, global, communicating, infiniteMass);
+ el->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block.getId().getID()));
+ ellipsoid = static_cast<EllipsoidID>(&bs.add(std::move(el)));
}
}
}
- if (ellipsoid != NULL)
+ if (ellipsoid != nullptr)
{
// Logging the successful creation of the Ellipsoid
WALBERLA_LOG_DETAIL(
- "Created Ellipsoid " << ellipsoid->getSystemID() << "\n"
- << " User-ID = " << uid << "\n"
- << " Global position = " << gpos << "\n"
- << " Semi-axes = " << semiAxes << "\n"
- << " LinVel = " << ellipsoid->getLinearVel() << "\n"
- << " Material = " << Material::getName( material )
+ "Created Ellipsoid " << ellipsoid->getSystemID() << "\n"
+ << " User-ID = " << uid << "\n"
+ << " Global position = " << gpos << "\n"
+ << " Semi-axes = " << semiAxes << "\n"
+ << " LinVel = " << ellipsoid->getLinearVel() << "\n"
+ << " Material = " << Material::getName( material )
);
}
diff --git a/src/pe/rigidbody/GeomPrimitive.cpp b/src/pe/rigidbody/GeomPrimitive.cpp
index ce6d2d8113c69fde7724259fde28cbc46c5247ee..0594e19a3a6b91331d424a5d414b78fbdc7c7712 100644
--- a/src/pe/rigidbody/GeomPrimitive.cpp
+++ b/src/pe/rigidbody/GeomPrimitive.cpp
@@ -64,7 +64,7 @@ GeomPrimitive::GeomPrimitive( id_t const typeID, id_t sid, id_t uid, MaterialID
/*!\brief Destructor for the Primitive class.
*/
GeomPrimitive::~GeomPrimitive()
-{}
+= default;
//*************************************************************************************************
} // namespace pe
diff --git a/src/pe/rigidbody/Node.h b/src/pe/rigidbody/Node.h
deleted file mode 100644
index 584d44e4f5bb66ce8c2d55d7891992178776160e..0000000000000000000000000000000000000000
--- a/src/pe/rigidbody/Node.h
+++ /dev/null
@@ -1,137 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file Node.h
-//! \author Klaus Iglberger
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#pragma once
-
-
-//*************************************************************************************************
-// Includes
-//*************************************************************************************************
-
-#include <pe/Types.h>
-#include <core/DataTypes.h>
-
-namespace walberla {
-namespace pe {
-
-//=================================================================================================
-//
-// SPECIALIZATION FOR THE UNION FIND ALGORITHM
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Node for the 'Union Find' algorithm.
- *
- * This specialization of the BodyTrait class template adapts rigid bodies to the 'Union Find'
- * batch generation algorithm. In this algorithm, rigid bodies act as nodes in a graph and
- * contacts between the rigid bodies act as edges.
- */
-class Node
-{
-public:
-
- //**Constructor*********************************************************************************
- /*!\name Constructor */
- //@{
- explicit inline Node();
- //@}
- //**********************************************************************************************
-
- //**Node functions******************************************************************************
- /*!\name Node functions */
- //@{
- inline ConstNodeID getRoot() const;
- inline void resetNode() const;
- //@}
- //**********************************************************************************************
-
-public:
- //**Member variables****************************************************************************
- /*!\name Member variables */
- //@{
- mutable ConstNodeID root_; //!< The root of the contact graph containing the rigid body.
- mutable size_t rank_; //!< The current rank of the rigid body in the contact graph.
- mutable size_t batch_; //!< Index of the batch containing all contacts in the contact graph.
- //@}
- //**********************************************************************************************
-};
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Default constructor for the BodyTrait<UnionFind> specialization.
- */
-inline Node::Node()
- : rank_ ( 0 )
- , batch_( 0 )
-{
- root_ = this ;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Calculating the current root of the contact graph.
- *
- * \return The current root of the contact graph.
- *
- * This function returns the current root of the contact graph and compresses the graph for
- * a fast access to the root node.
- */
-inline ConstNodeID Node::getRoot() const
-{
- ConstNodeID root( this );
-
- // Traverse the contact graph to find the root node
- while( root->root_ != root ) {
- root = root->root_;
- }
-
- // Retraverse the graph for graph compression
- ConstNodeID tmp( this );
- while( tmp->root_ != tmp ) {
- ConstNodeID last = tmp;
- tmp = tmp->root_;
- last->root_ = root;
- }
-
- return root;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Resetting the data members of the node.
- *
- * \return void
- */
-inline void Node::resetNode() const
-{
- root_ = this;
- rank_ = 0;
- batch_ = 0;
-}
-//*************************************************************************************************
-
-} // namespace pe
-
-} // namespace walberla
diff --git a/src/pe/rigidbody/Owner.h b/src/pe/rigidbody/Owner.h
index 53e15de8816e96d0e91bee393bb1242dce51c9c6..3295ca272ef4ee69ff581f3c6a061da8ff3e6877 100644
--- a/src/pe/rigidbody/Owner.h
+++ b/src/pe/rigidbody/Owner.h
@@ -40,7 +40,7 @@ struct Owner
int rank_; //< rank of the owner of the shadow copy
IBlockID::IDType blockID_; //< block id of the block the shadow copy is located in
- Owner(): rank_(-1) {}
+ Owner(): rank_(-1), blockID_(0) {}
Owner(const int rank, const IBlockID::IDType blockID) : rank_(rank), blockID_(blockID) {}
};
//*************************************************************************************************
diff --git a/src/pe/rigidbody/PlaneFactory.cpp b/src/pe/rigidbody/PlaneFactory.cpp
index 2f780a12a1d1377fcf72b283d082e0e3a1320884..650054ee07b68655d53d5e959122d35ed66ea2ce 100644
--- a/src/pe/rigidbody/PlaneFactory.cpp
+++ b/src/pe/rigidbody/PlaneFactory.cpp
@@ -26,7 +26,8 @@
#include "pe/rigidbody/BodyStorage.h"
#include "pe/rigidbody/Plane.h"
-#include "core/logging/Logging.h"
+#include <core/logging/Logging.h>
+#include <core/UniqueID.h>
namespace walberla {
namespace pe {
@@ -44,9 +45,8 @@ PlaneID createPlane( BodyStorage& globalStorage, id_t uid, Vec3 normal, const Ve
const id_t sid( UniqueID<RigidBody>::createGlobal() );
- PlaneID plane = new Plane( sid, uid, gpos, normal, normal*gpos, material );
-
- globalStorage.add(plane);
+ PlanePtr pl = std::make_unique<Plane>( sid, uid, gpos, normal, normal*gpos, material );
+ PlaneID plane = static_cast<PlaneID>(&globalStorage.add(std::move(pl)));
// Logging the successful creation of the plane
WALBERLA_LOG_DETAIL( "Created plane " << sid << "\n"
diff --git a/src/pe/rigidbody/RigidBody.cpp b/src/pe/rigidbody/RigidBody.cpp
index 45d40109e31a29020a55517e8c28b1b5fecddf2f..f30f35ce6c244393433217aafb54e914a2f79223 100644
--- a/src/pe/rigidbody/RigidBody.cpp
+++ b/src/pe/rigidbody/RigidBody.cpp
@@ -33,8 +33,7 @@ namespace pe{
* \param uid The user-specific ID of the rigid body.
*/
RigidBody::RigidBody( id_t const typeID, id_t sid, id_t uid )
- : Node()
- , awake_( true ) // Sleep mode flag
+ : awake_( true ) // Sleep mode flag
, mass_( 0 ) // Total mass of the rigid body
, invMass_( 0 ) // Inverse total mass of the rigid body
, motion_(sleepThreshold) // The current motion of the rigid body
@@ -48,7 +47,7 @@ RigidBody::RigidBody( id_t const typeID, id_t sid, id_t uid )
, Iinv_( real_c(0) ) // Inverse moment of inertia
, q_() // Orientation of the body frame
, R_() // Rigid body rotation
- , manager_(0) // The rigid body manager responsible for the rigid body
+ , manager_(nullptr) // The rigid body manager responsible for the rigid body
, finite_ (true) // Finiteness flag
, visible_(true) // Visibility flag
, remote_ (false) // Remote flag
@@ -57,7 +56,6 @@ RigidBody::RigidBody( id_t const typeID, id_t sid, id_t uid )
, toBeDeleted_(false) // deletion flag
, sid_ (sid) // System-specific body index
, uid_ (uid) // User-specific body ID
- , contacts_() // Vector of the currently attached contacts
, typeID_(typeID) // geometry type
{
sb_ = this; // The superordinate rigid body
@@ -77,8 +75,7 @@ RigidBody::RigidBody( id_t const typeID, id_t sid, id_t uid )
/*!\brief Destructor for the RigidBody class.
*/
RigidBody::~RigidBody()
-{
-}
+= default;
//*************************************************************************************************
diff --git a/src/pe/rigidbody/RigidBody.h b/src/pe/rigidbody/RigidBody.h
index 004423cc12a1e14f3f9de124046895db2c0add15..4f872a685b2b836ba1ccd33c61d9889946822073 100644
--- a/src/pe/rigidbody/RigidBody.h
+++ b/src/pe/rigidbody/RigidBody.h
@@ -28,16 +28,12 @@
#include "core/math/Matrix3.h"
#include "core/math/Quaternion.h"
#include "core/math/Vector3.h"
-#include <pe/rigidbody/Node.h>
#include "core/NonCopyable.h"
#include "core/DataTypes.h"
-#include "core/ptrvector/PtrVector.h"
-#include "core/ptrvector/policies/NoDelete.h"
#include "core/debug/Debug.h"
#include "core/logging/Logging.h"
#include "core/math/AABB.h"
-#include "pe/attachable/Attachable.h"
#include "pe/rigidbody/MPIRigidBodyTrait.h"
namespace walberla{
@@ -49,8 +45,7 @@ class Union;
/**
* \ingroup pe
*/
-class RigidBody : public Node
- , public ccd::HashGridsBodyTrait
+class RigidBody : public ccd::HashGridsBodyTrait
, public cr::HCSITSBodyTrait
, private NonCopyable
{
@@ -58,21 +53,6 @@ private:
template <typename BodyTypeTuple>
friend class Union;
- //**Type definitions****************************************************************************
- typedef PtrVector<RigidBody,NoDelete> Bodies; //!< Vector for superordinate bodies containing this rigid body.
- typedef PtrVector<Contact,NoDelete> Contacts; //!< Vector for attached contacts.
- typedef PtrVector<Attachable,NoDelete> Attachables; //!< Vector for attachables.
- //**********************************************************************************************
-
-public:
- //**Type definitions****************************************************************************
- typedef Contacts::Iterator ContactIterator; //!< Iterator over the currently attached contacts.
- typedef Contacts::ConstIterator ConstContactIterator; //!< ConstIterator over the currently attached contacts.
- typedef Attachables::Iterator AttachableIterator; //!< Iterator over the currently attached attachables.
- typedef Attachables::ConstIterator ConstAttachableIterator; //!< ConstIterator over the currently attached attachables.
- typedef Bodies::Iterator AttachedBodyIterator; //!< Iterator over the currently attached rigid bodies.
- typedef Bodies::ConstIterator ConstAttachedBodyIterator; //!< ConstIterator over the currently attached rigid bodies.
- //**********************************************************************************************
protected:
//**Constructor*********************************************************************************
/*!\name Constructor */
@@ -275,38 +255,6 @@ public:
//@}
//**********************************************************************************************
- //**Contact functions***************************************************************************
- /*!\name Contact functions */
- //@{
- inline void registerContact( ContactID contact );
- inline bool hasContacts () const;
- inline void clearContacts();
- inline size_t countContacts() const;
- inline ContactIterator beginContacts();
- inline ConstContactIterator beginContacts() const;
- inline ContactIterator endContacts ();
- inline ConstContactIterator endContacts () const;
- //@}
- //**********************************************************************************************
-
- //**Attachable functions************************************************************************
- /*!\name Attachable functions */
- //@{
- void registerAttachable ( AttachableID attachable );
- void deregisterAttachable( AttachableID attachable );
- inline bool isAttached () const;
- inline size_t countAttachables () const;
- inline AttachableIterator beginAttachables ();
- inline ConstAttachableIterator beginAttachables () const;
- inline AttachableIterator endAttachables ();
- inline ConstAttachableIterator endAttachables () const;
- inline AttachedBodyIterator beginAttachedBodies ();
- inline ConstAttachedBodyIterator beginAttachedBodies () const;
- inline AttachedBodyIterator endAttachedBodies ();
- inline ConstAttachedBodyIterator endAttachedBodies () const;
- //@}
- //**********************************************************************************************
-
//**MPI functions*******************************************************************************
/*!\name MPI functions */
//@{
@@ -460,9 +408,6 @@ protected:
bool toBeDeleted_; //!< This flag marks the body for deletion during the next synchronization (only works on local bodies)
id_t sid_; //!< The unique system-specific body ID.
id_t uid_; //!< The user-specific body ID.
- Contacts contacts_; //!< Vector for the currently attached contacts.
- Attachables attachables_; //!< Vector for the currently attached attachables.
- Bodies attachedBodies_; //!< Vector for the currently attached rigid bodies.
//@}
//**********************************************************************************************
@@ -929,7 +874,7 @@ inline const Mat3& RigidBody::getBodyInertia() const
*/
inline const Mat3 RigidBody::getInertia() const
{
- return R_ * I_ * R_.getTranspose();
+ return math::transformMatrixRART(R_, I_);
}
//*************************************************************************************************
@@ -953,7 +898,7 @@ inline const Mat3& RigidBody::getInvBodyInertia() const
*/
inline const Mat3 RigidBody::getInvInertia() const
{
- return R_ * Iinv_ * R_.getTranspose();
+ return math::transformMatrixRART(R_, Iinv_);
}
//*************************************************************************************************
@@ -1865,7 +1810,7 @@ inline void RigidBody::addImpulseAtPos( const Vec3& j, const Vec3& p )
{
if( !hasSuperBody() ) {
v_ += j * invMass_;
- w_ += ( R_ * Iinv_ * R_.getTranspose() ) * ( ( p - gpos_ ) % j );
+ w_ += getInvInertia() * ( ( p - gpos_ ) % j );
wake();
}
else sb_->addImpulseAtPos( j, p );
@@ -1943,240 +1888,6 @@ inline void RigidBody::signalFixation()
-//=================================================================================================
-//
-// CONTACT FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Registering a single attached contact with the rigid body.
- *
- * \param contact The contact to be registered with the rigid body.
- * \return void
- */
-inline void RigidBody::registerContact( ContactID contact )
-{
- WALBERLA_ASSERT( !hasSuperBody(), "Invalid contact on subordinate body detected" );
- contacts_.pushBack( contact );
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Clears all contacts registered with the rigid body.
- *
- * \return void
- */
-inline void RigidBody::clearContacts()
-{
- contacts_.clear();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns whether any contacts are registered with the rigid body.
- *
- * \return \a true if at least one contact is registered with the rigid body, \a false if not.
- */
-inline bool RigidBody::hasContacts() const
-{
- return !contacts_.isEmpty();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the number of currently registered contacts.
- *
- * \return The number of registered contacts.
- */
-inline size_t RigidBody::countContacts() const
-{
- return contacts_.size();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first attached contact.
- *
- * \return Iterator to the first attached contact.
- */
-inline RigidBody::ContactIterator RigidBody::beginContacts()
-{
- return contacts_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first attached contact.
- *
- * \return Iterator to the first attached contact.
- */
-inline RigidBody::ConstContactIterator RigidBody::beginContacts() const
-{
- return contacts_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last attached contact.
- *
- * \return Iterator just past the last attached contact.
- */
-inline RigidBody::ContactIterator RigidBody::endContacts()
-{
- return contacts_.end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last attached contact.
- *
- * \return Iterator just past the last attached contact.
- */
-inline RigidBody::ConstContactIterator RigidBody::endContacts() const
-{
- return contacts_.end();
-}
-//*************************************************************************************************
-
-
-
-
-//=================================================================================================
-//
-// ATTACHABLE FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Returns whether any attachable is registered with the rigid body.
- *
- * \return \a true in case at least one attachable is registered with the rigid body, \a false otherwise.
- */
-inline bool RigidBody::isAttached() const
-{
- return !attachables_.isEmpty();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the number of currently registered attachables.
- *
- * \return The number of registered attachables.
- */
-inline size_t RigidBody::countAttachables() const
-{
- return attachables_.size();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first registered attachable.
- *
- * \return Iterator to the first registered attachable.
- */
-inline RigidBody::AttachableIterator RigidBody::beginAttachables()
-{
- return attachables_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first registered attachable.
- *
- * \return Iterator to the first registered attachable.
- */
-inline RigidBody::ConstAttachableIterator RigidBody::beginAttachables() const
-{
- return attachables_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last registered attachable.
- *
- * \return Iterator just past the last registered attachable.
- */
-inline RigidBody::AttachableIterator RigidBody::endAttachables()
-{
- return attachables_.end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last registered attachable.
- *
- * \return Iterator just past the last registered attachable.
- */
-inline RigidBody::ConstAttachableIterator RigidBody::endAttachables() const
-{
- return attachables_.end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first attached rigid body.
- *
- * \return Iterator to the first attached rigid body.
- */
-inline RigidBody::AttachedBodyIterator RigidBody::beginAttachedBodies()
-{
- return attachedBodies_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator to the first attached rigid body.
- *
- * \return Iterator to the first attached rigid body.
- */
-inline RigidBody::ConstAttachedBodyIterator RigidBody::beginAttachedBodies() const
-{
- return attachedBodies_.begin();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last attached rigid body.
- *
- * \return Iterator just past the last attached rigid body.
- */
-inline RigidBody::AttachedBodyIterator RigidBody::endAttachedBodies()
-{
- return attachedBodies_.end();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns an iterator just past the last attached rigid body.
- *
- * \return Iterator just past the last attached rigid body.
- */
-inline RigidBody::ConstAttachedBodyIterator RigidBody::endAttachedBodies() const
-{
- return attachedBodies_.end();
-}
-//*************************************************************************************************
-
-
-
-
//=================================================================================================
//
// MPI FUNCTIONS
@@ -2291,7 +2002,7 @@ inline const Vec3 RigidBody::accFromWF( const Vec3& gpos ) const
const Vec3 vdot( force_ * invMass_ );
// Calculating the angular acceleration
- const Vec3 wdot( R_ * Iinv_ * R_.getTranspose() * ( torque_ - w_ % ( R_ * I_ * R_.getTranspose() * w_ ) ) );
+ const Vec3 wdot( getInvInertia() * ( torque_ - w_ % ( getInertia() * w_ ) ) );
// Calculating the distance to the center of mass of the superordinate body
const Vec3 r( gpos - gpos_ );
@@ -3347,73 +3058,6 @@ inline void RigidBody::update( const Quat& dq )
-//=================================================================================================
-//
-// ATTACHABLE FUNCTIONS
-//
-//=================================================================================================
-
-//*************************************************************************************************
-/*!\brief Registering a single attachable with the rigid body.
- *
- * \param attachable The attachable to be registered with the rigid body.
- * \return void
- *
- * This function must NOT be called explicitly, but is reserved for internal use only!
- * Attachables are automatically registered during their construction process.
- */
-inline void RigidBody::registerAttachable( AttachableID attachable )
-{
- // Registering the attachable
- attachables_.pushBack( attachable );
-
- // Registering all newly attached rigid bodies
- const Attachable::Iterator end( attachable->end() );
- for( Attachable::Iterator body=attachable->begin(); body!=end; ++body ) {
- const AttachedBodyIterator bbegin( attachedBodies_.begin() );
- const AttachedBodyIterator bend ( attachedBodies_.end() );
- if( *body != this && std::find( bbegin, bend, *body ) == bend )
- attachedBodies_.pushBack( *body );
- }
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Deregistering a single attachable from the rigid body.
- *
- * \param attachable The attachable to be deregistered from the rigid body.
- * \return void
- *
- * This function must NOT be called explicitly, but is reserved for internal use only!
- * Attachables are automatically deregistered during their destruction process.
- */
-inline void RigidBody::deregisterAttachable( AttachableID attachable )
-{
- // Deregistering the attachable
- Attachables::Iterator pos( std::find( attachables_.begin(), attachables_.end(), attachable ) );
- WALBERLA_ASSERT( pos != attachables_.end(), "Attachable is not registered" );
- attachables_.erase( pos );
-
- // Deregistering all attached rigid bodies
- attachedBodies_.clear();
-
- // Recreating the vector of attached rigid bodies
- for( Attachables::Iterator it=attachables_.begin(); it!=attachables_.end(); ++it ) {
- const Attachable::Iterator end( it->end() );
- for( Attachable::Iterator body=it->begin(); body!=end; ++body ) {
- const AttachedBodyIterator bbegin( attachedBodies_.begin() );
- const AttachedBodyIterator bend ( attachedBodies_.end() );
- if( *body != this && std::find( bbegin, bend, *body ) == bend )
- attachedBodies_.pushBack( *body );
- }
- }
-}
-//*************************************************************************************************
-
-
-
-
//=================================================================================================
//
// SIMULATION FUNCTIONS
diff --git a/src/pe/rigidbody/RigidBodyCastIterator.h b/src/pe/rigidbody/RigidBodyCastIterator.h
new file mode 100644
index 0000000000000000000000000000000000000000..7241baa63ce3b6eac5bafb20be5571016f992526
--- /dev/null
+++ b/src/pe/rigidbody/RigidBodyCastIterator.h
@@ -0,0 +1,315 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file RigidBodyCastIterator.h
+//! \author Klaus Iglberger
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "RigidBody.h"
+
+#include <memory>
+#include <type_traits>
+#include <vector>
+
+namespace walberla {
+namespace pe {
+
+//*************************************************************************************************
+/*!\brief Dynamic cast iterator for polymorphic pointer vectors.
+ *
+ * The RigidBodyCastIterator is a forward iterator which only selects elements of type C.
+ * Dereferencing this iterator will implicitly cast to C.
+ */
+template <typename C>
+class RigidBodyCastIterator
+{
+ static_assert(std::is_base_of<RigidBody, C>::value && !std::is_base_of<C, RigidBody>::value,
+ "C has to be strictly derived from RigidBody");
+
+ template <typename C2>
+ friend inline bool operator==( const RigidBodyCastIterator<C2>& lhs, const RigidBodyCastIterator<C2>& rhs );
+ template <typename C2>
+ friend inline bool operator!=( const RigidBodyCastIterator<C2>& lhs, const RigidBodyCastIterator<C2>& rhs );
+public:
+ using ContainerType = std::vector< std::unique_ptr<RigidBody> >;
+ //**Type definitions****************************************************************************
+ // STL iterator requirements
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = C;
+ using pointer = C*;
+ using reference = C&;
+ using difference_type = std::ptrdiff_t;
+ //**********************************************************************************************
+
+ //**Constructors********************************************************************************
+ /*!\name Constructors */
+ //@{
+ inline RigidBodyCastIterator() {}
+ explicit inline RigidBodyCastIterator( const typename ContainerType::iterator& begin, const typename ContainerType::iterator& end );
+
+ RigidBodyCastIterator( const RigidBodyCastIterator<C>& it) = default;
+ RigidBodyCastIterator( RigidBodyCastIterator<C>&& it) = default;
+
+ RigidBodyCastIterator& operator=(const RigidBodyCastIterator<C>& it) = default;
+ RigidBodyCastIterator& operator=(RigidBodyCastIterator<C>&& it) = default;
+
+ //**Operators***********************************************************************************
+ /*!\name Operators */
+ //@{
+ inline RigidBodyCastIterator<C>& operator++();
+ inline RigidBodyCastIterator<C> operator++( int ) {RigidBodyCastIterator<C> tmp(*this); ++(*this); return tmp;}
+ //@}
+ //**********************************************************************************************
+
+ //**Access operators****************************************************************************
+ /*!\name Access operators */
+ //@{
+ inline reference operator*() {return static_cast<reference>( *(cur_->get()) );}
+ inline pointer operator->() {return static_cast<pointer>( cur_->get() );}
+ //@}
+ //**********************************************************************************************
+
+ //**Utility functions***************************************************************************
+ /*!\name Utility functions */
+ //@{
+ inline pointer getBodyID() {return static_cast<pointer>(cur_->get());}
+ //@}
+ //**********************************************************************************************
+
+private:
+ //**Member variables****************************************************************************
+ /*!\name Member variables */
+ //@{
+ typename ContainerType::iterator cur_; //!< Pointer to the current memory location.
+ typename ContainerType::iterator end_; //!< Pointer to the element one past the last element in the element range.
+ //@}
+ //**********************************************************************************************
+};
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Standard constructor for CastIterator.
+ *
+ * \param begin The beginning of the element range.
+ * \param end The end of the element range.
+ */
+template< typename C > // Cast type
+inline RigidBodyCastIterator<C>::RigidBodyCastIterator( const typename ContainerType::iterator& begin,
+ const typename ContainerType::iterator& end )
+ : cur_(begin) // Pointer to the current memory location
+ , end_(end) // Pointer to the element one past the last element in the element range
+{
+ cur_ = std::find_if(cur_, end_, [](const ContainerType::iterator::value_type& p) {return p->getTypeID() == C::getStaticTypeID();});
+}
+//*************************************************************************************************
+
+//*************************************************************************************************
+/*!\brief Pre-increment operator.
+ *
+ * \return Reference to the incremented cast iterator.
+ */
+template< typename C >
+inline RigidBodyCastIterator<C>& RigidBodyCastIterator<C>::operator++()
+{
+ cur_ = std::find_if(++cur_, end_, [](const ContainerType::iterator::value_type& p) {return p->getTypeID() == C::getStaticTypeID();});
+
+ return *this;
+}
+//*************************************************************************************************
+
+
+//**********************************************************************************************
+/*!\brief Equality comparison between two CastIterator objects.
+//
+// \param lhs The left hand side cast iterator.
+// \param rhs The right hand side cast iterator.
+// \return \a true if the iterators point to the same element, \a false if not.
+*/
+template< typename C >
+inline bool operator==( const RigidBodyCastIterator<C>& lhs, const RigidBodyCastIterator<C>& rhs )
+{
+ return lhs.cur_ == rhs.cur_;
+}
+//**********************************************************************************************
+
+//**********************************************************************************************
+/*!\brief Inequality comparison between two CastIterator objects.
+//
+// \param lhs The left hand side cast iterator.
+// \param rhs The right hand side cast iterator.
+// \return \a true if the iterators don't point to the same element, \a false if they do.
+*/
+template< typename C >
+inline bool operator!=( const RigidBodyCastIterator<C>& lhs, const RigidBodyCastIterator<C>& rhs )
+{
+ return !operator==(lhs, rhs);
+}
+//**********************************************************************************************
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+template <typename C>
+class ConstRigidBodyCastIterator
+{
+ static_assert(std::is_base_of<RigidBody, C>::value && !std::is_base_of<C, RigidBody>::value,
+ "C has to be strictly derived from RigidBody");
+
+ template <typename C2>
+ friend bool operator==( const ConstRigidBodyCastIterator<C2>& lhs, const ConstRigidBodyCastIterator<C2>& rhs );
+ template <typename C2>
+ friend bool operator!=( const ConstRigidBodyCastIterator<C2>& lhs, const ConstRigidBodyCastIterator<C2>& rhs );
+public:
+ using ContainerType = std::vector< std::unique_ptr<RigidBody> >;
+ //**Type definitions****************************************************************************
+ // STL iterator requirements
+ using iterator_category = std::forward_iterator_tag;
+ using value_type = C const;
+ using pointer = C const *;
+ using reference = C const &;
+ using difference_type = std::ptrdiff_t;
+ //**********************************************************************************************
+
+ //**Constructors********************************************************************************
+ /*!\name Constructors */
+ //@{
+ inline ConstRigidBodyCastIterator() {}
+ explicit inline ConstRigidBodyCastIterator( const typename ContainerType::const_iterator& begin,
+ const typename ContainerType::const_iterator& end );
+
+ ConstRigidBodyCastIterator( const ConstRigidBodyCastIterator<C>& it) = default;
+ ConstRigidBodyCastIterator( ConstRigidBodyCastIterator<C>&& it) = default;
+
+ ConstRigidBodyCastIterator& operator=(const ConstRigidBodyCastIterator<C>& it) = default;
+ ConstRigidBodyCastIterator& operator=(ConstRigidBodyCastIterator<C>&& it) = default;
+
+ //**Operators***********************************************************************************
+ /*!\name Operators */
+ //@{
+ inline ConstRigidBodyCastIterator<C>& operator++();
+ inline ConstRigidBodyCastIterator<C> operator++( int ) {ConstRigidBodyCastIterator<C> tmp(*this); ++(*this); return tmp;}
+ //@}
+ //**********************************************************************************************
+
+ //**Access operators****************************************************************************
+ /*!\name Access operators */
+ //@{
+ inline reference operator*() {return static_cast<reference>( *(cur_->get()) );}
+ inline pointer operator->() {return static_cast<pointer>( cur_->get() );}
+ //@}
+ //**********************************************************************************************
+
+ //**Utility functions***************************************************************************
+ /*!\name Utility functions */
+ //@{
+ inline pointer getBodyID() {return static_cast<pointer>(cur_->get());}
+ //@}
+ //**********************************************************************************************
+
+private:
+ //**Member variables****************************************************************************
+ /*!\name Member variables */
+ //@{
+ typename ContainerType::const_iterator cur_; //!< Pointer to the current memory location.
+ typename ContainerType::const_iterator end_; //!< Pointer to the element one past the last element in the element range.
+ //@}
+ //**********************************************************************************************
+};
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Standard constructor for CastIterator.
+ *
+ * \param begin The beginning of the element range.
+ * \param end The end of the element range.
+ */
+template< typename C > // Cast type
+inline ConstRigidBodyCastIterator<C>::ConstRigidBodyCastIterator( const typename ContainerType::const_iterator& begin,
+ const typename ContainerType::const_iterator& end )
+ : cur_(begin) // Pointer to the current memory location
+ , end_(end) // Pointer to the element one past the last element in the element range
+{
+ cur_ = std::find_if(cur_, end_, [](const ContainerType::const_iterator::value_type& p) {return p->getTypeID() == C::getStaticTypeID();});
+}
+//*************************************************************************************************
+
+//*************************************************************************************************
+/*!\brief Pre-increment operator.
+ *
+ * \return Reference to the incremented cast iterator.
+ */
+template< typename C >
+inline ConstRigidBodyCastIterator<C>& ConstRigidBodyCastIterator<C>::operator++()
+{
+ cur_ = std::find_if(++cur_, end_, [](const ContainerType::const_iterator::value_type& p) {return p->getTypeID() == C::getStaticTypeID();});
+
+ return *this;
+}
+//*************************************************************************************************
+
+
+//**********************************************************************************************
+/*!\brief Equality comparison between two CastIterator objects.
+//
+// \param lhs The left hand side cast iterator.
+// \param rhs The right hand side cast iterator.
+// \return \a true if the iterators point to the same element, \a false if not.
+*/
+template< typename C >
+inline bool operator==( const ConstRigidBodyCastIterator<C>& lhs, const ConstRigidBodyCastIterator<C>& rhs )
+{
+ return lhs.cur_ == rhs.cur_;
+}
+//**********************************************************************************************
+
+//**********************************************************************************************
+/*!\brief Inequality comparison between two CastIterator objects.
+//
+// \param lhs The left hand side cast iterator.
+// \param rhs The right hand side cast iterator.
+// \return \a true if the iterators don't point to the same element, \a false if they do.
+*/
+template< typename C >
+inline bool operator!=( const ConstRigidBodyCastIterator<C>& lhs, const ConstRigidBodyCastIterator<C>& rhs )
+{
+ return !operator==(lhs, rhs);
+}
+//**********************************************************************************************
+
+} // namespace pe
+} // namespace walberla
diff --git a/src/pe/rigidbody/RigidBodyIterator.h b/src/pe/rigidbody/RigidBodyIterator.h
new file mode 100644
index 0000000000000000000000000000000000000000..8e2be67d2f299dde26ebb313b4a17e4c22642301
--- /dev/null
+++ b/src/pe/rigidbody/RigidBodyIterator.h
@@ -0,0 +1,367 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file RigidBodyIterator.h
+//! \author Klaus Iglberger
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "RigidBody.h"
+
+#include <memory>
+#include <type_traits>
+#include <vector>
+
+namespace walberla {
+namespace pe {
+
+//*************************************************************************************************
+/*!\brief Implementation of an iterator for pointer vectors.
+ *
+ * This iterator implementation will automatically dereference twice at dereference calls!
+ * Therefore the return types are not unique_ptrs but RigidBodys.
+ */
+class RigidBodyIterator
+{
+ friend inline bool operator==( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs );
+ friend inline bool operator!=( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs );
+ friend inline bool operator>( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs );
+ friend inline bool operator<( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs );
+ friend inline bool operator>=( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs );
+ friend inline bool operator<=( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs );
+public:
+ using ContainerType = std::vector< std::unique_ptr<RigidBody> >;
+ //**Type definitions****************************************************************************
+ // STL iterator requirements
+ using iterator_category = std::random_access_iterator_tag;
+ using value_type = RigidBody;
+ using pointer = RigidBody*;
+ using reference = RigidBody&;
+ using difference_type = std::ptrdiff_t;
+ //**********************************************************************************************
+
+ //**Constructors********************************************************************************
+ /*!\name Constructors */
+ //@{
+ inline RigidBodyIterator() {}
+ explicit inline RigidBodyIterator( const typename ContainerType::iterator& it ) : it_(it) {}
+
+ RigidBodyIterator( const RigidBodyIterator& it) = default;
+ RigidBodyIterator( RigidBodyIterator&& it) = default;
+
+ RigidBodyIterator& operator=(const RigidBodyIterator& it) = default;
+ RigidBodyIterator& operator=(RigidBodyIterator&& it) = default;
+
+ //**Operators***********************************************************************************
+ /*!\name Operators */
+ //@{
+ inline RigidBodyIterator& operator++() {++it_; return *this;}
+ inline RigidBodyIterator operator++( int ) {RigidBodyIterator tmp(*this); ++(*this); return tmp;}
+ inline RigidBodyIterator& operator--() {--it_; return *this;}
+ inline RigidBodyIterator operator--( int ) {RigidBodyIterator tmp(*this); --(*this); return tmp;}
+ inline RigidBodyIterator& operator+=( difference_type n ) {it_ += n; return *this;}
+ inline RigidBodyIterator operator+ ( difference_type n ) const {return RigidBodyIterator( it_ + n );}
+ inline RigidBodyIterator& operator-=( difference_type n ) {it_ -= n; return *this;}
+ inline RigidBodyIterator operator- ( difference_type n ) const {return RigidBodyIterator( it_ - n );}
+ inline difference_type operator- ( const RigidBodyIterator& it ) const {return it_ - it.it_;}
+ //@}
+ //**********************************************************************************************
+
+ //**Access operators****************************************************************************
+ /*!\name Access operators */
+ //@{
+ inline reference operator[]( difference_type n ) const {return *it_[n];}
+ inline reference operator*() const {return **it_;}
+ inline pointer operator->() const {return it_->get();}
+ //@}
+ //**********************************************************************************************
+
+ //**Utility functions***************************************************************************
+ /*!\name Utility functions */
+ //@{
+ inline pointer getBodyID() {return it_->get();}
+ inline ContainerType::iterator get() const {return it_;}
+ //@}
+ //**********************************************************************************************
+
+private:
+ //**Member variables****************************************************************************
+ /*!\name Member variables */
+ //@{
+ typename ContainerType::iterator it_; //!< wrapped iterator
+ //@}
+ //**********************************************************************************************
+};
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Equality comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the iterators point to the same element, \a false if not.
+ */
+inline bool operator==( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs )
+{
+ return lhs.it_ == rhs.it_;
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Inequality comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the iterators don't point to the same element, \a false if they do.
+ */
+inline bool operator!=( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs )
+{
+ return !operator==(lhs, rhs);
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Less-than comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the left-hand side iterator points to a lower element, \a false if not.
+ */
+inline bool operator<( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs )
+{
+ return lhs.it_ < rhs.it_;
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Greater-than comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the left-hand side iterator points to a higher element, \a false if not.
+ */
+inline bool operator>( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs )
+{
+ return lhs.it_ > rhs.it_;
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Less-or-equal-than comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the left-hand side iterator points to a lower or the same element, \a false if not.
+ */
+inline bool operator<=( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs )
+{
+ return lhs.it_ <= rhs.it_;
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Greater-or-equal-than comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the left-hand side iterator points to a higher or the same element, \a false if not.
+ */
+inline bool operator>=( const RigidBodyIterator& lhs, const RigidBodyIterator& rhs )
+{
+ return lhs.it_ >= rhs.it_;
+}
+//*************************************************************************************************
+
+
+
+
+
+
+
+
+
+
+
+
+class ConstRigidBodyIterator
+{
+ friend inline bool operator==( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs );
+ friend inline bool operator!=( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs );
+ friend inline bool operator>( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs );
+ friend inline bool operator<( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs );
+ friend inline bool operator>=( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs );
+ friend inline bool operator<=( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs );
+public:
+ using ContainerType = std::vector< std::unique_ptr<RigidBody> >;
+ //**Type definitions****************************************************************************
+ // STL iterator requirements
+ using iterator_category = std::random_access_iterator_tag;
+ using value_type = RigidBody const;
+ using pointer = RigidBody const *;
+ using reference = RigidBody const &;
+ using difference_type = std::ptrdiff_t;
+ //**********************************************************************************************
+
+ //**Constructors********************************************************************************
+ /*!\name Constructors */
+ //@{
+ inline ConstRigidBodyIterator() {}
+ inline ConstRigidBodyIterator( const RigidBodyIterator& it ) : it_(it.get()) {}
+ explicit inline ConstRigidBodyIterator( const typename ContainerType::iterator& it ) : it_(it) {}
+ explicit inline ConstRigidBodyIterator( const typename ContainerType::const_iterator& it ) : it_(it) {}
+
+ ConstRigidBodyIterator( const ConstRigidBodyIterator& it) = default;
+ ConstRigidBodyIterator( ConstRigidBodyIterator&& it) = default;
+
+ ConstRigidBodyIterator& operator=(const ConstRigidBodyIterator& it) = default;
+ ConstRigidBodyIterator& operator=(ConstRigidBodyIterator&& it) = default;
+
+ //**Operators***********************************************************************************
+ /*!\name Operators */
+ //@{
+ inline ConstRigidBodyIterator& operator++() {++it_; return *this;}
+ inline ConstRigidBodyIterator operator++( int ) {ConstRigidBodyIterator tmp(*this); ++(*this); return tmp;}
+ inline ConstRigidBodyIterator& operator--() {--it_; return *this;}
+ inline ConstRigidBodyIterator operator--( int ) {ConstRigidBodyIterator tmp(*this); --(*this); return tmp;}
+ inline ConstRigidBodyIterator& operator+=( difference_type n ) {it_ += n; return *this;}
+ inline ConstRigidBodyIterator operator+ ( difference_type n ) const {return ConstRigidBodyIterator( it_ + n );}
+ inline ConstRigidBodyIterator& operator-=( difference_type n ) {it_ -= n; return *this;}
+ inline ConstRigidBodyIterator operator- ( difference_type n ) const {return ConstRigidBodyIterator( it_ - n );}
+ inline difference_type operator- ( const ConstRigidBodyIterator& it ) const {return it_ - it.it_;}
+ //@}
+ //**********************************************************************************************
+
+ //**Access operators****************************************************************************
+ /*!\name Access operators */
+ //@{
+ inline reference operator[]( difference_type n ) const {return *it_[n];}
+ inline reference operator*() const {return **it_;}
+ inline pointer operator->() const {return it_->get();}
+ //@}
+ //**********************************************************************************************
+
+ //**Utility functions***************************************************************************
+ /*!\name Utility functions */
+ //@{
+ inline pointer getBodyID() const {return it_->get();}
+ inline ContainerType::const_iterator get() const {return it_;}
+ //@}
+ //**********************************************************************************************
+
+private:
+ //**Member variables****************************************************************************
+ /*!\name Member variables */
+ //@{
+ typename ContainerType::const_iterator it_; //!< wrapped iterator
+ //@}
+ //**********************************************************************************************
+};
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Equality comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the iterators point to the same element, \a false if not.
+ */
+inline bool operator==( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs )
+{
+ return lhs.it_ == rhs.it_;
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Inequality comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the iterators don't point to the same element, \a false if they do.
+ */
+inline bool operator!=( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs )
+{
+ return !operator==(lhs, rhs);
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Less-than comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the left-hand side iterator points to a lower element, \a false if not.
+ */
+inline bool operator<( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs )
+{
+ return lhs.it_ < rhs.it_;
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Greater-than comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the left-hand side iterator points to a higher element, \a false if not.
+ */
+inline bool operator>( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs )
+{
+ return lhs.it_ > rhs.it_;
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Less-or-equal-than comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the left-hand side iterator points to a lower or the same element, \a false if not.
+ */
+inline bool operator<=( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs )
+{
+ return lhs.it_ <= rhs.it_;
+}
+//*************************************************************************************************
+
+
+//*************************************************************************************************
+/*!\brief Greater-or-equal-than comparison between two PtrIterator objects.
+ *
+ * \param lhs The left-hand side pointer iterator.
+ * \param rhs The right-hand side pointer iterator.
+ * \return \a true if the left-hand side iterator points to a higher or the same element, \a false if not.
+ */
+inline bool operator>=( const ConstRigidBodyIterator& lhs, const ConstRigidBodyIterator& rhs )
+{
+ return lhs.it_ >= rhs.it_;
+}
+//*************************************************************************************************
+
+} // namespace pe
+} // namespace walberla
diff --git a/src/pe/rigidbody/SphereFactory.cpp b/src/pe/rigidbody/SphereFactory.cpp
index c9487031def01e2876e0d2bf6d341c1e9681825b..d88774c45f10803f84eaa1ac9f8fcd5a21fb91c6 100644
--- a/src/pe/rigidbody/SphereFactory.cpp
+++ b/src/pe/rigidbody/SphereFactory.cpp
@@ -26,6 +26,9 @@
#include "pe/rigidbody/BodyStorage.h"
#include "pe/rigidbody/Sphere.h"
+#include <core/logging/Logging.h>
+#include <core/UniqueID.h>
+
namespace walberla {
namespace pe {
@@ -39,32 +42,31 @@ SphereID createSphere( BodyStorage& globalStorage, BlockStorage& blocks, BlockDa
if( radius <= real_c(0) )
throw std::invalid_argument( "Invalid sphere radius" );
- SphereID sphere = NULL;
+ SphereID sphere = nullptr;
if (global)
{
const id_t sid = UniqueID<RigidBody>::createGlobal();
WALBERLA_ASSERT_EQUAL(communicating, false);
WALBERLA_ASSERT_EQUAL(infiniteMass, true);
- sphere = new Sphere(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, material, global, false, true);
- globalStorage.add(sphere);
+ SpherePtr sp = std::make_unique<Sphere>(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, material, global, false, true);
+ sphere = static_cast<SphereID>(&globalStorage.add( std::move(sp) ));
} else
{
- for (auto it = blocks.begin(); it != blocks.end(); ++it){
- IBlock* block = (&(*it));
- if (block->getAABB().contains(gpos))
+ for (auto& block : blocks){
+ if (block.getAABB().contains(gpos))
{
const id_t sid( UniqueID<RigidBody>::create() );
- Storage* bs = block->getData<Storage>(storageID);
- sphere = new Sphere(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, material, global, communicating, infiniteMass);
- sphere->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block->getId().getID()));
- (*bs)[0].add(sphere);
+ BodyStorage& bs = (*block.getData<Storage>(storageID))[0];
+ SpherePtr sp = std::make_unique<Sphere>(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, material, global, communicating, infiniteMass);
+ sp->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block.getId().getID()));
+ sphere = static_cast<SphereID>(&bs.add( std::move(sp) ));
}
}
}
- if (sphere != NULL)
+ if (sphere != nullptr)
{
// Logging the successful creation of the sphere
WALBERLA_LOG_DETAIL(
diff --git a/src/pe/rigidbody/SquirmerFactory.cpp b/src/pe/rigidbody/SquirmerFactory.cpp
index 41b495b75aa008cf3aae1278b98ad450302b9cd7..7160ff2d0fa80e72dcf28a5f3fe7445e0679999f 100644
--- a/src/pe/rigidbody/SquirmerFactory.cpp
+++ b/src/pe/rigidbody/SquirmerFactory.cpp
@@ -24,6 +24,9 @@
#include "pe/rigidbody/BodyStorage.h"
#include "pe/rigidbody/Squirmer.h"
+#include <core/logging/Logging.h>
+#include <core/UniqueID.h>
+
namespace walberla {
namespace pe {
@@ -38,32 +41,31 @@ SquirmerID createSquirmer( BodyStorage& globalStorage, BlockStorage& blocks, Blo
if( radius <= real_c(0) )
throw std::invalid_argument( "Invalid squirmer radius" );
- SquirmerID squirmer = NULL;
+ SquirmerID squirmer = nullptr;
if (global)
{
const id_t sid = UniqueID<RigidBody>::createGlobal();
WALBERLA_ASSERT_EQUAL(communicating, false);
WALBERLA_ASSERT_EQUAL(infiniteMass, true);
- squirmer = new Squirmer(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, squirmerVelocity, squirmerBeta, material, global, false, true);
- globalStorage.add(squirmer);
+ SquirmerPtr sq = std::make_unique<Squirmer>(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, squirmerVelocity, squirmerBeta, material, global, false, true);
+ squirmer = static_cast<SquirmerID>(&globalStorage.add(std::move(sq)));
} else
{
- for (auto it = blocks.begin(); it != blocks.end(); ++it){
- IBlock* block = (&(*it));
- if (block->getAABB().contains(gpos))
+ for (auto& block : blocks){
+ if (block.getAABB().contains(gpos))
{
const id_t sid( UniqueID<RigidBody>::create() );
- Storage* bs = block->getData<Storage>(storageID);
- squirmer = new Squirmer(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, squirmerVelocity, squirmerBeta, material, global, communicating, infiniteMass);
- squirmer->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block->getId().getID()));
- (*bs)[0].add(squirmer);
+ BodyStorage& bs = (*block.getData<Storage>(storageID))[0];
+ SquirmerPtr sq = std::make_unique<Squirmer>(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, squirmerVelocity, squirmerBeta, material, global, communicating, infiniteMass);
+ sq->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block.getId().getID()));
+ squirmer = static_cast<SquirmerID>(&bs.add( std::move(sq) ));
}
}
}
- if (squirmer != NULL)
+ if (squirmer != nullptr)
{
// Logging the successful creation of the squirmer
WALBERLA_LOG_DETAIL(
diff --git a/src/pe/rigidbody/StorageDataHandling.h b/src/pe/rigidbody/StorageDataHandling.h
index 6e3b0d2dafad64473a5b63f325e00bdccd49eb38..dd319398a9bba478d4dcdd92085ab9365041cb0e 100644
--- a/src/pe/rigidbody/StorageDataHandling.h
+++ b/src/pe/rigidbody/StorageDataHandling.h
@@ -29,6 +29,7 @@
#include "pe/communication/DynamicMarshalling.h"
#include "blockforest/BlockDataHandling.h"
+#include "blockforest/BlockForest.h"
#include "domain_decomposition/BlockStorage.h"
#include "core/Abort.h"
@@ -88,8 +89,8 @@ void StorageDataHandling<BodyTuple>::serialize( IBlock * const block, const Bloc
{
WALBERLA_ABORT( "Body to be stored not contained within block!" );
}
- marshal( buffer, RigidBodyCopyNotification( **bodyIt ) );
- MarshalDynamically<BodyTuple>::execute( buffer, **bodyIt );
+ marshal( buffer, RigidBodyCopyNotification( *bodyIt ) );
+ MarshalDynamically<BodyTuple>::execute( buffer, *bodyIt );
}
}
@@ -114,21 +115,8 @@ template<typename BodyTuple>
void StorageDataHandling<BodyTuple>::serializeCoarseToFine( Block * const block, const BlockDataID & id, mpi::SendBuffer & buffer, const uint_t child )
{
// get child aabb
- const math::AABB aabb = block->getAABB();
- const real_t xMid = (aabb.xMax() + aabb.xMin()) * real_t(0.5);
- const real_t yMid = (aabb.yMax() + aabb.yMin()) * real_t(0.5);
- const real_t zMid = (aabb.zMax() + aabb.zMin()) * real_t(0.5);
-
- const real_t xMin = (child & uint_t(1)) ? xMid : aabb.xMin();
- const real_t xMax = (child & uint_t(1)) ? aabb.xMax() : xMid;
-
- const real_t yMin = (child & uint_t(2)) ? yMid : aabb.yMin();
- const real_t yMax = (child & uint_t(2)) ? aabb.yMax() : yMid;
-
- const real_t zMin = (child & uint_t(4)) ? zMid : aabb.zMin();
- const real_t zMax = (child & uint_t(4)) ? aabb.zMax() : zMid;
-
- const math::AABB childAABB(xMin, yMin, zMin, xMax, yMax, zMax);
+ const auto childID = BlockID(block->getId(), child);
+ const auto childAABB = block->getForest().getAABBFromBlockId(childID);
//WALBERLA_LOG_DEVEL( (child & uint_t(1)) << (child & uint_t(2)) << (child & uint_t(4)) << "\naabb: " << aabb << "\nchild: " << childAABB );
using namespace walberla::pe::communication;
@@ -146,8 +134,8 @@ void StorageDataHandling<BodyTuple>::serializeCoarseToFine( Block * const block,
}
if( childAABB.contains( bodyIt->getPosition()) )
{
- marshal( buffer, RigidBodyCopyNotification( **bodyIt ) );
- MarshalDynamically<BodyTuple>::execute( buffer, **bodyIt );
+ marshal( buffer, RigidBodyCopyNotification( *bodyIt ) );
+ MarshalDynamically<BodyTuple>::execute( buffer, *bodyIt );
++numOfParticles;
}
}
@@ -166,8 +154,8 @@ void StorageDataHandling<BodyTuple>::serializeFineToCoarse( Block * const block,
{
WALBERLA_ABORT( "Body to be stored not contained within block!" );
}
- marshal( buffer, RigidBodyCopyNotification( **bodyIt ) );
- MarshalDynamically<BodyTuple>::execute( buffer, **bodyIt );
+ marshal( buffer, RigidBodyCopyNotification( *bodyIt ) );
+ MarshalDynamically<BodyTuple>::execute( buffer, *bodyIt );
}
}
@@ -214,16 +202,16 @@ void StorageDataHandling<BodyTuple>::deserializeImpl( IBlock * const block, cons
typename RigidBodyCopyNotification::Parameters objparam;
unmarshal( buffer, objparam );
- BodyID bd = UnmarshalDynamically<BodyTuple>::execute(buffer, objparam.geomType_, block->getBlockStorage().getDomain(), block->getAABB());
+ auto bd = UnmarshalDynamically<BodyTuple>::execute(buffer, objparam.geomType_, block->getBlockStorage().getDomain(), block->getAABB());
bd->setRemote( false );
bd->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block->getId().getID()));
if ( !block->getAABB().contains( bd->getPosition()) )
{
- WALBERLA_ABORT("Loaded body not contained within block!\n" << "aabb: " << block->getAABB() << "\nparticle:" << bd );
+ WALBERLA_ABORT("Loaded body not contained within block!\n" << "aabb: " << block->getAABB() << "\nparticle:" << *bd );
}
WALBERLA_ASSERT_EQUAL(localBodyStorage.find( bd->getSystemID() ), localBodyStorage.end());
- localBodyStorage.add(bd);
+ localBodyStorage.add(std::move(bd));
--numBodies;
}
diff --git a/src/pe/rigidbody/Union.h b/src/pe/rigidbody/Union.h
index 81c8128f6a4253f8d17f43801fef4a39f9e056b7..fe6e0ce94f1e975feaae4cea68b97aa6aa85ad1d 100644
--- a/src/pe/rigidbody/Union.h
+++ b/src/pe/rigidbody/Union.h
@@ -27,7 +27,10 @@
//*************************************************************************************************
#include <pe/Config.h>
+#include <pe/rigidbody/BodyStorage.h>
#include <pe/rigidbody/RigidBody.h>
+#include <pe/rigidbody/RigidBodyCastIterator.h>
+#include <pe/rigidbody/RigidBodyIterator.h>
#include <pe/Types.h>
#include <core/debug/Debug.h>
@@ -65,23 +68,24 @@ class Union : public RigidBody
{
public:
//**Type definitions****************************************************************************
- typedef BodyTypeTuple BodyTypeTupleT;
+ using BodyTypeTupleT = BodyTypeTuple;
- typedef PtrVector<RigidBody, PtrDelete> Bodies; //!< Iterator over the contained rigid bodies.
- typedef Bodies::Iterator Iterator; //!< Iterator over the contained rigid bodies.
- typedef Bodies::ConstIterator ConstIterator; //!< Constant iterator over the contained rigid bodies.
- //**++++++++++++++++****************************************************************************
+ //**********************************************************************************************
- //**Forward declarations for nested classes*****************************************************
-// template< typename C > class CastIterator;
-// template< typename C > class ConstCastIterator;
+ using size_type = BodyStorage::size_type; //!< Size type of the body storage.
+ using iterator = BodyStorage::iterator; //!< Iterator over non-const bodies.
+ using const_iterator = BodyStorage::const_iterator; //!< Iterator over constant bodies.
+ template <typename C> //cast type
+ using cast_iterator = BodyStorage::cast_iterator<C>;
+ template <typename C> //cast type
+ using const_cast_iterator = BodyStorage::const_cast_iterator<C>;
//**********************************************************************************************
//**Constructors********************************************************************************
/*!\name Constructors */
//@{
explicit Union( id_t sid, id_t uid, const Vec3& gpos, const Vec3& rpos, const Quat& q,
- const bool global, const bool communicating, const bool infiniteMass );
+ const bool global, const bool communicating, const bool infiniteMass );
//@}
//**********************************************************************************************
@@ -95,28 +99,35 @@ public:
public:
//**Get functions*******************************************************************************
- /*!\name Get functions */
+ /*!\name BodyStorage functions */
//@{
- inline bool isEmpty() const;
- inline size_t size() const;
- template< typename C > inline size_t size() const {return bodies_.size<C>();}
- inline BodyID getBody( size_t index );
- inline ConstBodyID getBody( size_t index ) const;
-
- inline Iterator begin() {return bodies_.begin();}
- inline ConstIterator begin() const {return bodies_.begin();}
- template< typename C > inline Bodies::CastIterator<C> begin() {return bodies_.begin<C>();}
- template< typename C > inline Bodies::ConstCastIterator<C> begin() const {return bodies_.begin<C>();}
-
- inline Iterator end() {return bodies_.end();}
- inline ConstIterator end() const {return bodies_.end();}
- template< typename C > inline Bodies::CastIterator<C> end() {return bodies_.end<C>();}
- template< typename C > inline Bodies::ConstCastIterator<C> end() const {return bodies_.end<C>();}
-
- virtual inline real_t getVolume() const;
+ inline bool isEmpty() const {return bodies_.isEmpty();}
+ inline size_t size() const {return bodies_.size();}
+
+ inline iterator begin () {return bodies_.begin();}
+ inline const_iterator begin () const {return bodies_.begin();}
+ inline const_iterator cbegin () const {return bodies_.cbegin();}
+ inline iterator end () {return bodies_.end();}
+ inline const_iterator end () const {return bodies_.end();}
+ inline const_iterator cend () const {return bodies_.cend();}
+
+ template< typename C >
+ inline cast_iterator<C> begin() {return bodies_.begin<C>();}
+ template< typename C >
+ inline const_cast_iterator<C> begin() const {return bodies_.begin<C>();}
+ template< typename C >
+ inline const_cast_iterator<C> cbegin() const {return bodies_.cbegin<C>();}
+ template< typename C >
+ inline cast_iterator<C> end() {return bodies_.end<C>();}
+ template< typename C >
+ inline const_cast_iterator<C> end() const {return bodies_.end<C>();}
+ template< typename C >
+ inline const_cast_iterator<C> cend() const {return bodies_.cend<C>();}
//@}
//**********************************************************************************************
+ virtual inline real_t getVolume() const;
+
//**Set functions*******************************************************************************
/*!\name Set functions */
//@{
@@ -146,7 +157,7 @@ public:
//**Rigid body manager functions****************************************************************
/*!\name Rigid body manager functions */
//@{
- void add ( BodyID body );
+ inline RigidBody& add( std::unique_ptr<RigidBody>&& body );
//@}
//**********************************************************************************************
@@ -183,18 +194,13 @@ protected:
/*!\name Utility functions */
//@{
inline virtual void calcBoundingBox() WALBERLA_OVERRIDE; // Calculation of the axis-aligned bounding box
- void calcCenterOfMass(); ///< updates the center of mass (gpos)
+ void calcCenterOfMass(); ///< updates the center of mass (gpos)
inline void calcInertia(); // Calculation of the moment of inertia
//@}
//**********************************************************************************************
- //**Member variables****************************************************************************
- /*!\name Member variables */
- //@{
- PtrVector<RigidBody, PtrDelete> bodies_; //!< Rigid bodies contained in the union.
- //@}
- //**********************************************************************************************
private:
+ BodyStorage bodies_; //!< Rigid bodies contained in the union.
std::vector<id_t> containedTypeIDs_;
static id_t staticTypeID_; //< type id of sphere, will be set by SetBodyTypeIDs
@@ -228,7 +234,7 @@ private:
*/
template <typename BodyTypeTuple>
Union<BodyTypeTuple>::Union( id_t sid, id_t uid, const Vec3& gpos, const Vec3& rpos, const Quat& q,
- const bool global, const bool communicating, const bool /*infiniteMass*/ )
+ const bool global, const bool communicating, const bool /*infiniteMass*/ )
: RigidBody( getStaticTypeID(), sid, uid ) // Initialization of the parent class
{
// Initializing the instantiated union
@@ -241,7 +247,7 @@ Union<BodyTypeTuple>::Union( id_t sid, id_t uid, const Vec3& gpos, const Vec3& r
calcInertia();
setGlobal( global );
-// setMass( infiniteMass );
+ // setMass( infiniteMass );
setCommunicating( communicating );
setFinite( true );
}
@@ -322,7 +328,7 @@ void Union<BodyTypeTuple>::calcBoundingBox()
// Setting the bounding box of an empty union
if( bodies_.isEmpty() ) {
aabb_ = math::AABB(
- gpos_[0] - real_t(0.01),
+ gpos_[0] - real_t(0.01),
gpos_[1] - real_t(0.01),
gpos_[2] - real_t(0.01),
gpos_[0] + real_t(0.01),
@@ -334,7 +340,7 @@ void Union<BodyTypeTuple>::calcBoundingBox()
// Using the bounding box of the first contained bodies as initial bounding box
// and merging it with the bounding boxes of all other bodies
else {
- aabb_ = bodies_[0]->getAABB();
+ aabb_ = bodies_.begin()->getAABB();
for( auto b=bodies_.begin()+1; b!=bodies_.end(); ++b )
aabb_.merge( b->getAABB() );
}
@@ -366,7 +372,7 @@ void Union<BodyTypeTuple>::calcCenterOfMass()
// Calculating the center of mass of a single body
if( bodies_.size() == 1 )
{
- const BodyID body( bodies_[0] );
+ const BodyID body( bodies_.begin().getBodyID() );
gpos_ = body->getPosition();
mass_ = body->getMass();
if( !isFixed() && mass_ > real_t(0) )
@@ -512,8 +518,8 @@ void Union<BodyTypeTuple>::setPositionImpl( real_t px, real_t py, real_t pz )
gpos_ = gpos;
// Updating the contained bodies
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- (*b)->update( dp );
+ for( auto& b : bodies_ )
+ b.update( dp );
Union<BodyTypeTuple>::calcBoundingBox(); // Setting the axis-aligned bounding box
wake(); // Waking the union from sleep mode
@@ -548,8 +554,8 @@ void Union<BodyTypeTuple>::setOrientationImpl( real_t r, real_t i, real_t j, rea
R_ = q_.toRotationMatrix();
// Updating the contained bodies
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- (*b)->update( dq );
+ for( auto& b : bodies_ )
+ b.update( dq );
Union<BodyTypeTuple>::calcBoundingBox(); // Setting the axis-aligned bounding box
wake(); // Waking the union from sleep mode
@@ -586,8 +592,8 @@ void Union<BodyTypeTuple>::update( const Vec3& dp )
gpos_ += dp;
// Updating the contained bodies
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- (*b)->update( dp );
+ for( auto& b : bodies_ )
+ b.update( dp );
// Setting the axis-aligned bounding box
Union<BodyTypeTuple>::calcBoundingBox();
@@ -623,8 +629,8 @@ void Union<BodyTypeTuple>::update( const Quat& dq )
R_ = q_.toRotationMatrix();
// Updating the contained bodies
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- (*b)->update( dq );
+ for( auto& b : bodies_ )
+ b.update( dq );
// Setting the axis-aligned bounding box
Union<BodyTypeTuple>::calcBoundingBox();
@@ -694,38 +700,38 @@ void Union<BodyTypeTuple>::update( const Quat& dq )
* union (to make the entire union (in-)visible.
*/
template <typename BodyTypeTuple>
-void Union<BodyTypeTuple>::add( BodyID body )
+RigidBody& Union<BodyTypeTuple>::add( std::unique_ptr<RigidBody>&& body )
{
// Checking for "self-assignment"
- if( body == BodyID( this ) ) return;
+ if( body.get() == BodyID( this ) ) return *this;
// Checking the global flags of the body and the union in MPI parallel simulations
if( body->isGlobal() ^ global_ )
throw std::logic_error( "Global flags of body and union do not match" );
+ // Registering the rigid body
+ auto& bd = bodies_.add( std::move(body) );
+
Vec3 oldCenterOfMass = getPosition();
Vec3 oldImpulse = getLinearVel() * getMass();
- Vec3 bodyCenterOfMass = body->getPosition();
- Vec3 bodyImpulse = body->getLinearVel() * body->getMass();
+ Vec3 bodyCenterOfMass = bd.getPosition();
+ Vec3 bodyImpulse = bd.getLinearVel() * bd.getMass();
-
- // Registering the rigid body
- body->setSB(this);
- bodies_.pushBack( body );
+ bd.setSB(this); //having a superbody will forward all getVel calls to superbody!!!
// Updating the axis-aligned bounding box
if( bodies_.size() == 1 )
- aabb_ = body->getAABB();
+ aabb_ = bd.getAABB();
else
- aabb_.merge( body->getAABB() );
+ aabb_.merge( bd.getAABB() );
// Setting the union's total mass and center of mass
calcCenterOfMass();
// Setting the contained primitives' relative position in reference to the center of mass
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- ( *b )->calcRelPosition();
+ for( auto& b : bodies_ )
+ b.calcRelPosition();
// Setting the moment of inertia
calcInertia();
@@ -735,11 +741,13 @@ void Union<BodyTypeTuple>::add( BodyID body )
setAngularVel( Vec3(0,0,0) );
addImpulseAtPos( oldImpulse, oldCenterOfMass);
addImpulseAtPos( bodyImpulse, bodyCenterOfMass);
- body->setLinearVel( Vec3(0,0,0) );
- body->setAngularVel( Vec3(0,0,0) );
+ bd.setLinearVel( Vec3(0,0,0) );
+ bd.setAngularVel( Vec3(0,0,0) );
// Signaling the internal modification to the superordinate body
signalModification();
+
+ return bodies_.back();
}
//*************************************************************************************************
@@ -771,8 +779,8 @@ void Union<BodyTypeTuple>::translateImpl( real_t dx, real_t dy, real_t dz )
gpos_ += dp;
// Updating the contained bodies
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- (*b)->update( dp );
+ for( auto& b : bodies_ )
+ b.update( dp );
Union<BodyTypeTuple>::calcBoundingBox(); // Setting the axis-aligned bounding box
wake(); // Waking the union from sleep mode
@@ -811,8 +819,8 @@ void Union<BodyTypeTuple>::rotateImpl( const Quat& dq )
R_ = q_.toRotationMatrix(); // Updating the rotation of the union
// Updating the contained bodies
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- (*b)->update( dq );
+ for( auto& b : bodies_ )
+ b.update( dq );
Union<BodyTypeTuple>::calcBoundingBox(); // Setting the axis-aligned bounding box
wake(); // Waking the union from sleep mode
@@ -843,8 +851,8 @@ void Union<BodyTypeTuple>::rotateAroundOriginImpl( const Quat& dq )
gpos_ = dq.rotate( gpos_ ); // Updating the global position of the union
// Updating the contained bodies
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- (*b)->update( dq );
+ for( auto& b : bodies_ )
+ b.update( dq );
Union<BodyTypeTuple>::calcBoundingBox(); // Setting the axis-aligned bounding box
wake(); // Waking the union from sleep mode
@@ -876,8 +884,8 @@ void Union<BodyTypeTuple>::rotateAroundPointImpl( const Vec3& point, const Quat
gpos_ = point + dq.rotate( dp ); // Updating the global position of the union
// Updating the contained bodies
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- (*b)->update( dq );
+ for( auto& b : bodies_ )
+ b.update( dq );
Union<BodyTypeTuple>::calcBoundingBox(); // Setting the axis-aligned bounding box
wake(); // Waking the union from sleep mode
@@ -906,8 +914,8 @@ template <typename BodyTypeTuple>
bool Union<BodyTypeTuple>::containsRelPointImpl( real_t px, real_t py, real_t pz ) const
{
const Vec3 gpos( pointFromBFtoWF( px, py, pz ) );
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- if( b->containsPoint( gpos ) ) return true;
+ for( auto& b : bodies_ )
+ if( b.containsPoint( gpos ) ) return true;
return false;
}
//*************************************************************************************************
@@ -929,9 +937,10 @@ bool Union<BodyTypeTuple>::isSurfaceRelPointImpl( real_t px, real_t py, real_t p
bool surface( false );
const Vec3 gpos( pointFromBFtoWF( px, py, pz ) );
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b ) {
- if( b->containsPoint( gpos ) ) return false;
- else if( b->isSurfacePoint( gpos ) ) surface = true;
+ for( auto& b : bodies_ )
+ {
+ if( b.containsPoint( gpos ) ) return false;
+ else if( b.isSurfacePoint( gpos ) ) surface = true;
}
return surface;
@@ -974,8 +983,8 @@ void Union<BodyTypeTuple>::handleModification()
calcCenterOfMass();
// Setting the contained primitives' relative position in reference to the center of mass
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- ( *b )->calcRelPosition();
+ for( auto& b : bodies_ )
+ b.calcRelPosition();
// Setting the moment of inertia
calcInertia();
@@ -1004,8 +1013,8 @@ void Union<BodyTypeTuple>::handleTranslation()
calcCenterOfMass();
// Setting the contained bodies' relative position in reference to the center of mass
- for( auto b=bodies_.begin(); b!=bodies_.end(); ++b )
- ( *b )->calcRelPosition();
+ for( auto& b : bodies_ )
+ b.calcRelPosition();
// Setting the moment of inertia
calcInertia();
@@ -1155,65 +1164,6 @@ std::ostream& operator<<( std::ostream& os, Union<BodyTypeTuple> const * u )
//
//=================================================================================================
-//*************************************************************************************************
-/*!\brief Returns whether the union contains any bodies or not.
- *
- * \return \a true if the union is empty, \a false if it not.
- */
-template <typename BodyTypeTuple>
-inline bool Union<BodyTypeTuple>::isEmpty() const
-{
- return bodies_.size() == 0;
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns the number of rigid bodies contained in the union.
- *
- * \return The number of rigid bodies.
- */
-template <typename BodyTypeTuple>
-inline size_t Union<BodyTypeTuple>::size() const
-{
- return bodies_.size();
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a handle to the indexed rigid body.
- *
- * \param index Access index. The index has to be in the range \f$[0..size-1]\f$.
- * \return Handle to the accessed body.
- *
- * \b Note: No runtime check is performed to insure the validity of the access index.
- */
-template <typename BodyTypeTuple>
-inline BodyID Union<BodyTypeTuple>::getBody( size_t index )
-{
- WALBERLA_ASSERT_LESS( index, bodies_.size(), "Invalid access index" );
- return bodies_[index];
-}
-//*************************************************************************************************
-
-
-//*************************************************************************************************
-/*!\brief Returns a constant handle to the indexed rigid body.
- *
- * \param index Access index. The index has to be in the range \f$[0..size-1]\f$.
- * \return Constant handle to the accessed body.
- *
- * \b Note: No runtime check is performed to insure the validity of the access index.
- */
-template <typename BodyTypeTuple>
-inline ConstBodyID Union<BodyTypeTuple>::getBody( size_t index ) const
-{
- WALBERLA_ASSERT_LESS( index, bodies_.size(), "Invalid access index" );
- return bodies_[index];
-}
-//*************************************************************************************************
-
//*************************************************************************************************
/*!\brief Returns unique type id of this type
diff --git a/src/pe/rigidbody/UnionFactory.h b/src/pe/rigidbody/UnionFactory.h
index e237e0dd31d83642f80663ed48b7c083498cad63..eeff2ffe8c578fe05924c8fea440afb89b33e5e2 100644
--- a/src/pe/rigidbody/UnionFactory.h
+++ b/src/pe/rigidbody/UnionFactory.h
@@ -31,8 +31,10 @@
#include "pe/rigidbody/Union.h"
#include "pe/Types.h"
-#include "blockforest/BlockForest.h"
-#include "core/debug/Debug.h"
+#include <blockforest/BlockForest.h>
+#include <core/debug/Debug.h>
+#include <core/logging/Logging.h>
+#include <core/UniqueID.h>
namespace walberla {
namespace pe {
@@ -73,32 +75,31 @@ Union<BodyTypeTuple>* createUnion( BodyStorage& globalStorage, BlockStorage& b
if (Union<BodyTypeTuple>::getStaticTypeID() == std::numeric_limits<id_t>::max())
throw std::runtime_error("Union TypeID not initalized!");
- Union<BodyTypeTuple>* bd = NULL;
+ Union<BodyTypeTuple>* bd = nullptr;
if (global)
{
const id_t sid = UniqueID<RigidBody>::createGlobal();
WALBERLA_ASSERT_EQUAL(communicating, false);
WALBERLA_ASSERT_EQUAL(infiniteMass, true);
- bd = new Union<BodyTypeTuple>(sid, uid, gpos, Vec3(0,0,0), Quat(), global, false, true);
- globalStorage.add(bd);
+ auto un = std::make_unique<Union<BodyTypeTuple>>(sid, uid, gpos, Vec3(0,0,0), Quat(), global, false, true);
+ bd = static_cast<Union<BodyTypeTuple>*>(&globalStorage.add(std::move(un)));
} else
{
- for (auto it = blocks.begin(); it != blocks.end(); ++it){
- IBlock* block = (&(*it));
- if (block->getAABB().contains(gpos))
+ for (auto& block : blocks){
+ if (block.getAABB().contains(gpos))
{
const id_t sid( UniqueID<RigidBody>::create() );
- Storage* bs = block->getData<Storage>(storageID);
- bd = new Union<BodyTypeTuple>(sid, uid, gpos, Vec3(0,0,0), Quat(), global, communicating, infiniteMass);
- bd->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block->getId().getID()));
- (*bs)[0].add(bd);
+ BodyStorage& bs = (*block.getData<Storage>(storageID))[0];
+ auto un = std::make_unique<Union<BodyTypeTuple>>(sid, uid, gpos, Vec3(0,0,0), Quat(), global, communicating, infiniteMass);
+ un->MPITrait.setOwner(Owner(MPIManager::instance()->rank(), block.getId().getID()));
+ bd = static_cast<Union<BodyTypeTuple>*>(&bs.add(std::move(un)));
}
}
}
- if (bd != NULL)
+ if (bd != nullptr)
{
// Logging the successful creation of the box
WALBERLA_LOG_DETAIL(
@@ -143,7 +144,6 @@ BoxID createBox( Union<BodyTypeTuple>* un,
if( lengths[0] <= real_t(0) || lengths[1] <= real_t(0) || lengths[2] <= real_t(0) )
throw std::invalid_argument( "Invalid side length" );
- BoxID box = NULL;
id_t sid = 0;
if (global)
@@ -156,9 +156,8 @@ BoxID createBox( Union<BodyTypeTuple>* un,
sid = UniqueID<RigidBody>::create();
}
- box = new Box(sid, uid, gpos, Vec3(0,0,0), Quat(), lengths, material, global, communicating, infiniteMass);
+ std::unique_ptr<Box> box = std::make_unique<Box>(sid, uid, gpos, Vec3(0,0,0), Quat(), lengths, material, global, communicating, infiniteMass);
box->MPITrait.setOwner( un->MPITrait.getOwner() );
- un->add(box);
if (box != NULL)
{
@@ -173,7 +172,7 @@ BoxID createBox( Union<BodyTypeTuple>* un,
);
}
- return box;
+ return static_cast<BoxID> (&(un->add(std::move(box))));
}
//*************************************************************************************************
@@ -215,7 +214,6 @@ CapsuleID createCapsule( Union<BodyTypeTuple>* un,
if( length <= real_c(0) )
throw std::invalid_argument( "Invalid capsule length" );
- CapsuleID capsule = NULL;
id_t sid = 0;
if (global)
@@ -228,16 +226,15 @@ CapsuleID createCapsule( Union<BodyTypeTuple>* un,
sid = UniqueID<RigidBody>::create();
}
- capsule = new Capsule(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, length, material, global, communicating, infiniteMass);
+ std::unique_ptr<Capsule> capsule = std::make_unique<Capsule>(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, length, material, global, communicating, infiniteMass);
capsule->MPITrait.setOwner( un->MPITrait.getOwner() );
- un->add(capsule);
if (capsule != NULL)
{
- WALBERLA_LOG_DETAIL("Created capsule " << capsule->getSystemID() << "\n" << capsule);
+ WALBERLA_LOG_DETAIL("Created capsule " << capsule->getSystemID() << "\n" << *capsule);
}
- return capsule;
+ return static_cast<CapsuleID>(&(un->add(std::move(capsule))));
}
//*************************************************************************************************
@@ -275,7 +272,6 @@ SphereID createSphere( Union<BodyTypeTuple>* un,
throw std::invalid_argument( "Invalid sphere radius" );
id_t sid(0);
- SphereID sphere = NULL;
if (global)
{
@@ -288,9 +284,8 @@ SphereID createSphere( Union<BodyTypeTuple>* un,
sid = UniqueID<RigidBody>::create();
}
- sphere = new Sphere(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, material, global, communicating, infiniteMass);
+ std::unique_ptr<Sphere> sphere = std::make_unique<Sphere>(sid, uid, gpos, Vec3(0,0,0), Quat(), radius, material, global, communicating, infiniteMass);
sphere->MPITrait.setOwner( un->MPITrait.getOwner() );
- un->add( sphere );
if (sphere != NULL)
{
@@ -305,7 +300,7 @@ SphereID createSphere( Union<BodyTypeTuple>* un,
);
}
- return sphere;
+ return static_cast<SphereID>(&(un->add( std::move(sphere) )));
}
} // namespace pe
diff --git a/src/pe/synchronization/RemoveAndNotify.h b/src/pe/synchronization/RemoveAndNotify.h
index 8eaf880fe6e80157b7199d37dbf5b75606925a53..6c8d27c0d89e6e7ec2f9cc34464f9c28c3593d4e 100644
--- a/src/pe/synchronization/RemoveAndNotify.h
+++ b/src/pe/synchronization/RemoveAndNotify.h
@@ -44,7 +44,7 @@ namespace pe {
* This function removes the rigid body from the body storage and generates deletion notifications.
*/
inline
-BodyStorage::Iterator removeAndNotify( Owner me, mpi::BufferSystem& bs, BodyStorage& localStorage, BodyStorage::Iterator body )
+BodyStorage::iterator removeAndNotify( Owner me, mpi::BufferSystem& bs, BodyStorage& localStorage, BodyStorage::iterator body )
{
using namespace walberla::pe::communication;
@@ -57,7 +57,7 @@ BodyStorage::Iterator removeAndNotify( Owner me, mpi::BufferSystem& bs, BodyStor
WALBERLA_LOG_DETAIL( "__Notify registered process " << (*it) << " of deletion of body " << body->getSystemID() );
mpi::SendBuffer& sb = bs.sendBuffer(it->rank_);
if (sb.isEmpty()) sb << walberla::uint8_c(0);
- packNotification(me, *it, sb, RigidBodyDeletionNotification( **body ));
+ packNotification(me, *it, sb, RigidBodyDeletionNotification( *body ));
}
}
diff --git a/src/pe/synchronization/SyncForces.h b/src/pe/synchronization/SyncForces.h
index 0bca535418797cfdfdf9f18979a169f607f80e87..b28fb837ab365264a78bef4a1812962f707967d3 100644
--- a/src/pe/synchronization/SyncForces.h
+++ b/src/pe/synchronization/SyncForces.h
@@ -20,9 +20,12 @@
#pragma once
-#include "blockforest/all.h"
-#include "core/all.h"
-#include "domain_decomposition/all.h"
+#include <core/DataTypes.h>
+#include <core/mpi/BufferSystem.h>
+#include <core/mpi/RecvBuffer.h>
+#include <core/mpi/Reduce.h>
+#include <core/mpi/SendBuffer.h>
+#include <domain_decomposition/BlockStorage.h>
#include "pe/BlockFunctions.h"
#include "pe/rigidbody/BodyStorage.h"
@@ -74,7 +77,7 @@ void reduceForces( BlockStorage& blocks, BlockDataID storageID )
WALBERLA_LOG_DETAIL( "__Sending force contribution " << bodyIt->getForce() << ", " << bodyIt->getTorque() << " of body " <<
bodyIt->getSystemID() << " to owner block " << bodyIt->MPITrait.getOwner().blockID_ << ".\n");
- packNotification(me, bodyIt->MPITrait.getOwner(), sb, RigidBodyForceNotification( *(*bodyIt) ) );
+ packNotification(me, bodyIt->MPITrait.getOwner(), sb, RigidBodyForceNotification( *bodyIt ) );
}
@@ -135,7 +138,7 @@ void reduceForces( BlockStorage& blocks, BlockDataID storageID, BodyStorage& glo
{
if (it->hasInfiniteMass()) continue;
- const Vec3 f( (*it)->getForce() ), tau( (*it)->getTorque() );
+ const Vec3 f( it->getForce() ), tau( it->getTorque() );
reductionBuffer[i++] = f[0];
reductionBuffer[i++] = f[1];
reductionBuffer[i++] = f[2];
@@ -150,8 +153,8 @@ void reduceForces( BlockStorage& blocks, BlockDataID storageID, BodyStorage& glo
for( auto it = globalBodyStorage.begin(); it != globalBodyStorage.end(); ++it )
{
if (it->hasInfiniteMass()) continue;
- (*it)->setForce ( Vec3( reductionBuffer[i], reductionBuffer[i + 1], reductionBuffer[i + 2] ) );
- (*it)->setTorque( Vec3( reductionBuffer[i + 3], reductionBuffer[i + 4], reductionBuffer[i + 5] ) );
+ it->setForce ( Vec3( reductionBuffer[i], reductionBuffer[i + 1], reductionBuffer[i + 2] ) );
+ it->setTorque( Vec3( reductionBuffer[i + 3], reductionBuffer[i + 4], reductionBuffer[i + 5] ) );
}
}
WALBERLA_LOG_DETAIL( "Sync force on global bodies finished." );
@@ -198,7 +201,7 @@ void distributeForces( BlockStorage& blocks, BlockDataID storageID )
WALBERLA_LOG_DETAIL( "__Sending force contribution " << bodyIt->getForce() << ", " << bodyIt->getTorque() << " of body " <<
bodyIt->getSystemID() << " to shadow owner " << sownerIt->blockID_ << ".\n");
- packNotification(me, *sownerIt, sb, RigidBodyForceNotification( *(*bodyIt) ) );
+ packNotification(me, *sownerIt, sb, RigidBodyForceNotification( *bodyIt ) );
}
}
diff --git a/src/pe/synchronization/SyncNextNeighbors.h b/src/pe/synchronization/SyncNextNeighbors.h
index 56da2bc958e39edf2994882fcc9e2b69fd5d2c77..83ad74ac0a839491f1d8023696354b61fa7f3cba 100644
--- a/src/pe/synchronization/SyncNextNeighbors.h
+++ b/src/pe/synchronization/SyncNextNeighbors.h
@@ -41,6 +41,7 @@
#include "blockforest/BlockForest.h"
#include "core/mpi/BufferSystem.h"
#include "core/timing/TimingTree.h"
+#include "domain_decomposition/MapPointToPeriodicDomain.h"
namespace walberla {
namespace pe {
@@ -56,7 +57,16 @@ void generateSynchonizationMessages(mpi::BufferSystem& bs, const Block& block, B
WALBERLA_LOG_DETAIL( "Assembling of body synchronization message starts..." );
// position update
- for( auto body = localStorage.begin(); body != localStorage.end(); ) {
+ for( auto body = localStorage.begin(); body != localStorage.end(); )
+ {
+ //correct position to make sure body is always inside the domain!
+ if (!body->isFixed())
+ {
+ auto pos = body->getPosition();
+ block.getBlockStorage().mapToPeriodicDomain(pos);
+ body->setPosition(pos);
+ }
+
bool isInsideDomain = domain.contains( body->getAABB(), -dx );
WALBERLA_ASSERT( !body->isRemote(), "Central body storage contains remote bodies." );
@@ -67,7 +77,7 @@ void generateSynchonizationMessages(mpi::BufferSystem& bs, const Block& block, B
}
const Vec3 gpos( body->getPosition() );
- BodyID b ( *body );
+ BodyID b ( body.getBodyID() );
if (body->isMarkedForDeletion())
{
@@ -146,7 +156,6 @@ void generateSynchonizationMessages(mpi::BufferSystem& bs, const Block& block, B
{
// Body is no longer locally owned (body is about to be migrated).
Owner owner( findContainingProcess( block, gpos ) );
- WALBERLA_ASSERT_UNEQUAL( owner.blockID_, me.blockID_, "Position is " << gpos );
WALBERLA_LOG_DETAIL( "Local body " << b->getSystemID() << " is no longer on process " << body->MPITrait.getOwner() << " but on process " << owner );
@@ -155,7 +164,7 @@ void generateSynchonizationMessages(mpi::BufferSystem& bs, const Block& block, B
WALBERLA_LOG_DETAIL( "Sending deletion notifications for body " << body->getSystemID() << " due to outflow." );
// Registered processes receive removal notification in the remove() routine.
- //todelete.push_back( *body );
+ //todelete.push_back( body.getBodyID() );
body = removeAndNotify( me, bs, localStorage, body );
// Note: Attached shadow copies are not deleted here. Instead we rely on the deferred deletion since we no
@@ -164,9 +173,10 @@ void generateSynchonizationMessages(mpi::BufferSystem& bs, const Block& block, B
// of which we own a shadow copy in the next position update since (probably) we no longer require the body but
// are still part of its registration list.
continue;
- }
- else
+ } else
{
+ WALBERLA_ASSERT_UNEQUAL( owner.blockID_, me.blockID_, "Position is " << gpos << "\nlocal Block is: " << block.getAABB() );
+
// New owner found among neighbors.
WALBERLA_ASSERT_UNEQUAL( owner.blockID_, block.getId().getID(), "Migration is restricted to neighboring blocks." );
@@ -189,8 +199,12 @@ void generateSynchonizationMessages(mpi::BufferSystem& bs, const Block& block, B
b->setRemote( true );
// Move body to shadow copy storage.
- body = localStorage.release( body );
- shadowStorage.add( b );
+ {
+ auto pos = b->getPosition();
+ correctBodyPosition(domain, block.getAABB().center(), pos);
+ b->setPosition(pos);
+ }
+ shadowStorage.add( localStorage.release( body ) );
// Note: We cannot determine here whether we require the body since we do not have up to date shadow copies.
// However, we will most likely have to keep the body since it typically still intersects the process subdomain.
diff --git a/src/pe/synchronization/SyncShadowOwners.h b/src/pe/synchronization/SyncShadowOwners.h
index e02cea958b435d39f54e749aa237c696cec6d8ca..89716ed2877a300fb0d29dcb34680f59a031a851 100644
--- a/src/pe/synchronization/SyncShadowOwners.h
+++ b/src/pe/synchronization/SyncShadowOwners.h
@@ -20,9 +20,12 @@
#pragma once
-#include "blockforest/all.h"
-#include "core/all.h"
-#include "domain_decomposition/all.h"
+#include <blockforest/BlockForest.h>
+#include <core/DataTypes.h>
+#include <core/mpi/BufferSystem.h>
+#include <core/mpi/RecvBuffer.h>
+#include <core/mpi/Reduce.h>
+#include <core/mpi/SendBuffer.h>
#include "pe/BlockFunctions.h"
#include "pe/rigidbody/BodyStorage.h"
@@ -79,7 +82,15 @@ void updateAndMigrate( BlockForest& forest, BlockDataID storageID, const bool sy
for( auto bodyIt = localStorage.begin(); bodyIt != localStorage.end(); )
{
- BodyID b (*bodyIt);
+ BodyID b (bodyIt.getBodyID());
+
+ //correct position to make sure body is always inside the domain!
+ if (!b->isFixed())
+ {
+ auto pos = b->getPosition();
+ block.getBlockStorage().mapToPeriodicDomain(pos);
+ b->setPosition(pos);
+ }
if( !b->isCommunicating() && !syncNonCommunicatingBodies ) {
++bodyIt;
@@ -131,8 +142,12 @@ void updateAndMigrate( BlockForest& forest, BlockDataID storageID, const bool sy
b->setRemote( true );
// Move body to shadow copy storage.
- bodyIt = localStorage.release( bodyIt );
- shadowStorage.add( b );
+ {
+ auto pos = b->getPosition();
+ correctBodyPosition(forest.getDomain(), block.getAABB().center(), pos);
+ b->setPosition(pos);
+ }
+ shadowStorage.add( localStorage.release( bodyIt ) );
b->MPITrait.deregisterShadowOwner( owner );
@@ -216,11 +231,11 @@ void checkAndResolveOverlap( BlockForest& forest, BlockDataID storageID, const r
BodyStorage& shadowStorage = (*storage)[1];
const Owner me( int_c(block.getProcess()), block.getId().getID() );
-// const math::AABB& blkAABB = block->getAABB();
+ // const math::AABB& blkAABB = block->getAABB();
for( auto bodyIt = localStorage.begin(); bodyIt != localStorage.end(); ++bodyIt)
{
- BodyID b (*bodyIt);
+ BodyID b (bodyIt.getBodyID());
if( !b->isCommunicating() && !syncNonCommunicatingBodies ) continue;
@@ -239,10 +254,10 @@ void checkAndResolveOverlap( BlockForest& forest, BlockDataID storageID, const r
if (b->MPITrait.getOwner() == nbProcess) continue; // dont send to owner!!
if (b->MPITrait.getBlockState( nbProcess.blockID_ )) continue; // only send to neighbor which do not know this body
-// WALBERLA_LOG_DEVEL("neighobur aabb: " << block.getNeighborAABB(nb));
-// WALBERLA_LOG_DEVEL("isInsideDomain: " << isInsideDomain);
-// WALBERLA_LOG_DEVEL("body AABB: " << b->getAABB());
-// WALBERLA_LOG_DEVEL("neighbour AABB: " << block.getNeighborAABB(nb));
+ // WALBERLA_LOG_DEVEL("neighobur aabb: " << block.getNeighborAABB(nb));
+ // WALBERLA_LOG_DEVEL("isInsideDomain: " << isInsideDomain);
+ // WALBERLA_LOG_DEVEL("body AABB: " << b->getAABB());
+ // WALBERLA_LOG_DEVEL("neighbour AABB: " << block.getNeighborAABB(nb));
if( (isInsideDomain ? block.getNeighborAABB(nb).intersects( b->getAABB(), dx ) : block.getBlockStorage().periodicIntersect(block.getNeighborAABB(nb), b->getAABB(), dx)) )
{
@@ -256,7 +271,7 @@ void checkAndResolveOverlap( BlockForest& forest, BlockDataID storageID, const r
}
for( auto bodyIt = shadowStorage.begin(); bodyIt != shadowStorage.end(); )
{
- BodyID b (*bodyIt);
+ BodyID b (bodyIt.getBodyID());
WALBERLA_ASSERT(!b->isGlobal(), "Global body in ShadowStorage!");
bool isInsideDomain = forest.getDomain().contains( b->getAABB(), -dx );
diff --git a/src/pe/utility/CreateWorld.cpp b/src/pe/utility/CreateWorld.cpp
index aa7df4ea465ba248072214d637bfd28c3af1df97..377473c657eff7436d5bef50a6683b5acf30a900 100644
--- a/src/pe/utility/CreateWorld.cpp
+++ b/src/pe/utility/CreateWorld.cpp
@@ -26,7 +26,9 @@
#include <pe/Types.h>
-#include <core/DataTypes.h>
+#include <blockforest/Initialization.h>
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
#include <core/logging/Logging.h>
#include <core/math/AABB.h>
@@ -51,9 +53,9 @@ private:
uint_t level_;
};
-std::unique_ptr<SetupBlockForest> createSetupBlockForest(const math::AABB simulationDomain,
+std::unique_ptr<SetupBlockForest> createSetupBlockForest(const math::AABB& simulationDomain,
Vector3<uint_t> blocks,
- const Vector3<bool> isPeriodic,
+ const Vector3<bool>& isPeriodic,
const uint_t numberOfProcesses,
const uint_t initialRefinementLevel)
{
@@ -79,7 +81,7 @@ std::unique_ptr<SetupBlockForest> createSetupBlockForest(const math::AABB simula
blocks[2] = 2;
}
- auto sforest = std::unique_ptr<SetupBlockForest>( new SetupBlockForest() );
+ auto sforest = std::make_unique<SetupBlockForest>( );
sforest->addWorkloadMemorySUIDAssignmentFunction( blockforest::uniformWorkloadAndMemoryAssignment );
sforest->addRefinementSelectionFunction( FixedRefinementLevelSelector(initialRefinementLevel) );
sforest->init( simulationDomain, blocks[0], blocks[1], blocks[2], isPeriodic[0], isPeriodic[1], isPeriodic[2] );
@@ -90,9 +92,9 @@ std::unique_ptr<SetupBlockForest> createSetupBlockForest(const math::AABB simula
return sforest;
}
-shared_ptr<BlockForest> createBlockForest(const math::AABB simulationDomain,
- Vector3<uint_t> blocks,
- const Vector3<bool> isPeriodic,
+shared_ptr<BlockForest> createBlockForest(const math::AABB& simulationDomain,
+ const Vector3<uint_t>& blocks,
+ const Vector3<bool>& isPeriodic,
const uint_t numberOfProcesses,
const uint_t initialRefinementLevel)
{
@@ -103,14 +105,14 @@ shared_ptr<BlockForest> createBlockForest(const math::AABB simulationDomain,
}
std::unique_ptr<SetupBlockForest> sforest( createSetupBlockForest( simulationDomain, blocks, isPeriodic, numberOfProcesses, initialRefinementLevel ));
- return shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), *sforest, false ) );
+ return std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), *sforest, false );
}
-shared_ptr<BlockForest> createBlockForest(const math::AABB simulationDomain,
- Vector3<uint_t> blocks,
- const Vector3<bool> isPeriodic,
+shared_ptr<BlockForest> createBlockForest(const math::AABB& simulationDomain,
+ const Vector3<uint_t>& blocks,
+ const Vector3<bool>& isPeriodic,
const bool setupRun,
- const std::string sbffile,
+ const std::string& sbffile,
const uint_t numberOfProcesses,
const uint_t initialRefinementLevel)
{
@@ -142,7 +144,7 @@ shared_ptr<BlockForest> createBlockForest(const math::AABB simulationDomain,
WALBERLA_LOG_INFO_ON_ROOT( "Production Run!" );
WALBERLA_LOG_INFO_ON_ROOT( "Creating the block structure: loading from file \'" << sbffile << "\' ..." );
- return shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false ) );
+ return std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), sbffile.c_str(), true, false );
}
diff --git a/src/pe/utility/CreateWorld.h b/src/pe/utility/CreateWorld.h
index 3d66078348bb8d9d2c358a35d7086d32810d0083..1cfec49c2ca45fa89c9e960f07d67a0f3fb184c2 100644
--- a/src/pe/utility/CreateWorld.h
+++ b/src/pe/utility/CreateWorld.h
@@ -24,23 +24,24 @@
// Includes
//*************************************************************************************************
-#include "blockforest/all.h"
-#include "core/all.h"
-#include "domain_decomposition/all.h"
+#include "blockforest/BlockForest.h"
+#include "core/config/Config.h"
+#include "core/DataTypes.h"
+#include <core/mpi/MPIManager.h>
namespace walberla {
namespace pe {
-shared_ptr<BlockForest> createBlockForest(const math::AABB simulationDomain,
- Vector3<uint_t> blocks,
- const Vector3<bool> isPeriodic,
+shared_ptr<BlockForest> createBlockForest(const math::AABB& simulationDomain,
+ const Vector3<uint_t>& blocks,
+ const Vector3<bool>& isPeriodic,
const uint_t numberOfProcesses = uint_c(mpi::MPIManager::instance()->numProcesses()),
const uint_t initialRefinementLevel = uint_t(0));
-shared_ptr<BlockForest> createBlockForest(const math::AABB simulationDomain,
- Vector3<uint_t> blocks,
- const Vector3<bool> isPeriodic,
+shared_ptr<BlockForest> createBlockForest(const math::AABB& simulationDomain,
+ const Vector3<uint_t>& blocks,
+ const Vector3<bool>& isPeriodic,
const bool setupRun,
- const std::string sbffile,
+ const std::string& sbffile,
const uint_t numberOfProcesses = uint_c(mpi::MPIManager::instance()->numProcesses()),
const uint_t initialRefinementLevel = uint_t(0));
shared_ptr<BlockForest> createBlockForestFromConfig(const Config::BlockHandle& mainConf);
diff --git a/src/pe/utility/DestroyBody.h b/src/pe/utility/DestroyBody.h
index 189203fda04a9ed28db4049a2e1044ee8078bf39..20da0f1c86a8d84596e674adc1045b89c9b1ce13 100644
--- a/src/pe/utility/DestroyBody.h
+++ b/src/pe/utility/DestroyBody.h
@@ -49,7 +49,7 @@ void destroyBody(BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID s
{
for (auto bodyIt = globalStorage.begin(); bodyIt != globalStorage.end(); )
{
- if ( p(*bodyIt) )
+ if ( p(bodyIt.getBodyID()) )
{
bodyIt = globalStorage.remove( bodyIt );
} else
@@ -68,7 +68,7 @@ void destroyBody(BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID s
BodyStorage& localStorage = storage[StorageType::LOCAL];
for (auto bodyIt = localStorage.begin(); bodyIt != localStorage.end(); )
{
- if ( p(*bodyIt) )
+ if ( p(bodyIt.getBodyID()) )
{
bodyIt = localStorage.remove( bodyIt );
} else
@@ -82,7 +82,7 @@ void destroyBody(BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID s
BodyStorage& shadowStorage = storage[StorageType::SHADOW];
for (auto bodyIt = shadowStorage.begin(); bodyIt != shadowStorage.end(); )
{
- if ( p(*bodyIt) )
+ if ( p(bodyIt.getBodyID()) )
{
bodyIt = shadowStorage.remove( bodyIt );
} else
diff --git a/src/pe/utility/GetBody.cpp b/src/pe/utility/GetBody.cpp
index 31fc394cc8e5f3d30110fea8a342c9d639f43677..bc5f5c1534600d9802e219aa1c21015e9cfbcfaa 100644
--- a/src/pe/utility/GetBody.cpp
+++ b/src/pe/utility/GetBody.cpp
@@ -30,7 +30,7 @@ BodyID getBody(BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID sto
auto bodyIt = globalStorage.find(sid);
if (bodyIt != globalStorage.end())
{
- return *bodyIt;
+ return bodyIt.getBodyID();
}
}
@@ -44,7 +44,7 @@ BodyID getBody(BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID sto
auto bodyIt = localStorage.find(sid);
if (bodyIt != localStorage.end())
{
- return *bodyIt;
+ return bodyIt.getBodyID();
}
}
if (storageSelect & StorageSelect::SHADOW)
@@ -53,12 +53,12 @@ BodyID getBody(BodyStorage& globalStorage, BlockStorage& blocks, BlockDataID sto
auto bodyIt = shadowStorage.find(sid);
if (bodyIt != shadowStorage.end())
{
- return *bodyIt;
+ return bodyIt.getBodyID();
}
}
}
- return NULL;
+ return nullptr;
}
} // namespace pe
diff --git a/src/pe/utility/GetInfo.cpp b/src/pe/utility/GetInfo.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..776f4cbef33d8e99b00f0fd10779bdf789535691
--- /dev/null
+++ b/src/pe/utility/GetInfo.cpp
@@ -0,0 +1,56 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file GetInfo.cpp
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include "GetInfo.h"
+
+#include "core/debug/Debug.h"
+#include <core/mpi/Reduce.h>
+#include <pe/rigidbody/BodyStorage.h>
+#include <pe/Types.h>
+
+namespace walberla {
+namespace pe {
+
+std::pair<int64_t, int64_t> getNumBodies( const domain_decomposition::BlockStorage& bs, const BlockDataID& storageID, const int rank )
+{
+ int64_t numParticles = 0;
+ int64_t numShadowParticles = 0;
+ for (const auto& blk : bs)
+ {
+ Storage const * storage = blk.getData< Storage >( storageID );
+ const BodyStorage& localStorage = (*storage)[0];
+ const BodyStorage& shadowStorage = (*storage)[1];
+ numParticles += localStorage.size();
+ numShadowParticles += shadowStorage.size();
+ }
+ if (rank == -1)
+ {
+ mpi::allReduceInplace(numParticles, mpi::SUM);
+ mpi::allReduceInplace(numShadowParticles, mpi::SUM);
+ } else
+ {
+ mpi::reduceInplace(numParticles, mpi::SUM, rank);
+ mpi::reduceInplace(numShadowParticles, mpi::SUM, rank);
+ }
+ return std::make_pair(numParticles, numShadowParticles);
+}
+
+} // namespace pe
+} // namespace walberla
diff --git a/src/pe/utility/GetInfo.h b/src/pe/utility/GetInfo.h
new file mode 100644
index 0000000000000000000000000000000000000000..7952f19d36bf6e8a9df630fbd821d8f650266d85
--- /dev/null
+++ b/src/pe/utility/GetInfo.h
@@ -0,0 +1,34 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file GetInfo.h
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <core/DataTypes.h>
+#include <domain_decomposition/BlockStorage.h>
+
+#include <utility>
+
+namespace walberla {
+namespace pe {
+
+std::pair<int64_t, int64_t> getNumBodies( const domain_decomposition::BlockStorage& bs, const BlockDataID& storageID, const int rank = -1);
+
+} // namespace pe
+} // namespace walberla
diff --git a/src/pe/vtk/BodyVtkOutput.cpp b/src/pe/vtk/BodyVtkOutput.cpp
index b2e154dc1248df49ad1a76db4fbf48814beb1137..a176e01e028c7534933e76510ed33a2a6809bf63 100644
--- a/src/pe/vtk/BodyVtkOutput.cpp
+++ b/src/pe/vtk/BodyVtkOutput.cpp
@@ -34,9 +34,9 @@ namespace pe {
std::vector< DefaultBodyVTKOutput::Attributes > DefaultBodyVTKOutput::getAttributes() const
{
std::vector< Attributes > attributes;
- attributes.push_back( Attributes( vtk::typeToString< float >(), "Velocity", uint_c(3) ) );
- attributes.push_back( Attributes( vtk::typeToString< int >(), "rank", uint_c(1) ) );
- attributes.push_back( Attributes( vtk::typeToString< int >(), "shadow", uint_c(1) ) );
+ attributes.emplace_back( vtk::typeToString< float >(), "Velocity", uint_c(3) );
+ attributes.emplace_back( vtk::typeToString< int >(), "rank", uint_c(1) );
+ attributes.emplace_back( vtk::typeToString< int >(), "shadow", uint_c(1) );
return attributes;
}
@@ -44,14 +44,14 @@ std::vector< DefaultBodyVTKOutput::Attributes > DefaultBodyVTKOutput::getAttribu
void DefaultBodyVTKOutput::configure()
{
bodies_.clear();
- for( auto blockIt = blockStorage_.begin(); blockIt != blockStorage_.end(); ++blockIt )
+ for( const auto& block : blockStorage_ )
{
- const Storage& bs = *(blockIt->getData<const Storage>( storageID_ ));
+ const BodyStorage& bs = (*(block.getData<const Storage>( storageID_ )))[0];
- for( auto it = bs[0].begin(); it != bs[0].end(); ++it )
+ for( const auto& body : bs )
{
- bodies_.push_back( *it );
+ bodies_.push_back( &body );
}
}
}
diff --git a/src/pe/vtk/EllipsoidVtkOutput.cpp b/src/pe/vtk/EllipsoidVtkOutput.cpp
index 4ec85db3819595a1300a9999295d44ab91182b8d..67be6f2473301074ac79ebfdf6ccbdee2601f570 100644
--- a/src/pe/vtk/EllipsoidVtkOutput.cpp
+++ b/src/pe/vtk/EllipsoidVtkOutput.cpp
@@ -32,12 +32,12 @@ namespace pe {
std::vector< EllipsoidVtkOutput::Attributes > EllipsoidVtkOutput::getAttributes() const
{
std::vector< Attributes > attributes;
- attributes.push_back( Attributes( vtk::typeToString< float >(), "mass", uint_c(1) ) );
- attributes.push_back( Attributes( vtk::typeToString< float >(), "tensorGlyph", uint_c(6) ) );
- attributes.push_back( Attributes( vtk::typeToString< float >(), "velocity", uint_c(3) ) );
- attributes.push_back( Attributes( vtk::typeToString< int >(), "rank", uint_c(1) ) );
- attributes.push_back( Attributes( vtk::typeToString< id_t >(), "id", uint_c(1) ) );
- attributes.push_back( Attributes( vtk::typeToString< id_t >(), "uid", uint_c(1) ) );
+ attributes.emplace_back( vtk::typeToString< float >(), "mass", uint_c(1) );
+ attributes.emplace_back( vtk::typeToString< float >(), "tensorGlyph", uint_c(6) );
+ attributes.emplace_back( vtk::typeToString< float >(), "velocity", uint_c(3) );
+ attributes.emplace_back( vtk::typeToString< int >(), "rank", uint_c(1) );
+ attributes.emplace_back( vtk::typeToString< id_t >(), "id", uint_c(1) );
+ attributes.emplace_back( vtk::typeToString< id_t >(), "uid", uint_c(1) );
return attributes;
}
@@ -47,16 +47,16 @@ void EllipsoidVtkOutput::configure()
bodies_.clear();
tensorGlyphs_.clear();
- for( auto blockIt = blockStorage_.begin(); blockIt != blockStorage_.end(); ++blockIt )
+ for( auto& block : blockStorage_ )
{
- const Storage& bs = *(blockIt->getData<const Storage>( storageID_ ));
+ const BodyStorage& localStorage = (*(block.getData<const Storage>( storageID_ )))[0];
- for( auto it = bs[0].begin(); it != bs[0].end(); ++it )
+ for( auto& body : localStorage )
{
- if (it->getTypeID() == Ellipsoid::getStaticTypeID())
+ if (body.getTypeID() == Ellipsoid::getStaticTypeID())
{
- auto ellipsoid = static_cast<ConstEllipsoidID> (*it);
+ auto ellipsoid = static_cast<ConstEllipsoidID> (&body);
bodies_.push_back(ellipsoid);
// compute tensor glyph for visualization with ParaView (tensorGlyph)
diff --git a/src/pe/vtk/EllipsoidVtkOutput.h b/src/pe/vtk/EllipsoidVtkOutput.h
index e12f91879e6aaf0d2eb3d74f04b5d5ab3103feea..680410dcea6377fa1eadd83f64664df7f1acb4ba 100644
--- a/src/pe/vtk/EllipsoidVtkOutput.h
+++ b/src/pe/vtk/EllipsoidVtkOutput.h
@@ -59,7 +59,7 @@ private:
ConstBlockDataID storageID_;
const BlockStorage & blockStorage_;
- std::vector< ConstEllipsoidID > bodies_;
+ std::vector< Ellipsoid const * > bodies_;
std::vector< std::array<real_t,6> > tensorGlyphs_;
};
diff --git a/src/pe/vtk/SphereVtkOutput.cpp b/src/pe/vtk/SphereVtkOutput.cpp
index 90672a0f60d3ae642f87d21f325a5d3fcb992e9e..7ae03c08840e7ecd8d4ce3594f4eb17de918953f 100644
--- a/src/pe/vtk/SphereVtkOutput.cpp
+++ b/src/pe/vtk/SphereVtkOutput.cpp
@@ -35,13 +35,13 @@ namespace pe {
std::vector< SphereVtkOutput::Attributes > SphereVtkOutput::getAttributes() const
{
std::vector< Attributes > attributes;
- attributes.push_back( Attributes( vtk::typeToString< float >(), "mass", uint_c(1) ) );
- attributes.push_back( Attributes( vtk::typeToString< float >(), "radius", uint_c(1) ) );
- attributes.push_back( Attributes( vtk::typeToString< float >(), "velocity", uint_c(3) ) );
- attributes.push_back( Attributes( vtk::typeToString< float >(), "orientation", uint_c(3) ) );
- attributes.push_back( Attributes( vtk::typeToString< int >(), "rank", uint_c(1) ) );
- attributes.push_back( Attributes( vtk::typeToString< id_t >(), "id", uint_c(1) ) );
- attributes.push_back( Attributes( vtk::typeToString< id_t >(), "uid", uint_c(1) ) );
+ attributes.emplace_back( vtk::typeToString< float >(), "mass", uint_c(1) );
+ attributes.emplace_back( vtk::typeToString< float >(), "radius", uint_c(1) );
+ attributes.emplace_back( vtk::typeToString< float >(), "velocity", uint_c(3) );
+ attributes.emplace_back( vtk::typeToString< float >(), "orientation", uint_c(3) );
+ attributes.emplace_back( vtk::typeToString< int >(), "rank", uint_c(1) );
+ attributes.emplace_back( vtk::typeToString< id_t >(), "id", uint_c(1) );
+ attributes.emplace_back( vtk::typeToString< id_t >(), "uid", uint_c(1) );
return attributes;
}
@@ -49,49 +49,49 @@ std::vector< SphereVtkOutput::Attributes > SphereVtkOutput::getAttributes() cons
void SphereVtkOutput::configure()
{
bodies_.clear();
- for( auto blockIt = blockStorage_.begin(); blockIt != blockStorage_.end(); ++blockIt )
+ for( auto& block : blockStorage_ )
{
- const Storage& bs = *(blockIt->getData<const Storage>( storageID_ ));
+ const BodyStorage& localStorage = (*(block.getData<const Storage>( storageID_ )))[0];
- for( auto it = bs[0].begin(); it != bs[0].end(); ++it )
+ for( auto& body : localStorage )
{
- if (it->getTypeID() == Sphere::getStaticTypeID() || it->getTypeID() == Squirmer::getStaticTypeID())
- bodies_.push_back( static_cast<ConstSphereID> (*it) );
- if (it->getTypeID() == Union<boost::tuple<Sphere> >::getStaticTypeID())
+ if (body.getTypeID() == Sphere::getStaticTypeID() || body.getTypeID() == Squirmer::getStaticTypeID())
+ bodies_.push_back( static_cast<Sphere const *> (&body) );
+ if (body.getTypeID() == Union<boost::tuple<Sphere> >::getStaticTypeID())
{
- auto un = static_cast<Union<boost::tuple<Sphere> > const * > (*it);
+ auto un = static_cast<Union<boost::tuple<Sphere> > const * > (&body);
for( auto it2 = un->begin(); it2 != un->end(); ++it2 )
{
if (it2->getTypeID() == Sphere::getStaticTypeID())
- bodies_.push_back( static_cast<ConstSphereID> (*it2) );
+ bodies_.push_back( static_cast<ConstSphereID> (it2.getBodyID()) );
}
}
- if (it->getTypeID() == Union<boost::tuple<Squirmer> >::getStaticTypeID())
+ if (body.getTypeID() == Union<boost::tuple<Squirmer> >::getStaticTypeID())
{
- auto un = static_cast<Union<boost::tuple<Squirmer> > const * > (*it);
+ auto un = static_cast<Union<boost::tuple<Squirmer> > const * > (&body);
for( auto it2 = un->begin(); it2 != un->end(); ++it2 )
{
if (it2->getTypeID() == Squirmer::getStaticTypeID())
- bodies_.push_back( static_cast<ConstSphereID> (*it2) );
+ bodies_.push_back( static_cast<ConstSphereID> (it2.getBodyID()) );
}
}
- if (it->getTypeID() == Union<boost::tuple<Sphere,Squirmer> >::getStaticTypeID())
+ if (body.getTypeID() == Union<boost::tuple<Sphere,Squirmer> >::getStaticTypeID())
{
- auto un = static_cast<Union<boost::tuple<Sphere,Squirmer> > const * > (*it);
+ auto un = static_cast<Union<boost::tuple<Sphere,Squirmer> > const * > (&body);
for( auto it2 = un->begin(); it2 != un->end(); ++it2 )
{
if (it2->getTypeID() == Sphere::getStaticTypeID() || it2->getTypeID() == Squirmer::getStaticTypeID())
- bodies_.push_back( static_cast<ConstSphereID> (*it2) );
+ bodies_.push_back( static_cast<ConstSphereID> (it2.getBodyID()) );
}
}
- if (it->getTypeID() == Union<boost::tuple<Squirmer,Sphere> >::getStaticTypeID())
+ if (body.getTypeID() == Union<boost::tuple<Squirmer,Sphere> >::getStaticTypeID())
{
- auto un = static_cast<Union<boost::tuple<Squirmer,Sphere> > const * > (*it);
+ auto un = static_cast<Union<boost::tuple<Squirmer,Sphere> > const * > (&body);
for( auto it2 = un->begin(); it2 != un->end(); ++it2 )
{
if (it2->getTypeID() == Sphere::getStaticTypeID() || it2->getTypeID() == Squirmer::getStaticTypeID())
- bodies_.push_back( static_cast<ConstSphereID> (*it2) );
+ bodies_.push_back( static_cast<ConstSphereID> (it2.getBodyID()) );
}
}
}
diff --git a/src/pe/vtk/SphereVtkOutput.h b/src/pe/vtk/SphereVtkOutput.h
index 238c1fa8e305fc95813ce798d841b7705b90f95b..1878795f32bab639db91289edf4318c57e019d5c 100644
--- a/src/pe/vtk/SphereVtkOutput.h
+++ b/src/pe/vtk/SphereVtkOutput.h
@@ -61,7 +61,7 @@ private:
ConstBlockDataID storageID_;
const BlockStorage & blockStorage_;
- std::vector< ConstSphereID > bodies_;
+ std::vector< Sphere const * > bodies_;
};
diff --git a/src/pe_coupling/all.h b/src/pe_coupling/all.h
index 2dfc25e1272ad3e361b9d8bd094aa0f09fb4ce8d..53ba7b855d0848c8010f66bd34afa4ee29ba9d78 100644
--- a/src/pe_coupling/all.h
+++ b/src/pe_coupling/all.h
@@ -24,6 +24,7 @@
#pragma once
+#include "amr/all.h"
#include "discrete_particle_methods/all.h"
#include "mapping/all.h"
#include "geometry/all.h"
diff --git a/src/pe_coupling/amr/BlockInfo.h b/src/pe_coupling/amr/BlockInfo.h
new file mode 100644
index 0000000000000000000000000000000000000000..6d4873852ce3678479da0b1bcdf66fe51a12b124
--- /dev/null
+++ b/src/pe_coupling/amr/BlockInfo.h
@@ -0,0 +1,88 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BlockInfo.h
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include <core/mpi/RecvBuffer.h>
+#include <core/mpi/SendBuffer.h>
+
+#include <ostream>
+
+namespace walberla {
+namespace pe_coupling {
+
+struct BlockInfo {
+ // lbm quantities
+ uint_t numberOfCells;
+ uint_t numberOfFluidCells;
+ uint_t numberOfNearBoundaryCells;
+ // pe quantities
+ uint_t numberOfLocalBodies;
+ uint_t numberOfShadowBodies;
+ uint_t numberOfContacts;
+ // coupling quantities
+ uint_t numberOfPeSubCycles;
+
+ BlockInfo()
+ : numberOfCells(0), numberOfFluidCells(0), numberOfNearBoundaryCells(0),
+ numberOfLocalBodies(0), numberOfShadowBodies(0), numberOfContacts(0),
+ numberOfPeSubCycles(0) {}
+
+ BlockInfo(const uint_t numCells, const uint_t numFluidCells, const uint_t numNearBoundaryCells,
+ const uint_t numLocalBodies, const uint_t numShadowBodies, const uint_t numContacts,
+ const uint_t numPeSubCycles)
+ : numberOfCells(numCells), numberOfFluidCells(numFluidCells), numberOfNearBoundaryCells(numNearBoundaryCells),
+ numberOfLocalBodies(numLocalBodies), numberOfShadowBodies(numShadowBodies), numberOfContacts(numContacts),
+ numberOfPeSubCycles(numPeSubCycles) {}
+};
+
+
+inline
+std::ostream& operator<<( std::ostream& os, const BlockInfo& bi )
+{
+ os << bi.numberOfCells << " / " << bi.numberOfFluidCells << " / " << bi.numberOfNearBoundaryCells << " / "
+ << bi.numberOfLocalBodies << " / " << bi.numberOfShadowBodies << " / " << bi.numberOfContacts << " / "
+ << bi.numberOfPeSubCycles;
+ return os;
+}
+
+template< typename T, // Element type of SendBuffer
+ typename G> // Growth policy of SendBuffer
+mpi::GenericSendBuffer<T,G>& operator<<( mpi::GenericSendBuffer<T,G> & buf, const BlockInfo& info )
+{
+ buf.addDebugMarker( "pca" );
+ buf << info.numberOfCells << info.numberOfFluidCells << info.numberOfNearBoundaryCells
+ << info.numberOfLocalBodies << info.numberOfShadowBodies << info.numberOfContacts
+ << info.numberOfPeSubCycles;
+ return buf;
+}
+
+template< typename T> // Element type of SendBuffer
+mpi::GenericRecvBuffer<T>& operator>>( mpi::GenericRecvBuffer<T> & buf, BlockInfo& info )
+{
+ buf.readDebugMarker( "pca" );
+ buf >> info.numberOfCells >> info.numberOfFluidCells >> info.numberOfNearBoundaryCells
+ >> info.numberOfLocalBodies >> info.numberOfShadowBodies >> info.numberOfContacts
+ >> info.numberOfPeSubCycles;
+ return buf;
+}
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/InfoCollection.cpp b/src/pe_coupling/amr/InfoCollection.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..19238621785912cc6ee8bcfdaf3466c93a5b058b
--- /dev/null
+++ b/src/pe_coupling/amr/InfoCollection.cpp
@@ -0,0 +1,100 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file InfoCollection.h
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+
+#include "InfoCollection.h"
+
+namespace walberla {
+namespace pe_coupling {
+
+
+void getBlockInfoFromInfoCollection( const PhantomBlock * block, const shared_ptr<InfoCollection>& ic,
+ BlockInfo & blockInfo )
+{
+ WALBERLA_ASSERT_NOT_NULLPTR(block);
+
+ if (block->sourceBlockIsLarger())
+ {
+ // block is a result of refinement -> BlockInfo object only available for the father block
+ // there should be no particles on the block (otherwise it would not have been refined)
+ // and refinement in LBM does not change the number of cells
+ // we assume that the number of fluid and near boundary cells also stays the same
+ // (ATTENTION: not true for blocks intersecting with a boundary!)
+ // -> we can use the information of the father block for weight assignment
+
+ auto infoIt = ic->find( block->getId().getFatherId() );
+ WALBERLA_CHECK_UNEQUAL( infoIt, ic->end(), "Father block with ID " << block->getId().getFatherId() << " not found in info collection!" );
+
+ // check the above mentioned assumptions
+ WALBERLA_ASSERT_EQUAL(infoIt->second.numberOfLocalBodies, uint_t(0));
+ WALBERLA_ASSERT_EQUAL(infoIt->second.numberOfShadowBodies, uint_t(0));
+ WALBERLA_ASSERT_EQUAL(infoIt->second.numberOfContacts, uint_t(0));
+
+ blockInfo = infoIt->second;
+ }
+ else if (block->sourceBlockHasTheSameSize())
+ {
+ auto infoIt = ic->find( block->getId() );
+ WALBERLA_CHECK_UNEQUAL( infoIt, ic->end(), "Block with ID " << block->getId() << " not found in info collection!" );
+ blockInfo = infoIt->second;
+ }
+ else
+ {
+ // source block of block is smaller
+
+ // block is a result of coarsening -> BlockInfo object is available on all 8 child blocks
+ // there should be no particles on the block (otherwise it would not have been coarsened)
+ // and refinement in LBM does not change the number of cells
+ // we assume that the number of fluid and near boundary cells will be the average of all 8 child blocks
+ // -> we can use the information of the child blocks for weight assignment
+
+ blockforest::BlockID childIdForInit(block->getId(), 0);
+ auto childForInitIt = ic->find( childIdForInit );
+ WALBERLA_CHECK_UNEQUAL( childForInitIt, ic->end(), "Child block with ID " << childIdForInit << " not found in info collection!" );
+ BlockInfo combinedInfo = childForInitIt->second;
+ uint_t numFluidCells(0), numNearBoundaryCells(0);
+ for (uint_t child = 0; child < 8; ++child)
+ {
+ blockforest::BlockID childId(block->getId(), child);
+ auto childIt = ic->find( childId );
+ WALBERLA_CHECK_UNEQUAL( childIt, ic->end(), "Child block with ID " << childId << " not found in info collection!" );
+ numFluidCells += childIt->second.numberOfFluidCells;
+ numNearBoundaryCells += childIt->second.numberOfNearBoundaryCells;
+
+ // check above mentioned assumptions
+ WALBERLA_ASSERT_EQUAL(childIt->second.numberOfLocalBodies, uint_t(0));
+ WALBERLA_ASSERT_EQUAL(childIt->second.numberOfShadowBodies, uint_t(0));
+ WALBERLA_ASSERT_EQUAL(childIt->second.numberOfContacts, uint_t(0));
+ }
+ // total number of cells remains unchanged
+ combinedInfo.numberOfFluidCells = uint_c(numFluidCells / uint_t(8)); //average
+ combinedInfo.numberOfNearBoundaryCells = uint_c( numNearBoundaryCells / uint_t(8) ); //average
+ combinedInfo.numberOfLocalBodies = uint_t(0);
+ combinedInfo.numberOfShadowBodies = uint_t(0);
+ combinedInfo.numberOfContacts = uint_t(0); //sum
+ // number of pe sub cycles stays the same
+
+ blockInfo = combinedInfo;
+ }
+
+}
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/InfoCollection.h b/src/pe_coupling/amr/InfoCollection.h
new file mode 100644
index 0000000000000000000000000000000000000000..86e508e87e9e183fab6464eae655dbd6372984b1
--- /dev/null
+++ b/src/pe_coupling/amr/InfoCollection.h
@@ -0,0 +1,121 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file InfoCollection.h
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "BlockInfo.h"
+
+#include "blockforest/BlockForest.h"
+#include "blockforest/BlockID.h"
+#include "core/mpi/BufferSystem.h"
+
+#include "pe/ccd/ICCD.h"
+#include "pe/fcd/IFCD.h"
+#include "pe/rigidbody/BodyStorage.h"
+
+#include <map>
+
+namespace walberla {
+namespace pe_coupling {
+
+typedef std::map<blockforest::BlockID, BlockInfo> InfoCollection;
+typedef std::pair<blockforest::BlockID, BlockInfo> InfoCollectionPair;
+
+template <typename BoundaryHandling_T>
+void createWithNeighborhood(BlockForest& bf, const BlockDataID boundaryHandlingID,
+ const BlockDataID bodyStorageID, const BlockDataID ccdID, const BlockDataID fcdID,
+ const uint_t numberOfPeSubCycles,
+ InfoCollection& ic )
+{
+ ic.clear();
+
+ mpi::BufferSystem bs( MPIManager::instance()->comm(), 856 );
+
+ for (auto blockIt = bf.begin(); blockIt != bf.end(); ++blockIt)
+ {
+ auto * block = static_cast<blockforest::Block*> (&(*blockIt));
+
+ // evaluate LBM quantities
+ BoundaryHandling_T * boundaryHandling = blockIt->getData< BoundaryHandling_T >( boundaryHandlingID );
+ auto xyzSize = boundaryHandling->getFlagField()->xyzSize();
+ const uint_t numCells = xyzSize.numCells();
+ uint_t numFluidCells(0), numNearBoundaryCells(0);
+ for( auto cellIt = xyzSize.begin(); cellIt != xyzSize.end(); ++cellIt)
+ {
+ if( boundaryHandling->isDomain(*cellIt) )
+ {
+ ++numFluidCells;
+ }
+ if( boundaryHandling->isNearBoundary(*cellIt))
+ {
+ ++numNearBoundaryCells;
+ }
+ }
+
+ // evaluate PE quantities
+ auto * bodyStorage = block->getData<pe::Storage>(bodyStorageID);
+ pe::BodyStorage const & localStorage = (*bodyStorage)[pe::StorageType::LOCAL];
+ pe::BodyStorage const & shadowStorage = (*bodyStorage)[pe::StorageType::SHADOW];
+ const uint_t numLocalParticles = localStorage.size();
+ const uint_t numShadowParticles = shadowStorage.size();
+
+ auto * ccd = block->getData<pe::ccd::ICCD>(ccdID);
+ auto * fcd = block->getData<pe::fcd::IFCD>(fcdID);
+ ccd->generatePossibleContacts();
+ pe::Contacts& contacts = fcd->generateContacts( ccd->getPossibleContacts() );
+ const uint_t numContacts = contacts.size();
+
+ BlockInfo blockInfo(numCells, numFluidCells, numNearBoundaryCells, numLocalParticles, numShadowParticles, numContacts, numberOfPeSubCycles);
+ InfoCollectionPair infoCollectionEntry(block->getId(), blockInfo);
+
+ ic.insert( infoCollectionEntry );
+
+ for( auto nb = uint_t(0); nb < block->getNeighborhoodSize(); ++nb )
+ {
+ bs.sendBuffer( block->getNeighborProcess(nb) ) << infoCollectionEntry;
+ }
+
+ //note: is it necessary to add child blocks already into the info collection?
+ // here, we still have full geometrical information and can probably determine number of fluid and near boundary cells more easily
+ // however, the interesting (and most costly) blocks are never refined and thus their child infos is never needed
+ // see pe/amr/InfoCollection.cpp for an example
+
+ }
+
+ // size of buffer is unknown and changes with each send
+ bs.setReceiverInfoFromSendBufferState(false, true);
+ bs.sendAll();
+
+ for( auto recvIt = bs.begin(); recvIt != bs.end(); ++recvIt )
+ {
+ while( !recvIt.buffer().isEmpty() )
+ {
+ InfoCollectionPair val;
+ recvIt.buffer() >> val;
+ ic.insert(val);
+ }
+ }
+}
+
+void getBlockInfoFromInfoCollection( const PhantomBlock * block, const shared_ptr<InfoCollection>& ic, BlockInfo & blockInfo );
+
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/all.h b/src/pe_coupling/amr/all.h
new file mode 100644
index 0000000000000000000000000000000000000000..da4f4edfa80ea7004ca8903c15585a416bc807f2
--- /dev/null
+++ b/src/pe_coupling/amr/all.h
@@ -0,0 +1,29 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file all.h
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//! \brief Collective header file for module pe_coupling
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "BlockInfo.h"
+#include "InfoCollection.h"
+
+#include "level_determination/all.h"
+#include "weight_assignment/all.h"
\ No newline at end of file
diff --git a/src/pe_coupling/amr/level_determination/BodyPresenceLevelDetermination.cpp b/src/pe_coupling/amr/level_determination/BodyPresenceLevelDetermination.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5eafb9408ce8ac70bbc56f6201d2e7248545df44
--- /dev/null
+++ b/src/pe_coupling/amr/level_determination/BodyPresenceLevelDetermination.cpp
@@ -0,0 +1,81 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BodyPresenceLevelDetermination.cpp
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "BodyPresenceLevelDetermination.h"
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+
+void BodyPresenceLevelDetermination::operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > &, const BlockForest & /*forest*/ )
+{
+ for (auto &minTargetLevel : minTargetLevels) {
+ uint_t currentLevelOfBlock = minTargetLevel.first->getLevel();
+
+ const uint_t numberOfParticlesInDirectNeighborhood = getNumberOfLocalAndShadowBodiesInNeighborhood(minTargetLevel.first);
+
+ uint_t targetLevelOfBlock = currentLevelOfBlock; //keep everything as it is
+ if ( numberOfParticlesInDirectNeighborhood > uint_t(0) )
+ {
+ // set block to finest level if there are bodies nearby
+ targetLevelOfBlock = finestLevel_;
+ }
+ else
+ {
+ // block could coarsen since there are no bodies nearby
+ if( currentLevelOfBlock > uint_t(0) )
+ targetLevelOfBlock = currentLevelOfBlock - uint_t(1);
+ }
+
+ WALBERLA_CHECK_LESS_EQUAL(std::abs(int_c(targetLevelOfBlock) - int_c(currentLevelOfBlock)), uint_t(1), "Only level difference of maximum 1 allowed!");
+ minTargetLevel.second = targetLevelOfBlock;
+ }
+}
+
+uint_t BodyPresenceLevelDetermination::getNumberOfLocalAndShadowBodiesInNeighborhood(const Block * block)
+{
+ auto numBodies = uint_t(0);
+
+ // add bodies of current block
+ const auto infoIt = infoCollection_->find(block->getId());
+ WALBERLA_CHECK_UNEQUAL(infoIt, infoCollection_->end(), "Block with ID " << block->getId() << " not found in info collection!");
+
+ numBodies += infoIt->second.numberOfLocalBodies;
+ numBodies += infoIt->second.numberOfShadowBodies;
+
+ // add bodies of all neighboring blocks
+ for(uint_t i = 0; i < block->getNeighborhoodSize(); ++i)
+ {
+ const BlockID &neighborBlockID = block->getNeighborId(i);
+ const auto infoItNeighbor = infoCollection_->find(neighborBlockID);
+ WALBERLA_CHECK_UNEQUAL(infoItNeighbor, infoCollection_->end(), "Neighbor block with ID " << neighborBlockID << " not found in info collection!");
+
+ numBodies += infoItNeighbor->second.numberOfLocalBodies;
+ numBodies += infoItNeighbor->second.numberOfShadowBodies;
+ }
+ return numBodies;
+}
+
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/level_determination/BodyPresenceLevelDetermination.h b/src/pe_coupling/amr/level_determination/BodyPresenceLevelDetermination.h
new file mode 100644
index 0000000000000000000000000000000000000000..e57d318f01045172a6f0a43b9479dd19d5a1c0b4
--- /dev/null
+++ b/src/pe_coupling/amr/level_determination/BodyPresenceLevelDetermination.h
@@ -0,0 +1,62 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BodyPresenceLevelDetermination.h
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "blockforest/BlockForest.h"
+#include "pe_coupling/amr/InfoCollection.h"
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+/*
+ * Class to determine the minimum level a block can be.
+ * For coupled LBM-PE simulations the following rules apply:
+ * - a moving body will always remain on the finest block
+ * - a moving body is not allowed to extend into an area with a coarser block
+ * - if no moving body is present, the level can be as coarse as possible (restricted by the 2:1 rule)
+ * Therefore, if a body, local or remote (due to bodies that are larger than a block), is present on any of the
+ * neighboring blocks of a certain block, this block's target level is the finest level.
+ * This, together with a refinement checking frequency that depends on the maximum translational body velocity,
+ * ensures the above given requirements.
+ */
+class BodyPresenceLevelDetermination
+{
+public:
+
+ BodyPresenceLevelDetermination( const shared_ptr<pe_coupling::InfoCollection> & infoCollection, uint_t finestLevel) :
+ infoCollection_( infoCollection ), finestLevel_( finestLevel)
+ {}
+
+ void operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > &, const BlockForest & /*forest*/ );
+
+private:
+
+ uint_t getNumberOfLocalAndShadowBodiesInNeighborhood(const Block * block);
+
+ shared_ptr<pe_coupling::InfoCollection> infoCollection_;
+ uint_t finestLevel_;
+};
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/level_determination/GlobalBodyPresenceLevelDetermination.cpp b/src/pe_coupling/amr/level_determination/GlobalBodyPresenceLevelDetermination.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c99118611a8afb369ec7f2019fa2be4d57f1ba83
--- /dev/null
+++ b/src/pe_coupling/amr/level_determination/GlobalBodyPresenceLevelDetermination.cpp
@@ -0,0 +1,89 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file GlobalBodyPresenceLevelDetermination.cpp
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "GlobalBodyPresenceLevelDetermination.h"
+
+#include "pe_coupling/geometry/PeOverlapFraction.h"
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+void GlobalBodyPresenceLevelDetermination::operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > &, const BlockForest & /*forest*/ )
+{
+ for (auto &minTargetLevel : minTargetLevels) {
+ uint_t currentLevelOfBlock = minTargetLevel.first->getLevel();
+
+ auto blockExtendedAABB = minTargetLevel.first->getAABB().getExtended(blockExtensionLength_);
+ bool blockPartiallyOverlapsWithGlobalBodies = checkForPartialOverlapWithGlobalBodies(blockExtendedAABB);
+
+ uint_t targetLevelOfBlock = currentLevelOfBlock; //keep everything as it is
+ if ( blockPartiallyOverlapsWithGlobalBodies )
+ {
+ // set block to finest level since overlap with at least one global body is present
+ targetLevelOfBlock = finestLevel_;
+ }
+ else
+ {
+ // block could coarsen since there are no overlaps with global bodies
+ if( currentLevelOfBlock > uint_t(0) )
+ targetLevelOfBlock = currentLevelOfBlock - uint_t(1);
+ }
+
+ WALBERLA_ASSERT_LESS_EQUAL(std::abs(int_c(targetLevelOfBlock) - int_c(currentLevelOfBlock)), uint_t(1), "Only level difference of maximum 1 allowed!");
+ minTargetLevel.second = targetLevelOfBlock;
+ }
+}
+
+bool GlobalBodyPresenceLevelDetermination::checkForPartialOverlapWithGlobalBodies(const AABB& box)
+{
+ const Vector3<real_t> boxMidPoint( box.min() + real_t(0.5) * box.sizes());
+ const Vector3<real_t> dxVec( box.sizes() );
+ const auto maxDepthSuperSampling = uint_t(2);
+
+ bool partialOverlapWithAllBodies = false;
+
+ for( auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt )
+ {
+ auto bodyID = bodyIt.getBodyID();
+ if( globalBodySelectorFct_(bodyID))
+ {
+ real_t overlapFraction = pe_coupling::overlapFractionPe(*bodyID, boxMidPoint, dxVec, maxDepthSuperSampling);
+
+ // check for partial overlap
+ if( overlapFraction > real_t(0) && overlapFraction < real_t(1))
+ {
+ partialOverlapWithAllBodies = true;
+ }
+ // if fully contained in at least one body, no partial overlap possible
+ if( floatIsEqual(overlapFraction, real_t(1) ))
+ {
+ partialOverlapWithAllBodies = false;
+ break;
+ }
+ }
+ }
+ return partialOverlapWithAllBodies;
+}
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/level_determination/GlobalBodyPresenceLevelDetermination.h b/src/pe_coupling/amr/level_determination/GlobalBodyPresenceLevelDetermination.h
new file mode 100644
index 0000000000000000000000000000000000000000..1acdd271febd925de73daefd21657ac642d9c0aa
--- /dev/null
+++ b/src/pe_coupling/amr/level_determination/GlobalBodyPresenceLevelDetermination.h
@@ -0,0 +1,66 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file GlobalBodyPresenceLevelDetermination.h
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "blockforest/BlockForest.h"
+#include "pe/rigidbody/BodyStorage.h"
+#include "pe_coupling/utility/BodySelectorFunctions.h"
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+/*
+ * Class to determine the minimum level a block can be based on presence of global bodies.
+ * Only the global bodies that are given by the body selection function are considered.
+ * If a global body partially overlaps with a block this is block is determined to be on the finest grid.
+ * The block can be extended by the given extension length (e.g. the number of ghost layers * dx).
+ * This ensures correctness of the body mapping across block borders.
+ * Note: Blocks that are fully contained inside a global body can have any level.
+ */
+class GlobalBodyPresenceLevelDetermination
+{
+public:
+
+ GlobalBodyPresenceLevelDetermination( const shared_ptr<pe::BodyStorage> & globalBodyStorage,
+ uint_t finestLevel, real_t blockExtensionLength = real_t(0),
+ const std::function<bool(pe::BodyID)> & globalBodySelectorFct = selectAllBodies) :
+ globalBodyStorage_( globalBodyStorage ), finestLevel_( finestLevel ),
+ blockExtensionLength_( blockExtensionLength ),
+ globalBodySelectorFct_( globalBodySelectorFct )
+ {}
+
+ void operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
+ std::vector< const Block * > &, const BlockForest & /*forest*/ );
+
+private:
+
+ bool checkForPartialOverlapWithGlobalBodies(const AABB& box);
+
+ shared_ptr<pe::BodyStorage> globalBodyStorage_;
+ uint_t finestLevel_;
+ real_t blockExtensionLength_;
+ std::function<bool(pe::BodyID)> globalBodySelectorFct_;
+};
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/level_determination/all.h b/src/pe_coupling/amr/level_determination/all.h
new file mode 100644
index 0000000000000000000000000000000000000000..de0bbcaf5468a48b0f74d59535372f7d64f34d0b
--- /dev/null
+++ b/src/pe_coupling/amr/level_determination/all.h
@@ -0,0 +1,26 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file all.h
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//! \brief Collective header file for module pe_coupling
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "BodyPresenceLevelDetermination.h"
+#include "GlobalBodyPresenceLevelDetermination.h"
diff --git a/src/pe_coupling/amr/weight_assignment/MetisAssignmentFunctor.cpp b/src/pe_coupling/amr/weight_assignment/MetisAssignmentFunctor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ce01d28700bf3f989b3f6367c9553464a9c85f0e
--- /dev/null
+++ b/src/pe_coupling/amr/weight_assignment/MetisAssignmentFunctor.cpp
@@ -0,0 +1,100 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file MetisAssignmentFunctor.cpp
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "MetisAssignmentFunctor.h"
+#include "stencil/D3Q27.h"
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+void MetisAssignmentFunctor::operator()( std::vector< std::pair< const PhantomBlock *, walberla::any > > & blockData, const PhantomBlockForest & /*phantomBlockForest*/)
+{
+ for (auto &it : blockData) {
+ const PhantomBlock * block = it.first;
+ //only change of one level is supported!
+ WALBERLA_ASSERT_LESS( std::abs(int_c(block->getLevel()) - int_c(block->getSourceLevel())), 2 );
+
+ BlockInfo blockInfo;
+ pe_coupling::getBlockInfoFromInfoCollection(block, ic_, blockInfo);
+
+
+ std::vector<int64_t> metisVertexWeights(ncon_);
+
+ for( auto con = uint_t(0); con < ncon_; ++con )
+ {
+ real_t vertexWeight = std::max(weightEvaluationFct_[con](blockInfo), blockBaseWeight_);
+
+ int64_t metisVertexWeight = int64_c( vertexWeight );
+
+ WALBERLA_ASSERT_GREATER(metisVertexWeight, int64_t(0));
+ metisVertexWeights[con] = metisVertexWeight;
+ }
+
+ blockforest::DynamicParMetisBlockInfo info( metisVertexWeights );
+
+ info.setVertexCoords(it.first->getAABB().center() );
+
+ real_t blockVolume = it.first->getAABB().volume();
+ real_t approximateEdgeLength = std::cbrt( blockVolume );
+
+ int64_t faceNeighborWeight = int64_c(approximateEdgeLength * approximateEdgeLength ); //common face
+ int64_t edgeNeighborWeight = int64_c(approximateEdgeLength); //common edge
+ int64_t cornerNeighborWeight = int64_c( 1 ); //common corner
+
+ int64_t vertexSize = int64_c(blockVolume);
+ info.setVertexSize( vertexSize );
+
+ for( const uint_t idx : blockforest::getFaceNeighborhoodSectionIndices() )
+ {
+ for( auto nb = uint_t(0); nb < it.first->getNeighborhoodSectionSize(idx); ++nb )
+ {
+ auto neighborBlockID = it.first->getNeighborId(idx,nb);
+ info.setEdgeWeight(neighborBlockID, faceNeighborWeight );
+ }
+ }
+
+ for( const uint_t idx : blockforest::getEdgeNeighborhoodSectionIndices() )
+ {
+ for( auto nb = uint_t(0); nb < it.first->getNeighborhoodSectionSize(idx); ++nb )
+ {
+ auto neighborBlockID = it.first->getNeighborId(idx,nb);
+ info.setEdgeWeight(neighborBlockID, edgeNeighborWeight );
+ }
+ }
+
+ for( const uint_t idx : blockforest::getCornerNeighborhoodSectionIndices() )
+ {
+ for( auto nb = uint_t(0); nb < it.first->getNeighborhoodSectionSize(idx); ++nb )
+ {
+ auto neighborBlockID = it.first->getNeighborId(idx,nb);
+ info.setEdgeWeight(neighborBlockID, cornerNeighborWeight );
+ }
+ }
+
+ it.second = info;
+
+ }
+}
+
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/weight_assignment/MetisAssignmentFunctor.h b/src/pe_coupling/amr/weight_assignment/MetisAssignmentFunctor.h
new file mode 100644
index 0000000000000000000000000000000000000000..384746aa6c3777add20c1283fde6c2ca06523a09
--- /dev/null
+++ b/src/pe_coupling/amr/weight_assignment/MetisAssignmentFunctor.h
@@ -0,0 +1,68 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file MetisAssignmentFunctor.h
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "pe_coupling/amr/InfoCollection.h"
+
+#include "blockforest/loadbalancing/DynamicParMetis.h"
+
+#include <functional>
+#include <vector>
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+class MetisAssignmentFunctor
+{
+public:
+
+ MetisAssignmentFunctor( shared_ptr<InfoCollection>& ic,
+ const std::function<real_t(const BlockInfo&)> & weightEvaluationFct,
+ const uint_t ncon = 1)
+ : ic_(ic), ncon_(ncon), weightEvaluationFct_(ncon, weightEvaluationFct) {}
+
+ MetisAssignmentFunctor( shared_ptr<InfoCollection>& ic,
+ const std::vector< std::function<real_t(const BlockInfo&)> > & weightEvaluationFct )
+ : ic_(ic), ncon_(weightEvaluationFct.size()), weightEvaluationFct_(weightEvaluationFct) {}
+
+ void operator()( std::vector< std::pair< const PhantomBlock *, walberla::any > > & blockData, const PhantomBlockForest & phantomBlockForest);
+
+ inline void setWeightEvaluationFct( const std::function<real_t(const BlockInfo &)> & weightEvaluationFct, const uint_t con = 0 ) { weightEvaluationFct_[con] = weightEvaluationFct; }
+ inline void setWeightEvaluationFcts( const std::vector< std::function<real_t(const BlockInfo &)> > & weightEvaluationFct) { weightEvaluationFct_ = weightEvaluationFct; }
+
+ uint_t getNcon() const { return ncon_; }
+
+ inline void setBlockBaseWeight( const real_t blockBaseWeight ){ blockBaseWeight_ = blockBaseWeight; }
+ inline real_t getBlockBaseWeight() const { return blockBaseWeight_; }
+
+private:
+
+ shared_ptr<InfoCollection> ic_;
+ uint_t ncon_;
+ std::vector< std::function<real_t(const BlockInfo&)> > weightEvaluationFct_;
+ real_t blockBaseWeight_ = real_t(1);
+};
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
+
diff --git a/src/pe_coupling/amr/weight_assignment/WeightAssignmentFunctor.cpp b/src/pe_coupling/amr/weight_assignment/WeightAssignmentFunctor.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..5fc297aa37e3af631ff392b4c9f065186996e30b
--- /dev/null
+++ b/src/pe_coupling/amr/weight_assignment/WeightAssignmentFunctor.cpp
@@ -0,0 +1,46 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file WeightAssignmentFunctor.cpp
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "WeightAssignmentFunctor.h"
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+void WeightAssignmentFunctor::operator()( std::vector< std::pair< const PhantomBlock *, walberla::any > > & blockData, const PhantomBlockForest & )
+{
+ for (auto &it : blockData) {
+ const PhantomBlock * block = it.first;
+ //only change of one level is supported!
+ WALBERLA_ASSERT_LESS( std::abs(int_c(block->getLevel()) - int_c(block->getSourceLevel())), 2 );
+
+ BlockInfo blockInfo;
+ pe_coupling::getBlockInfoFromInfoCollection(block, ic_, blockInfo);
+
+ real_t blockWeight = std::max(weightEvaluationFct_(blockInfo), blockBaseWeight_);
+
+ it.second = PhantomBlockWeight( double_c( blockWeight ) );
+
+ }
+}
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/weight_assignment/WeightAssignmentFunctor.h b/src/pe_coupling/amr/weight_assignment/WeightAssignmentFunctor.h
new file mode 100644
index 0000000000000000000000000000000000000000..5fa776362e591d01a5286eb7922b179875bfbe06
--- /dev/null
+++ b/src/pe_coupling/amr/weight_assignment/WeightAssignmentFunctor.h
@@ -0,0 +1,58 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file WeightAssignmentFunctor.h
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "pe_coupling/amr/BlockInfo.h"
+#include "pe_coupling/amr/InfoCollection.h"
+
+#include "blockforest/loadbalancing/PODPhantomData.h"
+
+#include <functional>
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+class WeightAssignmentFunctor
+{
+public:
+ typedef walberla::blockforest::PODPhantomWeight<double> PhantomBlockWeight;
+
+ WeightAssignmentFunctor( const shared_ptr<InfoCollection>& ic,
+ const std::function<real_t(const BlockInfo&)> & weightEvaluationFct ) :
+ ic_(ic), weightEvaluationFct_(weightEvaluationFct) {}
+
+ void operator()( std::vector< std::pair< const PhantomBlock *, walberla::any > > & blockData, const PhantomBlockForest & );
+
+ inline void setWeightEvaluationFct( const std::function<real_t(const BlockInfo &)> & weightEvaluationFct ) { weightEvaluationFct_ = weightEvaluationFct;}
+
+ inline void setBlockBaseWeight( const real_t blockBaseWeight ){blockBaseWeight_ = blockBaseWeight;}
+ inline real_t getBlockBaseWeight() const { return blockBaseWeight_;}
+
+private:
+ shared_ptr<InfoCollection> ic_;
+ std::function<real_t(const BlockInfo&)> weightEvaluationFct_;
+ real_t blockBaseWeight_ = real_t(1);
+};
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/weight_assignment/WeightEvaluationFunctions.cpp b/src/pe_coupling/amr/weight_assignment/WeightEvaluationFunctions.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..81e1fa0c46f4be2dc3698230fc9cf19f084657cc
--- /dev/null
+++ b/src/pe_coupling/amr/weight_assignment/WeightEvaluationFunctions.cpp
@@ -0,0 +1,35 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file WeightEvaluationFunctions.cpp
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "pe_coupling/amr/weight_assignment/WeightEvaluationFunctions.h"
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+
+real_t defaultWeightEvaluationFunction(const BlockInfo& blockInfo)
+{
+ return real_c(blockInfo.numberOfCells);
+}
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/weight_assignment/WeightEvaluationFunctions.h b/src/pe_coupling/amr/weight_assignment/WeightEvaluationFunctions.h
new file mode 100644
index 0000000000000000000000000000000000000000..958151ea39697c6c8f26e6bcc4e5034fa5fc9d5b
--- /dev/null
+++ b/src/pe_coupling/amr/weight_assignment/WeightEvaluationFunctions.h
@@ -0,0 +1,39 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file WeightEvaluationFunctions.h
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "pe_coupling/amr/BlockInfo.h"
+
+namespace walberla {
+namespace pe_coupling {
+namespace amr {
+
+
+/*
+ * Examples of weight evaluation functions, useful for coupled LBM-PE simulations:
+ * - defaultWeightEvaluationFunction: weight is just the number of cells (thus constant on each block)
+ */
+
+real_t defaultWeightEvaluationFunction(const BlockInfo& blockInfo);
+
+} // namespace amr
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/amr/weight_assignment/all.h b/src/pe_coupling/amr/weight_assignment/all.h
new file mode 100644
index 0000000000000000000000000000000000000000..8f9cf169df8cecc0567c3c89706222b28f3285ab
--- /dev/null
+++ b/src/pe_coupling/amr/weight_assignment/all.h
@@ -0,0 +1,27 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file all.h
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//! \brief Collective header file for module pe_coupling
+//
+//======================================================================================================================
+
+#pragma once
+
+#include "MetisAssignmentFunctor.h"
+#include "WeightAssignmentFunctor.h"
+#include "WeightEvaluationFunctions.h"
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h
index a318686d8865509b3597d3361852c51c42c1ffcc..c452f886443049220e2529456a8fc5673175bd98 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/AddedMassForceEvaluator.h
@@ -121,7 +121,7 @@ void AddedMassForceEvaluator< FlagField_T, FieldInterpolator_T, Distributor_T >
for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- if(!dpmBodySelectorFct_(*bodyIt)) continue;
+ if(!dpmBodySelectorFct_(bodyIt.getBodyID())) continue;
Vector3<real_t> forceOnFluid( real_t(0) );
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h
index 229be174ef1951b0e2601a65717457683c8d1467..7345398b7c123bd7aa83f658738a1d799dd209c5 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/BodyVelocityTimeDerivativeEvaluator.h
@@ -63,7 +63,7 @@ public:
{
for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
{
- if(!dpmBodySelectorFct_(*bodyIt)) continue;
+ if(!dpmBodySelectorFct_(bodyIt.getBodyID())) continue;
bodyVelocityMap_.insert( std::pair<walberla::id_t, Vector3< real_t > >( bodyIt->getSystemID(), bodyIt->getLinearVel() ) );
}
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h
index 33a2e7d76fa567bd754214a4ccba52280c31299e..11709d1e8f4c1dc0c182f64e51e5203db20d85e8 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/InteractionForceEvaluator.h
@@ -106,8 +106,8 @@ public:
private:
shared_ptr<StructuredBlockStorage> blockStorage_;
- const BlockDataID bodyStorageID_;
- const BlockDataID pdfFieldID_;
+ const BlockDataID bodyStorageID_ {};
+ const BlockDataID pdfFieldID_ {};
std::function<Vector3<real_t> ( const Vector3<real_t> &, const Vector3<real_t> &, real_t, real_t, real_t, real_t )> dragForceCorrelationFunction_;
@@ -136,7 +136,7 @@ void InteractionForceEvaluator< FlagField_T, FieldInterpolator_T, Distributor_T
for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- if(!dpmBodySelectorFct_(*bodyIt)) continue;
+ if(!dpmBodySelectorFct_(bodyIt.getBodyID())) continue;
Vector3<real_t> forceOnFluid( real_t(0) );
@@ -154,7 +154,7 @@ void InteractionForceEvaluator< FlagField_T, FieldInterpolator_T, Distributor_T
// evaluate drag force
Vector3<real_t> bodyVelocity = bodyIt->getLinearVel();
- real_t bodyDiameter = getSphereEquivalentDiameter( *(*bodyIt) );
+ real_t bodyDiameter = getSphereEquivalentDiameter( *bodyIt );
real_t bodyVolume = bodyIt->getVolume();
real_t fluidDensity( real_t(1) );
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h
index d04ca701ca8788abc87b424b4b9b3a3328109819..de8518349033f98cfddec3c1bd1f5678b440c151 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/LiftForceEvaluator.h
@@ -115,7 +115,7 @@ void LiftForceEvaluator< FlagField_T, FieldInterpolator_T, Distributor_T >
for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- if(!dpmBodySelectorFct_(*bodyIt)) continue;
+ if(!dpmBodySelectorFct_(bodyIt.getBodyID())) continue;
Vector3<real_t> forceOnFluid( real_t(0) );
@@ -123,7 +123,7 @@ void LiftForceEvaluator< FlagField_T, FieldInterpolator_T, Distributor_T >
Vector3<real_t> bodyVelocity = bodyIt->getLinearVel();
real_t fluidDensity( real_t(1) );
- real_t bodyDiameter = getSphereEquivalentDiameter( *(*bodyIt) );
+ real_t bodyDiameter = getSphereEquivalentDiameter( *bodyIt );
// interpolate fluid velocity and fluid curl to body position
Vector3<real_t> fluidVelocity( real_t(0) );
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/LubricationForceEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/LubricationForceEvaluator.h
index e99d3e88f63befc5ef49a932eb395af4cad82a76..b9bf10293b45ccbf7831871e2f1014cf783d3abd 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/LubricationForceEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/LubricationForceEvaluator.h
@@ -78,8 +78,8 @@ private:
// member variables
shared_ptr<StructuredBlockStorage> blockStorage_;
shared_ptr<pe::BodyStorage> globalBodyStorage_;
- const BlockDataID pdfFieldID_;
- const BlockDataID bodyStorageID_;
+ const BlockDataID pdfFieldID_ {};
+ const BlockDataID bodyStorageID_ {};
real_t dynamicViscosity_;
real_t cutOffDistance_;
@@ -100,7 +100,7 @@ void LubricationForceEvaluator::operator ()()
// lubrication forces for spheres
if ( body1It->getTypeID() == pe::Sphere::getStaticTypeID() )
{
- pe::SphereID sphereI = static_cast<pe::SphereID> ( *body1It );
+ pe::SphereID sphereI = static_cast<pe::SphereID> ( body1It.getBodyID() );
auto copyBody1It = body1It;
// loop over all rigid bodies after current body1 to avoid double forces
@@ -109,7 +109,7 @@ void LubricationForceEvaluator::operator ()()
// sphere-sphere lubrication
if ( body2It->getTypeID() == pe::Sphere::getStaticTypeID() )
{
- pe::SphereID sphereJ = static_cast<pe::SphereID>( *body2It );
+ pe::SphereID sphereJ = static_cast<pe::SphereID>( body2It.getBodyID() );
treatLubricationSphrSphr( sphereI, sphereJ, blockIt->getAABB() );
}
}
@@ -121,19 +121,19 @@ void LubricationForceEvaluator::operator ()()
{
if ( body1It->getTypeID() == pe::Sphere::getStaticTypeID() )
{
- pe::SphereID sphereI = static_cast<pe::SphereID> ( *body1It );
+ pe::SphereID sphereI = static_cast<pe::SphereID> ( body1It.getBodyID() );
for (auto body2It = globalBodyStorage_->begin(); body2It != globalBodyStorage_->end(); ++body2It)
{
if ( body2It->getTypeID() == pe::Plane::getStaticTypeID() )
{
// sphere-plane lubrication
- pe::PlaneID planeJ = static_cast<pe::PlaneID>( *body2It );
+ pe::PlaneID planeJ = static_cast<pe::PlaneID>( body2It.getBodyID() );
treatLubricationSphrPlane( sphereI, planeJ );
} else if ( body2It->getTypeID() == pe::Sphere::getStaticTypeID() )
{
// sphere-sphere lubrication
- pe::SphereID sphereJ = static_cast<pe::SphereID>( *body2It );
+ pe::SphereID sphereJ = static_cast<pe::SphereID>( body2It.getBodyID() );
treatLubricationSphrSphr( sphereI, sphereJ, blockIt->getAABB() );
}
}
diff --git a/src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h b/src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h
index 1c83df74afc0eba7d192454f350932307f27bef4..586b51bc25d29259c632ed1bb76dcfc4cd08c43b 100644
--- a/src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h
+++ b/src/pe_coupling/discrete_particle_methods/evaluators/SolidVolumeFractionFieldEvaluator.h
@@ -89,7 +89,7 @@ public:
// assign the local bodies' volume to the cell, depending on the chosen Distributor_T
for( auto bodyIt = pe::LocalBodyIterator::begin(*block, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- if(!dpmBodySelectorFct_(*bodyIt)) continue;
+ if(!dpmBodySelectorFct_(bodyIt.getBodyID())) continue;
real_t bodyVolume = bodyIt->getVolume();
const Vector3<real_t> bodyPosition = bodyIt->getPosition();
diff --git a/src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h b/src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h
index 75ebeef5b370820e5f306b06c0f954c45b7dd16e..9ffbad829435d7797e2727455005d769d752344c 100644
--- a/src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h
+++ b/src/pe_coupling/discrete_particle_methods/utility/BodyVelocityInitializer.h
@@ -82,7 +82,7 @@ public:
for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
{
- if(!dpmBodySelectorFct_(*bodyIt)) continue;
+ if(!dpmBodySelectorFct_(bodyIt.getBodyID())) continue;
Vector3<real_t> forceOnFluid( real_t(0) );
diff --git a/src/pe_coupling/geometry/PeBodyOverlapFunctions.h b/src/pe_coupling/geometry/PeBodyOverlapFunctions.h
index 8d86350d25a6bca82e69ef7d7e41947b459e600d..b0b0b3b289b7d7bc1fb3103e187a57b1bc487ab6 100644
--- a/src/pe_coupling/geometry/PeBodyOverlapFunctions.h
+++ b/src/pe_coupling/geometry/PeBodyOverlapFunctions.h
@@ -26,6 +26,8 @@
#include "pe/rigidbody/RigidBody.h"
#include "pe/rigidbody/Sphere.h"
+#include "pe/rigidbody/Plane.h"
+#include "pe/rigidbody/Squirmer.h"
namespace walberla {
namespace geometry {
@@ -57,19 +59,20 @@ template<> inline FastOverlapResult fastOverlapCheck( const pe::Sphere & peSpher
return DONT_KNOW;
}
-template<> inline FastOverlapResult fastOverlapCheck( const pe::Sphere & peSphere, const Vector3<real_t> & cellMidpoint, real_t dx )
+template<> inline FastOverlapResult fastOverlapCheck( const pe::Sphere & peSphere, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx )
{
const real_t sqrt3half = std::sqrt( real_t(3) ) / real_t(2);
const real_t midPointDistSq = (peSphere.getPosition() - cellMidpoint).sqrLength();
+ const real_t dxMax = dx.max();
// Check against outer circle of box
- const real_t dist1 = peSphere.getRadius() + sqrt3half * dx;
+ const real_t dist1 = peSphere.getRadius() + sqrt3half * dxMax;
if ( midPointDistSq > dist1 * dist1 )
return COMPLETELY_OUTSIDE;
// Check against inner circle of box
- const real_t dist2 = peSphere.getRadius() - sqrt3half * dx;
+ const real_t dist2 = peSphere.getRadius() - sqrt3half * dxMax;
if ( midPointDistSq < dist2 * dist2 )
return CONTAINED_INSIDE_BODY;
@@ -81,6 +84,66 @@ template<> inline bool contains( const pe::Sphere & peSphere, const Vector3<real
return peSphere.containsPoint( point[0], point[1], point[2] );
}
+template<> inline FastOverlapResult fastOverlapCheck( const pe::Squirmer & peSquirmer, const AABB & box )
+{
+ return fastOverlapCheck( static_cast<const pe::Sphere &>(peSquirmer), box );
+}
+
+template<> inline FastOverlapResult fastOverlapCheck( const pe::Squirmer & peSquirmer, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx )
+{
+ return fastOverlapCheck( static_cast<const pe::Sphere &>(peSquirmer), cellMidpoint, dx );
+}
+
+template<> inline bool contains( const pe::Squirmer & peSquirmer, const Vector3<real_t> & point )
+{
+ return contains( static_cast<const pe::Sphere &>(peSquirmer), point );
+}
+
+/////////////////////////////////////////////////
+// specialization for pe::Plane //
+/////////////////////////////////////////////////
+
+template<> inline FastOverlapResult fastOverlapCheck( const pe::Plane & pePlane, const AABB & box )
+{
+ if ( ! pePlane.getAABB().intersects( box ) )
+ {
+ // if axis aligned plane, its AABB is not inf
+ return COMPLETELY_OUTSIDE;
+ }
+
+ uint_t numberOfContainedCorners( 0 );
+ for( const Vector3<real_t> aabbCorner : box.corners() )
+ {
+ if( pePlane.containsPoint(aabbCorner))
+ {
+ ++numberOfContainedCorners;
+ }
+ }
+
+ if( numberOfContainedCorners == uint_t(0) )
+ {
+ return COMPLETELY_OUTSIDE;
+ }
+ if( numberOfContainedCorners == uint_t(8) )
+ {
+ return CONTAINED_INSIDE_BODY;
+ }
+ // else
+ return PARTIAL_OVERLAP;
+
+}
+
+template<> inline FastOverlapResult fastOverlapCheck( const pe::Plane & pePlane, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx )
+{
+ AABB box = AABB::createFromMinMaxCorner( cellMidpoint[0] - real_t(0.5)*dx[0], cellMidpoint[1] - real_t(0.5)*dx[1], cellMidpoint[2] - real_t(0.5)*dx[2],
+ cellMidpoint[0] + real_t(0.5)*dx[0], cellMidpoint[1] + real_t(0.5)*dx[1], cellMidpoint[2] + real_t(0.5)*dx[2]);
+ return fastOverlapCheck(pePlane, box);
+}
+
+template<> inline bool contains( const pe::Plane & pePlane, const Vector3<real_t> & point )
+{
+ return pePlane.containsPoint( point[0], point[1], point[2] );
+}
////////////////////////////////////
// general pe body implementation //
@@ -98,11 +161,11 @@ template<> inline FastOverlapResult fastOverlapCheck( const pe::RigidBody & peBo
}
}
-template<> inline FastOverlapResult fastOverlapCheck( const pe::RigidBody & peBody, const Vector3<real_t> & cellMidpoint, real_t dx )
+template<> inline FastOverlapResult fastOverlapCheck( const pe::RigidBody & peBody, const Vector3<real_t> & cellMidpoint, const Vector3<real_t> & dx )
{
- AABB box = AABB::createFromMinMaxCorner( cellMidpoint[0] - real_t(0.5)*dx, cellMidpoint[1] - real_t(0.5)*dx, cellMidpoint[2] - real_t(0.5)*dx,
- cellMidpoint[0] + real_t(0.5)*dx, cellMidpoint[1] + real_t(0.5)*dx, cellMidpoint[2] + real_t(0.5)*dx);
+ AABB box = AABB::createFromMinMaxCorner( cellMidpoint[0] - real_t(0.5)*dx[0], cellMidpoint[1] - real_t(0.5)*dx[1], cellMidpoint[2] - real_t(0.5)*dx[2],
+ cellMidpoint[0] + real_t(0.5)*dx[0], cellMidpoint[1] + real_t(0.5)*dx[1], cellMidpoint[2] + real_t(0.5)*dx[2]);
if ( ! peBody.getAABB().intersects( box ) )
{
diff --git a/src/pe_coupling/geometry/PeIntersectionRatio.cpp b/src/pe_coupling/geometry/PeIntersectionRatio.cpp
index c9ef56e2df4f0f7b15b7aeebe4b65cda5b65f094..8d9fde471086ae01aed4fd554f44d1feca496031 100644
--- a/src/pe_coupling/geometry/PeIntersectionRatio.cpp
+++ b/src/pe_coupling/geometry/PeIntersectionRatio.cpp
@@ -22,6 +22,8 @@
#include "pe_coupling/geometry/PeIntersectionRatio.h"
+#include "core/math/Matrix3.h"
+
namespace walberla {
namespace lbm {
@@ -33,7 +35,7 @@ real_t intersectionRatioSpherePe( const pe::Sphere & sphere,
WALBERLA_ASSERT( walberla::geometry::contains( sphere, fluidPoint + direction ), "fluidPoint + direction: " << fluidPoint + direction );
// get the physical sphere center
- Vector3< real_t > sphereCenter( sphere.getPosition() );
+ const Vector3< real_t >& sphereCenter( sphere.getPosition() );
real_t dirLength = direction.length();
Vector3< real_t > l = sphereCenter - fluidPoint;
@@ -52,6 +54,68 @@ real_t intersectionRatioSpherePe( const pe::Sphere & sphere,
}
+real_t intersectionRatioPlanePe( const pe::Plane & plane,
+ const Vector3<real_t> & fluidPoint,
+ const Vector3<real_t> & direction )
+{
+ WALBERLA_ASSERT( !walberla::geometry::contains<pe::RigidBody>( plane, fluidPoint ), "fluidPoint: " << fluidPoint );
+ WALBERLA_ASSERT( walberla::geometry::contains<pe::RigidBody>( plane, fluidPoint + direction ), "fluidPoint + direction: " << fluidPoint + direction );
+
+
+ const Vector3<real_t>& planeCenter( plane.getPosition() );
+ const Vector3<real_t>& planeNormal( plane.getNormal() );
+
+ real_t denom = planeNormal * direction;
+
+ auto diff = planeCenter - fluidPoint;
+
+ WALBERLA_ASSERT_FLOAT_UNEQUAL(denom, real_t(0));
+
+ real_t delta = diff * planeNormal / denom;
+
+ WALBERLA_ASSERT_GREATER_EQUAL( delta, real_t( 0 ) );
+ WALBERLA_ASSERT_LESS_EQUAL( delta, real_t( 1 ) );
+
+ return delta;
+
+}
+
+real_t intersectionRatioEllipsoidPe( const pe::Ellipsoid & ellipsoid,
+ const Vector3<real_t> & fluidPoint,
+ const Vector3<real_t> & direction )
+{
+ WALBERLA_ASSERT( !walberla::geometry::contains<pe::RigidBody>( ellipsoid, fluidPoint ), "fluidPoint: " << fluidPoint );
+ WALBERLA_ASSERT( walberla::geometry::contains<pe::RigidBody>( ellipsoid, fluidPoint + direction ), "fluidPoint + direction: " << fluidPoint + direction );
+
+ Vector3<real_t> transformedP = ellipsoid.pointFromWFtoBF(fluidPoint);
+ Vector3<real_t> transformedDir = ellipsoid.vectorFromWFtoBF(direction);
+
+ Vector3<real_t> semiAxes = ellipsoid.getSemiAxes();
+
+ Matrix3<real_t> M = Matrix3<real_t>::makeDiagonalMatrix(real_t(1)/semiAxes[0], real_t(1)/semiAxes[1], real_t(1)/semiAxes[2]);
+
+ Vector3<real_t> P_M = M*transformedP;
+ Vector3<real_t> d_M = M*transformedDir;
+
+ const real_t a = d_M*d_M;
+ const real_t b = real_t(2)*P_M*d_M;
+ const real_t c = P_M*P_M - real_t(1);
+
+ const real_t discriminant = b*b - real_t(4)*a*c;
+
+ WALBERLA_ASSERT_GREATER_EQUAL(discriminant, real_t(0), "No intersection possible!");
+ WALBERLA_ASSERT_FLOAT_UNEQUAL(a, real_t(0));
+
+ const real_t root = std::sqrt(discriminant);
+ real_t delta = (-b - root) / (real_t(2) * a);
+
+ WALBERLA_ASSERT_GREATER_EQUAL( delta, real_t( 0 ) );
+ WALBERLA_ASSERT_LESS_EQUAL( delta, real_t( 1 ) );
+
+ return delta;
+
+}
+
} // namespace lbm
} // namespace walberla
diff --git a/src/pe_coupling/geometry/PeIntersectionRatio.h b/src/pe_coupling/geometry/PeIntersectionRatio.h
index d6fb8d517d43835eda7518388d9e3f0be8bd08c0..0697fc94306972ebed5b0c915dd36bcf67d5b516 100644
--- a/src/pe_coupling/geometry/PeIntersectionRatio.h
+++ b/src/pe_coupling/geometry/PeIntersectionRatio.h
@@ -26,7 +26,10 @@
#include "pe_coupling/geometry/PeBodyOverlapFunctions.h"
#include "pe/rigidbody/RigidBody.h"
+#include "pe/rigidbody/Ellipsoid.h"
+#include "pe/rigidbody/Plane.h"
#include "pe/rigidbody/Sphere.h"
+#include "pe/rigidbody/Squirmer.h"
#include "pe/Types.h"
@@ -37,19 +40,39 @@ real_t intersectionRatioSpherePe( const pe::Sphere & sphere,
const Vector3<real_t> & fluidPoint,
const Vector3<real_t> & direction );
+real_t intersectionRatioPlanePe( const pe::Plane & plane,
+ const Vector3<real_t> & fluidPoint,
+ const Vector3<real_t> & direction );
+
+real_t intersectionRatioEllipsoidPe( const pe::Ellipsoid & ellipsoid,
+ const Vector3<real_t> & fluidPoint,
+ const Vector3<real_t> & direction );
inline real_t intersectionRatio( const pe::RigidBody & peRigidBody,
const Vector3<real_t> & fluidPoint,
const Vector3<real_t> & direction,
const real_t epsilon )
{
- if( peRigidBody.getTypeID() == pe::Sphere::getStaticTypeID() )
+ if( peRigidBody.getTypeID() == pe::Sphere::getStaticTypeID() || peRigidBody.getTypeID() == pe::Squirmer::getStaticTypeID() )
{
const pe::Sphere & sphere = static_cast< const pe::Sphere & >( peRigidBody );
const real_t ratio = intersectionRatioSpherePe( sphere, fluidPoint, direction );
WALBERLA_ASSERT_LESS_EQUAL( std::fabs( ( fluidPoint + ratio * direction - sphere.getPosition() ).length() - sphere.getRadius() ), epsilon );
return ratio;
}
+ else if ( peRigidBody.getTypeID() == pe::Plane::getStaticTypeID() )
+ {
+ const pe::Plane & plane = static_cast< const pe::Plane & >( peRigidBody );
+ const real_t ratio = intersectionRatioPlanePe( plane, fluidPoint, direction );
+ WALBERLA_ASSERT_FLOAT_EQUAL( ( fluidPoint + ratio * direction - plane.getPosition() ) * plane.getNormal(), real_t(0) );
+ return ratio;
+ }
+ else if ( peRigidBody.getTypeID() == pe::Ellipsoid::getStaticTypeID() )
+ {
+ const pe::Ellipsoid & ellipsoid = static_cast< const pe::Ellipsoid & >( peRigidBody );
+ const real_t ratio = intersectionRatioEllipsoidPe( ellipsoid, fluidPoint, direction );
+ return ratio;
+ }
// Add more pe bodies here if specific intersectionRatio(...) function is available
else
{
diff --git a/src/pe_coupling/geometry/PeOverlapFraction.h b/src/pe_coupling/geometry/PeOverlapFraction.h
index 3ea54525196e4def723f3ce2283dfae0136406af..7193aae0a465b3915219602c145a45e567f34654 100644
--- a/src/pe_coupling/geometry/PeOverlapFraction.h
+++ b/src/pe_coupling/geometry/PeOverlapFraction.h
@@ -25,6 +25,8 @@
#include "pe/rigidbody/RigidBody.h"
#include "pe/rigidbody/Sphere.h"
+#include "pe/rigidbody/Squirmer.h"
+#include "pe/rigidbody/Plane.h"
#include "PeBodyOverlapFunctions.h"
@@ -33,18 +35,23 @@ namespace pe_coupling{
real_t overlapFractionPe( const pe::RigidBody & peRigidBody, const Vector3<real_t> & cellMidpoint,
- real_t dx, uint_t maxDepth=4 )
+ const Vector3<real_t> & dx, uint_t maxDepth=4 )
{
- if( peRigidBody.getTypeID() == pe::Sphere::getStaticTypeID() )
+ if( peRigidBody.getTypeID() == pe::Sphere::getStaticTypeID() || peRigidBody.getTypeID() == pe::Squirmer::getStaticTypeID() )
{
const pe::Sphere & sphere = static_cast< const pe::Sphere & >( peRigidBody );
return geometry::overlapFraction( sphere, cellMidpoint, dx, maxDepth );
}
- // Add more pe bodies here if specific fastOverlapCheck(...) and contains(...) function is available
- else
+ if( peRigidBody.getTypeID() == pe::Plane::getStaticTypeID() )
{
- return geometry::overlapFraction( peRigidBody, cellMidpoint, dx, maxDepth );
+ const pe::Plane & plane = static_cast< const pe::Plane & >( peRigidBody );
+ return geometry::overlapFraction( plane, cellMidpoint, dx, maxDepth );
}
+
+ // Add more pe bodies here if specific fastOverlapCheck(...) and contains(...) function is available
+ // else: fallback to default implementation
+ return geometry::overlapFraction( peRigidBody, cellMidpoint, dx, maxDepth );
+
}
diff --git a/src/pe_coupling/geometry/SphereEquivalentDiameter.h b/src/pe_coupling/geometry/SphereEquivalentDiameter.h
index 3e1bfbc7b417e2e397a5548efa90512333a346d4..d3750379167bc8506ec25c6e2d103a19c811b986 100644
--- a/src/pe_coupling/geometry/SphereEquivalentDiameter.h
+++ b/src/pe_coupling/geometry/SphereEquivalentDiameter.h
@@ -24,6 +24,7 @@
#include "pe/rigidbody/RigidBody.h"
#include "pe/rigidbody/Sphere.h"
+#include "pe/rigidbody/Squirmer.h"
namespace walberla {
namespace pe_coupling {
@@ -32,7 +33,7 @@ namespace pe_coupling {
// calculates sphere-equivalent diameter (diameter of a sphere with same volume as given body)
real_t getSphereEquivalentDiameter( pe::RigidBody & body )
{
- if( body.getTypeID() == pe::Sphere::getStaticTypeID() )
+ if( body.getTypeID() == pe::Sphere::getStaticTypeID() || body.getTypeID() == pe::Squirmer::getStaticTypeID() )
{
pe::Sphere & sphere = static_cast<pe::Sphere &>( body );
real_t radius = sphere.getRadius();
diff --git a/src/pe_coupling/mapping/BodyBBMapping.cpp b/src/pe_coupling/mapping/BodyBBMapping.cpp
index c3726a574fd68c97b6dc5329311f6bb927e0fb77..41d5e0c10803c49a031bddd6fe6e4b021f2ae158 100644
--- a/src/pe_coupling/mapping/BodyBBMapping.cpp
+++ b/src/pe_coupling/mapping/BodyBBMapping.cpp
@@ -57,7 +57,7 @@ CellInterval getCellBB( const pe::ConstBodyID body, const IBlock & block, Struct
// then determine the cell bounding box of the intersection
blockStorage.getCellBBFromAABB( cellBB, body->getAABB().getIntersection( extendedBlockAABB ), level );
- // if infinte body does not intersect with the extended block AABB, return an empty interval
+ // if infinite body does not intersect with the extended block AABB, return an empty interval
if( cellBB.empty() ) return CellInterval();
}
diff --git a/src/pe_coupling/mapping/BodyMapping.h b/src/pe_coupling/mapping/BodyMapping.h
index 4af2e9d3195ebaddc0ce3a6a08108c2c4d28d10d..48f05c2ee0a25b28f492ae927b052d9b9dbdc97d 100644
--- a/src/pe_coupling/mapping/BodyMapping.h
+++ b/src/pe_coupling/mapping/BodyMapping.h
@@ -106,14 +106,14 @@ void mapBodies( StructuredBlockStorage & blockStorage, const BlockDataID & bound
for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
{
- if( mappingBodySelectorFct(*bodyIt))
- mapBody<BoundaryHandling_T>( *bodyIt, *blockIt, blockStorage, boundaryHandlingID, obstacle );
+ if( mappingBodySelectorFct(bodyIt.getBodyID()))
+ mapBody<BoundaryHandling_T>( bodyIt.getBodyID(), *blockIt, blockStorage, boundaryHandlingID, obstacle );
}
for( auto bodyIt = globalBodyStorage.begin(); bodyIt != globalBodyStorage.end(); ++bodyIt )
{
- if( mappingBodySelectorFct(*bodyIt))
- mapBody< BoundaryHandling_T >( *bodyIt, *blockIt, blockStorage, boundaryHandlingID, obstacle );
+ if( mappingBodySelectorFct(bodyIt.getBodyID()))
+ mapBody< BoundaryHandling_T >( bodyIt.getBodyID(), *blockIt, blockStorage, boundaryHandlingID, obstacle );
}
}
}
diff --git a/src/pe_coupling/momentum_exchange_method/BodyMapping.h b/src/pe_coupling/momentum_exchange_method/BodyMapping.h
index 7651386b613b476a00d5070c1550884930a003f9..045eeb5d1ec0c97d2085c98242b3611d24599186 100644
--- a/src/pe_coupling/momentum_exchange_method/BodyMapping.h
+++ b/src/pe_coupling/momentum_exchange_method/BodyMapping.h
@@ -102,13 +102,13 @@ public:
for( auto bodyIt = pe::BodyIterator::begin(*block, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
{
- if( mappingBodySelectorFct_(*bodyIt) )
- mapBodyAndUpdateMapping(*bodyIt, block, boundaryHandling, flagField , bodyField, obstacle, formerObstacle, dx, dy, dz);
+ if( mappingBodySelectorFct_(bodyIt.getBodyID()) )
+ mapBodyAndUpdateMapping(bodyIt.getBodyID(), block, boundaryHandling, flagField , bodyField, obstacle, formerObstacle, dx, dy, dz);
}
for( auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt)
{
- if( mappingBodySelectorFct_(*bodyIt))
- mapBodyAndUpdateMapping(*bodyIt, block, boundaryHandling, flagField , bodyField, obstacle, formerObstacle, dx, dy, dz);
+ if( mappingBodySelectorFct_(bodyIt.getBodyID()))
+ mapBodyAndUpdateMapping(bodyIt.getBodyID(), block, boundaryHandling, flagField , bodyField, obstacle, formerObstacle, dx, dy, dz);
}
}
@@ -123,6 +123,9 @@ private:
CellInterval cellBB = getCellBB( body, *block, *blockStorage_, flagField->nrOfGhostLayers() );
+ WALBERLA_ASSERT_LESS_EQUAL(body->getLinearVel().length(), real_t(1),
+ "Velocity is above 1 (" << body->getLinearVel() << "), which violates the assumption made in the getCellBB() function. The coupling might thus not work properly. Body:\n" << *body);
+
Vector3<real_t> startCellCenter = blockStorage_->getBlockLocalCellCenter( *block, cellBB.min() );
real_t cz = startCellCenter[2];
@@ -157,6 +160,9 @@ private:
}
// let pointer from body field point to this body
(*bodyField)(x,y,z) = body;
+
+ WALBERLA_ASSERT(isFlagSet( cellFlagPtr, obstacle ), "Flag mapping incorrect for body\n" << *body );
+ WALBERLA_ASSERT_EQUAL((*bodyField)(x,y,z), body, "Body field does not point to correct body\n" << *body << ".");
}
else
{
@@ -273,13 +279,13 @@ void mapMovingBodies( StructuredBlockStorage & blockStorage, const BlockDataID &
{
for (auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt)
{
- if( mappingBodySelectorFct(*bodyIt))
- mapMovingBody< BoundaryHandling_T >( *bodyIt, *blockIt, blockStorage, boundaryHandlingID, bodyFieldID, obstacle );
+ if( mappingBodySelectorFct(bodyIt.getBodyID()))
+ mapMovingBody< BoundaryHandling_T >( bodyIt.getBodyID(), *blockIt, blockStorage, boundaryHandlingID, bodyFieldID, obstacle );
}
for( auto bodyIt = globalBodyStorage.begin(); bodyIt != globalBodyStorage.end(); ++bodyIt)
{
- if( mappingBodySelectorFct(*bodyIt))
- mapMovingBody< BoundaryHandling_T >( *bodyIt, *blockIt, blockStorage, boundaryHandlingID, bodyFieldID, obstacle );
+ if( mappingBodySelectorFct(bodyIt.getBodyID()))
+ mapMovingBody< BoundaryHandling_T >( bodyIt.getBodyID(), *blockIt, blockStorage, boundaryHandlingID, bodyFieldID, obstacle );
}
}
}
diff --git a/src/pe_coupling/momentum_exchange_method/restoration/ExtrapolationDirectionFinder.cpp b/src/pe_coupling/momentum_exchange_method/restoration/ExtrapolationDirectionFinder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9821dbb80e8e9565c889ee61be52b83a1a733e14
--- /dev/null
+++ b/src/pe_coupling/momentum_exchange_method/restoration/ExtrapolationDirectionFinder.cpp
@@ -0,0 +1,49 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file ExtrapolationDirectionFinder.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+
+#include "ExtrapolationDirectionFinder.h"
+
+namespace walberla {
+namespace pe_coupling {
+
+
+void SphereNormalExtrapolationDirectionFinder
+::getDirection( const cell_idx_t & x, const cell_idx_t & y, const cell_idx_t & z, IBlock * const block, Vector3<cell_idx_t> & extrapolationDirection ) const
+{
+ BodyField_T * bodyField = block->getData< BodyField_T >( bodyFieldID_ );
+
+ WALBERLA_ASSERT_NOT_NULLPTR( bodyField );
+ WALBERLA_ASSERT_NOT_NULLPTR( (*bodyField)(x,y,z) );
+
+ real_t cx, cy, cz;
+ blockStorage_->getBlockLocalCellCenter( *block, Cell(x,y,z), cx, cy, cz );
+
+ Vector3<real_t> bodyCenterPosition = (*bodyField)(x,y,z)->getPosition();
+ WALBERLA_ASSERT( !math::isnan(bodyCenterPosition) );
+
+ Vector3<real_t> bodyNormal( cx - bodyCenterPosition[0], cy - bodyCenterPosition[1], cz - bodyCenterPosition[2] );
+
+ findCorrespondingLatticeDirection< stencil::D3Q27 >( bodyNormal, extrapolationDirection );
+}
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/momentum_exchange_method/restoration/ExtrapolationDirectionFinder.h b/src/pe_coupling/momentum_exchange_method/restoration/ExtrapolationDirectionFinder.h
index e23d38be85023d5d2976b62d0a995cb09a517de5..7e9968d83b16e7070931e6be79f7e79a92efba53 100644
--- a/src/pe_coupling/momentum_exchange_method/restoration/ExtrapolationDirectionFinder.h
+++ b/src/pe_coupling/momentum_exchange_method/restoration/ExtrapolationDirectionFinder.h
@@ -134,24 +134,5 @@ private:
};
-void SphereNormalExtrapolationDirectionFinder
-::getDirection( const cell_idx_t & x, const cell_idx_t & y, const cell_idx_t & z, IBlock * const block, Vector3<cell_idx_t> & extrapolationDirection ) const
-{
- BodyField_T * bodyField = block->getData< BodyField_T >( bodyFieldID_ );
-
- WALBERLA_ASSERT_NOT_NULLPTR( bodyField );
- WALBERLA_ASSERT_NOT_NULLPTR( (*bodyField)(x,y,z) );
-
- real_t cx, cy, cz;
- blockStorage_->getBlockLocalCellCenter( *block, Cell(x,y,z), cx, cy, cz );
-
- Vector3<real_t> bodyCenterPosition = (*bodyField)(x,y,z)->getPosition();
- WALBERLA_ASSERT( !math::isnan(bodyCenterPosition) );
-
- Vector3<real_t> bodyNormal( cx - bodyCenterPosition[0], cy - bodyCenterPosition[1], cz - bodyCenterPosition[2] );
-
- findCorrespondingLatticeDirection< stencil::D3Q27 >( bodyNormal, extrapolationDirection );
-}
-
} // namespace pe_coupling
} // namespace walberla
diff --git a/src/pe_coupling/momentum_exchange_method/restoration/PDFReconstruction.h b/src/pe_coupling/momentum_exchange_method/restoration/PDFReconstruction.h
index d21808bb3cc8bae4084ea24bff84b6051dd30253..e65d2cc3ce392a73bc93cc59ff183be76ab35e29 100644
--- a/src/pe_coupling/momentum_exchange_method/restoration/PDFReconstruction.h
+++ b/src/pe_coupling/momentum_exchange_method/restoration/PDFReconstruction.h
@@ -108,7 +108,7 @@ private:
if (isFlagSet(flagField->get(x,y,z), formerObstacle)) {
boundaryHandling->setDomain( fluid, x, y, z );
removeFlag( flagField->get(x,y,z), formerObstacle );
- (*bodyField)(x,y,z) = NULL;
+ (*bodyField)(x,y,z) = nullptr;
}
}
}
@@ -163,18 +163,18 @@ void PDFReconstruction< LatticeModel_T, BoundaryHandling_T, Reconstructer_T >
for( auto bodyIt = pe::BodyIterator::begin(*block, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
{
- if( !movingBodySelectorFct_(*bodyIt) )
+ if( !movingBodySelectorFct_(bodyIt.getBodyID()) )
continue;
- CellInterval cellBB = getCellBB( *bodyIt, *block, *blockStorage_, numberOfGhostLayersToInclude );
+ CellInterval cellBB = getCellBB( bodyIt.getBodyID(), *block, *blockStorage_, numberOfGhostLayersToInclude );
reconstructPDFsInCells(cellBB, block, flagField, formerObstacle );
}
for( auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt )
{
- if( !movingBodySelectorFct_(*bodyIt) )
+ if( !movingBodySelectorFct_(bodyIt.getBodyID()) )
continue;
- CellInterval cellBB = getCellBB( *bodyIt, *block, *blockStorage_, numberOfGhostLayersToInclude );
+ CellInterval cellBB = getCellBB( bodyIt.getBodyID(), *block, *blockStorage_, numberOfGhostLayersToInclude );
reconstructPDFsInCells(cellBB, block, flagField, formerObstacle );
}
}
@@ -191,18 +191,18 @@ void PDFReconstruction< LatticeModel_T, BoundaryHandling_T, Reconstructer_T >
for( auto bodyIt = pe::BodyIterator::begin(*block, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
{
- if( !movingBodySelectorFct_(*bodyIt) )
+ if( !movingBodySelectorFct_(bodyIt.getBodyID()) )
continue;
- CellInterval cellBB = getCellBB( *bodyIt, *block, *blockStorage_, numberOfGhostLayersToInclude );
+ CellInterval cellBB = getCellBB( bodyIt.getBodyID(), *block, *blockStorage_, numberOfGhostLayersToInclude );
updateFlags(cellBB, boundaryHandling, flagField, bodyField, formerObstacle, fluid);
}
for( auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt )
{
- if( !movingBodySelectorFct_(*bodyIt) )
+ if( !movingBodySelectorFct_(bodyIt.getBodyID()) )
continue;
- CellInterval cellBB = getCellBB( *bodyIt, *block, *blockStorage_, numberOfGhostLayersToInclude );
+ CellInterval cellBB = getCellBB( bodyIt.getBodyID(), *block, *blockStorage_, numberOfGhostLayersToInclude );
updateFlags(cellBB, boundaryHandling, flagField, bodyField, formerObstacle, fluid);
}
}
diff --git a/src/pe_coupling/partially_saturated_cells_method/BodyAndVolumeFractionMapping.cpp b/src/pe_coupling/partially_saturated_cells_method/BodyAndVolumeFractionMapping.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d0d36a921672c5cc6793d4e1bc6739dc08b444e4
--- /dev/null
+++ b/src/pe_coupling/partially_saturated_cells_method/BodyAndVolumeFractionMapping.cpp
@@ -0,0 +1,235 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BodyAndVolumeFractionMapping.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "BodyAndVolumeFractionMapping.h"
+
+#include "geometry/bodies/BodyOverlapFunctions.h"
+
+#include "pe/rigidbody/BodyIterators.h"
+
+#include "pe_coupling/geometry/PeOverlapFraction.h"
+#include "pe_coupling/mapping/BodyBBMapping.h"
+
+namespace walberla {
+namespace pe_coupling {
+
+
+void mapPSMBodyAndVolumeFraction( const pe::BodyID body, IBlock & block, StructuredBlockStorage & blockStorage,
+ const BlockDataID bodyAndVolumeFractionFieldID )
+{
+ typedef std::pair< pe::BodyID, real_t > BodyAndVolumeFraction_T;
+ typedef GhostLayerField< std::vector< BodyAndVolumeFraction_T >, 1 > BodyAndVolumeFractionField_T;
+
+ BodyAndVolumeFractionField_T * bodyAndVolumeFractionField = block.getData< BodyAndVolumeFractionField_T >( bodyAndVolumeFractionFieldID );
+ WALBERLA_ASSERT_NOT_NULLPTR( bodyAndVolumeFractionField );
+
+ // get bounding box of body
+ CellInterval cellBB = getCellBB( body, block, blockStorage, bodyAndVolumeFractionField->nrOfGhostLayers() );
+
+ uint_t level = blockStorage.getLevel( block );
+ Vector3<real_t> dxVec(blockStorage.dx(level), blockStorage.dy(level), blockStorage.dz(level));
+
+ for( auto cellIt = cellBB.begin(); cellIt != cellBB.end(); ++cellIt )
+ {
+ Cell cell( *cellIt );
+
+ // get the cell's center
+ Vector3<real_t> cellCenter;
+ cellCenter = blockStorage.getBlockLocalCellCenter( block, cell );
+
+ const real_t fraction = overlapFractionPe( *body, cellCenter, dxVec );
+
+ // if the cell intersected with the body, store a pointer to that body and the corresponding volume fraction in the field
+ if( fraction > real_t(0) )
+ {
+ bodyAndVolumeFractionField->get(cell).emplace_back( body, fraction );
+ }
+ }
+}
+
+
+void BodyAndVolumeFractionMapping::initialize()
+{
+ for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
+ {
+ BodyAndVolumeFractionField_T * bodyAndVolumeFractionField = blockIt->getData< BodyAndVolumeFractionField_T >( bodyAndVolumeFractionFieldID_ );
+
+ if( updatedBodyAndVolumeFractionField_ == nullptr )
+ {
+ // hold internally an identical field for swapping
+ updatedBodyAndVolumeFractionField_ = shared_ptr<BodyAndVolumeFractionField_T>( bodyAndVolumeFractionField->cloneUninitialized() );
+
+ auto xyzFieldSize = updatedBodyAndVolumeFractionField_->xyzSize();
+ for( auto fieldIt = xyzFieldSize.begin(); fieldIt != xyzFieldSize.end(); ++fieldIt )
+ {
+ (updatedBodyAndVolumeFractionField_->get(*fieldIt)).clear();
+ }
+ }
+
+ // clear the field
+ auto xyzFieldSize = bodyAndVolumeFractionField->xyzSize();
+ for( auto fieldIt = xyzFieldSize.begin(); fieldIt != xyzFieldSize.end(); ++fieldIt )
+ {
+ (bodyAndVolumeFractionField->get(*fieldIt)).clear();
+ }
+
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ if( mappingBodySelectorFct_(bodyIt.getBodyID()) )
+ {
+ mapPSMBodyAndVolumeFraction(bodyIt.getBodyID(), *blockIt, *blockStorage_, bodyAndVolumeFractionFieldID_ );
+ lastUpdatedPositionMap_.insert( std::pair< walberla::id_t, Vector3< real_t > >( bodyIt->getSystemID(), bodyIt->getPosition() ) );
+ }
+ }
+
+ for( auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt )
+ {
+ if( mappingBodySelectorFct_(bodyIt.getBodyID()) )
+ {
+ mapPSMBodyAndVolumeFraction(bodyIt.getBodyID(), *blockIt, *blockStorage_, bodyAndVolumeFractionFieldID_);
+ lastUpdatedPositionMap_.insert( std::pair< walberla::id_t, Vector3< real_t > >( bodyIt->getSystemID(), bodyIt->getPosition() ) );
+ }
+ }
+
+ }
+}
+
+void BodyAndVolumeFractionMapping::update()
+{
+ std::map< walberla::id_t, Vector3< real_t > > tempLastUpdatedPositionMap;
+
+ for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
+ {
+ BodyAndVolumeFractionField_T * bodyAndVolumeFractionField = blockIt->getData< BodyAndVolumeFractionField_T >( bodyAndVolumeFractionFieldID_ );
+
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ if( mappingBodySelectorFct_(bodyIt.getBodyID()) )
+ {
+ updatePSMBodyAndVolumeFraction(bodyIt.getBodyID(), *blockIt, bodyAndVolumeFractionField, tempLastUpdatedPositionMap);
+ }
+ }
+
+ for( auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt )
+ {
+ if( mappingBodySelectorFct_(bodyIt.getBodyID()) )
+ {
+ updatePSMBodyAndVolumeFraction(bodyIt.getBodyID(), *blockIt, bodyAndVolumeFractionField, tempLastUpdatedPositionMap);
+ }
+ }
+
+ bodyAndVolumeFractionField->swapDataPointers( *updatedBodyAndVolumeFractionField_ );
+
+ auto xyzFieldSize = updatedBodyAndVolumeFractionField_->xyzSize();
+ for( auto fieldIt = xyzFieldSize.begin(); fieldIt != xyzFieldSize.end(); ++fieldIt )
+ {
+ (updatedBodyAndVolumeFractionField_->get(*fieldIt)).clear();
+ }
+ }
+
+ lastUpdatedPositionMap_ = tempLastUpdatedPositionMap;
+}
+
+void BodyAndVolumeFractionMapping::updatePSMBodyAndVolumeFraction( pe::BodyID body, IBlock & block,
+ BodyAndVolumeFractionField_T * oldBodyAndVolumeFractionField,
+ std::map< walberla::id_t, Vector3< real_t > > & tempLastUpdatedPositionMap )
+{
+
+ WALBERLA_ASSERT_NOT_NULLPTR( oldBodyAndVolumeFractionField );
+
+ // estimate traveled distance since last volume fraction update
+ real_t traveledSquaredDistance( real_t(0) );
+ auto mapBodyIt = lastUpdatedPositionMap_.find( body->getSystemID() );
+ if( mapBodyIt != lastUpdatedPositionMap_.end() )
+ {
+ // body found and traveled distance can be estimated
+ Vector3<real_t> distanceVec = body->getPosition() - mapBodyIt->second;
+ traveledSquaredDistance = distanceVec.sqrLength();
+ } else
+ {
+ // body was not found in map -> is a new body, so no information is known
+ traveledSquaredDistance = std::numeric_limits<real_t>::max();
+ }
+
+ // get bounding box of body
+ CellInterval cellBB = getCellBB( body, block, *blockStorage_, oldBodyAndVolumeFractionField->nrOfGhostLayers() );
+
+ uint_t level = blockStorage_->getLevel( block );
+ Vector3<real_t> dxVec(blockStorage_->dx(level), blockStorage_->dy(level), blockStorage_->dz(level));
+
+ // if body has not moved (specified by some epsilon), just reuse old fraction values
+ if( body->getLinearVel().sqrLength() < velocityUpdatingEpsilonSquared_ &&
+ body->getAngularVel().sqrLength() < velocityUpdatingEpsilonSquared_ &&
+ traveledSquaredDistance < positionUpdatingEpsilonSquared_ )
+ {
+ for( cell_idx_t z = cellBB.zMin(); z <= cellBB.zMax(); ++z )
+ {
+ for( cell_idx_t y = cellBB.yMin(); y <= cellBB.yMax(); ++y )
+ {
+ for( cell_idx_t x = cellBB.xMin(); x <= cellBB.xMax(); ++x )
+ {
+
+ auto oldVec = oldBodyAndVolumeFractionField->get(x,y,z);
+ for( auto pairIt = oldVec.begin(); pairIt != oldVec.end(); ++pairIt )
+ {
+ if( pairIt->first == body )
+ {
+ updatedBodyAndVolumeFractionField_->get(x,y,z).push_back(*pairIt);
+ break;
+ }
+ }
+ }
+ }
+ }
+ tempLastUpdatedPositionMap.insert( std::pair< walberla::id_t, Vector3< real_t > >( body->getSystemID(), mapBodyIt->second ) );
+
+ } else
+ {
+ // else body has moved significantly or is new to this block, thus the volume fraction has to be calculated
+ for( cell_idx_t z = cellBB.zMin(); z <= cellBB.zMax(); ++z )
+ {
+ for( cell_idx_t y = cellBB.yMin(); y <= cellBB.yMax(); ++y )
+ {
+ for( cell_idx_t x = cellBB.xMin(); x <= cellBB.xMax(); ++x )
+ {
+ // get the cell's center
+ Vector3<real_t> cellCenter;
+ cellCenter = blockStorage_->getBlockLocalCellCenter( block, Cell(x,y,z) );
+
+ const real_t fraction = overlapFractionPe( *body, cellCenter, dxVec, superSamplingDepth_ );
+
+ // if the cell intersected with the body, store a pointer to that body and the corresponding volume fraction in the field
+ if( fraction > real_t(0) )
+ {
+ updatedBodyAndVolumeFractionField_->get(x,y,z).emplace_back( body, fraction );
+ }
+ }
+ }
+ }
+
+ tempLastUpdatedPositionMap.insert( std::pair< walberla::id_t, Vector3< real_t > >( body->getSystemID(), body->getPosition() ) );
+ }
+}
+
+
+} // namespace pe_coupling
+} // namespace walberla
+
diff --git a/src/pe_coupling/partially_saturated_cells_method/BodyAndVolumeFractionMapping.h b/src/pe_coupling/partially_saturated_cells_method/BodyAndVolumeFractionMapping.h
index 9f28d42e6bd41f2226766c3e6b88bb8ad0b350ec..59fb85590fd9db424523e3f2c6cf6db0d9d84bef 100644
--- a/src/pe_coupling/partially_saturated_cells_method/BodyAndVolumeFractionMapping.h
+++ b/src/pe_coupling/partially_saturated_cells_method/BodyAndVolumeFractionMapping.h
@@ -22,16 +22,8 @@
#pragma once
#include "domain_decomposition/StructuredBlockStorage.h"
-
#include "field/GhostLayerField.h"
-
-#include "geometry/bodies/BodyOverlapFunctions.h"
-
-#include "pe/rigidbody/BodyIterators.h"
#include "pe/Types.h"
-
-#include "pe_coupling/geometry/PeOverlapFraction.h"
-#include "pe_coupling/mapping/BodyBBMapping.h"
#include "pe_coupling/utility/BodySelectorFunctions.h"
#include <functional>
@@ -49,34 +41,7 @@ namespace pe_coupling {
*
*/
void mapPSMBodyAndVolumeFraction( const pe::BodyID body, IBlock & block, StructuredBlockStorage & blockStorage,
- const BlockDataID bodyAndVolumeFractionFieldID )
-{
- typedef std::pair< pe::BodyID, real_t > BodyAndVolumeFraction_T;
- typedef GhostLayerField< std::vector< BodyAndVolumeFraction_T >, 1 > BodyAndVolumeFractionField_T;
-
- BodyAndVolumeFractionField_T * bodyAndVolumeFractionField = block.getData< BodyAndVolumeFractionField_T >( bodyAndVolumeFractionFieldID );
- WALBERLA_ASSERT_NOT_NULLPTR( bodyAndVolumeFractionField );
-
- // get bounding box of body
- CellInterval cellBB = getCellBB( body, block, blockStorage, bodyAndVolumeFractionField->nrOfGhostLayers() );
-
- for( auto cellIt = cellBB.begin(); cellIt != cellBB.end(); ++cellIt )
- {
- Cell cell( *cellIt );
-
- // get the cell's center
- Vector3<real_t> cellCenter;
- cellCenter = blockStorage.getBlockLocalCellCenter( block, cell );
-
- const real_t fraction = overlapFractionPe( *body, cellCenter, blockStorage.dx( blockStorage.getLevel( block ) ) );
-
- // if the cell intersected with the body, store a pointer to that body and the corresponding volume fraction in the field
- if( fraction > real_t(0) )
- {
- bodyAndVolumeFractionField->get(cell).push_back( BodyAndVolumeFraction_T( body, fraction ) );
- }
- }
-}
+ const BlockDataID bodyAndVolumeFractionFieldID );
/*!\brief Mapping class that can be used inside the timeloop to update the volume fractions and body mappings
*
@@ -151,165 +116,6 @@ private:
const uint_t superSamplingDepth_;
};
-void BodyAndVolumeFractionMapping::initialize()
-{
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- BodyAndVolumeFractionField_T * bodyAndVolumeFractionField = blockIt->getData< BodyAndVolumeFractionField_T >( bodyAndVolumeFractionFieldID_ );
-
- if( updatedBodyAndVolumeFractionField_ == NULL )
- {
- // hold internally an identical field for swapping
- updatedBodyAndVolumeFractionField_ = shared_ptr<BodyAndVolumeFractionField_T>( bodyAndVolumeFractionField->cloneUninitialized() );
-
- auto xyzFieldSize = updatedBodyAndVolumeFractionField_->xyzSize();
- for( auto fieldIt = xyzFieldSize.begin(); fieldIt != xyzFieldSize.end(); ++fieldIt )
- {
- (updatedBodyAndVolumeFractionField_->get(*fieldIt)).clear();
- }
- }
-
- // clear the field
- auto xyzFieldSize = bodyAndVolumeFractionField->xyzSize();
- for( auto fieldIt = xyzFieldSize.begin(); fieldIt != xyzFieldSize.end(); ++fieldIt )
- {
- (bodyAndVolumeFractionField->get(*fieldIt)).clear();
- }
-
- for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
- {
- if( mappingBodySelectorFct_(*bodyIt) )
- {
- mapPSMBodyAndVolumeFraction( *bodyIt, *blockIt, *blockStorage_, bodyAndVolumeFractionFieldID_ );
- lastUpdatedPositionMap_.insert( std::pair< walberla::id_t, Vector3< real_t > >( bodyIt->getSystemID(), bodyIt->getPosition() ) );
- }
- }
-
- for( auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt )
- {
- if( mappingBodySelectorFct_(*bodyIt) )
- {
- mapPSMBodyAndVolumeFraction(*bodyIt, *blockIt, *blockStorage_, bodyAndVolumeFractionFieldID_);
- lastUpdatedPositionMap_.insert( std::pair< walberla::id_t, Vector3< real_t > >( bodyIt->getSystemID(), bodyIt->getPosition() ) );
- }
- }
-
- }
-}
-
-void BodyAndVolumeFractionMapping::update()
-{
- std::map< walberla::id_t, Vector3< real_t > > tempLastUpdatedPositionMap;
-
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- BodyAndVolumeFractionField_T * bodyAndVolumeFractionField = blockIt->getData< BodyAndVolumeFractionField_T >( bodyAndVolumeFractionFieldID_ );
-
- for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
- {
- if( mappingBodySelectorFct_(*bodyIt) )
- {
- updatePSMBodyAndVolumeFraction(*bodyIt, *blockIt, bodyAndVolumeFractionField, tempLastUpdatedPositionMap);
- }
- }
-
- for( auto bodyIt = globalBodyStorage_->begin(); bodyIt != globalBodyStorage_->end(); ++bodyIt )
- {
- if( mappingBodySelectorFct_(*bodyIt) )
- {
- updatePSMBodyAndVolumeFraction(*bodyIt, *blockIt, bodyAndVolumeFractionField, tempLastUpdatedPositionMap);
- }
- }
-
- bodyAndVolumeFractionField->swapDataPointers( *updatedBodyAndVolumeFractionField_ );
-
- auto xyzFieldSize = updatedBodyAndVolumeFractionField_->xyzSize();
- for( auto fieldIt = xyzFieldSize.begin(); fieldIt != xyzFieldSize.end(); ++fieldIt )
- {
- (updatedBodyAndVolumeFractionField_->get(*fieldIt)).clear();
- }
- }
-
- lastUpdatedPositionMap_ = tempLastUpdatedPositionMap;
-}
-
-void BodyAndVolumeFractionMapping::updatePSMBodyAndVolumeFraction( pe::BodyID body, IBlock & block,
- BodyAndVolumeFractionField_T * oldBodyAndVolumeFractionField,
- std::map< walberla::id_t, Vector3< real_t > > & tempLastUpdatedPositionMap )
-{
-
- WALBERLA_ASSERT_NOT_NULLPTR( oldBodyAndVolumeFractionField );
-
- // estimate traveled distance since last volume fraction update
- real_t traveledSquaredDistance( real_t(0) );
- auto mapBodyIt = lastUpdatedPositionMap_.find( body->getSystemID() );
- if( mapBodyIt != lastUpdatedPositionMap_.end() )
- {
- // body found and traveled distance can be estimated
- Vector3<real_t> distanceVec = body->getPosition() - mapBodyIt->second;
- traveledSquaredDistance = distanceVec.sqrLength();
- } else
- {
- // body was not found in map -> is a new body, so no information is known
- traveledSquaredDistance = std::numeric_limits<real_t>::max();
- }
-
- // get bounding box of body
- CellInterval cellBB = getCellBB( body, block, *blockStorage_, oldBodyAndVolumeFractionField->nrOfGhostLayers() );
-
- // if body has not moved (specified by some epsilon), just reuse old fraction values
- if( body->getLinearVel().sqrLength() < velocityUpdatingEpsilonSquared_ &&
- body->getAngularVel().sqrLength() < velocityUpdatingEpsilonSquared_ &&
- traveledSquaredDistance < positionUpdatingEpsilonSquared_ )
- {
- for( cell_idx_t z = cellBB.zMin(); z <= cellBB.zMax(); ++z )
- {
- for( cell_idx_t y = cellBB.yMin(); y <= cellBB.yMax(); ++y )
- {
- for( cell_idx_t x = cellBB.xMin(); x <= cellBB.xMax(); ++x )
- {
-
- auto oldVec = oldBodyAndVolumeFractionField->get(x,y,z);
- for( auto pairIt = oldVec.begin(); pairIt != oldVec.end(); ++pairIt )
- {
- if( pairIt->first == body )
- {
- updatedBodyAndVolumeFractionField_->get(x,y,z).push_back(*pairIt);
- break;
- }
- }
- }
- }
- }
- tempLastUpdatedPositionMap.insert( std::pair< walberla::id_t, Vector3< real_t > >( body->getSystemID(), mapBodyIt->second ) );
-
- } else
- {
- // else body has moved significantly or is new to this block, thus the volume fraction has to be calculated
- for( cell_idx_t z = cellBB.zMin(); z <= cellBB.zMax(); ++z )
- {
- for( cell_idx_t y = cellBB.yMin(); y <= cellBB.yMax(); ++y )
- {
- for( cell_idx_t x = cellBB.xMin(); x <= cellBB.xMax(); ++x )
- {
- // get the cell's center
- Vector3<real_t> cellCenter;
- cellCenter = blockStorage_->getBlockLocalCellCenter( block, Cell(x,y,z) );
-
- const real_t fraction = overlapFractionPe( *body, cellCenter, blockStorage_->dx( blockStorage_->getLevel( block ) ), superSamplingDepth_ );
-
- // if the cell intersected with the body, store a pointer to that body and the corresponding volume fraction in the field
- if( fraction > real_t(0) )
- {
- updatedBodyAndVolumeFractionField_->get(x,y,z).push_back( BodyAndVolumeFraction_T( body, fraction ) );
- }
- }
- }
- }
-
- tempLastUpdatedPositionMap.insert( std::pair< walberla::id_t, Vector3< real_t > >( body->getSystemID(), body->getPosition() ) );
- }
-}
} // namespace pe_coupling
diff --git a/src/pe_coupling/utility/BodiesForceTorqueContainer.cpp b/src/pe_coupling/utility/BodiesForceTorqueContainer.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bed1c267c35770e232638d6b423e283cf3bc9172
--- /dev/null
+++ b/src/pe_coupling/utility/BodiesForceTorqueContainer.cpp
@@ -0,0 +1,97 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BodiesForceTorqueContainer.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "BodiesForceTorqueContainer.h"
+
+#include "blockforest/StructuredBlockForest.h"
+#include "core/math/Vector3.h"
+#include "pe/rigidbody/BodyIterators.h"
+
+namespace walberla {
+namespace pe_coupling {
+
+
+
+void BodiesForceTorqueContainer::store()
+{
+ // clear map
+ clear();
+
+ // (re-)build map
+ for( auto blockIt = blockForest_->begin(); blockIt != blockForest_->end(); ++blockIt )
+ {
+ auto bodyForceTorqueStorage = blockIt->getData<ForceTorqueStorage_T>(bodyForceTorqueStorageID_);
+
+ for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ auto & f = (*bodyForceTorqueStorage)[ bodyIt->getSystemID() ];
+
+ const auto & force = bodyIt->getForce();
+ const auto & torque = bodyIt->getTorque();
+ f = {{force[0], force[1], force[2], torque[0], torque[1], torque[2] }};
+ }
+ }
+}
+
+void BodiesForceTorqueContainer::setOnBodies()
+{
+ // set the force/torque stored in the block-local map onto all bodies
+ for( auto blockIt = blockForest_->begin(); blockIt != blockForest_->end(); ++blockIt )
+ {
+ auto bodyForceTorqueStorage = blockIt->getData<ForceTorqueStorage_T>(bodyForceTorqueStorageID_);
+
+ for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ const auto f = bodyForceTorqueStorage->find( bodyIt->getSystemID() );
+
+ if( f != bodyForceTorqueStorage->end() )
+ {
+ const auto & ftValues = f->second;
+ bodyIt->addForce ( ftValues[0], ftValues[1], ftValues[2] );
+ bodyIt->addTorque( ftValues[3], ftValues[4], ftValues[5] );
+ }
+ // else: new body has arrived that was not known before
+ }
+ }
+}
+
+void BodiesForceTorqueContainer::clear()
+{
+ for( auto blockIt = blockForest_->begin(); blockIt != blockForest_->end(); ++blockIt )
+ {
+ auto bodyForceTorqueStorage = blockIt->getData<ForceTorqueStorage_T>(bodyForceTorqueStorageID_);
+ bodyForceTorqueStorage->clear();
+ }
+}
+
+void BodiesForceTorqueContainer::swap( BodiesForceTorqueContainer & other )
+{
+ std::swap( bodyForceTorqueStorageID_, other.bodyForceTorqueStorageID_);
+}
+
+
+
+
+
+
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/utility/BodiesForceTorqueContainer.h b/src/pe_coupling/utility/BodiesForceTorqueContainer.h
index a32dc589d99d0a1138b4e5d1cab974338dc0933e..fe367b5e095075f7882c19f9cf213d793be40351 100644
--- a/src/pe_coupling/utility/BodiesForceTorqueContainer.h
+++ b/src/pe_coupling/utility/BodiesForceTorqueContainer.h
@@ -21,13 +21,10 @@
#pragma once
-#include "core/math/Vector3.h"
-#include "domain_decomposition/StructuredBlockStorage.h"
-#include "pe/rigidbody/BodyIterators.h"
-#include "pe/synchronization/SyncForces.h"
+#include "blockforest/StructuredBlockForest.h"
#include <map>
-#include <vector>
+#include <array>
namespace walberla {
namespace pe_coupling {
@@ -36,95 +33,40 @@ class BodiesForceTorqueContainer
{
public:
- BodiesForceTorqueContainer( const shared_ptr<StructuredBlockStorage> & blockStorage, const BlockDataID & bodyStorageID )
- : blockStorage_( blockStorage ), bodyStorageID_( bodyStorageID )
- { }
+ typedef std::map< walberla::id_t, std::array<real_t,6> > ForceTorqueStorage_T;
- void operator()()
+ BodiesForceTorqueContainer( const shared_ptr<StructuredBlockForest> & blockForest, const BlockDataID & bodyStorageID )
+ : blockForest_( blockForest ), bodyStorageID_( bodyStorageID )
{
- store();
+ // has to be added to the forest (not the storage) to register correctly
+ bodyForceTorqueStorageID_ = blockForest->addBlockData(make_shared<blockforest::AlwaysCreateBlockDataHandling<ForceTorqueStorage_T> >(), "BodiesForceTorqueContainer");
}
- void store()
+ void operator()()
{
- // clear map
- clear();
-
- // sum up all forces/torques from shadow copies on local body (owner)
- pe::reduceForces( blockStorage_->getBlockStorage(), bodyStorageID_ );
- // send total forces/torques to shadow owners
- pe::distributeForces( blockStorage_->getBlockStorage(), bodyStorageID_ );
-
- // (re-)build map
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
- {
- auto & f = bodyForceTorqueMap_[ bodyIt->getSystemID() ];
-
- // only add if body has not been added already before (from another block)
- if( f.empty() )
- {
- const auto & force = bodyIt->getForce();
- f.push_back( force[0] );
- f.push_back( force[1] );
- f.push_back( force[2] );
-
- const auto & torque = bodyIt->getTorque();
- f.push_back( torque[0] );
- f.push_back( torque[1] );
- f.push_back( torque[2] );
- }
-
- // reset of force/torque on remote bodies necessary to erase the multiple occurrences of forces/torques on bodies
- // (due to call to distributeForces() before)
- if ( bodyIt->isRemote() )
- {
- bodyIt->resetForceAndTorque();
- }
- }
- }
-
+ store();
}
- void setOnBodies()
- {
- // owning process sets the force/torque on the bodies
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
- {
- const auto &f = bodyForceTorqueMap_[bodyIt->getSystemID()];
- WALBERLA_ASSERT( !f.empty(), "When attempting to set force/torque on local body " << bodyIt->getSystemID() << " at position " << bodyIt->getPosition() << ", body was not found in map!");
- bodyIt->addForce ( f[0], f[1], f[2] );
- bodyIt->addTorque( f[3], f[4], f[5] );
- }
- }
- }
+ void store();
- void clear()
- {
- bodyForceTorqueMap_.clear();
- }
+ void setOnBodies();
- void swap( BodiesForceTorqueContainer & other )
- {
- std::swap( this->bodyForceTorqueMap_, other.bodyForceTorqueMap_ );
- }
+ void clear();
+
+ void swap( BodiesForceTorqueContainer & other );
private:
- shared_ptr<StructuredBlockStorage> blockStorage_;
+ shared_ptr<StructuredBlockStorage> blockForest_;
const BlockDataID bodyStorageID_;
- std::map< walberla::id_t, std::vector<real_t> > bodyForceTorqueMap_;
+ BlockDataID bodyForceTorqueStorageID_;
};
class BodyContainerSwapper
{
public:
- BodyContainerSwapper( const shared_ptr<BodiesForceTorqueContainer> & cont1,
- const shared_ptr<BodiesForceTorqueContainer> & cont2 )
+ BodyContainerSwapper( const shared_ptr<BodiesForceTorqueContainer> & cont1, const shared_ptr<BodiesForceTorqueContainer> & cont2 )
: cont1_( cont1 ), cont2_( cont2 )
{ }
diff --git a/src/pe_coupling/utility/BodySelectorFunctions.cpp b/src/pe_coupling/utility/BodySelectorFunctions.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4c10f95028c47e88b3340aef74840337dc723992
--- /dev/null
+++ b/src/pe_coupling/utility/BodySelectorFunctions.cpp
@@ -0,0 +1,50 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BodySelectorFunctions.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "BodySelectorFunctions.h"
+
+#include "pe/rigidbody/RigidBody.h"
+
+namespace walberla {
+namespace pe_coupling {
+
+bool selectAllBodies(pe::BodyID /*bodyID*/)
+{
+ return true;
+}
+
+bool selectRegularBodies(pe::BodyID bodyID)
+{
+ return !bodyID->hasInfiniteMass() && !bodyID->isGlobal();
+}
+
+bool selectFixedBodies(pe::BodyID bodyID)
+{
+ return bodyID->hasInfiniteMass() && !bodyID->isGlobal();
+}
+
+bool selectGlobalBodies(pe::BodyID bodyID)
+{
+ return bodyID->isGlobal();
+}
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/utility/BodySelectorFunctions.h b/src/pe_coupling/utility/BodySelectorFunctions.h
index 75bc5c93b1e12c5c970c8b0f11556f08e5980d06..a811d416b2fe440d2ff4a0c062b18b7f0823eae2 100644
--- a/src/pe_coupling/utility/BodySelectorFunctions.h
+++ b/src/pe_coupling/utility/BodySelectorFunctions.h
@@ -21,29 +21,18 @@
#pragma once
-#include "pe/Types.h"
+#include "pe/rigidbody/RigidBody.h"
namespace walberla {
namespace pe_coupling {
-bool selectAllBodies(pe::BodyID /*bodyID*/)
-{
- return true;
-}
-
-bool selectRegularBodies(pe::BodyID bodyID)
-{
- return !bodyID->hasInfiniteMass() && !bodyID->isGlobal();
-}
-
-bool selectFixedBodies(pe::BodyID bodyID)
-{
- return bodyID->hasInfiniteMass() && !bodyID->isGlobal();
-}
-
-bool selectGlobalBodies(pe::BodyID bodyID)
-{
- return bodyID->isGlobal();
-}
+bool selectAllBodies(pe::BodyID /*bodyID*/);
+
+bool selectRegularBodies(pe::BodyID bodyID);
+
+bool selectFixedBodies(pe::BodyID bodyID);
+
+bool selectGlobalBodies(pe::BodyID bodyID);
+
} // namespace pe_coupling
} // namespace walberla
diff --git a/src/pe_coupling/utility/ForceOnBodiesAdder.cpp b/src/pe_coupling/utility/ForceOnBodiesAdder.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..4c7c17f8376763af77004bedb8cd83186515460e
--- /dev/null
+++ b/src/pe_coupling/utility/ForceOnBodiesAdder.cpp
@@ -0,0 +1,49 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file ForceOnBodiesAdder.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "ForceOnBodiesAdder.h"
+
+#include "core/math/Vector3.h"
+#include "domain_decomposition/StructuredBlockStorage.h"
+#include "pe/rigidbody/BodyIterators.h"
+
+
+namespace walberla {
+namespace pe_coupling {
+
+void ForceOnBodiesAdder::operator()()
+{
+ for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->addForce ( force_ );
+ }
+ }
+}
+
+void ForceOnBodiesAdder::updateForce( const Vector3<real_t> & newForce )
+{
+ force_ = newForce;
+}
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/utility/ForceOnBodiesAdder.h b/src/pe_coupling/utility/ForceOnBodiesAdder.h
index 2d6e3f4ead588cc83b1fbc147e76fed8d4a1d38c..b0b7056d52aa54498197317eb48f4fdf294c4b0b 100644
--- a/src/pe_coupling/utility/ForceOnBodiesAdder.h
+++ b/src/pe_coupling/utility/ForceOnBodiesAdder.h
@@ -23,8 +23,6 @@
#include "core/math/Vector3.h"
#include "domain_decomposition/StructuredBlockStorage.h"
-#include "pe/rigidbody/BodyIterators.h"
-
namespace walberla {
namespace pe_coupling {
@@ -39,21 +37,9 @@ public:
{ }
// set a constant force on all (only local, to avoid force duplication) bodies
- void operator()()
- {
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
- {
- bodyIt->addForce ( force_ );
- }
- }
- }
+ void operator()();
- void updateForce( const Vector3<real_t> & newForce )
- {
- force_ = newForce;
- }
+ void updateForce( const Vector3<real_t> & newForce );
private:
diff --git a/src/pe_coupling/utility/ForceTorqueOnBodiesResetter.cpp b/src/pe_coupling/utility/ForceTorqueOnBodiesResetter.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e3301650a01ce5b2a5a6cfc7f517576891ddfaf4
--- /dev/null
+++ b/src/pe_coupling/utility/ForceTorqueOnBodiesResetter.cpp
@@ -0,0 +1,41 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file ForceTorqueOnBodiesResetter.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "ForceTorqueOnBodiesResetter.h"
+
+#include "pe/rigidbody/BodyIterators.h"
+
+namespace walberla {
+namespace pe_coupling {
+
+void ForceTorqueOnBodiesResetter::operator()()
+{
+ for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->resetForceAndTorque();
+ }
+ }
+}
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/utility/ForceTorqueOnBodiesResetter.h b/src/pe_coupling/utility/ForceTorqueOnBodiesResetter.h
index c42e96b0c9cd6bdbac95688654aa9d4b1b979e17..a86368f83fdaf26b4f2c586ac90f178042d567f6 100644
--- a/src/pe_coupling/utility/ForceTorqueOnBodiesResetter.h
+++ b/src/pe_coupling/utility/ForceTorqueOnBodiesResetter.h
@@ -21,10 +21,7 @@
#pragma once
-#include "core/math/Vector3.h"
#include "domain_decomposition/StructuredBlockStorage.h"
-#include "pe/rigidbody/BodyIterators.h"
-
namespace walberla {
namespace pe_coupling {
@@ -38,17 +35,7 @@ public:
{ }
// resets forces and torques on all (local and remote) bodies
- void operator()()
- {
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
- {
- bodyIt->resetForceAndTorque();
- }
- }
- }
-
+ void operator()();
private:
diff --git a/src/pe_coupling/utility/ForceTorqueOnBodiesScaler.cpp b/src/pe_coupling/utility/ForceTorqueOnBodiesScaler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..677c5788d7dea105e6952d911d9d8942deb0cbce
--- /dev/null
+++ b/src/pe_coupling/utility/ForceTorqueOnBodiesScaler.cpp
@@ -0,0 +1,55 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file ForceTorqueOnBodiesScaler.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "ForceTorqueOnBodiesScaler.h"
+
+#include "core/math/Vector3.h"
+#include "pe/rigidbody/BodyIterators.h"
+
+namespace walberla {
+namespace pe_coupling {
+
+void ForceTorqueOnBodiesScaler::operator()()
+{
+ Vector3<real_t> force(real_t(0));
+ Vector3<real_t> torque(real_t(0));
+ for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ force = scalingFactor_ * bodyIt->getForce();
+ torque = scalingFactor_ * bodyIt->getTorque();
+
+ bodyIt->resetForceAndTorque();
+
+ bodyIt->setForce ( force );
+ bodyIt->setTorque( torque );
+ }
+ }
+}
+
+void ForceTorqueOnBodiesScaler::resetScalingFactor( const real_t newScalingFactor )
+{
+ scalingFactor_ = newScalingFactor;
+}
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/utility/ForceTorqueOnBodiesScaler.h b/src/pe_coupling/utility/ForceTorqueOnBodiesScaler.h
index ead115a69ea789ec629c600d396b7c2028d6fa7e..f903e8ddc1606112f60dbf19a872379077a4c325 100644
--- a/src/pe_coupling/utility/ForceTorqueOnBodiesScaler.h
+++ b/src/pe_coupling/utility/ForceTorqueOnBodiesScaler.h
@@ -21,15 +21,12 @@
#pragma once
-#include "core/math/Vector3.h"
#include "domain_decomposition/StructuredBlockStorage.h"
-#include "pe/rigidbody/BodyIterators.h"
-
namespace walberla {
namespace pe_coupling {
-// scales force/torquew on all bodies (local and remote) by a constant scalar value
+// scales force/torque on all bodies (local and remote) by a constant scalar value
// can e.g. be used to average the force/torque over two time steps
class ForceTorqueOnBodiesScaler
{
@@ -41,29 +38,9 @@ public:
{ }
// resets forces and torques on all (local and remote) bodies
- void operator()()
- {
- Vector3<real_t> force(real_t(0));
- Vector3<real_t> torque(real_t(0));
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
- {
- force = scalingFactor_ * bodyIt->getForce();
- torque = scalingFactor_ * bodyIt->getTorque();
-
- bodyIt->resetForceAndTorque();
-
- bodyIt->setForce ( force );
- bodyIt->setTorque( torque );
- }
- }
- }
+ void operator()();
- void resetScalingFactor( const real_t newScalingFactor )
- {
- scalingFactor_ = newScalingFactor;
- }
+ void resetScalingFactor( const real_t newScalingFactor );
private:
diff --git a/src/pe_coupling/utility/LubricationCorrection.cpp b/src/pe_coupling/utility/LubricationCorrection.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..eaf1952149fc4c35d7b6b45b23549c3516557f76
--- /dev/null
+++ b/src/pe_coupling/utility/LubricationCorrection.cpp
@@ -0,0 +1,278 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file LubricationCorrection.cpp
+//! \ingroup pe_coupling
+//! \author Kristina Pickl <kristina.pickl@fau.de>
+//! \author Dominik Bartuschat
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include "LubricationCorrection.h"
+
+#include "core/logging/all.h"
+#include "core/debug/Debug.h"
+
+#include "pe/rigidbody/BodyIterators.h"
+#include "pe/utility/Distance.h"
+
+namespace walberla {
+namespace pe_coupling {
+
+void LubricationCorrection::operator ()()
+{
+ WALBERLA_LOG_PROGRESS( "Calculating Lubrication Force" );
+
+ for (auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt)
+ {
+ // loop over all rigid bodies
+ for( auto body1It = pe::BodyIterator::begin( *blockIt, bodyStorageID_ ); body1It != pe::BodyIterator::end(); ++body1It )
+ {
+ // lubrication forces for spheres
+ if ( body1It->getTypeID() == pe::Sphere::getStaticTypeID() )
+ {
+ pe::SphereID sphereI = static_cast<pe::SphereID> ( body1It.getBodyID() );
+
+ auto copyBody1It = body1It;
+ // loop over all rigid bodies after current body1 to avoid double forces
+ for( auto body2It = (++copyBody1It); body2It != pe::BodyIterator::end(); ++body2It )
+ {
+ // sphere-sphere lubrication
+ if ( body2It->getTypeID() == pe::Sphere::getStaticTypeID() )
+ {
+ pe::SphereID sphereJ = static_cast<pe::SphereID>( body2It.getBodyID() );
+ treatLubricationSphrSphr( sphereI, sphereJ, blockIt->getAABB() );
+ }
+ }
+ }
+ }
+
+ // lubrication correction for local bodies with global bodies (for example sphere-plane)
+ for( auto body1It = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID_ ); body1It != pe::LocalBodyIterator::end(); ++body1It )
+ {
+ if ( body1It->getTypeID() == pe::Sphere::getStaticTypeID() )
+ {
+ pe::SphereID sphereI = static_cast<pe::SphereID> ( body1It.getBodyID() );
+
+ for (auto body2It = globalBodyStorage_->begin(); body2It != globalBodyStorage_->end(); ++body2It)
+ {
+ if ( body2It->getTypeID() == pe::Plane::getStaticTypeID() )
+ {
+ // sphere-plane lubrication
+ pe::PlaneID planeJ = static_cast<pe::PlaneID>( body2It.getBodyID() );
+ treatLubricationSphrPlane( sphereI, planeJ );
+ } else if ( body2It->getTypeID() == pe::Sphere::getStaticTypeID() )
+ {
+ // sphere-sphere lubrication
+ pe::SphereID sphereJ = static_cast<pe::SphereID>( body2It.getBodyID() );
+ treatLubricationSphrSphr( sphereI, sphereJ, blockIt->getAABB() );
+ }
+ }
+ }
+ }
+ }
+}
+//*****************************************************************************************************************************************
+
+
+
+//////////////////////
+// Helper Functions //
+//////////////////////
+
+void LubricationCorrection::treatLubricationSphrSphr( const pe::SphereID sphereI, const pe::SphereID sphereJ, const math::AABB & blockAABB )
+{
+
+ WALBERLA_ASSERT_UNEQUAL( sphereI->getSystemID(), sphereJ->getSystemID() );
+
+ real_t gap = pe::getSurfaceDistance( sphereI, sphereJ );
+
+ if ( gap > cutOffDistance_ || gap < real_t(0) )
+ {
+ WALBERLA_LOG_DETAIL("gap " << gap << " larger than cutOff " << cutOffDistance_ << " - ignoring pair");
+ return;
+ }
+
+ if ( gap < minimalGapSize_ )
+ {
+ WALBERLA_LOG_DETAIL("gap " << gap << " smaller than minimal gap " << minimalGapSize_ << " - using minimal gap");
+ gap = minimalGapSize_;
+ }
+
+ const pe::Vec3 &posSphereI = sphereI->getPosition();
+ const pe::Vec3 &posSphereJ = sphereJ->getPosition();
+ pe::Vec3 fLub(0);
+
+ // compute (global) coordinate between spheres' centers of gravity
+ pe::Vec3 midPoint( (posSphereI + posSphereJ ) * real_c(0.5) );
+
+ // Let process on which midPoint lies do the lubrication correction
+ // or the local process of sphereI if sphereJ is global
+ if ( blockAABB.contains(midPoint) || sphereJ->isGlobal() )
+ {
+ fLub = compLubricationSphrSphr(gap, sphereI, sphereJ);
+ sphereI->addForce( fLub);
+ sphereJ->addForce(-fLub);
+
+ WALBERLA_LOG_DETAIL( "Lubrication force on sphere " << sphereI->getID() << " from sphere " << sphereJ->getID() << " is:" << fLub);
+ WALBERLA_LOG_DETAIL( "Lubrication force on sphere " << sphereJ->getID() << " from sphere " << sphereI->getID() << " is:" << -fLub << "\n");
+ }
+
+}
+
+void LubricationCorrection::treatLubricationSphrPlane( const pe::SphereID sphereI, const pe::ConstPlaneID planeJ )
+{
+
+ real_t gap = pe::getSurfaceDistance( sphereI, planeJ );
+
+ if ( gap > cutOffDistance_ || gap < real_t(0) )
+ {
+ WALBERLA_LOG_DETAIL("gap " << gap << " larger than cutOff " << cutOffDistance_ << " - ignoring pair");
+ return;
+ }
+
+ if ( gap < minimalGapSize_ )
+ {
+ WALBERLA_LOG_DETAIL("gap " << gap << " smaller than minimal gap " << minimalGapSize_ << " - using minimal gap");
+ gap = minimalGapSize_;
+ }
+
+ pe::Vec3 fLub = compLubricationSphrPlane( gap, sphereI, planeJ);
+
+ WALBERLA_LOG_DETAIL( "Lubrication force on sphere " << sphereI->getID() << " to plane with id " << planeJ->getID() << " is:" << fLub << std::endl );
+ sphereI->addForce( fLub );
+
+}
+
+
+
+//*****************************************************************************************************************************************
+/*! \brief Computes lubrication correction force between spheres.
+ * \ingroup pe_coupling
+ *
+ * Lubrication correction according to Ladd and Verberg, 2001
+ * ("Lattice-Boltzmann Simulations of Particle-Fluid Suspensions")
+ *
+ * Note: Verified quantitatively by computation in spreadsheet
+ * and qualitatively by considering direction of force for example setup.
+ */
+//*****************************************************************************************************************************************
+pe::Vec3 LubricationCorrection::compLubricationSphrSphr( real_t gap, const pe::SphereID sphereI, const pe::SphereID sphereJ) const
+{
+ const pe::Vec3 &posSphereI = sphereI->getPosition();
+ const pe::Vec3 &posSphereJ = sphereJ->getPosition();
+
+ const pe::Vec3 &tmpVec = posSphereJ - posSphereI;
+ const pe::Vec3 &rIJ = tmpVec.getNormalized();
+
+ real_t radiusSphereI = sphereI->getRadius();
+ real_t radiusSphereJ = sphereJ->getRadius();
+
+ pe::Vec3 velDiff(sphereI->getLinearVel() - sphereJ->getLinearVel());
+
+ real_t length = velDiff * rIJ;
+
+ real_t radiiSQR = ( radiusSphereI * radiusSphereJ ) * ( radiusSphereI * radiusSphereJ );
+ real_t radiiSumSQR = ( radiusSphereI + radiusSphereJ ) * ( radiusSphereI + radiusSphereJ );
+
+ pe::Vec3 fLub = ( -real_t(6) * dynamicViscosity_ * walberla::math::PI * radiiSQR / radiiSumSQR * ( real_t(1) / gap - real_t(1) / cutOffDistance_) * length * rIJ);
+
+ WALBERLA_LOG_DETAIL_SECTION()
+ {
+ std::stringstream ss;
+ ss << "Sphere I: \n uid:" << sphereI->getID() << "\n";
+ ss << "vel: " << sphereI->getLinearVel() << "\n";
+ ss << "rad: " << radiusSphereI << "\n";
+ ss << "pos: " << posSphereI << "\n\n";
+
+ ss << "Sphere J: \n uid:" << sphereJ->getID() << "\n";
+ ss << "vel: " << sphereJ->getLinearVel() << "\n";
+ ss << "rad: " << radiusSphereJ << "\n";
+ ss << "pos: " << posSphereJ << "\n\n";
+
+ real_t distance = gap + radiusSphereI + radiusSphereJ;
+ ss << "distance: " << distance << "\n";
+ ss << "viscosity: " << dynamicViscosity_ << "\n";
+
+ ss << "gap: " << gap << "\n";
+ ss << "cutOff: " << cutOffDistance_ << "\n";
+ ss << "velDiff " << velDiff << "\n";
+ ss << "rIJ " << rIJ << "\n\n";
+
+ ss << "Resulting lubrication force: " << fLub << "\n";
+
+ WALBERLA_LOG_DETAIL( ss.str() );
+ }
+
+ return fLub;
+}
+//*****************************************************************************************************************************************
+
+
+
+//*****************************************************************************************************************************************
+/*! \brief Computes lubrication correction force between sphere and wall.
+ * \ingroup pe_coupling
+ *
+ * Lubrication correction according to Ladd and Verberg, 2001
+ * ("Lattice-Boltzmann Simulations of Particle-Fluid Suspensions" )
+ *
+ * Note: Verified quantitatively by computation in spreadsheet
+ * and qualitatively by considering direction of force for example setup.
+ */
+//*****************************************************************************************************************************************
+pe::Vec3 LubricationCorrection::compLubricationSphrPlane( real_t gap, const pe::SphereID sphereI, const pe::ConstPlaneID planeJ) const
+{
+ const pe::Vec3 &posSphereI( sphereI->getPosition() );
+ real_t radiusSphereI = sphereI->getRadius();
+
+ const pe::Vec3 &planeNormal( planeJ->getNormal() ); // took negative of normal from sphere to plane (plane's normal) - sign cancels out anyway
+ pe::Vec3 rIJ( planeNormal.getNormalized() ); // for safety reasons, normalize normal
+
+ real_t length = sphereI->getLinearVel() * rIJ;
+
+ real_t radiiSQR = radiusSphereI * radiusSphereI;
+
+ pe::Vec3 fLub( -real_t(6) * dynamicViscosity_ * walberla::math::PI * radiiSQR * (real_t(1) / gap - real_t(1) / cutOffDistance_) * length * rIJ);
+
+ WALBERLA_LOG_DETAIL_SECTION() {
+ std::stringstream ss;
+ ss << "Sphere I: \n uid:" << sphereI->getID() << "\n";
+ ss << "vel: " << sphereI->getLinearVel() << "\n";
+ ss << "rad: " << radiusSphereI << "\n";
+ ss << "pos: " << posSphereI << "\n\n";
+
+ real_t distance = gap + radiusSphereI;
+ ss << "distance: " << distance << "\n";
+ ss << "viscosity: " << dynamicViscosity_ << "\n";
+
+ ss << "gap: " << gap << "\n";
+ ss << "cutOff: " << cutOffDistance_ << "\n";
+ ss << "velDiff " << sphereI->getLinearVel() << "\n";
+ ss << "rIJ " << -rIJ << "\n\n";
+
+ ss << "Resulting lubrication force: " << fLub << "\n";
+
+ WALBERLA_LOG_DETAIL( ss.str() );
+ }
+
+ return fLub;
+}
+
+
+} // pe_coupling
+} // walberla
diff --git a/src/pe_coupling/utility/LubricationCorrection.h b/src/pe_coupling/utility/LubricationCorrection.h
index c318c66c6e42b3a3bdb3cafc50854b8f82c60569..b4f34181505f1a42472222875c72f74596f62162 100644
--- a/src/pe_coupling/utility/LubricationCorrection.h
+++ b/src/pe_coupling/utility/LubricationCorrection.h
@@ -24,15 +24,11 @@
#pragma once
-#include "core/logging/all.h"
-#include "core/debug/Debug.h"
-#include "domain_decomposition/BlockStorage.h"
-#include "lbm/field/PdfField.h"
-#include "pe/rigidbody/BodyIterators.h"
+#include "domain_decomposition/StructuredBlockStorage.h"
+
#include "pe/rigidbody/Plane.h"
#include "pe/rigidbody/Sphere.h"
-#include "pe/utility/Distance.h"
namespace walberla {
namespace pe_coupling {
@@ -67,7 +63,6 @@ private:
// member variables
shared_ptr<StructuredBlockStorage> blockStorage_;
shared_ptr<pe::BodyStorage> globalBodyStorage_;
- const BlockDataID pdfFieldID_;
const BlockDataID bodyStorageID_;
real_t dynamicViscosity_;
@@ -76,247 +71,5 @@ private:
}; // class LubricationCorrection
-
-void LubricationCorrection::operator ()()
-{
- WALBERLA_LOG_PROGRESS( "Calculating Lubrication Force" );
-
- for (auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt)
- {
- // loop over all rigid bodies
- for( auto body1It = pe::BodyIterator::begin( *blockIt, bodyStorageID_ ); body1It != pe::BodyIterator::end(); ++body1It )
- {
- // lubrication forces for spheres
- if ( body1It->getTypeID() == pe::Sphere::getStaticTypeID() )
- {
- pe::SphereID sphereI = static_cast<pe::SphereID> ( *body1It );
-
- auto copyBody1It = body1It;
- // loop over all rigid bodies after current body1 to avoid double forces
- for( auto body2It = (++copyBody1It); body2It != pe::BodyIterator::end(); ++body2It )
- {
- // sphere-sphere lubrication
- if ( body2It->getTypeID() == pe::Sphere::getStaticTypeID() )
- {
- pe::SphereID sphereJ = static_cast<pe::SphereID>( *body2It );
- treatLubricationSphrSphr( sphereI, sphereJ, blockIt->getAABB() );
- }
- }
- }
- }
-
- // lubrication correction for local bodies with global bodies (for example sphere-plane)
- for( auto body1It = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID_ ); body1It != pe::LocalBodyIterator::end(); ++body1It )
- {
- if ( body1It->getTypeID() == pe::Sphere::getStaticTypeID() )
- {
- pe::SphereID sphereI = static_cast<pe::SphereID> ( *body1It );
-
- for (auto body2It = globalBodyStorage_->begin(); body2It != globalBodyStorage_->end(); ++body2It)
- {
- if ( body2It->getTypeID() == pe::Plane::getStaticTypeID() )
- {
- // sphere-plane lubrication
- pe::PlaneID planeJ = static_cast<pe::PlaneID>( *body2It );
- treatLubricationSphrPlane( sphereI, planeJ );
- } else if ( body2It->getTypeID() == pe::Sphere::getStaticTypeID() )
- {
- // sphere-sphere lubrication
- pe::SphereID sphereJ = static_cast<pe::SphereID>( *body2It );
- treatLubricationSphrSphr( sphereI, sphereJ, blockIt->getAABB() );
- }
- }
- }
- }
- }
-}
-//*****************************************************************************************************************************************
-
-
-
-//////////////////////
-// Helper Functions //
-//////////////////////
-
-void LubricationCorrection::treatLubricationSphrSphr( const pe::SphereID sphereI, const pe::SphereID sphereJ, const math::AABB & blockAABB )
-{
-
- WALBERLA_ASSERT_UNEQUAL( sphereI->getSystemID(), sphereJ->getSystemID() );
-
- real_t gap = pe::getSurfaceDistance( sphereI, sphereJ );
-
- if ( gap > cutOffDistance_ || gap < real_t(0) )
- {
- WALBERLA_LOG_DETAIL("gap " << gap << " larger than cutOff " << cutOffDistance_ << " - ignoring pair");
- return;
- }
-
- if ( gap < minimalGapSize_ )
- {
- WALBERLA_LOG_DETAIL("gap " << gap << " smaller than minimal gap " << minimalGapSize_ << " - using minimal gap");
- gap = minimalGapSize_;
- }
-
- const pe::Vec3 &posSphereI = sphereI->getPosition();
- const pe::Vec3 &posSphereJ = sphereJ->getPosition();
- pe::Vec3 fLub(0);
-
- // compute (global) coordinate between spheres' centers of gravity
- pe::Vec3 midPoint( (posSphereI + posSphereJ ) * real_c(0.5) );
-
- // Let process on which midPoint lies do the lubrication correction
- // or the local process of sphereI if sphereJ is global
- if ( blockAABB.contains(midPoint) || sphereJ->isGlobal() )
- {
- fLub = compLubricationSphrSphr(gap, sphereI, sphereJ);
- sphereI->addForce( fLub);
- sphereJ->addForce(-fLub);
-
- WALBERLA_LOG_DETAIL( "Lubrication force on sphere " << sphereI->getID() << " from sphere " << sphereJ->getID() << " is:" << fLub);
- WALBERLA_LOG_DETAIL( "Lubrication force on sphere " << sphereJ->getID() << " from sphere " << sphereI->getID() << " is:" << -fLub << "\n");
- }
-
-}
-
-void LubricationCorrection::treatLubricationSphrPlane( const pe::SphereID sphereI, const pe::ConstPlaneID planeJ )
-{
-
- real_t gap = pe::getSurfaceDistance( sphereI, planeJ );
-
- if ( gap > cutOffDistance_ || gap < real_t(0) )
- {
- WALBERLA_LOG_DETAIL("gap " << gap << " larger than cutOff " << cutOffDistance_ << " - ignoring pair");
- return;
- }
-
- if ( gap < minimalGapSize_ )
- {
- WALBERLA_LOG_DETAIL("gap " << gap << " smaller than minimal gap " << minimalGapSize_ << " - using minimal gap");
- gap = minimalGapSize_;
- }
-
- pe::Vec3 fLub = compLubricationSphrPlane( gap, sphereI, planeJ);
-
- WALBERLA_LOG_DETAIL( "Lubrication force on sphere " << sphereI->getID() << " to plane with id " << planeJ->getID() << " is:" << fLub << std::endl );
- sphereI->addForce( fLub );
-
-}
-
-
-
-//*****************************************************************************************************************************************
-/*! \brief Computes lubrication correction force between spheres.
- * \ingroup pe_coupling
- *
- * Lubrication correction according to Ladd and Verberg, 2001
- * ("Lattice-Boltzmann Simulations of Particle-Fluid Suspensions")
- *
- * Note: Verified quantitatively by computation in spreadsheet
- * and qualitatively by considering direction of force for example setup.
- */
-//*****************************************************************************************************************************************
-pe::Vec3 LubricationCorrection::compLubricationSphrSphr( real_t gap, const pe::SphereID sphereI, const pe::SphereID sphereJ) const
-{
- const pe::Vec3 &posSphereI = sphereI->getPosition();
- const pe::Vec3 &posSphereJ = sphereJ->getPosition();
-
- const pe::Vec3 &tmpVec = posSphereJ - posSphereI;
- const pe::Vec3 &rIJ = tmpVec.getNormalized();
-
- real_t radiusSphereI = sphereI->getRadius();
- real_t radiusSphereJ = sphereJ->getRadius();
-
- pe::Vec3 velDiff(sphereI->getLinearVel() - sphereJ->getLinearVel());
-
- real_t length = velDiff * rIJ;
-
- real_t radiiSQR = ( radiusSphereI * radiusSphereJ ) * ( radiusSphereI * radiusSphereJ );
- real_t radiiSumSQR = ( radiusSphereI + radiusSphereJ ) * ( radiusSphereI + radiusSphereJ );
-
- pe::Vec3 fLub = ( -real_t(6) * dynamicViscosity_ * walberla::math::PI * radiiSQR / radiiSumSQR * ( real_t(1) / gap - real_t(1) / cutOffDistance_) * length * rIJ);
-
- WALBERLA_LOG_DETAIL_SECTION()
- {
- std::stringstream ss;
- ss << "Sphere I: \n uid:" << sphereI->getID() << "\n";
- ss << "vel: " << sphereI->getLinearVel() << "\n";
- ss << "rad: " << radiusSphereI << "\n";
- ss << "pos: " << posSphereI << "\n\n";
-
- ss << "Sphere J: \n uid:" << sphereJ->getID() << "\n";
- ss << "vel: " << sphereJ->getLinearVel() << "\n";
- ss << "rad: " << radiusSphereJ << "\n";
- ss << "pos: " << posSphereJ << "\n\n";
-
- real_t distance = gap + radiusSphereI + radiusSphereJ;
- ss << "distance: " << distance << "\n";
- ss << "viscosity: " << dynamicViscosity_ << "\n";
-
- ss << "gap: " << gap << "\n";
- ss << "cutOff: " << cutOffDistance_ << "\n";
- ss << "velDiff " << velDiff << "\n";
- ss << "rIJ " << rIJ << "\n\n";
-
- ss << "Resulting lubrication force: " << fLub << "\n";
-
- WALBERLA_LOG_DETAIL( ss.str() );
- }
-
- return fLub;
-}
-//*****************************************************************************************************************************************
-
-
-
-//*****************************************************************************************************************************************
-/*! \brief Computes lubrication correction force between sphere and wall.
- * \ingroup pe_coupling
- *
- * Lubrication correction according to Ladd and Verberg, 2001
- * ("Lattice-Boltzmann Simulations of Particle-Fluid Suspensions" )
- *
- * Note: Verified quantitatively by computation in spreadsheet
- * and qualitatively by considering direction of force for example setup.
- */
-//*****************************************************************************************************************************************
-pe::Vec3 LubricationCorrection::compLubricationSphrPlane( real_t gap, const pe::SphereID sphereI, const pe::ConstPlaneID planeJ) const
-{
- const pe::Vec3 &posSphereI( sphereI->getPosition() );
- real_t radiusSphereI = sphereI->getRadius();
-
- const pe::Vec3 &planeNormal( planeJ->getNormal() ); // took negative of normal from sphere to plane (plane's normal) - sign cancels out anyway
- pe::Vec3 rIJ( planeNormal.getNormalized() ); // for safety reasons, normalize normal
-
- real_t length = sphereI->getLinearVel() * rIJ;
-
- real_t radiiSQR = radiusSphereI * radiusSphereI;
-
- pe::Vec3 fLub( -real_t(6) * dynamicViscosity_ * walberla::math::PI * radiiSQR * (real_t(1) / gap - real_t(1) / cutOffDistance_) * length * rIJ);
-
- WALBERLA_LOG_DETAIL_SECTION() {
- std::stringstream ss;
- ss << "Sphere I: \n uid:" << sphereI->getID() << "\n";
- ss << "vel: " << sphereI->getLinearVel() << "\n";
- ss << "rad: " << radiusSphereI << "\n";
- ss << "pos: " << posSphereI << "\n\n";
-
- real_t distance = gap + radiusSphereI;
- ss << "distance: " << distance << "\n";
- ss << "viscosity: " << dynamicViscosity_ << "\n";
-
- ss << "gap: " << gap << "\n";
- ss << "cutOff: " << cutOffDistance_ << "\n";
- ss << "velDiff " << sphereI->getLinearVel() << "\n";
- ss << "rIJ " << -rIJ << "\n\n";
-
- ss << "Resulting lubrication force: " << fLub << "\n";
-
- WALBERLA_LOG_DETAIL( ss.str() );
- }
-
- return fLub;
-}
-
-
} // pe_coupling
} // walberla
diff --git a/src/pe_coupling/utility/TimeStep.cpp b/src/pe_coupling/utility/TimeStep.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a85fb0de3e857ff8b40e983f42fdd95ad07b16e3
--- /dev/null
+++ b/src/pe_coupling/utility/TimeStep.cpp
@@ -0,0 +1,112 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file TimeStep.cpp
+//! \ingroup pe_coupling
+//! \author Florian Schornbaum <florian.schornbaum@fau.de>
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include "TimeStep.h"
+
+#include "pe/rigidbody/BodyIterators.h"
+
+#include <map>
+#include <array>
+
+namespace walberla {
+namespace pe_coupling {
+
+void TimeStep::operator()()
+{
+ if( numberOfSubIterations_ == 1 )
+ {
+ forceEvaluationFunc_();
+
+ collisionResponse_.timestep( timeStepSize_ );
+ synchronizeFunc_();
+ }
+ else
+ {
+ // 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.
+
+ // generate map from all known bodies (process local) to total forces/torques
+ // this has to be done on a block-local basis, since the same body could reside on several blocks from this process
+ using BlockID_T = domain_decomposition::IBlockID::IDType;
+ std::map< BlockID_T, std::map< walberla::id_t, std::array< real_t, 6 > > > forceTorqueMap;
+
+ for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
+ {
+ BlockID_T blockID = blockIt->getId().getID();
+ auto& blockLocalForceTorqueMap = forceTorqueMap[blockID];
+
+ // iterate over local and remote bodies and store force/torque in map
+ for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ auto & f = blockLocalForceTorqueMap[ bodyIt->getSystemID() ];
+
+ const auto & force = bodyIt->getForce();
+ const auto & torque = bodyIt->getTorque();
+
+ f = {{force[0], force[1], force[2], torque[0], torque[1], torque[2] }};
+ }
+ }
+
+ // perform pe time steps
+ const real_t subTimeStepSize = timeStepSize_ / real_c( numberOfSubIterations_ );
+ for( uint_t i = 0; i != numberOfSubIterations_; ++i )
+ {
+
+ // in the first iteration, forces are already set
+ if( i != 0 )
+ {
+ for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
+ {
+ BlockID_T blockID = blockIt->getId().getID();
+ auto& blockLocalForceTorqueMap = forceTorqueMap[blockID];
+
+ // re-set stored force/torque on bodies
+ for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+
+ const auto f = blockLocalForceTorqueMap.find( bodyIt->getSystemID() );
+
+ if( f != blockLocalForceTorqueMap.end() )
+ {
+ const auto & ftValues = f->second;
+ bodyIt->addForce ( ftValues[0], ftValues[1], ftValues[2] );
+ bodyIt->addTorque( ftValues[3], ftValues[4], ftValues[5] );
+ }
+ }
+ }
+ }
+
+ // evaluate forces (e.g. lubrication forces)
+ forceEvaluationFunc_();
+
+ collisionResponse_.timestep( subTimeStepSize );
+ synchronizeFunc_();
+ }
+ }
+}
+
+
+} // namespace pe_coupling
+} // namespace walberla
diff --git a/src/pe_coupling/utility/TimeStep.h b/src/pe_coupling/utility/TimeStep.h
index d89e0a6e7aff337ba570c252e605fe4d006c8e9c..283282b6893e9b6307b7dcb77b2ddc734dee9523 100644
--- a/src/pe_coupling/utility/TimeStep.h
+++ b/src/pe_coupling/utility/TimeStep.h
@@ -23,20 +23,12 @@
#pragma once
-#include "core/debug/Debug.h"
#include "core/timing/TimingTree.h"
-
-#include "domain_decomposition/BlockStorage.h"
-
+#include "domain_decomposition/StructuredBlockStorage.h"
#include "pe/cr/ICR.h"
-#include "pe/rigidbody/BodyIterators.h"
-#include "pe/synchronization/SyncForces.h"
#include <functional>
-#include <map>
-
-
namespace walberla {
namespace pe_coupling {
@@ -72,93 +64,9 @@ public:
, forceEvaluationFunc_( forceEvaluationFunc )
{}
- void operator()()
- {
- if( numberOfSubIterations_ == 1 )
- {
- forceEvaluationFunc_();
-
- collisionResponse_.timestep( timeStepSize_ );
- synchronizeFunc_();
- }
- else
- {
- // 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.
-
- // sum up all forces/torques from shadow copies on local body (owner)
- pe::reduceForces( blockStorage_->getBlockStorage(), bodyStorageID_ );
- // send total forces/torques to shadow owners
- pe::distributeForces( blockStorage_->getBlockStorage(), bodyStorageID_ );
-
- // generate map from all known bodies (process local) to total forces/torques
- std::map< walberla::id_t, std::vector< real_t > > forceMap;
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- // iterate over local and remote bodies and store force/torque in map
- // Remote bodies are required since during the then following collision response time steps,
- // bodies can change ownership (i.e. a now remote body could become a local body ).
- // Since only the owning process re-sets the force/torque later, remote body values have to be stored as well.
- for( auto bodyIt = pe::BodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::BodyIterator::end(); ++bodyIt )
- {
- auto & f = forceMap[ bodyIt->getSystemID() ];
-
- // only add if body has not been added already before (from another block)
- if( f.empty() )
- {
- const auto & force = bodyIt->getForce();
- f.push_back( force[0] );
- f.push_back( force[1] );
- f.push_back( force[2] );
-
- const auto & torque = bodyIt->getTorque();
- f.push_back( torque[0] );
- f.push_back( torque[1] );
- f.push_back( torque[2] );
- }
-
- // reset of force/torque on remote bodies necessary to erase the multiple occurrences of forces/torques on bodies
- // (due to call to distributeForces() before)
- if ( bodyIt->isRemote() )
- {
- bodyIt->resetForceAndTorque();
- }
- }
- }
-
- // perform pe time steps
- const real_t subTimeStepSize = timeStepSize_ / real_c( numberOfSubIterations_ );
- for( uint_t i = 0; i != numberOfSubIterations_; ++i )
- {
-
- // in the first iteration, forces on local bodies are already set by force synchronization
- if( i != 0 )
- {
- for( auto blockIt = blockStorage_->begin(); blockIt != blockStorage_->end(); ++blockIt )
- {
- // only owning process sets force/torque on bodies
- for( auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID_); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
- {
- const auto & f = forceMap[ bodyIt->getSystemID() ];
- WALBERLA_ASSERT( !f.empty(), "When attempting to set force/torque on local body " << bodyIt->getSystemID() << " at position " << bodyIt->getPosition() << ", body was not found in map!");
- bodyIt->addForce ( f[0], f[1], f[2] );
- bodyIt->addTorque( f[3], f[4], f[5] );
- }
- }
- }
-
- // evaluate forces (e.g. lubrication forces)
- forceEvaluationFunc_();
-
- collisionResponse_.timestep( subTimeStepSize );
- synchronizeFunc_();
- }
- }
- }
+ void operator()();
-protected:
+private:
const real_t timeStepSize_;
const uint_t numberOfSubIterations_;
diff --git a/src/postprocessing/sqlite/SQLite.cpp b/src/postprocessing/sqlite/SQLite.cpp
index e83aa46e18a0627452791efb16568d07e07efcb6..5e27286ef4b3f10c77cfb68b65d9ae81cef13bd0 100644
--- a/src/postprocessing/sqlite/SQLite.cpp
+++ b/src/postprocessing/sqlite/SQLite.cpp
@@ -35,7 +35,7 @@ namespace postprocessing {
SQLiteDB::SQLiteDB( const string & dbFile, const int busyTimeout )
- : valid_(true), dbHandle_(NULL), file_( dbFile )
+ : valid_(true), dbHandle_(nullptr), file_( dbFile )
{
static const char * CREATE_RUN_TABLE =
"CREATE TABLE IF NOT EXISTS runs ("
@@ -52,11 +52,11 @@ SQLiteDB::SQLiteDB( const string & dbFile, const int busyTimeout )
}
sqlite3_busy_timeout( dbHandle_, busyTimeout*1000 );
- sqlite3_exec( dbHandle_, "PRAGMA foreign_keys = ON;",0,0,0 );
- sqlite3_exec( dbHandle_, CREATE_RUN_TABLE, 0,0,0);
+ sqlite3_exec( dbHandle_, "PRAGMA foreign_keys = ON;",nullptr,nullptr,nullptr );
+ sqlite3_exec( dbHandle_, CREATE_RUN_TABLE, nullptr,nullptr,nullptr);
static const char* UPDATE_RUN_TABLE_CMD = "ALTER TABLE runs ADD COLUMN uuid STRING;";
- sqlite3_exec( dbHandle_, UPDATE_RUN_TABLE_CMD, 0, 0, 0 );
+ sqlite3_exec( dbHandle_, UPDATE_RUN_TABLE_CMD, nullptr, nullptr, nullptr );
}
@@ -89,7 +89,7 @@ uint_t storeRunImpl( sqlite3 * dbHandle, std::string & filename,
{
WALBERLA_ASSERT_NOT_NULLPTR( dbHandle );
- sqlite3_exec( dbHandle, "BEGIN;",0,0,0 );
+ sqlite3_exec( dbHandle, "BEGIN;",nullptr,nullptr,nullptr );
string insertRunCommand = "INSERT INTO runs (timestamp, uuid ";
std::stringstream values;
@@ -101,7 +101,7 @@ uint_t storeRunImpl( sqlite3 * dbHandle, std::string & filename,
insertRunCommand += "," + i->first;
values << ", " << i->second;
string command = "ALTER TABLE runs ADD COLUMN " + i->first + " INTEGER ";
- sqlite3_exec ( dbHandle, command.c_str(), 0,0,0 ); // ignore errors (column can exist already)
+ sqlite3_exec ( dbHandle, command.c_str(), nullptr,nullptr,nullptr ); // ignore errors (column can exist already)
}
// Add columns for string properties
@@ -110,7 +110,7 @@ uint_t storeRunImpl( sqlite3 * dbHandle, std::string & filename,
insertRunCommand += "," + i->first;
values << ", " << "\"" << i->second << "\"";
string command = "ALTER TABLE runs ADD COLUMN " + i->first + " TEXT ";
- sqlite3_exec ( dbHandle, command.c_str(), 0,0,0 ); // ignore errors (column can exist already)
+ sqlite3_exec ( dbHandle, command.c_str(), nullptr,nullptr,nullptr ); // ignore errors (column can exist already)
}
@@ -122,7 +122,7 @@ uint_t storeRunImpl( sqlite3 * dbHandle, std::string & filename,
insertRunCommand += "," + i->first;
values << ", " << i->second;
string command = "ALTER TABLE runs ADD COLUMN " + i->first + " DOUBLE ";
- sqlite3_exec( dbHandle, command.c_str(), 0, 0, 0 ); // ignore errors (column can exist already)
+ sqlite3_exec( dbHandle, command.c_str(), nullptr, nullptr, nullptr ); // ignore errors (column can exist already)
}
else
{
@@ -138,20 +138,20 @@ uint_t storeRunImpl( sqlite3 * dbHandle, std::string & filename,
values << " ,1";
// no boolean in sqlite3, use integer instead
string command = "ALTER TABLE runs ADD COLUMN " + i->getIdentifier() + " INTEGER ";
- sqlite3_exec ( dbHandle, command.c_str(), 0,0,0 ); // ignore errors (column can exist already)
+ sqlite3_exec ( dbHandle, command.c_str(), nullptr,nullptr,nullptr ); // ignore errors (column can exist already)
}
insertRunCommand += " ) ";
values << "); ";
insertRunCommand += values.str();
- int ret = sqlite3_exec ( dbHandle, insertRunCommand.c_str(), 0, 0, 0 );
+ int ret = sqlite3_exec ( dbHandle, insertRunCommand.c_str(), nullptr, nullptr, nullptr );
if ( ret != SQLITE_OK) {
WALBERLA_LOG_WARNING( "Failed to insert a row into run table of sqlite3 database: " << sqlite3_errmsg(dbHandle) << "\n sql command: " << insertRunCommand.c_str() );
}
uint_t generatedPrimaryKey = uint_c ( sqlite3_last_insert_rowid( dbHandle ) );
- sqlite3_exec( dbHandle, "END TRANSACTION;",0,0,0 );
+ sqlite3_exec( dbHandle, "END TRANSACTION;",nullptr,nullptr,nullptr );
return generatedPrimaryKey;
}
@@ -172,14 +172,14 @@ void storeAdditionalRunInfoImpl( sqlite3 * dbHandle,
const map<string, string > & stringProperties ,
const map<string, double > & realProperties )
{
- sqlite3_exec( dbHandle, "BEGIN;",0,0,0 );
+ sqlite3_exec( dbHandle, "BEGIN;",nullptr,nullptr,nullptr );
std::string CREATE_TABLE =
"CREATE TABLE IF NOT EXISTS " + tableName +
" (runId INTEGER, "
" FOREIGN KEY (runId) REFERENCES runs(runId) "
" );" ;
- sqlite3_exec( dbHandle, CREATE_TABLE.c_str(), 0,0,0);
+ sqlite3_exec( dbHandle, CREATE_TABLE.c_str(), nullptr,nullptr,nullptr);
string insertRunCommand = "INSERT INTO " + tableName + "( runId";
std::stringstream values;
@@ -190,7 +190,7 @@ void storeAdditionalRunInfoImpl( sqlite3 * dbHandle,
insertRunCommand += "," + i->first;
values << ", " << i->second;
string command = "ALTER TABLE " + tableName + " ADD COLUMN " + i->first + " INTEGER ";
- sqlite3_exec ( dbHandle, command.c_str(), 0,0,0 ); // ignore errors (column can exist already)
+ sqlite3_exec ( dbHandle, command.c_str(), nullptr,nullptr,nullptr ); // ignore errors (column can exist already)
}
// Add columns for string properties
@@ -199,7 +199,7 @@ void storeAdditionalRunInfoImpl( sqlite3 * dbHandle,
insertRunCommand += "," + i->first;
values << ", " << "\"" << i->second << "\"";
string command = "ALTER TABLE " + tableName + " ADD COLUMN " + i->first + " TEXT ";
- sqlite3_exec ( dbHandle, command.c_str(), 0,0,0 ); // ignore errors (column can exist already)
+ sqlite3_exec ( dbHandle, command.c_str(), nullptr,nullptr,nullptr ); // ignore errors (column can exist already)
}
@@ -209,18 +209,18 @@ void storeAdditionalRunInfoImpl( sqlite3 * dbHandle,
insertRunCommand += "," + i->first;
values << ", " << i->second ;
string command = "ALTER TABLE " + tableName + " ADD COLUMN " + i->first + " DOUBLE ";
- sqlite3_exec ( dbHandle, command.c_str(), 0,0,0 ); // ignore errors (column can exist already)
+ sqlite3_exec ( dbHandle, command.c_str(), nullptr,nullptr,nullptr ); // ignore errors (column can exist already)
}
insertRunCommand += " ) ";
values << "); ";
insertRunCommand += values.str();
- int ret = sqlite3_exec ( dbHandle, insertRunCommand.c_str(), 0, 0, 0 );
+ int ret = sqlite3_exec ( dbHandle, insertRunCommand.c_str(), nullptr, nullptr, nullptr );
if ( ret != SQLITE_OK) {
WALBERLA_LOG_WARNING( "Failed to insert a row into run table of sqlite3 database: " << sqlite3_errmsg(dbHandle) << "\n sql command: " << insertRunCommand.c_str() );
}
- sqlite3_exec( dbHandle, "END TRANSACTION;",0,0,0 );
+ sqlite3_exec( dbHandle, "END TRANSACTION;",nullptr,nullptr,nullptr );
}
@@ -293,7 +293,7 @@ void SQLiteDB::storeTimingPool ( uint_t runId,
const WcTimingPool & tp,
const std::string & timingPoolName )
{
- sqlite3_exec( dbHandle_, "BEGIN;",0,0,0 );
+ sqlite3_exec( dbHandle_, "BEGIN;",nullptr,nullptr,nullptr );
assert ( timingPoolName.length() > 0 && timingPoolName.length() < 255 );
@@ -316,10 +316,10 @@ void SQLiteDB::storeTimingPool ( uint_t runId,
" INSERT INTO timingPool (runId,name,sweep,average,min,max,count,variance,percentage) "
" VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ? )";
- sqlite3_exec( dbHandle_, CREATE_TIMINGPOOL_TABLE, 0,0,0 );
+ sqlite3_exec( dbHandle_, CREATE_TIMINGPOOL_TABLE, nullptr,nullptr,nullptr );
- sqlite3_stmt *stmt = NULL;
- auto retVal = sqlite3_prepare_v2(dbHandle_, INSERT_STATEMENT, -1, &stmt, 0 );
+ sqlite3_stmt *stmt = nullptr;
+ auto retVal = sqlite3_prepare_v2(dbHandle_, INSERT_STATEMENT, -1, &stmt, nullptr );
if ( retVal != SQLITE_OK ) {
WALBERLA_LOG_WARNING( "Failed to prepare SQL Insert statement." << file_ );
return;
@@ -346,7 +346,7 @@ void SQLiteDB::storeTimingPool ( uint_t runId,
sqlite3_step ( stmt ); // execute statement
sqlite3_reset ( stmt ); // undo binding
}
- sqlite3_exec( dbHandle_, "END TRANSACTION;",0,0,0 );
+ sqlite3_exec( dbHandle_, "END TRANSACTION;",nullptr,nullptr,nullptr );
sqlite3_finalize( stmt ); // free prepared statement
}
@@ -365,7 +365,7 @@ void SQLiteDB::storeTimingTree ( uint_t runId,
const WcTimingTree & tt,
const std::string & timingTreeName )
{
- sqlite3_exec( dbHandle_, "BEGIN;",0,0,0 );
+ sqlite3_exec( dbHandle_, "BEGIN;",nullptr,nullptr,nullptr );
assert ( timingTreeName.length() > 0 && timingTreeName.length() < 255 );
@@ -385,7 +385,7 @@ void SQLiteDB::storeTimingTree ( uint_t runId,
" FOREIGN KEY (runId) REFERENCES runs(runId) "
" );" ;
- sqlite3_exec( dbHandle_, CREATE_TIMINGTREE_TABLE, 0,0,0 );
+ sqlite3_exec( dbHandle_, CREATE_TIMINGTREE_TABLE, nullptr,nullptr,nullptr );
double totalTime = 0.0;
for (auto it = tt.getRawData().tree_.begin(); it != tt.getRawData().tree_.end(); ++it)
@@ -395,7 +395,7 @@ void SQLiteDB::storeTimingTree ( uint_t runId,
storeTimingNode(runId, std::numeric_limits<int>::max(), tt.getRawData(), timingTreeName, "Total", totalTime);
- sqlite3_exec( dbHandle_, "END TRANSACTION;",0,0,0 );
+ sqlite3_exec( dbHandle_, "END TRANSACTION;",nullptr,nullptr,nullptr );
}
//*******************************************************************************************************************
@@ -418,8 +418,8 @@ void SQLiteDB::storeTimingNode ( const uint_t runId,
" INSERT INTO timingTree (runId,name,parentId,sweep,average,min,max,count,variance,percentage) "
" VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
- sqlite3_stmt *stmt = NULL;
- auto retVal = sqlite3_prepare_v2(dbHandle_, INSERT_STATEMENT, -1, &stmt, 0 );
+ sqlite3_stmt *stmt = nullptr;
+ auto retVal = sqlite3_prepare_v2(dbHandle_, INSERT_STATEMENT, -1, &stmt, nullptr );
if ( retVal != SQLITE_OK ) {
WALBERLA_LOG_WARNING( "Failed to prepare SQL Insert statement (" << retVal << ")." );
return;
diff --git a/src/python_coupling/DictWrapper.h b/src/python_coupling/DictWrapper.h
index 912ce3a830aa9930ca1130b096a34ec0b4a9d2dc..0d2f0cab139433909ec078d7f1cf2b44e15e0a72 100644
--- a/src/python_coupling/DictWrapper.h
+++ b/src/python_coupling/DictWrapper.h
@@ -28,7 +28,9 @@
#include "PythonWrapper.h"
#include "core/DataTypes.h"
#include "core/Abort.h"
-#include <boost/bind.hpp>
+
+#include <functional>
+
namespace walberla {
namespace python_coupling {
diff --git a/src/python_coupling/DictWrapper.impl.h b/src/python_coupling/DictWrapper.impl.h
index 400eb2e7f09e4855cd2d1ffdb630b2dfb6ac6448..b6ffecb9be49db88624e5461c1f9b20ab5670d1b 100644
--- a/src/python_coupling/DictWrapper.impl.h
+++ b/src/python_coupling/DictWrapper.impl.h
@@ -19,6 +19,8 @@
//
//======================================================================================================================
+#include <functional>
+
namespace walberla {
namespace python_coupling {
@@ -113,7 +115,7 @@ inline void runPythonObject( boost::python::object obj ) {
template<>
inline std::function<void()> DictWrapper::get( const std::string & name ) {
boost::python::object obj ( d_[name] );
- return boost::bind( &runPythonObject, obj );
+ return std::bind( &runPythonObject, obj );
}
template<>
diff --git a/src/python_coupling/Manager.h b/src/python_coupling/Manager.h
index b6294b6fb0a6f218585b1e75bcc9d1bf5ba262ed..ed843ff11649c00ecfedf7b3e02713d8ce4afdb5 100644
--- a/src/python_coupling/Manager.h
+++ b/src/python_coupling/Manager.h
@@ -61,7 +61,7 @@ namespace python_coupling {
boost::python::object testBlockData( IBlock & block, BlockDataID blockDataID )
{
BlockDataToObjectTester tester( &block, blockDataID );
- for_each_noncopyable_type< TypeList > ( boost::ref(tester) );
+ for_each_noncopyable_type< TypeList > ( std::ref(tester) );
return tester.getResult();
}
diff --git a/src/python_coupling/Shell.cpp b/src/python_coupling/Shell.cpp
index 8f4379a9ed68e2810f920c440d5471181d5ec437..1a34e91a4c4b0d717ec8201cc82c7db47eafd791 100644
--- a/src/python_coupling/Shell.cpp
+++ b/src/python_coupling/Shell.cpp
@@ -238,7 +238,7 @@ namespace walberla {
namespace python_coupling {
Shell::Shell( const std::string & ) {}
- Shell::~Shell() {}
+ Shell::~Shell() = default;
void Shell::operator()() {}
} // namespace python_coupling
diff --git a/src/python_coupling/basic_exports/BasicExports.cpp b/src/python_coupling/basic_exports/BasicExports.cpp
index a3e4a8f31cbeb1715515319c2b6ff0e37bbe1e42..724efcfce421d3d171604a59617c3e4d6dfa15bc 100644
--- a/src/python_coupling/basic_exports/BasicExports.cpp
+++ b/src/python_coupling/basic_exports/BasicExports.cpp
@@ -43,6 +43,8 @@
#include <boost/version.hpp>
+#include <functional>
+
using namespace boost::python;
@@ -842,7 +844,7 @@ object * blockDataCreationHelper( IBlock * block, StructuredBlockStorage * bs,
uint_t StructuredBlockStorage_addBlockData( StructuredBlockStorage & s, const std::string & name, object functionPtr )
{
BlockDataID res = s.addStructuredBlockData(name)
- << StructuredBlockDataCreator<object>( boost::bind( &blockDataCreationHelper, _1,_2, functionPtr ) );
+ << StructuredBlockDataCreator<object>( std::bind( &blockDataCreationHelper, std::placeholders::_1, std::placeholders::_2, functionPtr ) );
//TODO extend this for moving block data ( packing und unpacking with pickle )
return res;
}
diff --git a/src/python_coupling/helper/ModuleInit.cpp b/src/python_coupling/helper/ModuleInit.cpp
index 60b18f57d5e15d873c3a5fbc619404d240a405fd..0058c7a713bbba4db5fc11449dd375c2c26dcb83 100644
--- a/src/python_coupling/helper/ModuleInit.cpp
+++ b/src/python_coupling/helper/ModuleInit.cpp
@@ -54,7 +54,7 @@ void initWalberlaForPythonModule()
Abort::instance()->resetAbortFunction( Abort::exceptionAbort );
- mpi::MPIManager::instance()->initializeMPI( 0,0 );
+ mpi::MPIManager::instance()->initializeMPI( nullptr,nullptr );
mpi::MPIManager::instance()->useWorldComm();
}
diff --git a/src/python_coupling/helper/MplHelpers.h b/src/python_coupling/helper/MplHelpers.h
index 640f45637b09d10dc54904250749830dea43fbc8..d9b0086647f491efacf3d7bf56c060124819b66c 100644
--- a/src/python_coupling/helper/MplHelpers.h
+++ b/src/python_coupling/helper/MplHelpers.h
@@ -28,8 +28,8 @@
#include <boost/mpl/pair.hpp>
#include <boost/mpl/transform.hpp>
-#include <boost/bind.hpp>
+#include <functional>
#include <map>
@@ -102,7 +102,7 @@ public:
return map_[ blockDataID ];
Exporter exporter( block_, blockDataID );
- for_each_noncopyable_type< FieldTypeList> ( boost::ref(exporter) );
+ for_each_noncopyable_type< FieldTypeList> ( std::ref(exporter) );
map_[ blockDataID ] = exporter.result;
return exporter.result;
}
diff --git a/src/simd/AVX2.h b/src/simd/AVX2.h
index 552cbb645b1f56daf13c5be564f61894861a1815..20fe0d4f3f6e2663d2b0ca1f30a74aa90382d2af 100644
--- a/src/simd/AVX2.h
+++ b/src/simd/AVX2.h
@@ -25,7 +25,7 @@
#include "immintrin.h"
#include "waLBerlaDefinitions.h"
-
+#include "core/DataTypes.h"
#include "IntelVecTypesCppOperators.h"
diff --git a/src/timeloop/PerformanceMeter.cpp b/src/timeloop/PerformanceMeter.cpp
index 7af5f847d18ba2ae2bc51049fbe8706a3d30a0a7..6efb92d969bb67da70230c1453a7c0a4cb62db9b 100644
--- a/src/timeloop/PerformanceMeter.cpp
+++ b/src/timeloop/PerformanceMeter.cpp
@@ -53,7 +53,7 @@ namespace timeloop {
*******************************************************************************************************************/
std::function<void () > PerformanceMeter::getBeforeFunction()
{
- return boost::bind ( &PerformanceMeter::timingStart, this );
+ return std::bind ( &PerformanceMeter::timingStart, this );
}
@@ -66,7 +66,7 @@ namespace timeloop {
*******************************************************************************************************************/
std::function<void () > PerformanceMeter::getAfterFunction()
{
- return boost::bind ( &PerformanceMeter::timingEnd, this );
+ return std::bind ( &PerformanceMeter::timingEnd, this );
}
@@ -85,7 +85,7 @@ namespace timeloop {
void PerformanceMeter::addMeasurement ( const std::string & name, CountFunction countFunction,
uint_t countFreq, real_t scaling )
{
- measurements_.push_back( Measurement( countFunction, name, scaling, countFreq ) );
+ measurements_.emplace_back( countFunction, name, scaling, countFreq );
uint_t cells = 0;
for( auto block = blockStorage_.begin(); block != blockStorage_.end(); ++block )
cells += countFunction( *block );
@@ -105,7 +105,7 @@ namespace timeloop {
*******************************************************************************************************************/
void PerformanceMeter::addMeasurement ( const std::string & name, real_t scaling )
{
- measurements_.push_back( Measurement( CountFunction(), name, scaling, uint_t(0) ) );
+ measurements_.emplace_back( CountFunction(), name, scaling, uint_t(0) );
uint_t cellsOnProcess = 0;
for( auto block = blockStorage_.begin(); block != blockStorage_.end(); ++block )
diff --git a/src/timeloop/PerformanceMeter.h b/src/timeloop/PerformanceMeter.h
index 732121789149a1553e927fe2eb5d24e8ffa07846..731f968fe7046e95e03f7ac2e7953119fce48f57 100644
--- a/src/timeloop/PerformanceMeter.h
+++ b/src/timeloop/PerformanceMeter.h
@@ -23,9 +23,7 @@
#include "core/timing/Timer.h"
#include "domain_decomposition/StructuredBlockStorage.h"
-#include <boost/bind.hpp>
#include <functional>
-
#include <iostream>
#include <map>
#include <string>
@@ -180,7 +178,7 @@ namespace timeloop {
typename FField::flag_t activeMask,
uint_t countFreq , real_t scaling )
{
- this->addMeasurement( name, boost::bind( flagFieldCountFunction<FField>, _1, flagFieldID, activeMask ),
+ this->addMeasurement( name, std::bind( flagFieldCountFunction<FField>, std::placeholders::_1, flagFieldID, activeMask ),
countFreq, scaling );
}
diff --git a/src/timeloop/SelectableFunctionCreators.h b/src/timeloop/SelectableFunctionCreators.h
index b6762e469e37afc1f3c093c76af35c822731ec82..4deaa2ce49eea46714205b7198935b105a9d7b1b 100644
--- a/src/timeloop/SelectableFunctionCreators.h
+++ b/src/timeloop/SelectableFunctionCreators.h
@@ -25,7 +25,6 @@
#include "core/uid/SUID.h"
#include "domain_decomposition/BlockStorage.h"
-#include <boost/bind.hpp>
#include <functional>
#include <string>
@@ -177,7 +176,7 @@ namespace timeloop {
BlockDataID bdId = bs_.addBlockData() << bdCreator;
// add a sweep function that fetches the block data sweep and executes it
- auto sweepFunc = boost::bind ( executeSweepOnBlock<SweepClass>, _1, bdId );
+ auto sweepFunc = std::bind ( executeSweepOnBlock<SweepClass>, std::placeholders::_1, bdId );
( *this ) << Sweep ( sweepFunc, sw.identifier_, sw.requiredSelectors_, sw.incompatibleSelectors_ );
return *this;
diff --git a/src/timeloop/Timeloop.cpp b/src/timeloop/Timeloop.cpp
index dea97c05787fb69adf29bcc84d51a4a9c03c9f9b..6b2f548d54ec9922200488243eec2355e3a9f676 100644
--- a/src/timeloop/Timeloop.cpp
+++ b/src/timeloop/Timeloop.cpp
@@ -138,7 +138,7 @@ Timeloop::FctHandle
Timeloop::addFuncBeforeTimeStep(const VoidFctNoArguments& f, const std::string & id,
const Set<SUID> & r, const Set<SUID> & e )
{
- beforeFunctions_.push_back( SelectableFunc(f,r,e,id) );
+ beforeFunctions_.emplace_back(f,r,e,id );
return beforeFunctions_.size() - 1;
}
@@ -157,7 +157,7 @@ Timeloop::FctHandle
Timeloop::addFuncAfterTimeStep(const VoidFctNoArguments& f, const std::string & id,
const Set<SUID> & r, const Set<SUID> & e )
{
- afterFunctions_.push_back( SelectableFunc(f,r,e,id) );
+ afterFunctions_.emplace_back(f,r,e,id );
return afterFunctions_.size() - 1;
}
@@ -179,7 +179,7 @@ void Timeloop::executeSelectable( const selectable::SetSelectableObject<VoidFctN
{
std::string objectName;
const VoidFctNoArguments * exe = selectable.getUnique( selector,objectName );
- if( exe == NULL )
+ if( exe == nullptr )
WALBERLA_ABORT( "Trying to selecting " << what << ": "
<< "Multiple Matches found! Check your selector " << selector << std::endl
<< "All registered objects: " << std::endl << selectable << std::endl );
diff --git a/src/vtk/Initialization.cpp b/src/vtk/Initialization.cpp
index d551086d5192ed5c2a824c7eef9cbe3a5a2adfa2..d6df0a4fb137d35fb8e4c8834d137bad99029b35 100644
--- a/src/vtk/Initialization.cpp
+++ b/src/vtk/Initialization.cpp
@@ -29,7 +29,8 @@
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/split.hpp>
-#include <boost/bind.hpp>
+
+#include <functional>
namespace walberla {
@@ -43,7 +44,7 @@ static void splitVector( T& x, T& y, T& z, const Config::BlockHandle& bb, const
std::vector< std::string > coordinates;
std::string vector = bb.getParameter< std::string >( vertex );
boost::split( coordinates, vector, boost::is_any_of("<,> \t") );
- coordinates.erase( std::remove_if( coordinates.begin(), coordinates.end(), boost::bind( &std::string::empty, _1 ) ), coordinates.end() );
+ coordinates.erase( std::remove_if( coordinates.begin(), coordinates.end(), std::bind( &std::string::empty, std::placeholders::_1 ) ), coordinates.end() );
if( coordinates.size() != 3 )
WALBERLA_ABORT( errorMsg );
@@ -60,7 +61,7 @@ static std::vector< std::string > splitList( const std::string& string )
std::vector< std::string > list;
boost::split( list, string, boost::is_any_of(", \t") );
- list.erase( std::remove_if( list.begin(), list.end(), boost::bind( &std::string::empty, _1 ) ), list.end() );
+ list.erase( std::remove_if( list.begin(), list.end(), std::bind( &std::string::empty, std::placeholders::_1 ) ), list.end() );
return list;
}
@@ -71,7 +72,7 @@ static void addStates( Set<SUID>& set, const std::string& string )
{
std::vector< std::string > states;
boost::split( states, string, boost::is_any_of(", \t") );
- states.erase( std::remove_if( states.begin(), states.end(), boost::bind( &std::string::empty, _1 ) ), states.end() );
+ states.erase( std::remove_if( states.begin(), states.end(), std::bind( &std::string::empty, std::placeholders::_1 ) ), states.end() );
for( auto it = states.begin(); it != states.end(); ++it )
set += SUID( *it );
@@ -294,7 +295,7 @@ void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & ou
{
for( auto inclusionFilterId = inclusionFiltersBlock.begin(); inclusionFilterId != inclusionFiltersBlock.end(); ++inclusionFilterId )
{
- if( inclusionFilterId->first.compare( "combine" ) == 0 )
+ if( inclusionFilterId->first == "combine" )
{
std::vector< std::string > filterList = splitList( inclusionFilterId->second );
ChainedFilter combine;
@@ -322,7 +323,7 @@ void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & ou
{
for( auto exclusionFilterId = exclusionFiltersBlock.begin(); exclusionFilterId != exclusionFiltersBlock.end(); ++exclusionFilterId )
{
- if( exclusionFilterId->first.compare( "combine" ) == 0 )
+ if( exclusionFilterId->first == "combine" )
{
std::vector< std::string > filterList = splitList( exclusionFilterId->second );
ChainedFilter combine;
@@ -564,7 +565,7 @@ void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & ou
* \param configBlockName Name of the block in the configuration that is used to setup the VTK output
*/
//**********************************************************************************************************************
-void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & outputFunctions, RegisterVTKOutputFunction registerVTKOutputFunction,
+void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & outputFunctions, const RegisterVTKOutputFunction& registerVTKOutputFunction,
const shared_ptr< const StructuredBlockStorage > & storage, const shared_ptr< Config > & config,
const std::string & configBlockName )
{
@@ -574,7 +575,7 @@ void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & ou
-void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & outputFunctions, RegisterVTKOutputFunction registerVTKOutputFunction,
+void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & outputFunctions, const RegisterVTKOutputFunction& registerVTKOutputFunction,
const shared_ptr< const StructuredBlockStorage > & storage, const Config::BlockHandle & parentBlockHandle,
const std::string & configBlockName )
{
diff --git a/src/vtk/Initialization.h b/src/vtk/Initialization.h
index b08caac6a49eb3f7a0e2f024a32cc6f62d1b2505..22e5902180b3934dd2b39a40caaecb1fe3f2cbda 100644
--- a/src/vtk/Initialization.h
+++ b/src/vtk/Initialization.h
@@ -80,11 +80,11 @@ typedef std::function< void ( std::vector< shared_ptr< BlockCellDataWriterInterf
std::map< std::string, VTKOutput::CellFilter > & filters,
std::map< std::string, VTKOutput::BeforeFunction > & beforeFunctions ) > RegisterVTKOutputFunction;
-void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & outputFunctions, RegisterVTKOutputFunction registerVTKOutputFunction,
+void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & outputFunctions, const RegisterVTKOutputFunction& registerVTKOutputFunction,
const shared_ptr< const StructuredBlockStorage > & storage, const shared_ptr< Config > & config,
const std::string & configBlockName = std::string("VTK") );
-void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & outputFunctions, RegisterVTKOutputFunction registerVTKOutputFunction,
+void initializeVTKOutput( std::map< std::string, SelectableOutputFunction > & outputFunctions, const RegisterVTKOutputFunction& registerVTKOutputFunction,
const shared_ptr< const StructuredBlockStorage > & storage, const Config::BlockHandle & parentBlockHandle,
const std::string & configBlockName = std::string("VTK") );
diff --git a/src/vtk/VTKOutput.cpp b/src/vtk/VTKOutput.cpp
index 7e660ac3157ab190a038781ea2f9ee8840a7f251..3d3cfa15924a0fc0642a36db1a372b72760646f0 100644
--- a/src/vtk/VTKOutput.cpp
+++ b/src/vtk/VTKOutput.cpp
@@ -45,7 +45,7 @@ VTKOutput::VTKOutput( const BlockStorage & bs, const std::string & identifier, c
const uint_t initialExecutionCount ) :
unstructuredBlockStorage_( &bs ),
- blockStorage_( NULL ),
+ blockStorage_( nullptr ),
baseFolder_( baseFolder ), executionFolder_( executionFolder ),
executionCounter_(initialExecutionCount), initialWriteCallsToSkip_(0), writeFrequency_( writeFrequency ), continuousNumbering_( continuousNumbering ),
pvdEnd_(-2), binary_( binary ), format_( binary ? std::string("binary") : std::string("ascii") ),
@@ -81,12 +81,12 @@ VTKOutput::VTKOutput( const StructuredBlockStorage & sbs, const std::string & id
-VTKOutput::VTKOutput( const shared_ptr< PointDataSource > pds, const std::string & identifier, const uint_t writeFrequency,
+VTKOutput::VTKOutput( const shared_ptr< PointDataSource >& pds, const std::string & identifier, const uint_t writeFrequency,
const std::string & baseFolder, const std::string & executionFolder,
const bool continuousNumbering, const bool binary, const bool littleEndian, const bool useMPIIO,
const uint_t initialExecutionCount ) :
- unstructuredBlockStorage_(NULL), blockStorage_( NULL ), pointDataSource_( pds ),
+ unstructuredBlockStorage_(nullptr), blockStorage_( nullptr ), pointDataSource_( pds ),
baseFolder_( baseFolder ), executionFolder_( executionFolder ),
executionCounter_(initialExecutionCount), initialWriteCallsToSkip_(0), writeFrequency_( writeFrequency ), continuousNumbering_( continuousNumbering ),
pvdEnd_(-2), binary_( binary ), format_( binary ? std::string("binary") : std::string("ascii") ),
@@ -102,12 +102,12 @@ VTKOutput::VTKOutput( const shared_ptr< PointDataSource > pds, const std::string
-VTKOutput::VTKOutput( const shared_ptr< PolylineDataSource > pds, const std::string & identifier, const uint_t writeFrequency,
+VTKOutput::VTKOutput( const shared_ptr< PolylineDataSource >& pds, const std::string & identifier, const uint_t writeFrequency,
const std::string & baseFolder, const std::string & executionFolder,
const bool continuousNumbering, const bool binary, const bool littleEndian, const bool useMPIIO,
const uint_t initialExecutionCount ) :
- unstructuredBlockStorage_(NULL), blockStorage_( NULL ), polylineDataSource_( pds ),
+ unstructuredBlockStorage_(nullptr), blockStorage_( nullptr ), polylineDataSource_( pds ),
baseFolder_( baseFolder ), executionFolder_( executionFolder ),
executionCounter_(initialExecutionCount), initialWriteCallsToSkip_(0), writeFrequency_( writeFrequency ), continuousNumbering_( continuousNumbering ),
pvdEnd_(-2), binary_( binary ), format_( binary ? std::string("binary") : std::string("ascii") ),
@@ -1240,9 +1240,9 @@ void VTKOutput::writeVTUPiece( std::ostream& ofs, const IBlock& block, const Cel
{
vimap[v] = numeric_cast< Index >(vc.size());
ci.push_back(numeric_cast< Index >(vc.size()));
- vc.push_back(VertexCoord((x == 0) ? aabb.xMin() : aabb.xMax(),
+ vc.emplace_back((x == 0) ? aabb.xMin() : aabb.xMax(),
(y == 0) ? aabb.yMin() : aabb.yMax(),
- (z == 0) ? aabb.zMin() : aabb.zMax()));
+ (z == 0) ? aabb.zMin() : aabb.zMax());
}
}
}
@@ -1329,9 +1329,9 @@ void VTKOutput::writeVTUPiece_sampling(std::ostream& ofs, const IBlock& block, c
{
vimap[v] = numeric_cast< Index >(vc.size());
ci.push_back(numeric_cast< Index >(vc.size()));
- vc.push_back(VertexCoord((x == 0) ? cell->aabb_.xMin() : cell->aabb_.xMax(),
+ vc.emplace_back((x == 0) ? cell->aabb_.xMin() : cell->aabb_.xMax(),
(y == 0) ? cell->aabb_.yMin() : cell->aabb_.yMax(),
- (z == 0) ? cell->aabb_.zMin() : cell->aabb_.zMax()));
+ (z == 0) ? cell->aabb_.zMin() : cell->aabb_.zMax());
}
}
}
diff --git a/src/vtk/VTKOutput.h b/src/vtk/VTKOutput.h
index 9b5945630446d443c88bfd5adda6b0bf77b3fc76..8d635ab44da684fd992c4328362fa8ebd5a6e986 100644
--- a/src/vtk/VTKOutput.h
+++ b/src/vtk/VTKOutput.h
@@ -198,13 +198,13 @@ private:
const uint_t ghostLayers, const bool forcePVTU, const uint_t initialExecutionCount = 0 );
/// creates a VTKOutput object that is supposed to output arbitrary point data
- VTKOutput( const shared_ptr< PointDataSource > pds, const std::string & identifier, const uint_t writeFrequency,
+ VTKOutput( const shared_ptr< PointDataSource >& pds, const std::string & identifier, const uint_t writeFrequency,
const std::string & baseFolder, const std::string & executionFolder,
const bool continuousNumbering, const bool binary, const bool littleEndian, const bool useMPIIO,
const uint_t initialExecutionCount = 0 );
/// creates a VTKOutput object that is supposed to output arbitrary polyline data
- VTKOutput( const shared_ptr< PolylineDataSource > pds, const std::string & identifier, const uint_t writeFrequency,
+ VTKOutput( const shared_ptr< PolylineDataSource >& pds, const std::string & identifier, const uint_t writeFrequency,
const std::string & baseFolder, const std::string & executionFolder,
const bool continuousNumbering, const bool binary, const bool littleEndian, const bool useMPIIO,
const uint_t initialExecutionCount = 0 );
diff --git a/tests/blockforest/BlockForestTest.cpp b/tests/blockforest/BlockForestTest.cpp
index 4ce1d00193675a6177a51c15aa367e7875facc56..e032b7de66420ca0e17c4fa6206c5e29889452b4 100644
--- a/tests/blockforest/BlockForestTest.cpp
+++ b/tests/blockforest/BlockForestTest.cpp
@@ -86,7 +86,7 @@ static void workloadMemorySUIDAssignmentFunction( SetupBlockForest& forest ) {
for( uint_t i = 0; i != forest.getNumberOfLevels(); ++i ) {
std::ostringstream oss;
oss << "Level_" << i;
- suids.push_back( SUID( oss.str(), false ) );
+ suids.emplace_back( oss.str(), false );
}
for( uint_t i = 0; i != blocks.size(); ++i ) {
@@ -139,7 +139,7 @@ static uint_t* blockdata5( const IBlock* const /*block*/ ) {
class Base
{
public:
- virtual ~Base() {}
+ virtual ~Base() = default;
bool operator==( const Base& /*rhs*/ ) const { return true; }
uint_t override() const { return 1; }
virtual uint_t func() const { return 2; }
@@ -149,7 +149,7 @@ class Derived : public Base
{
public:
uint_t override() const { return 10; }
- uint_t func() const { return 20; }
+ uint_t func() const override { return 20; }
};
@@ -169,7 +169,7 @@ static Derived* blockdataDerived( const IBlock* const /*block*/ )
class SecondBase
{
public:
- virtual ~SecondBase() {}
+ virtual ~SecondBase() = default;
bool operator==( const SecondBase& /*rhs*/ ) const { return true; }
uint_t override() const { return 100; }
};
@@ -179,7 +179,7 @@ class Multi : public Base, public SecondBase
public:
bool operator==( const Multi& /*rhs*/ ) const { return true; }
uint_t override() const { return 1000; }
- uint_t func() const { return 2000; }
+ uint_t func() const override { return 2000; }
};
diff --git a/tests/blockforest/DeterministicCreation.cpp b/tests/blockforest/DeterministicCreation.cpp
index b50dc5344cb3586c8e9b0ed38e68fa11f51b355d..d43582255c6899d8ec15d585d8de7bcce198908e 100644
--- a/tests/blockforest/DeterministicCreation.cpp
+++ b/tests/blockforest/DeterministicCreation.cpp
@@ -24,7 +24,7 @@
#include "core/logging/Logging.h"
#include "core/mpi/Environment.h"
-using namespace walberla;
+namespace walberla{
void TwoBlockForestsTest()
{
@@ -75,3 +75,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char** argv )
+{
+ return walberla::main(argc,argv);
+}
\ No newline at end of file
diff --git a/tests/blockforest/SaveLoadTest.cpp b/tests/blockforest/SaveLoadTest.cpp
index 11ab5d06b78ee4ad4e860056f77b9e79d7b5a701..12e41b44ac3c495f13ac90d6a7ec95ec925226ab 100644
--- a/tests/blockforest/SaveLoadTest.cpp
+++ b/tests/blockforest/SaveLoadTest.cpp
@@ -19,6 +19,8 @@
//======================================================================================================================
+#include <memory>
+
#include "blockforest/all.h"
#include "core/all.h"
#include "core/math/IntegerFactorization.h"
@@ -26,7 +28,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::blockforest;
void blockForestSaveLoadTest(const BlockForest::FileIOMode ioMode, const bool broadcast)
@@ -58,7 +60,7 @@ void blockForestSaveLoadTest(const BlockForest::FileIOMode ioMode, const bool br
check.clear();
- auto forestCheck = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), "SerializeDeserialize.sbf", broadcast ) );
+ auto forestCheck = std::make_shared< BlockForest >( uint_c( MPIManager::instance()->rank() ), "SerializeDeserialize.sbf", broadcast );
for (auto blockIt = forestCheck->begin(); blockIt != forestCheck->end(); ++blockIt)
{
@@ -120,3 +122,10 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc,argv);
+}
diff --git a/tests/blockforest/SetupBlockForestTest.cpp b/tests/blockforest/SetupBlockForestTest.cpp
index d2f1a73c0fffc6044f44ec6f4b0d00980cb48c01..f910fe4ecb23ac6099f1676fd44d5ae71e762986 100644
--- a/tests/blockforest/SetupBlockForestTest.cpp
+++ b/tests/blockforest/SetupBlockForestTest.cpp
@@ -173,7 +173,7 @@ static void checkNeighborhoodConsistency( const SetupBlockForest& forest ) {
// either one neighbor must be hit OR the block is located at the border of the (non-periodic) simulation domain
if( noHit )
- WALBERLA_CHECK( forest.getBlock(x,y,z) == NULL );
+ WALBERLA_CHECK( forest.getBlock(x,y,z) == nullptr );
}
// every neighbor must be hit by at least one point
diff --git a/tests/blockforest/communication/GhostLayerCommTest.cpp b/tests/blockforest/communication/GhostLayerCommTest.cpp
index 72e307c725af25bd0772f603148d211d0d093a3c..df97936c4f95c3eb98c0ab167c38186c93ebfd5b 100644
--- a/tests/blockforest/communication/GhostLayerCommTest.cpp
+++ b/tests/blockforest/communication/GhostLayerCommTest.cpp
@@ -40,7 +40,7 @@
#include <iostream>
-using namespace walberla;
+namespace walberla {
namespace wlb = walberla;
typedef GhostLayerField<real_t,19> PdfField;
@@ -269,8 +269,14 @@ int main(int argc, char **argv)
timeLoop.run();
+
+ return EXIT_SUCCESS;
+}
}
+int main(int argc, char **argv) {
+ return walberla::main(argc, argv);
+}
diff --git a/tests/boundary/BoundaryHandling.cpp b/tests/boundary/BoundaryHandling.cpp
index df06f25f3d4f06ac1c8c236ee99b9a321c6bf7db..dbc83e1fe2ed0137d412fdcb8e6f8a96f6020505 100644
--- a/tests/boundary/BoundaryHandling.cpp
+++ b/tests/boundary/BoundaryHandling.cpp
@@ -42,9 +42,9 @@ namespace walberla {
-typedef uint8_t flag_t;
+using flag_t = uint8_t;
-typedef FlagField< flag_t > FlagField_T;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< uint_t, stencil::D3Q27::Size > WorkField_T;
typedef GhostLayerField< uint_t, 1 > FactorField_T;
diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt
index 6885cf97661fa507cc240a45207b63a62aec4a43..ddb9907147e78dbba1d6a9d5fd07be6f2dc033e6 100644
--- a/tests/core/CMakeLists.txt
+++ b/tests/core/CMakeLists.txt
@@ -143,13 +143,6 @@ waLBerla_execute_test( NAME SetReductionTest27 COMMAND $<TARGET_FILE:SetReductio
waLBerla_compile_test( FILES mpi/ProbeVsExtraMessage.cpp DEPENDS postprocessing)
-##############
-# ptrvector #
-##############
-
-waLBerla_compile_test( NAME PtrVector FILES ptrvector/PtrVector.cpp )
-waLBerla_execute_test( NAME PtrVector )
-
##############
# selectable #
##############
diff --git a/tests/core/GridGeneratorTest.cpp b/tests/core/GridGeneratorTest.cpp
index 6de66e4c7c0aa86bb5786f2d342ba5fa446cd55f..7971b5f07b1861e03e8c63027903eb0cf30df2c9 100644
--- a/tests/core/GridGeneratorTest.cpp
+++ b/tests/core/GridGeneratorTest.cpp
@@ -90,45 +90,62 @@ void referencePointTest()
WALBERLA_CHECK_EQUAL( higherIt, endIt);
}
+template <class Grid>
+void rangeBasedTest()
+{
+ math::AABB domain(0,0,0,10,10,10);
+ real_t spacing = real_c(1);
+ auto dx = Vector3<real_t>( Grid::iterator::getUnitCellX(spacing), Grid::iterator::getUnitCellY(spacing), Grid::iterator::getUnitCellZ(spacing) );
+ auto lowerIt = typename Grid::iterator(domain, Vector3<real_t>(5,5,5) - dx * 30, spacing);
+ auto endIt = typename Grid::iterator();
+ for ( const auto& pt : Grid(domain, Vector3<real_t>(5,5,5) - dx * 30, spacing) )
+ {
+ WALBERLA_CHECK( lowerIt != endIt );
+ WALBERLA_CHECK_FLOAT_EQUAL( *lowerIt, pt);
+ ++lowerIt;
+ }
+ WALBERLA_CHECK( lowerIt == endIt );
+}
+
int main( int argc, char** argv )
{
walberla::Environment env(argc, argv);
WALBERLA_UNUSED(env);
std::vector< Vector3<real_t> > points;
- points.push_back( Vector3<real_t>(0,0,0) );
- points.push_back( Vector3<real_t>(1,0,0) );
- points.push_back( Vector3<real_t>(0,1,0) );
- points.push_back( Vector3<real_t>(1,1,0) );
- points.push_back( Vector3<real_t>(0,0,1) );
- points.push_back( Vector3<real_t>(1,0,1) );
- points.push_back( Vector3<real_t>(0,1,1) );
- points.push_back( Vector3<real_t>(1,1,1) );
+ points.emplace_back( real_t(0), real_t(0), real_t(0) );
+ points.emplace_back( real_t(1), real_t(0), real_t(0) );
+ points.emplace_back( real_t(0), real_t(1), real_t(0) );
+ points.emplace_back( real_t(1), real_t(1), real_t(0) );
+ points.emplace_back( real_t(0), real_t(0), real_t(1) );
+ points.emplace_back( real_t(1), real_t(0), real_t(1) );
+ points.emplace_back( real_t(0), real_t(1), real_t(1) );
+ points.emplace_back( real_t(1), real_t(1), real_t(1) );
auto correctPointIt = points.begin();
for (auto it = SCIterator(AABB(real_c(-0.01), real_c(-0.01), real_c(-0.01), real_c(1.9),real_c(1.9),real_c(1.9)), Vector3<real_t>(0,0,0), 1); it != SCIterator(); ++it, ++correctPointIt)
WALBERLA_CHECK_FLOAT_EQUAL( *it, *correctPointIt, (*it) << "!=" << (*correctPointIt) );
points.clear();
- points.push_back( Vector3<real_t>(0,0,0) );
- points.push_back( Vector3<real_t>(1,0,0) );
- points.push_back( Vector3<real_t>(real_c(0.5), real_c(0.866025),0) );
- points.push_back( Vector3<real_t>(real_c(1.5), real_c(0.866025),0) );
- points.push_back( Vector3<real_t>(0, real_c(1.73205),0) );
- points.push_back( Vector3<real_t>(1, real_c(1.73205),0) );
-
- points.push_back( Vector3<real_t>(real_c(0.5), real_c(0.288675), real_c(0.816497)) );
- points.push_back( Vector3<real_t>(real_c(1.5), real_c(0.288675), real_c(0.816497)) );
- points.push_back( Vector3<real_t>(0, real_c(1.1547), real_c(0.816497)) );
- points.push_back( Vector3<real_t>(1, real_c(1.1547), real_c(0.816497)) );
-
- points.push_back( Vector3<real_t>(0,0, real_c(1.63299) ) );
- points.push_back( Vector3<real_t>(1,0, real_c(1.63299) ) );
- points.push_back( Vector3<real_t>(real_c(0.5), real_c(0.866025), real_c(1.63299) ) );
- points.push_back( Vector3<real_t>(real_c(1.5), real_c(0.866025), real_c(1.63299) ) );
- points.push_back( Vector3<real_t>(0, real_c(1.73205), real_c(1.63299) ) );
- points.push_back( Vector3<real_t>(1, real_c(1.73205), real_c(1.63299) ) );
+ points.emplace_back(real_t(0),real_t(0),real_t(0) );
+ points.emplace_back(real_t(1),real_t(0),real_t(0) );
+ points.emplace_back(real_c(0.5), real_c(0.866025),real_t(0) );
+ points.emplace_back(real_c(1.5), real_c(0.866025),real_t(0) );
+ points.emplace_back(real_t(0), real_c(1.73205),real_t(0) );
+ points.emplace_back(real_t(1), real_c(1.73205),real_t(0) );
+
+ points.emplace_back(real_c(0.5), real_c(0.288675), real_c(0.816497) );
+ points.emplace_back(real_c(1.5), real_c(0.288675), real_c(0.816497) );
+ points.emplace_back(real_t(0), real_c(1.1547), real_c(0.816497) );
+ points.emplace_back(real_t(1), real_c(1.1547), real_c(0.816497) );
+
+ points.emplace_back(real_t(0),real_t(0), real_c(1.63299) );
+ points.emplace_back(real_t(1),real_t(0), real_c(1.63299) );
+ points.emplace_back(real_c(0.5), real_c(0.866025), real_c(1.63299) );
+ points.emplace_back(real_c(1.5), real_c(0.866025), real_c(1.63299) );
+ points.emplace_back(real_t(0), real_c(1.73205), real_c(1.63299) );
+ points.emplace_back(real_t(1), real_c(1.73205), real_c(1.63299) );
correctPointIt = points.begin();
- for (auto it = HCPIterator(AABB(real_c(-0.01), real_c(-0.01), real_c(-0.01), real_c(1.9),real_c(1.9),real_c(1.9)), Vector3<real_t>(0,0,0), 1); it != HCPIterator(); ++it, ++correctPointIt)
+ for (auto it = HCPIterator(AABB(real_c(-0.01), real_c(-0.01), real_c(-0.01), real_c(1.9),real_c(1.9),real_c(1.9)), Vector3<real_t>(real_t(0),real_t(0),real_t(0)), 1); it != HCPIterator(); ++it, ++correctPointIt)
{
WALBERLA_CHECK( floatIsEqual((*it)[0], (*correctPointIt)[0], real_c(0.00001)), (*it) << "!=" << (*correctPointIt));
WALBERLA_CHECK( floatIsEqual((*it)[1], (*correctPointIt)[1], real_c(0.00001)), (*it) << "!=" << (*correctPointIt));
@@ -139,5 +156,8 @@ int main( int argc, char** argv )
referencePointTest<SCIterator>();
referencePointTest<HCPIterator>();
+ rangeBasedTest<SCGrid>();
+ rangeBasedTest<HCPGrid>();
+
return EXIT_SUCCESS;
}
diff --git a/tests/core/debug/CheckMacroTest.cpp b/tests/core/debug/CheckMacroTest.cpp
index c4401e1698c2b0a2fbdab9024e7afbf4f677b93e..d2e4cf7a8ed94de05f876af83cc3e6ac67280fa3 100644
--- a/tests/core/debug/CheckMacroTest.cpp
+++ b/tests/core/debug/CheckMacroTest.cpp
@@ -54,7 +54,7 @@ int main()
{
// Pointers
- int* nullPointer = 0;
+ int* nullPointer = nullptr;
shared_ptr<int> sharedNullPointer;
WALBERLA_CHECK_NULLPTR(nullPointer);
WALBERLA_CHECK_NULLPTR(sharedNullPointer);
diff --git a/tests/core/load_balancing/MetisTest.cpp b/tests/core/load_balancing/MetisTest.cpp
index a460077c21653d9e628c12f868e330012a7d861f..22038220a93d192e4ac06c88a5fb220e5c415f8d 100644
--- a/tests/core/load_balancing/MetisTest.cpp
+++ b/tests/core/load_balancing/MetisTest.cpp
@@ -116,8 +116,8 @@ int main( int argc, char * argv[] )
int64_t edgecut;
std::vector< int64_t > part( numeric_cast<size_t>( nvtxs ) );
- int result = core::METIS_PartGraphRecursive( &nvtxs, &ncon, &(xadj.front()), &(adjncy.front()), NULL, NULL, NULL,
- &nparts, NULL, NULL, NULL, &edgecut, &(part.front()) );
+ int result = core::METIS_PartGraphRecursive( &nvtxs, &ncon, &(xadj.front()), &(adjncy.front()), nullptr, nullptr, nullptr,
+ &nparts, nullptr, nullptr, nullptr, &edgecut, &(part.front()) );
WALBERLA_CHECK_EQUAL( result, core::METIS_OK );
diff --git a/tests/core/load_balancing/ParMetisTest.cpp b/tests/core/load_balancing/ParMetisTest.cpp
index 0b9643961ab083a4da5a4fc886c5060eb9bc4116..fd72061009c5e4b26648e38473bd0f3185800ecc 100644
--- a/tests/core/load_balancing/ParMetisTest.cpp
+++ b/tests/core/load_balancing/ParMetisTest.cpp
@@ -136,7 +136,7 @@ int main( int argc, char * argv[] )
std::vector< int64_t > part( fieldSize[0] * fieldSize[1] );
MPI_Comm comm = MPIManager::instance()->comm();
- int result = core::ParMETIS_V3_PartKway( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), NULL, NULL, &wgtflag, &numflag, &ncon, &nparts,
+ int result = core::ParMETIS_V3_PartKway( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), nullptr, nullptr, &wgtflag, &numflag, &ncon, &nparts,
&(tpwgts.front()), &(ubvec.front()), options, &edgecut, &(part.front()), &comm );
diff --git a/tests/core/load_balancing/PlainParMetisTest.cpp b/tests/core/load_balancing/PlainParMetisTest.cpp
index 4419b3c0d96503bd9fdf142e48e993231c0f3896..3da514b38451c70db287b216e76ea7a78b634da0 100644
--- a/tests/core/load_balancing/PlainParMetisTest.cpp
+++ b/tests/core/load_balancing/PlainParMetisTest.cpp
@@ -171,22 +171,22 @@ int main( int argc, char * argv[] )
MPI_Comm comm = MPI_COMM_WORLD;
std::cout << "ParMETIS_V3_PartKway" << std::endl;
- WALBERLA_CHECK_EQUAL( ParMETIS_V3_PartKway( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), NULL, NULL, &wgtflag, &numflag, &ncon, &nparts,
+ WALBERLA_CHECK_EQUAL( ParMETIS_V3_PartKway( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), nullptr, nullptr, &wgtflag, &numflag, &ncon, &nparts,
&(tpwgts.front()), &(ubvec.front()), options, &edgecut, &(part.front()), &comm ),
METIS_OK );
std::cout << "ParMETIS_V3_PartGeomKway" << std::endl;
- WALBERLA_CHECK_EQUAL( ParMETIS_V3_PartGeomKway( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), NULL, NULL, &wgtflag, &numflag, &ndims, &(xyz.front()), &ncon, &nparts,
+ WALBERLA_CHECK_EQUAL( ParMETIS_V3_PartGeomKway( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), nullptr, nullptr, &wgtflag, &numflag, &ndims, &(xyz.front()), &ncon, &nparts,
&(tpwgts.front()), &(ubvec.front()), options, &edgecut, &(part.front()), &comm ),
METIS_OK );
std::cout << "ParMETIS_V3_PartGeom" << std::endl;
WALBERLA_CHECK_EQUAL( ParMETIS_V3_PartGeom( &(vtxdist.front()), &ndims, &(xyz.front()), &(part.front()), &comm ),
METIS_OK );
std::cout << "ParMETIS_V3_AdaptiveRepart" << std::endl;
- WALBERLA_CHECK_EQUAL( ParMETIS_V3_AdaptiveRepart( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), NULL, NULL, NULL, &wgtflag, &numflag, &ncon, &nparts,
+ WALBERLA_CHECK_EQUAL( ParMETIS_V3_AdaptiveRepart( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), nullptr, nullptr, nullptr, &wgtflag, &numflag, &ncon, &nparts,
&(tpwgts.front()), &(ubvec.front()), &ipc2redist, options, &edgecut, &(part.front()), &comm ),
METIS_OK );
std::cout << "ParMETIS_V3_RefineKway" << std::endl;
- WALBERLA_CHECK_EQUAL( ParMETIS_V3_RefineKway( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), NULL, NULL, &wgtflag, &numflag, &ncon, &nparts,
+ WALBERLA_CHECK_EQUAL( ParMETIS_V3_RefineKway( &(vtxdist.front()), &(xadj.front()), &(adjncy.front()), nullptr, nullptr, &wgtflag, &numflag, &ncon, &nparts,
&(tpwgts.front()), &(ubvec.front()), options, &edgecut, &(part.front()), &comm ),
METIS_OK );
diff --git a/tests/core/logging/LoggingTest.cpp b/tests/core/logging/LoggingTest.cpp
index f3068417ee17071e35460f1896130cc1343835c3..60c2e1b506da2bd45b36766e5fbac270acb22fd8 100644
--- a/tests/core/logging/LoggingTest.cpp
+++ b/tests/core/logging/LoggingTest.cpp
@@ -33,15 +33,15 @@ class MyStamp : public logging::Logging::CustomStamp
{
public:
MyStamp() : step_(uint_c(0)) {}
- ~MyStamp() {}
+ ~MyStamp() override = default;
void step( uint_t s ) { step_ = s; }
- std::string stamp()
+ std::string stamp() override
{
std::ostringstream oss;
oss << "[" << step_ << "]";
return oss.str();
}
- uint_t maxStampWidth() { return 5; }
+ uint_t maxStampWidth() override { return 5; }
private:
uint_t step_;
};
diff --git a/tests/core/math/GenericAABBTest.cpp b/tests/core/math/GenericAABBTest.cpp
index 9194c0ba802093334f89a50532ec45a36b27879b..d574ba15343cb932633661886ee2cc6c8cd582dd 100644
--- a/tests/core/math/GenericAABBTest.cpp
+++ b/tests/core/math/GenericAABBTest.cpp
@@ -36,7 +36,7 @@ using math::GenericAABB;
template< typename T >
void testEmptyAABB( const GenericAABB< T > & aabb )
{
- typedef Vector3< T > VecT;
+ using VecT = Vector3<T>;
WALBERLA_CHECK_EQUAL( aabb.minCorner(), VecT( T(0), T(0), T(0) ) );
WALBERLA_CHECK_EQUAL( aabb.maxCorner(), VecT( T(0), T(0), T(0) ) );
@@ -122,7 +122,7 @@ void testNonEmptyAABB( const GenericAABB< T > & aabb )
template< typename T >
void testAnyAABB( const GenericAABB< T > & aabb )
{
- typedef Vector3< T > VecT;
+ using VecT = Vector3<T>;
WALBERLA_CHECK_IDENTICAL( aabb.minCorner()[0], aabb.xMin() );
@@ -274,7 +274,7 @@ void testAnyAABB( const GenericAABB< T > & aabb )
template< typename T >
void testFixedAABB()
{
- typedef Vector3< T > VecT;
+ using VecT = Vector3<T>;
GenericAABB<T> aabb0;
testEmptyAABB( aabb0 );
@@ -330,7 +330,7 @@ void testFixedAABB()
template< typename T >
void testConstructors( const T x0, const T y0, const T z0, const T x1, const T y1, const T z1 )
{
- typedef Vector3< T > VecT;
+ using VecT = Vector3<T>;
{
GenericAABB< T > refAABB;
@@ -364,7 +364,7 @@ void testConstructors( const T x0, const T y0, const T z0, const T x1, const T y
{
GenericAABB< T > toBeCopied( x0, y0, z0, x1, y1, z1 );
- GenericAABB< T > refAABB( toBeCopied );
+ const GenericAABB< T > refAABB( toBeCopied ); // NOLINT
WALBERLA_CHECK_IDENTICAL( refAABB.minCorner()[0], std::min( x0, x1 ) );
WALBERLA_CHECK_IDENTICAL( refAABB.minCorner()[1], std::min( y0, y1 ) );
WALBERLA_CHECK_IDENTICAL( refAABB.minCorner()[2], std::min( z0, z1 ) );
@@ -645,7 +645,10 @@ int main(int argc, char**argv)
GenericAABB< double > doubleAABB( 1.0, 1.0, 1.0, 2.0, 2.0 ,2.0 );
GenericAABB< double > copiedAABB0( floatAABB );
- GenericAABB< double > copiedAABB1( doubleAABB );
+ const GenericAABB< double > copiedAABB1( doubleAABB );
+
+ WALBERLA_UNUSED(copiedAABB0);
+ WALBERLA_UNUSED(copiedAABB1);
randomTest<float>();
randomTest<double>();
diff --git a/tests/core/math/Matrix3Test.cpp b/tests/core/math/Matrix3Test.cpp
index 1cfbb83a211bd7f053c717d9975f0fe534026eea..7fd6aea27d2fdea315a27e87ea4dd342273840e4 100644
--- a/tests/core/math/Matrix3Test.cpp
+++ b/tests/core/math/Matrix3Test.cpp
@@ -62,6 +62,13 @@ void rotationTest()
WALBERLA_CHECK_FLOAT_EQUAL_EPSILON( result, cmp, real_t(1e-5) );
}
+void RARTTest()
+{
+ Matrix3<real_t> A ( 1,2,3,4,5,6,7,8,9 );
+ Matrix3<real_t> R ( 2,3,4,5,6,7,8,9,1 );
+ WALBERLA_CHECK_FLOAT_EQUAL( math::transformMatrixRART(R,A), R * A * R.getTranspose() );
+}
+
int main()
{
@@ -72,6 +79,7 @@ int main()
m1 * m2;
rotationTest();
+ RARTTest();
return 0;
}
diff --git a/tests/core/math/PlaneTest.cpp b/tests/core/math/PlaneTest.cpp
index 73e7d56c73808062b320609666219077e374398c..98cfdb45eca908c2a137488089a0a03314626ff8 100644
--- a/tests/core/math/PlaneTest.cpp
+++ b/tests/core/math/PlaneTest.cpp
@@ -36,10 +36,10 @@ using math::Plane;
template < typename scalar_t >
struct RandomPointGenerator
{
- typedef walberla::Vector3<scalar_t> vector_t;
+ using vector_t = walberla::Vector3<scalar_t>;
typedef std::mersenne_twister_engine< walberla::uint32_t, 32, 351, 175, 19, 0xccab8ee7, 11, 0xffffffff, 7, 0x31b6ab00, 15, 0xffe50000, 17, 0xa37d3c92 > mt11213b;
- typedef mt11213b RandomNumberEngine;
- typedef std::normal_distribution<scalar_t> NormalDistribution;
+ using RandomNumberEngine = mt11213b;
+ using NormalDistribution = std::normal_distribution<scalar_t>;
RandomPointGenerator( const vector_t & mu, const vector_t & sigma )
{
@@ -99,7 +99,7 @@ int main(int argc, char * argv[])
mpi::Environment mpiEnv( argc, argv );
- typedef Vector3<real_t> Vec3Real;
+ using Vec3Real = Vector3<real_t>;
Plane p( Vec3Real( real_t(0), real_t(0), real_t(0) ), Vec3Real( real_t(1), real_t(0), real_t(0) ) );
@@ -115,7 +115,7 @@ int main(int argc, char * argv[])
for( real_t x(-10); x < real_t(11); x += real_t(0.25) )
{
- static const Vector3<real_t> ZERO_VECTOR;
+ static const Vector3<real_t> ZERO_VECTOR {};
Plane pShifted( p );
pShifted.shift( x );
WALBERLA_CHECK_FLOAT_EQUAL( pShifted.signedDistance( ZERO_VECTOR ), -x );
diff --git a/tests/core/math/equation_system/EquationSolverTest.cpp b/tests/core/math/equation_system/EquationSolverTest.cpp
index 4d4fec40cc0d76bffab3c3aed814d1edd830dd26..4319769cfc8790368de21be1d261d6b5f13d4e04 100644
--- a/tests/core/math/equation_system/EquationSolverTest.cpp
+++ b/tests/core/math/equation_system/EquationSolverTest.cpp
@@ -81,23 +81,23 @@ int equationInput(){
std::vector<std::string> eqStringList;
//// Parameters
- eqStringList.push_back( "dt = 2e-7");
- eqStringList.push_back( "dx = 5e-6");
- eqStringList.push_back( "eta = 0.0001");
- eqStringList.push_back( "omega = 1.95");
- eqStringList.push_back( "rho = 1000");
+ eqStringList.emplace_back("dt = 2e-7");
+ eqStringList.emplace_back("dx = 5e-6");
+ eqStringList.emplace_back("eta = 0.0001");
+ eqStringList.emplace_back("omega = 1.95");
+ eqStringList.emplace_back("rho = 1000");
//// LBM Equations
- eqStringList.push_back( "'rho_L' = 1.0");
- eqStringList.push_back( "'dt_L' = 1.0");
- eqStringList.push_back( "'dx_L' = 1.0");
- eqStringList.push_back( "'c' = 'dx_L' / 'dt_L'");
- eqStringList.push_back( "'nu' = 'eta' / 'rho'");
- eqStringList.push_back( "'nu_L' = 'eta_L' / 'rho_L'");
- eqStringList.push_back( "'dt' = ( 0.1 * 'dx' ) / 'maxOcurringPhysVel'");
- eqStringList.push_back( "'cs' = ( 1.0 / ( 3.0 ^ 0.5 ) ) * 'c'");
- eqStringList.push_back( "'omega' = 1.0 / 'tau'");
- eqStringList.push_back( "'nu_L' = ( 'cs' ^ 2.0 ) * ( 'tau' - ( 0.5 * 'dt_L' ) )");
+ eqStringList.emplace_back("'rho_L' = 1.0");
+ eqStringList.emplace_back("'dt_L' = 1.0");
+ eqStringList.emplace_back("'dx_L' = 1.0");
+ eqStringList.emplace_back("'c' = 'dx_L' / 'dt_L'");
+ eqStringList.emplace_back("'nu' = 'eta' / 'rho'");
+ eqStringList.emplace_back("'nu_L' = 'eta_L' / 'rho_L'");
+ eqStringList.emplace_back("'dt' = ( 0.1 * 'dx' ) / 'maxOcurringPhysVel'");
+ eqStringList.emplace_back("'cs' = ( 1.0 / ( 3.0 ^ 0.5 ) ) * 'c'");
+ eqStringList.emplace_back("'omega' = 1.0 / 'tau'");
+ eqStringList.emplace_back("'nu_L' = ( 'cs' ^ 2.0 ) * ( 'tau' - ( 0.5 * 'dt_L' ) )");
/*
// Unsolvable:
// Parameters
@@ -171,7 +171,7 @@ int unitTest(double v)
}
int unitTests(unsigned int count){
- srand( static_cast<unsigned int>(time(NULL)) );
+ srand( static_cast<unsigned int>(time(nullptr)) );
double values[] = {0.0, 1.0, 1e-15, 1e+15};
unsigned int size = 4;
diff --git a/tests/core/mpi/BroadcastTest.cpp b/tests/core/mpi/BroadcastTest.cpp
index 9f502ae0c4b40aad6178911da4f8afacd6a1c4f9..2724851cf5a9ea31fb95253b6b9a77fd1b942aa8 100644
--- a/tests/core/mpi/BroadcastTest.cpp
+++ b/tests/core/mpi/BroadcastTest.cpp
@@ -26,7 +26,7 @@
#include "core/mpi/MPIManager.h"
#include <limits>
-#include <stdlib.h>
+#include <cstdlib>
#include <vector>
diff --git a/tests/core/mpi/BufferSystemTest.cpp b/tests/core/mpi/BufferSystemTest.cpp
index a6104a87ed537e76b3ce273f3aaf443d838b97e5..a57d24123ed8269d30e71112f4780ce72737b8e6 100644
--- a/tests/core/mpi/BufferSystemTest.cpp
+++ b/tests/core/mpi/BufferSystemTest.cpp
@@ -41,7 +41,7 @@ using namespace std::literals::chrono_literals;
-typedef std::mt19937 base_generator_type;
+using base_generator_type = std::mt19937;
/**
* Utility function for sleeping a random time
@@ -55,7 +55,7 @@ void randomSleep( int maxTimeInMs = 20 )
counter += 100;
int rank = MPIManager::instance()->worldRank();
- unsigned int seed = static_cast<unsigned int>(std::time(0)) + static_cast<unsigned int>(rank*1000) + counter;
+ unsigned int seed = static_cast<unsigned int>(std::time(nullptr)) + static_cast<unsigned int>(rank*1000) + counter;
generator.seed(seed);
std::uniform_int_distribution<> uni_dist(0,maxTimeInMs);
diff --git a/tests/core/mpi/BufferTest.cpp b/tests/core/mpi/BufferTest.cpp
index c34a1ef8e89d2a138031ba1dde8092be69e7f40a..741edc1f85340215798bc848b7a275adeb9e30c6 100644
--- a/tests/core/mpi/BufferTest.cpp
+++ b/tests/core/mpi/BufferTest.cpp
@@ -122,6 +122,16 @@ void initBoostArray( boost::array< T, N > & array )
*it = dist( rng );
}
+template<typename T, std::size_t N>
+void initStdArray( std::array< T, N > & array )
+{
+ static std::mt19937 rng;
+ std::uniform_int_distribution<T> dist;
+
+ for( auto it = array.begin(); it != array.end(); ++it )
+ *it = dist( rng );
+}
+
/// Simulates one send and receive operation
/// data is put into send buffer and copied to RecvBuffer
@@ -153,6 +163,7 @@ void bufferTest()
std::multimap<unsigned int, walberla::int64_t> stdMultiMap, stdMultiMapEmpty;
boost::array< unsigned int, 19 > boostArray;
+ std::array < unsigned int, 19 > stdArray;
initVecBool(boolStdVec);
initIntegerContainer(stdVec);
@@ -163,6 +174,7 @@ void bufferTest()
initIntegerMap(stdMap);
initIntegerMap(stdMultiMap);
initBoostArray(boostArray);
+ initStdArray(stdArray);
// Create send buffer and put two values in it
GenericSendBuffer<T> sb;
@@ -178,7 +190,7 @@ void bufferTest()
sb << stdMultiSet << stdMultiSetEmpty;
sb << stdMap << stdMapEmpty;
sb << stdMultiMap << stdMultiMapEmpty;
- sb << boostArray;
+ sb << boostArray << stdArray;
// Copying
//RecvBuffer<T> rb;
@@ -209,6 +221,7 @@ void bufferTest()
std::multimap<unsigned int, walberla::int64_t> recvStdMultiMap, recvStdMultiMapEmpty;
boost::array<unsigned int, 19> recvBoostArray;
+ std::array <unsigned int, 19> recvStdArray;
rb >> recvD >> recvI;
rb >> recvVec >> recvMat;
@@ -222,7 +235,7 @@ void bufferTest()
rb >> recvStdMultiSet >> recvStdMultiSetEmpty;
rb >> recvStdMap >> recvStdMapEmpty;
rb >> recvStdMultiMap >> recvStdMultiMapEmpty;
- rb >> recvBoostArray;
+ rb >> recvBoostArray >> recvStdArray;
// Validate
WALBERLA_CHECK_FLOAT_EQUAL(recvD,testDouble);
@@ -254,6 +267,7 @@ void bufferTest()
WALBERLA_CHECK_EQUAL(recvStdMultiMapEmpty, stdMultiMapEmpty);
WALBERLA_CHECK_EQUAL(recvBoostArray, boostArray);
+ WALBERLA_CHECK_EQUAL(recvStdArray, stdArray);
}
diff --git a/tests/core/mpi/ProbeVsExtraMessage.cpp b/tests/core/mpi/ProbeVsExtraMessage.cpp
index d05f2c8750b6d6e6fe9895912a590d1774b63c51..a6d3377437c4df849bac98d4a3631065dd355d12 100644
--- a/tests/core/mpi/ProbeVsExtraMessage.cpp
+++ b/tests/core/mpi/ProbeVsExtraMessage.cpp
@@ -30,7 +30,7 @@
#include <iostream>
#include <sstream>
-using namespace walberla;
+namespace walberla {
int getProcToReceiveFrom()
{
@@ -208,3 +208,9 @@ int main( int argc, char ** argv )
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/core/mpi/SetReductionTest.cpp b/tests/core/mpi/SetReductionTest.cpp
index d8dcc52ee95264f5cc2bb026412a721d4e86deeb..03822b995adf3c6482733fc3c9b53328d3c5cdc7 100644
--- a/tests/core/mpi/SetReductionTest.cpp
+++ b/tests/core/mpi/SetReductionTest.cpp
@@ -103,7 +103,7 @@ void testStrings()
std::vector< std::string > reducedValuesUnion = mpi::allReduceSet( values, mpi::UNION );
- values.push_back( "GRAPES" );
+ values.emplace_back("GRAPES" );
std::vector< std::string > reducedValuesIntersection = mpi::allReduceSet( values, mpi::INTERSECTION );
if( numProcesses == 1 )
diff --git a/tests/core/ptrvector/PtrVector.cpp b/tests/core/ptrvector/PtrVector.cpp
deleted file mode 100644
index 8ae38bdeaff93a71ac5187d7c223f87670de0b7f..0000000000000000000000000000000000000000
--- a/tests/core/ptrvector/PtrVector.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//======================================================================================================================
-//
-// This file is part of waLBerla. waLBerla 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.
-//
-// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
-//
-//! \file PtrVector.cpp
-//! \ingroup field
-//! \author Sebastian Eibl <sebastian.eibl@fau.de>
-//
-//======================================================================================================================
-
-#include "core/ptrvector/PtrVector.h"
-#include "core/ptrvector/policies/NoDelete.h"
-
-#include "core/debug/TestSubsystem.h"
-
-using namespace walberla;
-
-struct A{
- int c;
- int val;
- static int refCount;
-
- explicit A(int v = 0) : c(0), val(v) { ++refCount; }
- virtual ~A(){ --refCount; }
-};
-
-struct B : public A {
- B() : A(1) {}
-};
-
-struct C : public A {
- C() : A(2) {}
-};
-
-int A::refCount = 0;
-
-int main( int /*argc*/, char** /*argv*/ )
-{
- debug::enterTestMode();
- {
- auto a = new A();
- auto b = new B();
- auto c = new C();
-
- WALBERLA_CHECK_EQUAL(A::refCount, 3);
-
- PtrVector<A, PtrDelete> vec;
- vec.pushBack(a);
- vec.pushBack(b);
- vec.pushBack(c);
-
- WALBERLA_CHECK_EQUAL(A::refCount, 3);
-
- for (auto it = vec.begin(); it!=vec.end(); ++it){
- ++(it->c);
- }
- for (auto it = vec.begin<B>(); it!=vec.end<B>(); ++it){
- ++(it->c);
- }
-
- WALBERLA_CHECK_EQUAL(a->c, 1);
- WALBERLA_CHECK_EQUAL(b->c, 2);
-
- vec.erase(++vec.begin());
- int sum = 0;
- for (auto it = vec.begin(); it!=vec.end(); ++it){
- sum += it->val;
- }
-
- WALBERLA_CHECK_EQUAL(sum, 2);
- }
- WALBERLA_CHECK_EQUAL(A::refCount, 0);
-
- auto a = new A();
- auto b = new B();
- WALBERLA_CHECK_EQUAL(A::refCount, 2);
- {
- PtrVector<A, NoDelete> vec;
- vec.pushBack(a);
- vec.pushBack(b);
- WALBERLA_CHECK_EQUAL(A::refCount, 2);
- }
- WALBERLA_CHECK_EQUAL(A::refCount, 2);
-
- delete a;
- delete b;
-}
diff --git a/tests/core/selectable/SetSelectableObjectTest.cpp b/tests/core/selectable/SetSelectableObjectTest.cpp
index bbef76361d80d750bb69319077f1fa92bd918f1a..7e3ffec4a7d0146d2c704a79c257d7a9d6725bf1 100644
--- a/tests/core/selectable/SetSelectableObjectTest.cpp
+++ b/tests/core/selectable/SetSelectableObjectTest.cpp
@@ -41,7 +41,7 @@ int main( int /*argc*/, char** /*argv*/ ) {
debug::enterTestMode();
- typedef Set<size_t> A;
+ using A = Set<size_t>;
selectable::SetSelectableObject< std::string, size_t > container;
@@ -64,21 +64,21 @@ int main( int /*argc*/, char** /*argv*/ ) {
container.get( functions, A(1)+A(2)+A(3) );
expected.clear();
- expected.push_back("function_1");
- expected.push_back("function_5");
+ expected.emplace_back("function_1");
+ expected.emplace_back("function_5");
WALBERLA_CHECK_EQUAL( functions, expected );
WALBERLA_CHECK_EQUAL( container.get( function, A(1)+A(2)+A(3)+A(4) ), static_cast< size_t >(1) );
expected.clear();
- expected.push_back("function_4");
+ expected.emplace_back("function_4");
WALBERLA_CHECK_EQUAL( function, expected[0] );
WALBERLA_CHECK_EQUAL( container.get( function, A(1)+A(2) ), static_cast< size_t >(1) );
expected.clear();
- expected.push_back("function_3");
+ expected.emplace_back("function_3");
WALBERLA_CHECK_EQUAL( function, expected[0] );
WALBERLA_CHECK_EQUAL( container.get( function, A(1)+A(2)+A(3)+A(5)+A(6)+A(7) ), static_cast< size_t >(3) );
@@ -87,16 +87,16 @@ int main( int /*argc*/, char** /*argv*/ ) {
container.get( functions, A(1)+A(2)+A(3)+A(5)+A(6)+A(7) );
expected.clear();
- expected.push_back("function_1");
- expected.push_back("function_2");
- expected.push_back("function_5");
+ expected.emplace_back("function_1");
+ expected.emplace_back("function_2");
+ expected.emplace_back("function_5");
WALBERLA_CHECK_EQUAL( functions, expected );
WALBERLA_CHECK_EQUAL( container.get( function, A(1)+A(2)+A(3)+A(4)+A(5)+A(6)+A(7) ), static_cast< size_t >(1) );
expected.clear();
- expected.push_back("function_4");
+ expected.emplace_back("function_4");
WALBERLA_CHECK_EQUAL( function, expected[0] );
WALBERLA_CHECK_EQUAL( container.get( function, A(3)+A(5)+A(6) ), static_cast< size_t >(2) );
@@ -105,27 +105,27 @@ int main( int /*argc*/, char** /*argv*/ ) {
container.get( functions, A(3)+A(5)+A(6) );
expected.clear();
- expected.push_back("function_6");
- expected.push_back("function_7");
+ expected.emplace_back("function_6");
+ expected.emplace_back("function_7");
WALBERLA_CHECK_EQUAL( functions, expected );
WALBERLA_CHECK_EQUAL( container.get( function, A(1)+A(5)+A(6) ), static_cast< size_t >(1) );
expected.clear();
- expected.push_back("function_7");
+ expected.emplace_back("function_7");
WALBERLA_CHECK_EQUAL( function, expected[0] );
WALBERLA_CHECK_EQUAL( container.get( function, A(4)+A(5)+A(6) ), static_cast< size_t >(1) );
expected.clear();
- expected.push_back("function_6");
+ expected.emplace_back("function_6");
WALBERLA_CHECK_EQUAL( function, expected[0] );
WALBERLA_CHECK_EQUAL( container.get( function, A(7)+A(5)+A(6) ), static_cast< size_t >(1) );
expected.clear();
- expected.push_back("function_2");
+ expected.emplace_back("function_2");
WALBERLA_CHECK_EQUAL( function, expected[0] );
functions.clear();
@@ -133,13 +133,13 @@ int main( int /*argc*/, char** /*argv*/ ) {
functions.push_back( *it );
expected.clear();
- expected.push_back("function_1");
- expected.push_back("function_2");
- expected.push_back("function_3");
- expected.push_back("function_4");
- expected.push_back("function_5");
- expected.push_back("function_6");
- expected.push_back("function_7");
+ expected.emplace_back("function_1");
+ expected.emplace_back("function_2");
+ expected.emplace_back("function_3");
+ expected.emplace_back("function_4");
+ expected.emplace_back("function_5");
+ expected.emplace_back("function_6");
+ expected.emplace_back("function_7");
WALBERLA_CHECK_EQUAL( functions, expected );
diff --git a/tests/core/timing/SweepTimeloopTimerReduction.cpp b/tests/core/timing/SweepTimeloopTimerReduction.cpp
index f05b224e1f164b5991f8deb44370c450c05a6e0e..d071b0503d338b45ecccebb584d667754f52b4cd 100644
--- a/tests/core/timing/SweepTimeloopTimerReduction.cpp
+++ b/tests/core/timing/SweepTimeloopTimerReduction.cpp
@@ -36,45 +36,42 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
-
-
-void dummySweep ( IBlock * block )
+void dummySweep ( walberla::IBlock * block )
{
WALBERLA_LOG_DEVEL("DummySweep on block " << block );
}
int main( int argc, char ** argv )
{
- debug::enterTestMode();
+ walberla::debug::enterTestMode();
walberla::Environment walberlaEnv( argc, argv );
// 9 processes and 8 blocks: one process does not have a block
- WALBERLA_CHECK_EQUAL( MPIManager::instance()->numProcesses(), 9 );
+ WALBERLA_CHECK_EQUAL( walberla::MPIManager::instance()->numProcesses(), 9 );
- using namespace blockforest;
+ using namespace walberla::blockforest;
SetupBlockForest sforest;
sforest.addWorkloadMemorySUIDAssignmentFunction( uniformWorkloadAndMemoryAssignment );
- sforest.init( AABB(0,0,0, 2,2,2), 2, 2, 2, false, false, false );
+ sforest.init( walberla::AABB(0,0,0, 2,2,2), 2, 2, 2, false, false, false );
// calculate process distribution
const memory_t memoryLimit = 1;
GlobalLoadBalancing::MetisConfiguration< SetupBlock > metisConfig( false, false, uniformFacesDominantCommunication );
- sforest.calculateProcessDistribution_Default( uint_c( MPIManager::instance()->numProcesses() ), memoryLimit, "hilbert", 10, false, metisConfig );
- MPIManager::instance()->useWorldComm();
+ sforest.calculateProcessDistribution_Default( walberla::uint_c( walberla::MPIManager::instance()->numProcesses() ), memoryLimit, "hilbert", 10, false, metisConfig );
+ walberla::MPIManager::instance()->useWorldComm();
// create StructuredBlockForest (encapsulates a newly created BlockForest)
- auto bf = shared_ptr< BlockForest >( new BlockForest( uint_c( MPIManager::instance()->rank() ), sforest, true ) );
- auto sbf = shared_ptr< StructuredBlockForest >( new StructuredBlockForest( bf, 10, 10, 10 ) );
+ auto bf = std::make_shared< BlockForest >( walberla::uint_c( walberla::MPIManager::instance()->rank() ), sforest, true );
+ auto sbf = std::make_shared< StructuredBlockForest >( bf, 10, 10, 10 );
sbf->createCellBoundingBoxes();
- SweepTimeloop tl( sbf, 1 );
- tl.add() << Sweep( dummySweep, "DummySweep" );
+ walberla::SweepTimeloop tl( sbf, 1 );
+ tl.add() << walberla::Sweep( dummySweep, "DummySweep" );
- WcTimingPool timingPool;
+ walberla::WcTimingPool timingPool;
tl.run( timingPool );
timingPool.logResultOnRoot();
diff --git a/tests/core/timing/TimingPoolTest.cpp b/tests/core/timing/TimingPoolTest.cpp
index ca30ca0134b50fae471de03752386748893365a2..11f5f5b88562e3ecc883330e1602e1aae1cc3d27 100644
--- a/tests/core/timing/TimingPoolTest.cpp
+++ b/tests/core/timing/TimingPoolTest.cpp
@@ -28,7 +28,7 @@
#include <iostream>
-using namespace walberla;
+namespace walberla {
using std::cout;
using std::endl;
@@ -178,17 +178,18 @@ void merging()
pool1.merge( pool2, true );
WALBERLA_CHECK_EQUAL ( pool1["test"].getCounter(), 6 );
}
+}// namespace walberla
int main( int argc, char ** argv )
{
- debug::enterTestMode();
- MPIManager::instance()->initializeMPI( &argc, &argv );
+ walberla::debug::enterTestMode();
+ walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
- simpleTiming();
- scopedTimer();
- reduction();
- merging();
+ walberla::simpleTiming();
+ walberla::scopedTimer();
+ walberla::reduction();
+ walberla::merging();
return 0;
}
diff --git a/tests/core/timing/TimingTreeTest.cpp b/tests/core/timing/TimingTreeTest.cpp
index 862620f326fc8b0eeadcfb55c3b64c6221fd13be..f0f1dc20726b6d08a7de9a3228c02089ac9a67ce 100644
--- a/tests/core/timing/TimingTreeTest.cpp
+++ b/tests/core/timing/TimingTreeTest.cpp
@@ -13,7 +13,7 @@
// You should have received a copy of the GNU General Public License along
// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
-//! \file TimingPoolTest.cpp
+//! \file TimingTreeTest.cpp
//! \ingroup core
//! \author Martin Bauer <martin.bauer@fau.de>
//
@@ -27,24 +27,22 @@
#include <iostream>
-using namespace walberla;
-
void mssleep(unsigned int ms)
{
- timing::StaticPolicy::addTime( ms * 1e-3);
+ walberla::timing::StaticPolicy::addTime( ms * 1e-3);
}
int main( int argc, char ** argv )
{
- debug::enterTestMode();
+ walberla::debug::enterTestMode();
- mpi::Environment mpiEnv(argc, argv);
+ walberla::mpi::Environment mpiEnv(argc, argv);
WALBERLA_UNUSED( mpiEnv );
- const unsigned int rank = static_cast<unsigned int> ( MPIManager::instance()->worldRank() );
+ const unsigned int rank = static_cast<unsigned int> ( walberla::MPIManager::instance()->worldRank() );
- timing::TimingTree<timing::StaticPolicy> tt;
- timing::StaticPolicy::setTime(0);
+ walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt;
+ walberla::timing::StaticPolicy::setTime(0);
tt.start("A");
mssleep(100 * rank);
@@ -67,16 +65,40 @@ int main( int argc, char ** argv )
tt.stop("AC");
tt.stop("A");
+ WALBERLA_ASSERT(tt.timerExists("A"));
+ WALBERLA_ASSERT(tt.timerExists("A.AA"));
+ WALBERLA_ASSERT(tt.timerExists("A.AB.ABA"));
+ WALBERLA_ASSERT(tt.timerExists("A.AB.ABB"));
+ WALBERLA_ASSERT(tt.timerExists("A.AC.ACA"));
+ WALBERLA_ASSERT(!tt.timerExists("AAC"));
+ WALBERLA_ASSERT(!tt.timerExists("A.AA.C"));
+
// check copy constructor
- timing::TimingTree<timing::StaticPolicy> tt2(tt);
+ walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt2(tt);
// check assignment operator
- timing::TimingTree<timing::StaticPolicy> tt3;
+ walberla::timing::TimingTree<walberla::timing::StaticPolicy> tt3;
tt3 = tt;
- tt2 = tt.getReduced( timing::REDUCE_TOTAL, 0 );
- tt2 = tt.getReduced( timing::REDUCE_TOTAL, 1 );
-
- tt2 = tt.getReduced( timing::REDUCE_MIN, -1 );
+ WALBERLA_ASSERT(tt2.timerExists("A"));
+ WALBERLA_ASSERT(tt2.timerExists("A.AA"));
+ WALBERLA_ASSERT(tt2.timerExists("A.AB.ABA"));
+ WALBERLA_ASSERT(tt2.timerExists("A.AB.ABB"));
+ WALBERLA_ASSERT(tt2.timerExists("A.AC.ACA"));
+ WALBERLA_ASSERT(!tt2.timerExists("AAC"));
+ WALBERLA_ASSERT(!tt2.timerExists("A.AA.C"));
+
+ WALBERLA_ASSERT(tt3.timerExists("A"));
+ WALBERLA_ASSERT(tt3.timerExists("A.AA"));
+ WALBERLA_ASSERT(tt3.timerExists("A.AB.ABA"));
+ WALBERLA_ASSERT(tt3.timerExists("A.AB.ABB"));
+ WALBERLA_ASSERT(tt3.timerExists("A.AC.ACA"));
+ WALBERLA_ASSERT(!tt3.timerExists("AAC"));
+ WALBERLA_ASSERT(!tt3.timerExists("A.AA.C"));
+
+ tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, 0 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, 1 );
+
+ tt2 = tt.getReduced( walberla::timing::REDUCE_MIN, -1 );
{
const auto& data = tt2.getRawData();
WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -85,7 +107,7 @@ int main( int argc, char ** argv )
WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
}
- tt2 = tt.getReduced( timing::REDUCE_MAX, -1 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_MAX, -1 );
{
const auto& data = tt2.getRawData();
WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -94,7 +116,7 @@ int main( int argc, char ** argv )
WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
}
- tt2 = tt.getReduced( timing::REDUCE_AVG, -1 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_AVG, -1 );
{
const auto& data = tt2.getRawData();
WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
@@ -103,7 +125,7 @@ int main( int argc, char ** argv )
WALBERLA_CHECK_FLOAT_EQUAL( tt["A.AB.ABB"].total(), (0.100 * rank), "total time: " << tt["A.AB.ABB"].total() );
}
- tt2 = tt.getReduced( timing::REDUCE_TOTAL, -1 );
+ tt2 = tt.getReduced( walberla::timing::REDUCE_TOTAL, -1 );
{
const auto& data = tt2.getRawData();
WALBERLA_CHECK_FLOAT_EQUAL( data.tree_.at("A").timer_.total(), (1.8) );
diff --git a/tests/domain_decomposition/CMakeLists.txt b/tests/domain_decomposition/CMakeLists.txt
index 2c7cae2624be9baca0d50259c941223c233aa4f9..56fd5c358a5d74fc28ee78b910a0a08b22ca4524 100644
--- a/tests/domain_decomposition/CMakeLists.txt
+++ b/tests/domain_decomposition/CMakeLists.txt
@@ -4,6 +4,9 @@
#
###################################################################################################
+waLBerla_compile_test( NAME MapPointToPeriodicDomain FILES MapPointToPeriodicDomain.cpp DEPENDS core )
+waLBerla_execute_test( NAME MapPointToPeriodicDomain )
+
waLBerla_compile_test( NAME PeriodicIntersect FILES PeriodicIntersect.cpp DEPENDS core blockforest )
waLBerla_execute_test( NAME PeriodicIntersect )
diff --git a/tests/domain_decomposition/MapPointToPeriodicDomain.cpp b/tests/domain_decomposition/MapPointToPeriodicDomain.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..ee60a1144fb6495c955e2765c0c7dfc1444a433a
--- /dev/null
+++ b/tests/domain_decomposition/MapPointToPeriodicDomain.cpp
@@ -0,0 +1,85 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file MapToPeriodicDomain.cpp
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include "core/debug/TestSubsystem.h"
+#include "core/Environment.h"
+#include "core/math/AABB.h"
+#include "core/math/Vector3.h"
+#include "domain_decomposition/MapPointToPeriodicDomain.h"
+
+namespace walberla {
+namespace testing {
+
+int main (int argc, char** argv)
+{
+ using namespace walberla::domain_decomposition;
+
+ debug::enterTestMode();
+
+ walberla::Environment walberlaEnv( argc, argv );
+ WALBERLA_UNUSED(walberlaEnv);
+
+ std::array<bool, 3> isPeriodic{{true, true, true}};
+ math::Vector3<real_t> minCorner(real_t(2), real_t(3), real_t(4));
+ math::Vector3<real_t> maxCorner(real_t(3), real_t(4), real_t(5));
+ math::AABB domain(minCorner, maxCorner);
+
+ //minCorner -> minCorner
+ math::Vector3<real_t> p = minCorner;
+ mapPointToPeriodicDomain( isPeriodic, domain, p);
+ WALBERLA_CHECK_IDENTICAL( p[0], minCorner[0] );
+ WALBERLA_CHECK_IDENTICAL( p[1], minCorner[1] );
+ WALBERLA_CHECK_IDENTICAL( p[2], minCorner[2] );
+
+ //maxCorner -> minCorner
+ p = maxCorner;
+ mapPointToPeriodicDomain( isPeriodic, domain, p);
+ WALBERLA_CHECK_IDENTICAL( p[0], minCorner[0] );
+ WALBERLA_CHECK_IDENTICAL( p[1], minCorner[1] );
+ WALBERLA_CHECK_IDENTICAL( p[2], minCorner[2] );
+
+ //minCorner - epsilon -> maxCorner - epsilon
+ p[0] = std::nextafter(domain.xMin(), real_t(0));
+ p[1] = std::nextafter(domain.yMin(), real_t(0));
+ p[2] = std::nextafter(domain.zMin(), real_t(0));
+ mapPointToPeriodicDomain( isPeriodic, domain, p);
+ WALBERLA_CHECK_IDENTICAL( p[0], std::nextafter(domain.xMax(), domain.xMin()) );
+ WALBERLA_CHECK_IDENTICAL( p[1], std::nextafter(domain.yMax(), domain.yMin()) );
+ WALBERLA_CHECK_IDENTICAL( p[2], std::nextafter(domain.zMax(), domain.zMin()) );
+
+ //maxCorner - epsilon -> maxCorner - epsilon
+ p[0] = std::nextafter(domain.xMax(), domain.xMin());
+ p[1] = std::nextafter(domain.yMax(), domain.yMin());
+ p[2] = std::nextafter(domain.zMax(), domain.zMin());
+ mapPointToPeriodicDomain( isPeriodic, domain, p);
+ WALBERLA_CHECK_IDENTICAL( p[0], std::nextafter(domain.xMax(), domain.xMin()) );
+ WALBERLA_CHECK_IDENTICAL( p[1], std::nextafter(domain.yMax(), domain.yMin()) );
+ WALBERLA_CHECK_IDENTICAL( p[2], std::nextafter(domain.zMax(), domain.zMin()) );
+
+ return EXIT_SUCCESS;
+}
+
+} //namespace testing
+} //namespace walberla
+
+int main( int argc, char** argv )
+{
+ return walberla::testing::main(argc, argv);
+}
diff --git a/tests/domain_decomposition/PeriodicIntersect.cpp b/tests/domain_decomposition/PeriodicIntersect.cpp
index be1bd3f53f9487fc8b065f2b58dc00fecf8cde4b..6753c472eafefc73fda0d2492f683a5ff0c90038 100644
--- a/tests/domain_decomposition/PeriodicIntersect.cpp
+++ b/tests/domain_decomposition/PeriodicIntersect.cpp
@@ -31,7 +31,7 @@
#include "stencil/D3Q27.h"
-using namespace walberla;
+namespace walberla {
bool periodicCheck( StructuredBlockForest& forest, const math::AABB& box1, const math::AABB& box2)
{
@@ -194,3 +194,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/field/FieldGatherTest.cpp b/tests/field/FieldGatherTest.cpp
index 8f6645b03e8afd692029f51847e564cd6e32d228..5e0aacc5796a9aa5a92e94725ecb8c85176da4a9 100644
--- a/tests/field/FieldGatherTest.cpp
+++ b/tests/field/FieldGatherTest.cpp
@@ -28,7 +28,7 @@
#include "field/AddToStorage.h"
-using namespace walberla;
+namespace walberla {
int main( int argc, char ** argv )
@@ -82,3 +82,9 @@ int main( int argc, char ** argv )
return 0;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc,argv);
+}
diff --git a/tests/field/FieldMPIDatatypesTest.cpp b/tests/field/FieldMPIDatatypesTest.cpp
index 3328c1bd72c222d404c589041a9866fd2a8e33f3..0eba715567a53e2edd773b05344d7453978d5602 100644
--- a/tests/field/FieldMPIDatatypesTest.cpp
+++ b/tests/field/FieldMPIDatatypesTest.cpp
@@ -35,12 +35,9 @@
#include <random>
-namespace mpi_datatypes_test {
+namespace walberla {
-using namespace walberla;
using namespace field::communication;
-using walberla::real_t;
-using walberla::uint_t;
class FieldRandomizer
{
@@ -549,16 +546,10 @@ int main( int argc, char* argv[] )
return EXIT_SUCCESS;
}
-
-
-
-
-
-} // namespace mpi_datatypes_test
-
+} // namespace walberla
int main( int argc, char* argv[] )
{
- return mpi_datatypes_test::main( argc, argv );
+ return walberla::main( argc, argv );
}
diff --git a/tests/field/FieldTiming.cpp b/tests/field/FieldTiming.cpp
index 5e8fd340756e899de7c9c0c6ca2e725682c60bb8..283f0dc5fbf623ec1dd315ea3088f1e73cfcb4cb 100644
--- a/tests/field/FieldTiming.cpp
+++ b/tests/field/FieldTiming.cpp
@@ -30,7 +30,8 @@
#include <sstream>
-using namespace walberla;
+namespace walberla {
+
using namespace field;
using std::cout;
@@ -84,7 +85,7 @@ double sumHandWrittenPlusIf(const DoubleField & field)
const double* end = &field.get(cell_idx_c(field.xSize())-1,y,z,f)+1;
for(; begin!=end; ++begin) {
sum += *begin;
- if(begin == 0) // Artificial if condition to simulate iterators
+ if(begin == nullptr) // Artificial if condition to simulate iterators
cout << "Should not happen" << endl;
}
}
@@ -110,7 +111,7 @@ double sumIteratorCachedEnd(const DoubleField & field)
//WALBERLA_CHECK_EQUAL(field.layout() == fzyx );
double sum = 0;
- const DoubleField::const_iterator myEnd = field.end();
+ const DoubleField::const_iterator& myEnd = field.end();
for(DoubleField::const_iterator i = field.begin(); i != myEnd; ++i)
sum += *i;
@@ -172,7 +173,7 @@ double xyzfTest ( const DoubleField & field )
{
double sum = 0;
double sum2 = 0;
- const DoubleField::const_iterator myEnd = field.end();
+ const DoubleField::const_iterator& myEnd = field.end();
for(DoubleField::const_iterator i = field.begin(); i != myEnd; ++i)
{
sum += *i;
@@ -196,7 +197,7 @@ double initFieldRandom(DoubleField & field)
return sum;
}
-typedef std::function<double (const DoubleField & field)> Func;
+using Func = std::function<double (const DoubleField &)>;
void timeFunction( WcTimer & timer, Func f, const DoubleField & field, double sum, double epsilon, int nrExecutions=30 )
{
for(int i=0 ; i < nrExecutions; ++i)
@@ -263,4 +264,11 @@ int main(int argc, char ** argv)
ofstream of ( fileName.str().c_str() );
of << "size = [ " << xs << "," << ys << "," << zs <<"];" << endl;
tp.printMatlab( of );
+
+ return EXIT_SUCCESS;
+}
+}
+
+int main(int argc, char** argv){
+ return walberla::main(argc, argv);
}
diff --git a/tests/field/FlagFieldTest.cpp b/tests/field/FlagFieldTest.cpp
index a73c506fa1d67f1ff7f7dae4d26e02d09614ef8e..97b9d382ee34b5bfd732756b893faf298eb4de70 100644
--- a/tests/field/FlagFieldTest.cpp
+++ b/tests/field/FlagFieldTest.cpp
@@ -65,14 +65,14 @@ void registerTest()
WALBERLA_CHECK(overFlow);
vector<string> names;
- names.push_back("Flag1");
- names.push_back("Flag2");
- names.push_back("Flag3");
- names.push_back("Flag4");
- names.push_back("Flag5");
- names.push_back("Flag6");
- names.push_back("Flag7");
- names.push_back("Flag8");
+ names.emplace_back("Flag1");
+ names.emplace_back("Flag2");
+ names.emplace_back("Flag3");
+ names.emplace_back("Flag4");
+ names.emplace_back("Flag5");
+ names.emplace_back("Flag6");
+ names.emplace_back("Flag7");
+ names.emplace_back("Flag8");
for(size_t i=0; i<names.size(); ++i)
{
@@ -119,7 +119,7 @@ void shallowCopyTest()
{
// Test shallow copy
- typedef FlagField<wlb::uint8_t> FField;
+ using FField = FlagField<wlb::uint8_t>;
FField ff ( 3,3,3,1 );
ff.registerFlag("FirstFlag");
@@ -152,7 +152,7 @@ void shallowCopyTest()
void printingTest()
{
- typedef FlagField<wlb::uint8_t> FField;
+ using FField = FlagField<wlb::uint8_t>;
FField ff ( 3,3,3,1 );
auto ns = ff.registerFlag("NoSlip");
auto fs = ff.registerFlag("FreeSlip");
@@ -172,7 +172,7 @@ void printingTest()
void neighborhoodTest()
{
- typedef FlagField<wlb::uint8_t> FField;
+ using FField = FlagField<wlb::uint8_t>;
FField ff ( 3,3,3,1 );
auto i = ff.registerFlag("Interface");
auto l = ff.registerFlag("Liquid");
diff --git a/tests/field/adaptors/AdaptorTest.cpp b/tests/field/adaptors/AdaptorTest.cpp
index 028b8db3fe9ef0de471feb30c14c2e5ed9e0effa..109c348e344803d4816b1c58e4d3602ebdab4ddd 100644
--- a/tests/field/adaptors/AdaptorTest.cpp
+++ b/tests/field/adaptors/AdaptorTest.cpp
@@ -41,11 +41,11 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
+namespace walberla {
-typedef lbm::D3Q19< lbm::collision_model::SRT > LatticeModel_T;
+using LatticeModel_T = lbm::D3Q19<lbm::collision_model::SRT>;
-typedef lbm::PdfField< LatticeModel_T > PdfField;
+using PdfField = lbm::PdfField<LatticeModel_T>;
typedef GhostLayerField<real_t,1 > ScalarField;
typedef GhostLayerField<Vector3<real_t>,1 > VectorField;
@@ -54,9 +54,9 @@ template<typename Field_T>
class DoubledValueOfField
{
public:
- typedef Field_T basefield_t;
- typedef typename Field_T::const_base_iterator basefield_iterator;
- typedef typename Field_T::value_type value_type;
+ using basefield_t = Field_T;
+ using basefield_iterator = typename Field_T::const_base_iterator;
+ using value_type = typename Field_T::value_type;
static_assert( basefield_t::F_SIZE >= 2, "Only for fields with F_SIZE >=2 " );
@@ -84,7 +84,7 @@ void iteratorTest()
GhostLayerField<real_t, 2> field ( 4, 4, 3, 2, MAGIC_SRC );
// adapter reduces field to have only one f and one ghost layer
- typedef DoubledValueOfField< decltype(field) > Functor;
+ using Functor = DoubledValueOfField<decltype(field)>;
field::GhostLayerFieldAdaptor<Functor, 1 > adaptor ( field );
uint_t ctr = 0;
@@ -167,4 +167,9 @@ int main( int argc, char ** argv )
return 0;
}
+}
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
diff --git a/tests/field/communication/FieldPackInfoTest.cpp b/tests/field/communication/FieldPackInfoTest.cpp
index d7b94789b8699ffd1b659b9cfdc192ac3fdac4c0..4b48e8f478d4fb89139f0a48a7f6fdb33da0d0bb 100644
--- a/tests/field/communication/FieldPackInfoTest.cpp
+++ b/tests/field/communication/FieldPackInfoTest.cpp
@@ -34,7 +34,7 @@
#include <cstring>
-using namespace walberla;
+namespace walberla {
void testScalarField( IBlock * block, BlockDataID fieldId )
@@ -185,3 +185,9 @@ int main(int argc, char **argv)
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/field/distributors/DistributionTest.cpp b/tests/field/distributors/DistributionTest.cpp
index 4d0e4f644d153c055c9d61c0648568a13df94eb0..daf4784ba15e9ca733b49622eead02b63b8c9c41 100644
--- a/tests/field/distributors/DistributionTest.cpp
+++ b/tests/field/distributors/DistributionTest.cpp
@@ -32,14 +32,14 @@
#include <vector>
-using namespace walberla;
-
namespace distribution_tests {
+using namespace walberla;
+
const uint_t FieldGhostLayers( 1 );
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< real_t, 1> ScalarField_T;
typedef GhostLayerField< Vector3<real_t>, 1> Vec3Field_T;
@@ -249,7 +249,7 @@ void testNearestNeighborDistributor( const shared_ptr<StructuredBlockStorage> &
Vector3<real_t> distributionPoint(real_t(1.9), real_t(2.1), real_t(2.1));
real_t distributionValue(real_t(100));
auto containingBlockID = blocks->getBlock(distributionPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
auto distPtr = containingBlockID->getData<ScalarDistributor_T>(scalarDistributorID);
distPtr->distribute(distributionPoint, &distributionValue);
@@ -268,7 +268,7 @@ void testNearestNeighborDistributor( const shared_ptr<StructuredBlockStorage> &
Vector3<real_t> distributionPoint(real_t(5.4),real_t(2.1),real_t(3.2));
Vector3<real_t> distributionValue(real_t(100), real_t(-10), real_t(1));
auto containingBlockID = blocks->getBlock(distributionPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
auto distPtr = containingBlockID->getData<Vec3Distributor_T>(vectorDistributorID);
distPtr->distribute(distributionPoint, &distributionValue);
@@ -296,7 +296,7 @@ void testNearestNeighborDistributor( const shared_ptr<StructuredBlockStorage> &
distributionValue[1] = real_t(-10);
distributionValue[2] = real_t(1);
auto containingBlockID = blocks->getBlock(distributionPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
auto distPtr = containingBlockID->getData<MultiComponentDistributor_T>(multiComponentDistributorID);
distPtr->distribute(distributionPoint, distributionValue.begin());
@@ -334,7 +334,7 @@ void testKernelDistributor( const shared_ptr<StructuredBlockStorage> & blocks, c
Vector3<real_t> distributionPoint(real_t(1.9), real_t(2.1), real_t(2.1));
real_t distributionValue(real_t(100));
auto containingBlockID = blocks->getBlock(distributionPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
auto distPtr = containingBlockID->getData<ScalarDistributor_T>(scalarDistributorID);
distPtr->distribute(distributionPoint, &distributionValue);
@@ -353,7 +353,7 @@ void testKernelDistributor( const shared_ptr<StructuredBlockStorage> & blocks, c
Vector3<real_t> distributionPoint(real_t(5.4),real_t(2.1),real_t(3.2));
Vector3<real_t> distributionValue(real_t(100), real_t(-10), real_t(1));
auto containingBlockID = blocks->getBlock(distributionPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
auto distPtr = containingBlockID->getData<Vec3Distributor_T>(vectorDistributorID);
distPtr->distribute(distributionPoint, &distributionValue);
@@ -381,7 +381,7 @@ void testKernelDistributor( const shared_ptr<StructuredBlockStorage> & blocks, c
distributionValue[1] = real_t(-10);
distributionValue[2] = real_t(1);
auto containingBlockID = blocks->getBlock(distributionPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
auto distPtr = containingBlockID->getData<MultiComponentDistributor_T>(multiComponentDistributorID);
distPtr->distribute(distributionPoint, distributionValue.begin());
@@ -415,7 +415,7 @@ void testNearestNeighborDistributorAtBoundary( const shared_ptr<StructuredBlockS
Vector3<real_t> distributionPoint(real_t(1.9), real_t(2.1), real_t(2.1));
real_t distributionValue(real_t(100));
auto containingBlockID = blocks->getBlock(distributionPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
auto distPtr = containingBlockID->getData<ScalarDistributor_T>(scalarDistributorID);
distPtr->distribute(distributionPoint, &distributionValue);
}
@@ -433,7 +433,7 @@ void testNearestNeighborDistributorAtBoundary( const shared_ptr<StructuredBlockS
Vector3<real_t> distributionPoint(real_t(2.7), real_t(2.1), real_t(1.1));
real_t distributionValue(real_t(100));
auto containingBlockID = blocks->getBlock(distributionPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
auto distPtr = containingBlockID->getData<ScalarDistributor_T>(scalarDistributorID);
distPtr->distribute(distributionPoint, &distributionValue);
}
@@ -459,7 +459,7 @@ void testKernelDistributorAtBoundary( const shared_ptr<StructuredBlockStorage> &
Vector3<real_t> distributionPoint(real_t(1.9), real_t(2.1), real_t(2.1));
real_t distributionValue(real_t(100));
auto containingBlockID = blocks->getBlock(distributionPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
auto distPtr = containingBlockID->getData<ScalarDistributor_T>(scalarDistributorID);
distPtr->distribute(distributionPoint, &distributionValue);
}
@@ -477,7 +477,7 @@ void testKernelDistributorAtBoundary( const shared_ptr<StructuredBlockStorage> &
Vector3<real_t> distributionPoint(real_t(2.7), real_t(2.1), real_t(1.1));
real_t distributionValue(real_t(100));
auto containingBlockID = blocks->getBlock(distributionPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
auto distPtr = containingBlockID->getData<ScalarDistributor_T>(scalarDistributorID);
distPtr->distribute(distributionPoint, &distributionValue);
}
diff --git a/tests/field/interpolators/FieldInterpolationTest.cpp b/tests/field/interpolators/FieldInterpolationTest.cpp
index 32adf2898cf57a2ccbc988d01d0f9de02c8ebfd9..3571c3fd9cf154b98d88801301db89181e8b47b5 100644
--- a/tests/field/interpolators/FieldInterpolationTest.cpp
+++ b/tests/field/interpolators/FieldInterpolationTest.cpp
@@ -32,14 +32,14 @@
#include <vector>
-using namespace walberla;
+namespace walberla {
namespace field_interpolation_tests {
const uint_t FieldGhostLayers( 1 );
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< real_t, 1> ScalarField_T;
typedef GhostLayerField< Vector3<real_t>, 1> Vec3Field_T;
@@ -129,7 +129,7 @@ void testNearestNeighborFieldInterpolator( const shared_ptr<StructuredBlockStora
{
Vector3<real_t> interpolationPoint(real_t(1.9), real_t(2.1), real_t(2.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
@@ -142,7 +142,7 @@ void testNearestNeighborFieldInterpolator( const shared_ptr<StructuredBlockStora
{
Vector3<real_t> interpolationPoint(real_t(5.4),real_t(2.1),real_t(3.2));
auto containingBlockID = blocks->getBlock( interpolationPoint );
- if( containingBlockID != NULL ) {
+ if( containingBlockID != nullptr ) {
Vector3<real_t> interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<Vec3FieldInterpolator_T>(vectorFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -156,7 +156,7 @@ void testNearestNeighborFieldInterpolator( const shared_ptr<StructuredBlockStora
{
Vector3<real_t> interpolationPoint(real_t(4.4),real_t(2.1),real_t(3.2));
auto containingBlockID = blocks->getBlock( interpolationPoint );
- if( containingBlockID != NULL ) {
+ if( containingBlockID != nullptr ) {
std::vector<real_t> interpolatedValue(3, real_t(0));
auto interPtr = containingBlockID->getData<MultiComponentFieldInterpolator_T>(multiComponentFieldInterpolatorID);
interPtr->get(interpolationPoint, interpolatedValue.begin());
@@ -182,7 +182,7 @@ void testTrilinearFieldInterpolator( const shared_ptr<StructuredBlockStorage> &
{
Vector3<real_t> interpolationPoint(real_t(1.9), real_t(2.1), real_t(2.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
@@ -195,7 +195,7 @@ void testTrilinearFieldInterpolator( const shared_ptr<StructuredBlockStorage> &
{
Vector3<real_t> interpolationPoint(real_t(5.4),real_t(2.1),real_t(3.2));
auto containingBlockID = blocks->getBlock( interpolationPoint );
- if( containingBlockID != NULL ) {
+ if( containingBlockID != nullptr ) {
Vector3<real_t> interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<Vec3FieldInterpolator_T>(vectorFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -209,7 +209,7 @@ void testTrilinearFieldInterpolator( const shared_ptr<StructuredBlockStorage> &
{
Vector3<real_t> interpolationPoint(real_t(4.4),real_t(2.1),real_t(3.2));
auto containingBlockID = blocks->getBlock( interpolationPoint );
- if( containingBlockID != NULL ) {
+ if( containingBlockID != nullptr ) {
std::vector<real_t> interpolatedValue(3, real_t(0));
auto interPtr = containingBlockID->getData<MultiComponentFieldInterpolator_T>(multiComponentFieldInterpolatorID);
interPtr->get(interpolationPoint, interpolatedValue.begin());
@@ -235,7 +235,7 @@ void testKernelFieldInterpolator( const shared_ptr<StructuredBlockStorage> & blo
{
Vector3<real_t> interpolationPoint(real_t(1.9), real_t(2.1), real_t(2.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if( containingBlockID != NULL )
+ if( containingBlockID != nullptr )
{
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
@@ -248,7 +248,7 @@ void testKernelFieldInterpolator( const shared_ptr<StructuredBlockStorage> & blo
{
Vector3<real_t> interpolationPoint(real_t(5.4),real_t(2.1),real_t(3.2));
auto containingBlockID = blocks->getBlock( interpolationPoint );
- if( containingBlockID != NULL ) {
+ if( containingBlockID != nullptr ) {
Vector3<real_t> interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<Vec3FieldInterpolator_T>(vectorFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -262,7 +262,7 @@ void testKernelFieldInterpolator( const shared_ptr<StructuredBlockStorage> & blo
{
Vector3<real_t> interpolationPoint(real_t(4.4),real_t(2.1),real_t(3.2));
auto containingBlockID = blocks->getBlock( interpolationPoint );
- if( containingBlockID != NULL ) {
+ if( containingBlockID != nullptr ) {
std::vector<real_t> interpolatedValue(3, real_t(0));
auto interPtr = containingBlockID->getData<MultiComponentFieldInterpolator_T>(multiComponentFieldInterpolatorID);
interPtr->get(interpolationPoint, interpolatedValue.begin());
@@ -284,7 +284,7 @@ void testNearestNeighborFieldInterpolatorAtBoundary( const shared_ptr<Structured
{
Vector3<real_t> interpolationPoint(real_t(1.9), real_t(2.1), real_t(2.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -297,7 +297,7 @@ void testNearestNeighborFieldInterpolatorAtBoundary( const shared_ptr<Structured
{
Vector3<real_t> interpolationPoint(real_t(2.7), real_t(2.1), real_t(1.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -317,7 +317,7 @@ void testTrilinearFieldInterpolatorAtBoundary( const shared_ptr<StructuredBlockS
{
Vector3<real_t> interpolationPoint(real_t(1.9), real_t(2.1), real_t(2.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -330,7 +330,7 @@ void testTrilinearFieldInterpolatorAtBoundary( const shared_ptr<StructuredBlockS
{
Vector3<real_t> interpolationPoint(real_t(2.7), real_t(2.1), real_t(1.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -350,7 +350,7 @@ void testKernelFieldInterpolatorAtBoundary( const shared_ptr<StructuredBlockStor
{
Vector3<real_t> interpolationPoint(real_t(1.9), real_t(2.1), real_t(2.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -367,7 +367,7 @@ void testKernelFieldInterpolatorAtBoundary( const shared_ptr<StructuredBlockStor
{
Vector3<real_t> interpolationPoint(real_t(2.7), real_t(2.1), real_t(1.1));
auto containingBlockID = blocks->getBlock(interpolationPoint);
- if (containingBlockID != NULL) {
+ if (containingBlockID != nullptr) {
real_t interpolatedValue(real_t(0));
auto interPtr = containingBlockID->getData<ScalarFieldInterpolator_T>(scalarFieldInterpolatorID);
interPtr->get(interpolationPoint, &interpolatedValue);
@@ -424,7 +424,8 @@ int main(int argc, char **argv) {
}
} // namespace field_interpolation_tests
+}
int main( int argc, char **argv ){
- field_interpolation_tests::main(argc, argv);
+ walberla::field_interpolation_tests::main(argc, argv);
}
\ No newline at end of file
diff --git a/tests/gather/CurveGatherTest.cpp b/tests/gather/CurveGatherTest.cpp
index 1697fd4476908d0bf8cfcd70cf481883e883a0c3..362ea0fba6f4f097cec3de0908c6165d64f42018 100644
--- a/tests/gather/CurveGatherTest.cpp
+++ b/tests/gather/CurveGatherTest.cpp
@@ -37,7 +37,7 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<real_t,1> GlField;
@@ -103,3 +103,9 @@ int main( int argc, char ** argv )
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gather/GatherSchemeTest.cpp b/tests/gather/GatherSchemeTest.cpp
index d1904ed017102bce6c875d839008055e5613ef13..438d731dee22992aa9020560e98d9eead4575398 100644
--- a/tests/gather/GatherSchemeTest.cpp
+++ b/tests/gather/GatherSchemeTest.cpp
@@ -36,7 +36,7 @@
#include <iostream>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField<cell_idx_t, 1> ScalarField;
@@ -95,7 +95,7 @@ public:
: cellInterval_ ( ci )
{}
- virtual void process(const std::vector<std::vector<real_t> > & data)
+ void process(const std::vector<std::vector<real_t> > & data) override
{
uint_t counter =0;
for( auto it = cellInterval_.begin(); it != cellInterval_.end(); ++it )
@@ -190,3 +190,9 @@ int main(int argc, char ** argv )
}
return 0;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gather/MPIGatherSchemeTest.cpp b/tests/gather/MPIGatherSchemeTest.cpp
index 2d9189b4037be60a60862411c16e0053efa853a0..aecb1e1848dd80ae3544dc4f464e67b42dd72a4f 100644
--- a/tests/gather/MPIGatherSchemeTest.cpp
+++ b/tests/gather/MPIGatherSchemeTest.cpp
@@ -34,17 +34,16 @@
#include "core/mpi/MPIManager.h"
-using namespace walberla;
-
+namespace walberla {
class TestGatherPackInfo : public gather::GatherPackInfo
{
public:
- TestGatherPackInfo() {}
- virtual ~TestGatherPackInfo() {}
+ TestGatherPackInfo() = default;
+ ~TestGatherPackInfo() override = default;
- virtual void packData ( const IBlock *, mpi::GenericSendBuffer<unsigned char> & outBuffer )
+ void packData ( const IBlock *, mpi::GenericSendBuffer<unsigned char> & outBuffer ) override
{
auto mpi = MPIManager::instance();
@@ -57,7 +56,7 @@ public:
}
- virtual void unpackData( mpi::GenericRecvBuffer<unsigned char> & buffer )
+ void unpackData( mpi::GenericRecvBuffer<unsigned char> & buffer ) override
{
int nrOfItems;
buffer >> nrOfItems;
@@ -69,7 +68,7 @@ public:
receivedRanks_.insert( nrOfItems );
}
- virtual void gatherFinished()
+ void gatherFinished() override
{
auto mpi = MPIManager::instance();
@@ -87,7 +86,7 @@ public:
private:
std::set<int> receivedRanks_;
};
-
+}// namespace walberla
@@ -95,12 +94,12 @@ int main( int argc, char ** argv )
{
walberla::Environment env( argc, argv );
- debug::enterTestMode();
+ walberla::debug::enterTestMode();
- uint_t numProcesses = uint_c( MPIManager::instance()->numProcesses() );
+ walberla::uint_t numProcesses = walberla::uint_c( walberla::MPIManager::instance()->numProcesses() );
WALBERLA_CHECK( numProcesses >= 2 );
- using blockforest::createUniformBlockGrid;
+ using walberla::blockforest::createUniformBlockGrid;
auto blocks = createUniformBlockGrid( numProcesses, 1, 1,
1, 1, 1,
1,
@@ -108,8 +107,8 @@ int main( int argc, char ** argv )
false, false, false, // periodicity
false ); // do NOT keep global information
- gather::MPIGatherScheme gatherScheme( blocks->getBlockStorage(), 0 );
- gatherScheme.addPackInfo( make_shared<TestGatherPackInfo>() );
+ walberla::gather::MPIGatherScheme gatherScheme( blocks->getBlockStorage(), 0 );
+ gatherScheme.addPackInfo( walberla::make_shared<walberla::TestGatherPackInfo>() );
for(int i=0; i<3; ++i )
gatherScheme();
diff --git a/tests/geometry/BinaryRawFileTest.cpp b/tests/geometry/BinaryRawFileTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..cc219ea1b162c98abaa93f246f6a3c841f276c5f
--- /dev/null
+++ b/tests/geometry/BinaryRawFileTest.cpp
@@ -0,0 +1,155 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BinaryRawFileTest.cpp
+//! \ingroup geometry
+//! \author Christian Godenschwager <christian.godenschwager@fau.de>
+//
+//======================================================================================================================
+
+#include "blockforest/Initialization.h"
+
+#include "core/DataTypes.h"
+#include "core/Abort.h"
+#include "core/logging/Logging.h"
+#include "core/mpi/Environment.h"
+
+#include "field/AddToStorage.h"
+#include "field/vtk/VTKWriter.h"
+
+#include "geometry/structured/BinaryRawFile.h"
+
+#include "vtk/Initialization.h"
+
+#include <string>
+#include <vector>
+
+namespace walberla {
+namespace geometry {
+
+void test( const std::string & filename, const Vector3<uint_t> & size, const std::string & datatype, const bool vtkOut )
+{
+ WALBERLA_LOG_INFO( "Testing unscaled" );
+ BinaryRawFile brf( filename, size, datatype );
+
+ auto blocks = blockforest::createUniformBlockGrid( uint_t(1), uint_t( 1 ), uint_t( 1 ),
+ size[0], size[1], size[2],
+ real_t( 1 ),
+ uint_t( 1 ), uint_t( 1 ), uint_t( 1 ) );
+
+ typedef GhostLayerField< uint8_t, uint_t( 1 ) > ScalarField;
+
+ BlockDataID scalarFieldID = field::addToStorage<ScalarField>( blocks, "BinaryRawFile" );
+
+ for ( auto & block : *blocks)
+ {
+ auto field = block.getData<ScalarField>( scalarFieldID );
+
+ CellInterval ci( 0, 0, 0, cell_idx_c( size[0] ) - 1, cell_idx_c( size[1] ) - 1, cell_idx_c( size[2] ) - 1 );
+
+ for (const Cell & c : ci)
+ {
+ field->get( c ) = brf.get( uint_c( c[0] ), uint_c( c[1] ), uint_c( c[2] ) );
+ }
+ }
+
+ if (vtkOut)
+ {
+ WALBERLA_LOG_INFO( "Writing unscaled" );
+ auto vtkOutput = vtk::createVTKOutput_BlockData( blocks, "BinaryRawFile" );
+ vtkOutput->addCellDataWriter( make_shared< field::VTKWriter< ScalarField, uint8_t > >( scalarFieldID, "BinaryRawFile" ) );
+ writeFiles( vtkOutput, true )();
+ }
+}
+
+void testScaled( const std::string & filename, const Vector3<uint_t> & size, const std::string & datatype, const bool vtkOut )
+{
+ WALBERLA_LOG_INFO( "Testing scaled" );
+ BinaryRawFile brf( filename, size, datatype );
+
+ Vector3<uint_t> scaledSize( std::max( uint_t( 1 ), size[0] / uint_t( 2 ) ),
+ std::max( uint_t( 1 ), size[1] / uint_t( 3 ) ),
+ std::max( uint_t( 1 ), size[2] / uint_t( 5 ) ) );
+
+ auto blocks = blockforest::createUniformBlockGrid( uint_t( 1 ), uint_t( 1 ), uint_t( 1 ),
+ scaledSize[0], scaledSize[1], scaledSize[2],
+ real_t( 1 ),
+ uint_t( 1 ), uint_t( 1 ), uint_t( 1 ) );
+
+ BinaryRawFileInterpolator brfi( blocks->getDomain(), brf, BinaryRawFileInterpolator::NEAREST_NEIGHBOR );
+
+ typedef GhostLayerField< uint8_t, uint_t( 1 ) > ScalarField;
+
+ BlockDataID scalarFieldID = field::addToStorage<ScalarField>( blocks, "BinaryRawFile" );
+
+ for (auto & block : *blocks)
+ {
+ auto field = block.getData<ScalarField>( scalarFieldID );
+
+ CellInterval ci( 0, 0, 0, cell_idx_c( scaledSize[0] ) - 1, cell_idx_c( scaledSize[1] ) - 1, cell_idx_c( scaledSize[2] ) - 1 );
+
+ for (const Cell & c : ci)
+ {
+ auto pos = blocks->getBlockLocalCellCenter( block, c );
+ field->get( c ) = brfi.get( pos );
+ }
+ }
+
+ if (vtkOut)
+ {
+ WALBERLA_LOG_INFO( "Writing scaled" );
+ auto vtkOutput = vtk::createVTKOutput_BlockData( blocks, "BinaryRawFileScaled" );
+ vtkOutput->addCellDataWriter( make_shared< field::VTKWriter< ScalarField, uint8_t > >( scalarFieldID, "BinaryRawFile" ) );
+ writeFiles( vtkOutput, true )();
+ }
+}
+
+} // namespace geometry
+} // namespace walberla
+
+int main( int argc, char * argv[] )
+{
+ walberla::mpi::Environment env( argc, argv );
+
+ std::vector< std::string > args( argv, argv + argc );
+
+ auto it = std::find( args.begin(), args.end(), std::string( "--vtk" ) );
+ const bool vtk = it != args.end();
+ if (it != args.end())
+ args.erase( it );
+
+ if (args.size() != 6u)
+ WALBERLA_ABORT_NO_DEBUG_INFO( "USAGE: " << args.front() << " [--vtk] FILENAME XSIZE YSIZE ZSIZE DATATYPE" );
+
+ const std::string filename = args[1];
+
+ walberla::Vector3< walberla::uint_t > size;
+ try
+ {
+ size.set( std::stoull( args[2] ),
+ std::stoull( args[3] ),
+ std::stoull( args[4] ) );
+ }
+ catch (const std::invalid_argument &)
+ {
+ WALBERLA_ABORT_NO_DEBUG_INFO( "USAGE: " << args.front() << " FILENAME XSIZE YSIZE ZSIZE DATATYPE" );
+ }
+
+ const std::string datatype = args[5];
+
+ walberla::geometry::test( filename, size, datatype, vtk );
+ walberla::geometry::testScaled( filename, size, datatype, vtk );
+}
+
diff --git a/tests/geometry/CMakeLists.txt b/tests/geometry/CMakeLists.txt
index 789e44395fb2012327da3299c2d1698dd35b65d4..fa297777fb0c149ca2f3ebdc7f8eea781c69f302 100644
--- a/tests/geometry/CMakeLists.txt
+++ b/tests/geometry/CMakeLists.txt
@@ -28,3 +28,5 @@ waLBerla_execute_test( NAME ScalarFieldFromGrayScaleImageTest )
waLBerla_compile_test( FILES ImageTest.cpp )
waLBerla_execute_test( NAME ImageTest )
+
+waLBerla_compile_test( FILES BinaryRawFileTest.cpp )
diff --git a/tests/geometry/Functions.cpp b/tests/geometry/Functions.cpp
index f4341fae6b10f860d63f9311219aa6a3949d892a..83da9eac2452e9a26a81a0fac2964febf817de66 100644
--- a/tests/geometry/Functions.cpp
+++ b/tests/geometry/Functions.cpp
@@ -27,7 +27,7 @@
using namespace walberla;
using namespace walberla::geometry;
-typedef math::Vector3<real_t> Vec3;
+using Vec3 = math::Vector3<real_t>;
int main( int argc, char** argv )
{
diff --git a/tests/geometry/ScalarFieldFromBodyTest.cpp b/tests/geometry/ScalarFieldFromBodyTest.cpp
index 2e9beccc96240b7b54dc7da40de74234de832448..d6c29f3d1b4ddd97b36155b78e9a8087ea426867 100644
--- a/tests/geometry/ScalarFieldFromBodyTest.cpp
+++ b/tests/geometry/ScalarFieldFromBodyTest.cpp
@@ -38,11 +38,11 @@
#include "timeloop/SweepTimeloop.h"
#include <fstream>
+#include <memory>
-using namespace walberla;
+namespace walberla {
using namespace geometry;
-using walberla::uint8_t;
const uint_t confBlockCount [] = { 1, 1, 1 };
const uint_t confCells [] = { 30, 30, 30 };
@@ -270,8 +270,8 @@ int main( int argc, char ** argv )
using namespace geometry::initializer;
- auto geometryInitializationManager = shared_ptr<InitializationManager> ( new InitializationManager( blocks->getBlockStorage() ) );
- auto freeSurfaceInitializer = shared_ptr<OverlapFieldFromBody> ( new OverlapFieldFromBody( *blocks, scalarFieldID, "drop", "bubble" ) );
+ auto geometryInitializationManager = std::make_shared<InitializationManager> ( blocks->getBlockStorage() );
+ auto freeSurfaceInitializer = std::make_shared<OverlapFieldFromBody> ( *blocks, scalarFieldID, "drop", "bubble" );
geometryInitializationManager->registerInitializer( "FreeSurface", freeSurfaceInitializer );
@@ -287,4 +287,11 @@ int main( int argc, char ** argv )
gui.run();
}
+ return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp b/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
index cbdb1bf6547b10b0b4cbff5e7ff5382e55b98ddf..ea753bab2ac73d477ed6fbcf29d87ed65de42501 100644
--- a/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
+++ b/tests/geometry/ScalarFieldFromGrayScaleImageTest.cpp
@@ -35,11 +35,11 @@
#include "timeloop/SweepTimeloop.h"
#include <fstream>
+#include <memory>
-using namespace walberla;
+namespace walberla {
using namespace geometry;
-using walberla::uint8_t;
const uint_t confBlockCount [] = { 1, 1, 1 };
const uint_t confCells [] = { 30, 30, 30 };
@@ -67,8 +67,8 @@ int main( int argc, char ** argv )
// Geometry Initialization from config file
using namespace geometry::initializer;
- auto geometryInitializationManager = shared_ptr<InitializationManager> ( new InitializationManager( blocks->getBlockStorage() ) );
- auto freeSurfaceInitializer = shared_ptr<ScalarFieldFromGrayScaleImage> ( new ScalarFieldFromGrayScaleImage( *blocks, scalarFieldID ) );
+ auto geometryInitializationManager = std::make_shared<InitializationManager> ( blocks->getBlockStorage() );
+ auto freeSurfaceInitializer = std::make_shared<ScalarFieldFromGrayScaleImage> ( *blocks, scalarFieldID );
geometryInitializationManager->registerInitializer( "FreeSurfaceImage", freeSurfaceInitializer );
@@ -97,4 +97,10 @@ int main( int argc, char ** argv )
gui.run();
}
+ return EXIT_SUCCESS;
+}
+}
+
+int main( int argc, char ** argv ){
+ return walberla::main(argc, argv);
}
diff --git a/tests/geometry/VoxelFileTest.cpp b/tests/geometry/VoxelFileTest.cpp
index 3d6d18fa1654edfacffe3637801e0f4274576557..726616dc11a6c68ef962ee5ac9bdfe462b95ce81 100644
--- a/tests/geometry/VoxelFileTest.cpp
+++ b/tests/geometry/VoxelFileTest.cpp
@@ -53,7 +53,7 @@
#include "core/mpi/MPIManager.h"
#include "core/Filesystem.h"
-#include <boost/foreach.hpp>
+
#include <random>
#ifdef _MSC_VER
@@ -293,7 +293,7 @@ void runTests(const std::string & filename, size_t xSize, size_t ySize, size_t z
data.clear();
- typedef boost::multi_array_types::index bindex;
+ using bindex = boost::multi_array_types::index;
boost::multi_array<T, 3> reference(boost::extents[walberla::numeric_cast<bindex>(zSize)][walberla::numeric_cast<bindex>(ySize)][walberla::numeric_cast<bindex>(xSize)]);
makeRandomMultiArray(reference);
diff --git a/tests/gui/GuiPdfView.cpp b/tests/gui/GuiPdfView.cpp
index fcabb5a7ebab2d13161bfcd4bbbbcec6bd5ba56c..279db04f82961d69ba4c9dc8ccc1663dfdd4446f 100644
--- a/tests/gui/GuiPdfView.cpp
+++ b/tests/gui/GuiPdfView.cpp
@@ -34,14 +34,13 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
-using namespace blockforest;
+namespace walberla {
typedef GhostLayerField<real_t,19> PdfField;
typedef GhostLayerField<real_t,1> ScalarField;
typedef GhostLayerField<Vector3<real_t>,1 > VectorField;
-typedef FlagField<walberla::uint32_t > FField;
+using FField = FlagField<walberla::uint32_t>;
int main(int argc, char **argv)
@@ -53,11 +52,11 @@ int main(int argc, char **argv)
const uint_t nrOfTimeSteps = 20;
// Create BlockForest
- auto blocks = createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
- cells[0],cells[1],cells[2], //cells
- 1, //dx
- false, //one block per process
- true,true,true); //periodicity
+ auto blocks = blockforest::createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
+ cells[0],cells[1],cells[2], //cells
+ 1, //dx
+ false, //one block per process
+ true,true,true); //periodicity
// In addition to the normal GhostLayerField's we allocated additionally a field containing the whole global simulation domain for each block
@@ -83,10 +82,11 @@ int main(int argc, char **argv)
GUI gui (timeloop, blocks, argc, argv);
gui.run();
//timeloop.singleStep();
+ return EXIT_SUCCESS;
}
+} // namespace walberla
-
-
-
-
-
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/gui/SimpleGuiRun.cpp b/tests/gui/SimpleGuiRun.cpp
index 54b8a6a8d57a6dda55be00585fbec31787f4e48a..cb8d39af582fadb2b05bf8dcfaac1bda22dad72f 100644
--- a/tests/gui/SimpleGuiRun.cpp
+++ b/tests/gui/SimpleGuiRun.cpp
@@ -41,16 +41,14 @@
#include "timeloop/SweepTimeloop.h"
-using namespace walberla;
-using namespace blockforest;
-
+namespace walberla {
typedef GhostLayerField<real_t,19> PdfField;
typedef GhostLayerField<real_t,1> ScalarField;
typedef GhostLayerField<Vector3<real_t>,1 > VectorField;
-typedef FlagField<walberla::uint32_t > FField;
+using FField = FlagField<walberla::uint32_t>;
-typedef lbm::D3Q19<lbm::collision_model::SRT> LatticeModel;
+using LatticeModel = lbm::D3Q19<lbm::collision_model::SRT>;
int main(int argc, char **argv )
@@ -62,7 +60,7 @@ int main(int argc, char **argv )
const uint_t nrOfTimeSteps = 20;
// Create BlockForest
- auto blocks = createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
+ auto blocks = blockforest::createUniformBlockGrid(blockCount[0],blockCount[1],blockCount[2], //blocks
cells[0],cells[1],cells[2], //cells
1, //dx
false, //one block per process
@@ -143,9 +141,14 @@ int main(int argc, char **argv )
lbm::connectToGui<LatticeModel>( gui );
gui.run();
//timeloop.singleStep();
+ return EXIT_SUCCESS;
}
+}// namespace walberla
+int main(int argc, char **argv){
+ return walberla::main( argc, argv );
+}
diff --git a/tests/lbm/BoundaryHandlingCommunication.cpp b/tests/lbm/BoundaryHandlingCommunication.cpp
index 975f4bf0b3d5ec06fee9ee803653ca4bae4f6148..781b7ca9cfe622768a27d0e9578981c2de7ce16a 100644
--- a/tests/lbm/BoundaryHandlingCommunication.cpp
+++ b/tests/lbm/BoundaryHandlingCommunication.cpp
@@ -63,11 +63,10 @@
#endif
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla{
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
const FlagUID Fluid_Flag( "fluid" );
const FlagUID UBB_Flag( "velocity bounce back" );
@@ -109,7 +108,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block, const StructuredBlockStorage * const storage ) const
{
- typedef lbm::PdfField<LatticeModel_T> PdfField_T;
+ using PdfField_T = lbm::PdfField< LatticeModel_T >;
WALBERLA_ASSERT_NOT_NULLPTR( block );
WALBERLA_ASSERT_NOT_NULLPTR( storage );
@@ -268,7 +267,7 @@ int main( int argc, char ** argv )
// D3Q19 //
///////////
- typedef lbm::D3Q19< lbm::collision_model::TRT > D3Q19_TRT_COMP;
+ using D3Q19_TRT_COMP = lbm::D3Q19<lbm::collision_model::TRT>;
D3Q19_TRT_COMP d3q19comp = D3Q19_TRT_COMP( lbm::collision_model::TRT::constructWithMagicNumber( GlobalOmega ) );
BlockDataID pdfFieldId1 = lbm::addPdfFieldToStorage( blocks, "pdf field (D3Q19 with ghosts set)", d3q19comp );
@@ -316,7 +315,7 @@ int main( int argc, char ** argv )
// D3Q27 //
///////////
- typedef lbm::D3Q27< lbm::collision_model::TRT > D3Q27_TRT_COMP;
+ using D3Q27_TRT_COMP = lbm::D3Q27<lbm::collision_model::TRT>;
D3Q27_TRT_COMP d3q27comp = D3Q27_TRT_COMP( lbm::collision_model::TRT::constructWithMagicNumber( GlobalOmega ) );
BlockDataID pdfFieldId3 = lbm::addPdfFieldToStorage( blocks, "pdf field (D3Q27 with ghosts set)", d3q27comp );
@@ -399,3 +398,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/tests/lbm/DiffusionTest.cpp b/tests/lbm/DiffusionTest.cpp
index a6f126a35deeea6364a809f6c18edcfe5d97f79a..c1aa845088b935ef751deb37c31df158dc5bab13 100644
--- a/tests/lbm/DiffusionTest.cpp
+++ b/tests/lbm/DiffusionTest.cpp
@@ -79,15 +79,17 @@
#include <boost/lexical_cast.hpp>
+#include <functional>
+
namespace walberla {
-typedef uint8_t flag_t;
-typedef Vector3< real_t > vec3_t;
+using flag_t = uint8_t;
+using vec3_t = Vector3<real_t>;
typedef GhostLayerField< real_t, 1 > ScalarField;
typedef GhostLayerField< vec3_t, 1 > VectorField;
-typedef FlagField < flag_t > MyFlagField;
+using MyFlagField = FlagField<flag_t>;
typedef lbm::D3Q19< lbm::collision_model::SRT, true, lbm::force_model::Correction<VectorField>, 1 > AdvDiffLatticeModel_Corr;
typedef lbm::D3Q19< lbm::collision_model::SRT, true, lbm::force_model::None, 1 > AdvDiffLatticeModel_None;
@@ -168,8 +170,8 @@ template< typename AdvDiffLatticeModel >
int run( int argc, char **argv )
{
// typedefs
- typedef typename AdvDiffLatticeModel::Stencil AdvDiffStencil;
- typedef lbm::PdfField< AdvDiffLatticeModel > AdvDiffPDFField;
+ using AdvDiffStencil = typename AdvDiffLatticeModel::Stencil;
+ using AdvDiffPDFField = lbm::PdfField<AdvDiffLatticeModel>;
#ifdef _OPENMP
omp_set_num_threads( std::max( omp_get_num_threads()>>1, 4 ) );
@@ -280,16 +282,16 @@ int run( int argc, char **argv )
scheme.addPackInfo( make_shared< field::communication::PackInfo< AdvDiffPDFField > >( srcFieldID ) );
timeloop.addFuncBeforeTimeStep( scheme, "Communication" );
- using boost::ref;
+ using std::ref;
- timeloop.add() << Sweep( boost::bind( hydroFunc, _1, velFieldID, u, tperiod, ref(timestep) ), "Hydro Func" );
+ timeloop.add() << Sweep( std::bind( hydroFunc, std::placeholders::_1, velFieldID, u, tperiod, ref(timestep) ), "Hydro Func" );
timeloop.add() << Sweep( makeSharedSweep( lbm::makeCellwiseAdvectionDiffusionSweep< AdvDiffLatticeModel, VectorField, MyFlagField >(
srcFieldID, velFieldID, flagFieldID, getFluidFlag() ) ), "LBM_SRT" );
- timeloop.add() << BeforeFunction( boost::bind( prepFunc, u[dim], dv, D, cperiod, tperiod, ref(timestep), ref(cosi), ref(sisi), ref(sexp) ), "prepare test" )
- << Sweep ( boost::bind( testFunc<AdvDiffPDFField>, _1, srcFieldID, dim, v, cperiod, ref(cosi), ref(sisi), ref(sexp), ref(E_mean_) ), "Test Func" )
- << AfterFunction ( boost::bind( incTimeFunc, ref(timestep) ), "increment time" );
+ timeloop.add() << BeforeFunction( std::bind( prepFunc, u[dim], dv, D, cperiod, tperiod, ref(timestep), ref(cosi), ref(sisi), ref(sexp) ), "prepare test" )
+ << Sweep ( std::bind( testFunc<AdvDiffPDFField>, std::placeholders::_1, srcFieldID, dim, v, cperiod, ref(cosi), ref(sisi), ref(sexp), ref(E_mean_) ), "Test Func" )
+ << AfterFunction ( std::bind( incTimeFunc, ref(timestep) ), "increment time" );
// --- run timeloop --- //
diff --git a/tests/lbm/Poiseuille.cpp b/tests/lbm/Poiseuille.cpp
index 5e56138fe75b24a278d201d9af3a15226e76582b..fecccb13da47d29eaa26ed83aa63dd03c6a7baa2 100644
--- a/tests/lbm/Poiseuille.cpp
+++ b/tests/lbm/Poiseuille.cpp
@@ -86,11 +86,9 @@
#include <iostream>
#include <vector>
+namespace walberla {
-using namespace walberla;
-
-
-typedef walberla::uint8_t flag_t;
+using flag_t = walberla::uint8_t;
// Compressible SRT with constant force
using lbm::collision_model::SRT;
@@ -98,8 +96,8 @@ using lbm::force_model::GuoConstant;
typedef lbm::D3Q19< SRT, true, GuoConstant> LM;
// Fields
-typedef lbm::PdfField<LM> PdfField;
-typedef FlagField<flag_t> FField;
+using PdfField = lbm::PdfField<LM>;
+using FField = FlagField<flag_t>;
typedef GhostLayerField<Vector3<real_t>,1 > VectorField;
typedef GhostLayerField<real_t,1 > ScalarField;
@@ -390,6 +388,9 @@ int main( int argc, char** argv )
*/
return 0;
}
+} // namespace walberla
-
-
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/lbm/SweepEquivalenceTest.cpp b/tests/lbm/SweepEquivalenceTest.cpp
index 52f1f35ee2edfa9ea23302fc02a251861bd0e1df..2c8f0e15a9c9fd018f949c20b6a150e7d565d7a1 100644
--- a/tests/lbm/SweepEquivalenceTest.cpp
+++ b/tests/lbm/SweepEquivalenceTest.cpp
@@ -70,11 +70,10 @@
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla {
-typedef walberla::uint64_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint64_t;
+using FlagField_T = FlagField<flag_t>;
const FlagUID Fluid_Flag( "fluid" );
const FlagUID UBB_Flag( "velocity bounce back" );
@@ -120,7 +119,7 @@ template< typename LatticeModel_T >
typename MyBoundaryHandling<LatticeModel_T>::BoundaryHandling_T *
MyBoundaryHandling<LatticeModel_T>::operator()( IBlock * const block, const StructuredBlockStorage * const storage ) const
{
- typedef lbm::PdfField<LatticeModel_T> PdfField_T;
+ using PdfField_T = lbm::PdfField< LatticeModel_T >;
WALBERLA_ASSERT_NOT_NULLPTR( block );
WALBERLA_ASSERT_NOT_NULLPTR( storage );
@@ -257,8 +256,8 @@ struct AddTRTTest< LatticeModel_T, typename boost::enable_if_c< boost::is_same<
template< typename LatticeModel1_T, typename LatticeModel2_T >
void check( const shared_ptr< StructuredBlockForest > & blocks, const BlockDataID & fieldId1, const BlockDataID & fieldId2 )
{
- typedef lbm::PdfField< LatticeModel1_T > PdfField1_T;
- typedef lbm::PdfField< LatticeModel2_T > PdfField2_T;
+ using PdfField1_T = lbm::PdfField< LatticeModel1_T >;
+ using PdfField2_T = lbm::PdfField< LatticeModel2_T >;
for( auto block = blocks->begin(); block != blocks->end(); ++block )
{
@@ -364,7 +363,7 @@ int main( int argc, char ** argv )
// D3Q19, incompressible //
///////////////////////////
- fieldIds.push_back( std::vector< BlockDataID >() );
+ fieldIds.emplace_back( );
// SRT
@@ -491,7 +490,7 @@ int main( int argc, char ** argv )
// D3Q19, compressible //
/////////////////////////
- fieldIds.push_back( std::vector< BlockDataID >() );
+ fieldIds.emplace_back( );
// SRT
@@ -554,7 +553,7 @@ int main( int argc, char ** argv )
// D3Q27, incompressible //
///////////////////////////
- fieldIds.push_back( std::vector< BlockDataID >() );
+ fieldIds.emplace_back( );
// SRT
@@ -617,7 +616,7 @@ int main( int argc, char ** argv )
// D3Q27, compressible //
/////////////////////////
- fieldIds.push_back( std::vector< BlockDataID >() );
+ fieldIds.emplace_back( );
// SRT
@@ -652,7 +651,7 @@ int main( int argc, char ** argv )
// TRT <-> MRT COMPARISON //
////////////////////////////
- fieldIds.push_back( std::vector< BlockDataID >() );
+ fieldIds.emplace_back( );
// TRT
@@ -704,7 +703,7 @@ int main( int argc, char ** argv )
// D2Q9, incompressible //
//////////////////////////
- fieldIds.push_back( std::vector< BlockDataID >() );
+ fieldIds.emplace_back( );
// SRT
@@ -864,3 +863,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/lbm/boundary/DiffusionDirichlet.cpp b/tests/lbm/boundary/DiffusionDirichlet.cpp
index 807dd39ffee30805ce33ab979a1ea6fcb06a5fe9..79cee7c428ced16bbf99006d0011cee3be53e4a5 100644
--- a/tests/lbm/boundary/DiffusionDirichlet.cpp
+++ b/tests/lbm/boundary/DiffusionDirichlet.cpp
@@ -84,17 +84,17 @@
namespace walberla {
-typedef uint8_t flag_t;
-typedef Vector3< real_t > vec3_t;
+using flag_t = uint8_t;
+using vec3_t = Vector3<real_t>;
typedef lbm::D3Q19< lbm::collision_model::SRT, true, lbm::force_model::None, 1 > LM;
-typedef LM::CommunicationStencil CommunicationStencil;
+using CommunicationStencil = LM::CommunicationStencil;
-typedef lbm::PdfField < LM > MyPdfField;
+using MyPdfField = lbm::PdfField<LM>;
typedef GhostLayerField< real_t, 1 > ScalarField;
typedef GhostLayerField< Vector3<real_t>, 1> VectorField;
-typedef FlagField < flag_t > MyFlagField;
+using MyFlagField = FlagField<flag_t>;
typedef lbm::DefaultDiffusionBoundaryHandlingFactory< LM, MyFlagField > MyBoundaryHandling;
@@ -104,7 +104,7 @@ const FlagUID& getFluidFlag(){ static FlagUID uid( "Fluid" ); return uid; }
class PlugFlow
{
public:
- typedef std::complex<real_t> cplx_t;
+ using cplx_t = std::complex<real_t>;
PlugFlow( real_t L, real_t H, real_t u, real_t k ) :
period_( real_t(2)*math::PI/L ),
@@ -196,11 +196,11 @@ class CosBoundaryConfiguration : public MyBoundaryHandling::DiffusionDirichlet_T
public:
CosBoundaryConfiguration( real_t period ) : period_( period ){}
- virtual void val( real_t& _val, cell_idx_t x, cell_idx_t, cell_idx_t ) const { _val = real_c( cos( period_*( real_c(x) + real_c(0.5) ) ) ); }
+ void val( real_t& _val, cell_idx_t x, cell_idx_t, cell_idx_t ) const override { _val = real_c( cos( period_*( real_c(x) + real_c(0.5) ) ) ); }
private:
- const real_t period_;
- const vec3_t vel_;
+ const real_t period_ {};
+ const vec3_t vel_ {};
};
diff --git a/tests/lbm/boundary/SimpleDiffusionDirichlet.cpp b/tests/lbm/boundary/SimpleDiffusionDirichlet.cpp
index d28603a3feb1553d8d321d7b2ab216bc3ef14960..30c95b82abe998b1ced956ea650fd6ec7c9f7e8a 100644
--- a/tests/lbm/boundary/SimpleDiffusionDirichlet.cpp
+++ b/tests/lbm/boundary/SimpleDiffusionDirichlet.cpp
@@ -76,6 +76,7 @@
#include <stdexcept>
#include <array>
+#include <functional>
#include "gather/GnuPlotGraphWriter.h"
#include "field/vtk/FlagFieldCellFilter.h"
@@ -85,7 +86,6 @@
#include "vtk/VTKOutput.h"
-
namespace walberla {
typedef GhostLayerField< real_t, 1 > ScalarField;
@@ -93,11 +93,11 @@ typedef GhostLayerField< Vector3<real_t>, 1 > VectorField;
typedef lbm::D3Q19< lbm::collision_model::SRT, true, lbm::force_model::None, 1 > LM;
-typedef LM::CommunicationStencil CommunicationStencil;
-typedef lbm::PdfField< LM > MyPdfField;
+using CommunicationStencil = LM::CommunicationStencil;
+using MyPdfField = lbm::PdfField<LM>;
-typedef uint8_t flag_t;
-typedef FlagField< flag_t > MyFlagField;
+using flag_t = uint8_t;
+using MyFlagField = FlagField<flag_t>;
typedef lbm::DefaultDiffusionBoundaryHandlingFactory< LM, MyFlagField > MyBoundaryHandling;
@@ -138,7 +138,7 @@ shared_ptr< StructuredBlockForest > makeStructuredBlockStorage( uint_t length, u
uint_t cells[] = { length, width, width };
uint_t blocks[] = { uint_t(1u), uint_t(1u), uint_t(1u) };
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, refinement ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, refinement ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init(
@@ -249,6 +249,7 @@ public:
#ifdef TEST_USES_VTK_OUTPUT
error_.resize(time_);
#endif
+ WALBERLA_UNUSED(maxValue_);
}
void operator()();
diff --git a/tests/lbm/boundary/SimplePABTest.cpp b/tests/lbm/boundary/SimplePABTest.cpp
index 6b07233dffbff785e02d0698d7ae0bce0d58fde2..31bc21a747617028e54cd2be91bfa537a60ca498 100644
--- a/tests/lbm/boundary/SimplePABTest.cpp
+++ b/tests/lbm/boundary/SimplePABTest.cpp
@@ -62,12 +62,12 @@
namespace walberla {
- typedef uint8_t flag_t;
+ using flag_t = uint8_t;
typedef lbm::D3Q19< lbm::collision_model::SRT, false > LatticeModel;
- typedef LatticeModel::Stencil Stencil;
- typedef LatticeModel::CommunicationStencil CommunicationStencil;
- typedef lbm::PdfField< LatticeModel > PDFField;
- typedef FlagField< flag_t > MyFlagField;
+ using Stencil = LatticeModel::Stencil;
+ using CommunicationStencil = LatticeModel::CommunicationStencil;
+ using PDFField = lbm::PdfField<LatticeModel>;
+ using MyFlagField = FlagField<flag_t>;
shared_ptr< StructuredBlockForest > makeStructuredBlockStorage( uint_t channelWidth, uint_t channelLength )
diff --git a/tests/lbm/codegen/SrtWithForceFieldModel.gen.py b/tests/lbm/codegen/SrtWithForceFieldModel.gen.py
index 2ecb139fbbba9d4562a6781441f2d929f9404086..f004d38404605dc00412da91fccd66876f9e28d2 100644
--- a/tests/lbm/codegen/SrtWithForceFieldModel.gen.py
+++ b/tests/lbm/codegen/SrtWithForceFieldModel.gen.py
@@ -1,34 +1,34 @@
import sympy as sp
from lbmpy.boundaries import NoSlip, UBB
-from lbmpy_walberla import Field, generateLatticeModelFiles, RefinementScaling
-from lbmpy.creationfunctions import createLatticeBoltzmannMethod
-from lbmpy_walberla.boundary import createBoundaryClass
+from lbmpy_walberla import Field, generate_lattice_model_files, RefinementScaling
+from lbmpy.creationfunctions import create_lb_method
+from lbmpy_walberla.boundary import create_boundary_class
from pystencils_walberla.cmake_integration import codegen
+import pystencils as ps
# ------------- Lattice Model ------------------------------
-forceField = Field.createGeneric('force', spatialDimensions=3, indexDimensions=1, layout='fzyx')
-force = [forceField(0), forceField(1), forceField(2)]
+force_field = ps.fields("force(3): [3D]", layout='fzyx')
omega = sp.Symbol("omega")
scaling = RefinementScaling()
-scaling.addStandardRelaxationRateScaling(omega)
-scaling.addForceScaling(forceField)
+scaling.add_standard_relaxation_rate_scaling(omega)
+scaling.add_force_scaling(force_field)
-generateLatticeModelFiles(className='SrtWithForceFieldModel',
- method='srt', stencil='D3Q19', forceModel='guo', force=force,
- relaxationRates=[omega], refinementScaling=scaling)
+generate_lattice_model_files(class_name='SrtWithForceFieldModel',
+ method='srt', stencil='D3Q19', force_model='guo', force=force_field.center_vector,
+ relaxation_rates=[omega], refinement_scaling=scaling)
def genBoundary():
boundary = UBB([0.05, 0, 0], dim=3, name="MyUBB")
- method = createLatticeBoltzmannMethod(stencil='D3Q19', method='srt')
- return createBoundaryClass(boundary, method)
+ method = create_lb_method(stencil='D3Q19', method='srt')
+ return create_boundary_class(boundary, method)
def genNoSlip():
boundary = NoSlip(name='MyNoSlip')
- method = createLatticeBoltzmannMethod(stencil='D3Q19', method='srt')
- return createBoundaryClass(boundary, method)
+ method = create_lb_method(stencil='D3Q19', method='srt')
+ return create_boundary_class(boundary, method)
codegen.register(['MyUBB.h', 'MyUBB.cpp'], genBoundary)
codegen.register(['MyNoSlip.h', 'MyNoSlip.cpp',], genNoSlip)
diff --git a/tests/lbm/evaluations/PermeabilityTest.cpp b/tests/lbm/evaluations/PermeabilityTest.cpp
index 998efb953ec5bb3cb022947c281fbfc5058cde36..022ad27889a260167a7d900f50ee64b41efbe308 100644
--- a/tests/lbm/evaluations/PermeabilityTest.cpp
+++ b/tests/lbm/evaluations/PermeabilityTest.cpp
@@ -28,10 +28,10 @@
#include "timeloop/all.h"
-using namespace walberla;
+namespace walberla {
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
enum Scenario { BCC };
@@ -117,7 +117,7 @@ BlockDataID initPdfField( const shared_ptr<StructuredBlockForest> & blocks, real
template< >
BlockDataID initPdfField< lbm::collision_model::SRT >( const shared_ptr<StructuredBlockForest> & blocks, real_t omega )
{
- typedef lbm::D3Q19< lbm::collision_model::SRT > LatticeModel_T;
+ using LatticeModel_T = lbm::D3Q19<lbm::collision_model::SRT>;
LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::SRT( omega ) );
return lbm::addPdfFieldToStorage( blocks, "PDF Field (SRT)", latticeModel, Vector3<real_t>(), real_t(1) );
@@ -126,7 +126,7 @@ BlockDataID initPdfField< lbm::collision_model::SRT >( const shared_ptr<Structur
template< >
BlockDataID initPdfField< lbm::collision_model::TRT >( const shared_ptr<StructuredBlockForest> & blocks, real_t omega )
{
- typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
+ using LatticeModel_T = lbm::D3Q19<lbm::collision_model::TRT>;
LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::TRT::constructWithMagicNumber( omega ) );
return lbm::addPdfFieldToStorage( blocks, "PDF Field (TRT)", latticeModel, Vector3<real_t>(), real_t(1) );
@@ -135,7 +135,7 @@ BlockDataID initPdfField< lbm::collision_model::TRT >( const shared_ptr<Structur
template< >
BlockDataID initPdfField< lbm::collision_model::D3Q19MRT >( const shared_ptr<StructuredBlockForest> & blocks, real_t omega )
{
- typedef lbm::D3Q19< lbm::collision_model::D3Q19MRT > LatticeModel_T;
+ using LatticeModel_T = lbm::D3Q19<lbm::collision_model::D3Q19MRT>;
LatticeModel_T latticeModel = LatticeModel_T( lbm::collision_model::D3Q19MRT::constructPanWithMagicNumber( omega ) );
return lbm::addPdfFieldToStorage( blocks, "PDF Field (MRT)", latticeModel, Vector3<real_t>(), real_t(1) );
@@ -155,7 +155,7 @@ template< typename LatticeModel_T >
BlockDataID initBoundaryHandling( shared_ptr<StructuredBlockForest> & blocks, const BlockDataID & pdfFieldId, const BlockDataID & flagFieldId, const FlagUID & fluid, Setup setup )
{
typedef lbm::DefaultBoundaryHandlingFactory< LatticeModel_T, FlagField_T > BHFactory_T;
- typedef typename BHFactory_T::BoundaryHandling BoundaryHandling_T;
+ using BoundaryHandling_T = typename BHFactory_T::BoundaryHandling;
BlockDataID boundaryHandlingId = BHFactory_T::addBoundaryHandlingToStorage( blocks, "boundary handling", flagFieldId, pdfFieldId, fluid,
Vector3<real_t>(),
@@ -172,16 +172,16 @@ BlockDataID initBoundaryHandling( shared_ptr<StructuredBlockForest> & blocks, co
const real_t r = real_c(std::sqrt(real_c(3))) / real_c(4) * L * setup.kappa;
// spheres in all eight corners of the domain
- spheres.push_back( geometry::Sphere( Vector3<real_t>( 0, 0, 0 ), r ) );
- spheres.push_back( geometry::Sphere( Vector3<real_t>( L, 0, 0 ), r ) );
- spheres.push_back( geometry::Sphere( Vector3<real_t>( 0, L, 0 ), r ) );
- spheres.push_back( geometry::Sphere( Vector3<real_t>( 0, 0, L ), r ) );
- spheres.push_back( geometry::Sphere( Vector3<real_t>( L, L, 0 ), r ) );
- spheres.push_back( geometry::Sphere( Vector3<real_t>( L, 0, L ), r ) );
- spheres.push_back( geometry::Sphere( Vector3<real_t>( 0, L, L ), r ) );
- spheres.push_back( geometry::Sphere( Vector3<real_t>( L, L, L ), r ) );
+ spheres.emplace_back( Vector3<real_t>( 0, 0, 0 ), r );
+ spheres.emplace_back( Vector3<real_t>( L, 0, 0 ), r );
+ spheres.emplace_back( Vector3<real_t>( 0, L, 0 ), r );
+ spheres.emplace_back( Vector3<real_t>( 0, 0, L ), r );
+ spheres.emplace_back( Vector3<real_t>( L, L, 0 ), r );
+ spheres.emplace_back( Vector3<real_t>( L, 0, L ), r );
+ spheres.emplace_back( Vector3<real_t>( 0, L, L ), r );
+ spheres.emplace_back( Vector3<real_t>( L, L, L ), r );
// and one sphere in the middle
- spheres.push_back( geometry::Sphere( Vector3<real_t>( L / real_c(2), L / real_c(2), L / real_c(2) ), r ) );
+ spheres.emplace_back( Vector3<real_t>( L / real_c(2), L / real_c(2), L / real_c(2) ), r );
break;
}
@@ -207,9 +207,9 @@ BlockDataID initBoundaryHandling( shared_ptr<StructuredBlockForest> & blocks, co
template< typename LM_T >
int setupAndExecute( Setup setup )
{
- typedef lbm::PdfField< LM_T > PdfField_T;
+ using PdfField_T = lbm::PdfField< LM_T >;
typedef lbm::DefaultBoundaryHandlingFactory< LM_T, FlagField_T > BHFactory_T;
- typedef typename BHFactory_T::BoundaryHandling BoundaryHandling_T;
+ using BoundaryHandling_T = typename BHFactory_T::BoundaryHandling;
Vector3<uint_t> blockLength;
blockLength[0] = setup.length / setup.blocks[0];
@@ -301,3 +301,9 @@ int main( int argc, char ** argv )
WALBERLA_ABORT( "Unexpected error: " << e.what() << "! Aborting ..." );
}
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/tests/lbm/geometry/IntersectionRatioTest.cpp b/tests/lbm/geometry/IntersectionRatioTest.cpp
index ae7a4a159f2f60f62220b0b691cd9db0826add58..a252f9b65fd0f2eeb119088a394cc0894c21c41a 100644
--- a/tests/lbm/geometry/IntersectionRatioTest.cpp
+++ b/tests/lbm/geometry/IntersectionRatioTest.cpp
@@ -80,9 +80,9 @@ void testAABB()
std::mt19937 randomEngine;
std::vector<math::AABB> testAABBs;
- testAABBs.push_back( math::AABB( -UNIT, UNIT ) );
- testAABBs.push_back( math::AABB( ZERO, UNIT ) );
- testAABBs.push_back( math::AABB( -UNIT, ZERO ) );
+ testAABBs.emplace_back( -UNIT, UNIT );
+ testAABBs.emplace_back( ZERO, UNIT );
+ testAABBs.emplace_back( -UNIT, ZERO );
for( auto aabbIt = testAABBs.begin(); aabbIt != testAABBs.end(); ++aabbIt )
{
@@ -94,7 +94,7 @@ void testAABB()
Vector3<real_t> outerPoint, innerPoint;
do { outerPoint = outerAABB.randomPoint( randomEngine ); } while( aabbIt->contains( outerPoint ) );
innerPoint = aabbIt->randomPoint( randomEngine );
- testPoints.push_back( std::make_pair( outerPoint, innerPoint - outerPoint ) );
+ testPoints.emplace_back( outerPoint, innerPoint - outerPoint );
}
for( auto pointIt = testPoints.begin(); pointIt != testPoints.end(); ++pointIt )
diff --git a/tests/lbm/initializer/PdfFieldInitializerTest.cpp b/tests/lbm/initializer/PdfFieldInitializerTest.cpp
index 2ecdb5e4110e698342435c43b36ce21cec32a33f..5e8b2ac39dfc2ef78f5e59d6f7a7587d311ea2d3 100644
--- a/tests/lbm/initializer/PdfFieldInitializerTest.cpp
+++ b/tests/lbm/initializer/PdfFieldInitializerTest.cpp
@@ -30,12 +30,12 @@
#include <sstream>
-using namespace walberla;
+namespace walberla {
-typedef lbm::D3Q19< lbm::collision_model::SRT > LatticeModel_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
-typedef lbm::initializer::PdfFieldInitializer< LatticeModel_T > PdfFieldInitializer_T;
+using LatticeModel_T = lbm::D3Q19<lbm::collision_model::SRT>;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
+using PdfFieldInitializer_T = lbm::initializer::PdfFieldInitializer<LatticeModel_T>;
struct DensityInit
@@ -249,4 +249,10 @@ int main( int argc, char ** argv )
testDensityAndVelocityInitFromConfig( pdfFieldId, blocks, env.config(), false );
return 0;
+}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
}
\ No newline at end of file
diff --git a/tests/lbm/refinement/CommunicationEquivalence.cpp b/tests/lbm/refinement/CommunicationEquivalence.cpp
index 32f029d77f0f9cc621afa930578847da88f7e92f..150f7894947f95347c820d30b348779303fd5790 100644
--- a/tests/lbm/refinement/CommunicationEquivalence.cpp
+++ b/tests/lbm/refinement/CommunicationEquivalence.cpp
@@ -50,11 +50,10 @@
#include "timeloop/SweepTimeloop.h"
-#include <boost/bind.hpp>
-
#include <algorithm>
#include <cstdlib>
#include <fstream>
+#include <functional>
//#define TEST_USES_VTK_OUTPUT
#ifdef TEST_USES_VTK_OUTPUT
@@ -64,14 +63,7 @@
enum TestMode { ENTIRE_TOP, TOP, MIDDLE, ENTIRE_BOTTOM };
static const TestMode testMode = TOP;
-
-
-///////////
-// USING //
-///////////
-
-using namespace walberla;
-using walberla::uint_t;
+namespace walberla{
//////////////
// TYPEDEFS //
@@ -80,12 +72,12 @@ using walberla::uint_t;
typedef lbm::D3Q19< lbm::collision_model::SRT, false > LatticeModel_T;
//typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
//typedef lbm::D3Q19< lbm::collision_model::D3Q19MRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
+using Stencil_T = LatticeModel_T::Stencil;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = 4;
@@ -190,7 +182,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( const uint_t le
// initialize SetupBlockForest = determine domain decomposition
SetupBlockForest sforest;
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, levels ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, levels ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( AABB( real_c(0), real_c(0), real_c(0), real_c( numberOfXBlocks * numberOfXCellsPerBlock ),
@@ -495,3 +487,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+}
+
+int main( int argc, char ** argv )
+{
+ return walberla::main(argc, argv);
+}
\ No newline at end of file
diff --git a/tests/lbm/refinement/NonConstantDiffusion.cpp b/tests/lbm/refinement/NonConstantDiffusion.cpp
index 12d96631abb827c9af7307103731a678c5b92999..83ac2f989663821ac7f2db15a49c904d5cef42ca 100644
--- a/tests/lbm/refinement/NonConstantDiffusion.cpp
+++ b/tests/lbm/refinement/NonConstantDiffusion.cpp
@@ -75,6 +75,7 @@
#include <boost/lexical_cast.hpp>
#include <stdexcept>
+#include <functional>
#include "gather/GnuPlotGraphWriter.h"
#include "field/vtk/FlagFieldCellFilter.h"
@@ -92,11 +93,11 @@ typedef GhostLayerField< Vector3<real_t>, 1 > VectorField;
typedef lbm::D3Q19< lbm::collision_model::SRTField<ScalarField>, true, lbm::force_model::None, 1 > LM;
-typedef LM::Stencil Stencil;
-typedef lbm::PdfField< LM > MyPdfField;
+using Stencil = LM::Stencil;
+using MyPdfField = lbm::PdfField<LM>;
-typedef uint8_t flag_t;
-typedef FlagField< flag_t > MyFlagField;
+using flag_t = uint8_t;
+using MyFlagField = FlagField<flag_t>;
typedef lbm::DefaultDiffusionBoundaryHandlingFactory< LM, MyFlagField > MyBoundaryHandling;
@@ -137,7 +138,7 @@ shared_ptr< StructuredBlockForest > makeStructuredBlockStorage( uint_t length, u
uint_t cells[] = { length, width, width };
uint_t blocks[] = { uint_t(1u), uint_t(1u), uint_t(1u) };
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, refinement ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, refinement ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init(
diff --git a/tests/lbm/refinement/Uniformity.cpp b/tests/lbm/refinement/Uniformity.cpp
index 67e73915a3d4c01ee772e0688052e7365cb054bf..cd6eda7cd83f48dd72b8d8ab162e35668c3b451f 100644
--- a/tests/lbm/refinement/Uniformity.cpp
+++ b/tests/lbm/refinement/Uniformity.cpp
@@ -50,10 +50,9 @@
#include "timeloop/SweepTimeloop.h"
-#include <boost/bind.hpp>
-
#include <algorithm>
#include <cstdlib>
+#include <functional>
//#define TEST_USES_VTK_OUTPUT
#ifdef TEST_USES_VTK_OUTPUT
@@ -79,18 +78,18 @@ using walberla::uint_t;
typedef lbm::D3Q19< lbm::collision_model::SRT, false > LatticeModel_T;
//typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
//typedef lbm::D3Q19< lbm::collision_model::D3Q19MRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
+using Stencil_T = LatticeModel_T::Stencil;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = 4;
// dummy boundary handling
typedef lbm::NoSlip< LatticeModel_T, flag_t > NoSlip_T;
-typedef boost::tuples::tuple< NoSlip_T > BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<NoSlip_T>;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
///////////
@@ -150,7 +149,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( const uint_t le
// initialize SetupBlockForest = determine domain decomposition
SetupBlockForest sforest;
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, levels ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, levels ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( AABB( real_c(0), real_c(0), real_c(0), real_c( numberOfXBlocks * numberOfXCellsPerBlock ),
diff --git a/tests/mesh/CMakeLists.txt b/tests/mesh/CMakeLists.txt
index 3eebf6ed6ba80f3caeed8d6597b0be18d417358a..a8ba46bf91600553536f74698437ee66c1869eb0 100644
--- a/tests/mesh/CMakeLists.txt
+++ b/tests/mesh/CMakeLists.txt
@@ -53,6 +53,9 @@ if ( WALBERLA_BUILD_WITH_OPENMESH )
waLBerla_compile_test( FILES PeVTKMeshWriterTest.cpp DEPENDS mesh )
waLBerla_execute_test( NAME PeVTKMeshWriterTest COMMAND $<TARGET_FILE:PeVTKMeshWriterTest> )
+ waLBerla_compile_test( FILES MeshPeRaytracing.cpp DEPENDS mesh pe )
+ waLBerla_execute_test( NAME MeshPeRaytracing )
+
waLBerla_compile_test( FILES MeshAABBIntersectionTest.cpp DEPENDS mesh )
waLBerla_execute_test( NAME MeshAABBIntersectionTestDbg COMMAND $<TARGET_FILE:MeshAABBIntersectionTest> 10 )
waLBerla_execute_test( NAME MeshAABBIntersectionTest COMMAND $<TARGET_FILE:MeshAABBIntersectionTest> 10000 CONFIGURATIONS Release RelWithDbgInfo )
@@ -91,4 +94,7 @@ if ( WALBERLA_BUILD_WITH_OPENMESH )
waLBerla_execute_test( NAME NumericIntegrationTestSphere COMMAND $<TARGET_FILE:NumericIntegrationTest> sphere.obj )
waLBerla_execute_test( NAME NumericIntegrationTestBunny COMMAND $<TARGET_FILE:NumericIntegrationTest> bunny.obj CONFIGURATIONS Release RelWithDbgInfo )
+ waLBerla_compile_test( FILES MeshMarshalling.cpp DEPENDS core mesh )
+ waLBerla_execute_test( NAME MeshMarshalling )
+
endif()
diff --git a/tests/mesh/DistributedMeshVTKTest.cpp b/tests/mesh/DistributedMeshVTKTest.cpp
index 8b9dcc55aa3a3db48b3240253e2c0b4b6f02f0c7..e69aad05e39b930621e96cad07bb49090316f724 100644
--- a/tests/mesh/DistributedMeshVTKTest.cpp
+++ b/tests/mesh/DistributedMeshVTKTest.cpp
@@ -42,7 +42,7 @@ void test( const std::string & meshFile )
auto aabb = computeAABB( *mesh );
- typedef typename MeshType::Scalar Scalar;
+ using Scalar = typename MeshType::Scalar;
Vector3<Scalar> translation( numeric_cast<Scalar>( aabb.xSize() ) * Scalar(2) * Scalar( MPIManager::instance()->rank() ), Scalar(0), Scalar(0) );
translate( *mesh, translation );
diff --git a/tests/mesh/MeshBlockExclusionTest.cpp b/tests/mesh/MeshBlockExclusionTest.cpp
index 60833bf923b05693c4761253ca48a722f42f9f1b..7685ac644dc38bbbbbd408f8ca834aae93214aef 100644
--- a/tests/mesh/MeshBlockExclusionTest.cpp
+++ b/tests/mesh/MeshBlockExclusionTest.cpp
@@ -58,7 +58,7 @@ struct PointInAABB
struct AnyPointInAABB
{
- typedef std::vector< Vector3<real_t> > Points;
+ using Points = std::vector<Vector3<real_t> >;
AnyPointInAABB( const Points & points ) : points_(points) {}
diff --git a/tests/mesh/MeshContainmentOctreeTest.cpp b/tests/mesh/MeshContainmentOctreeTest.cpp
index 4e922e17a8e5f6a4a54f49437fccc32037052b91..40f542ddbfa20cc3afae192c5b70e9f875938af6 100644
--- a/tests/mesh/MeshContainmentOctreeTest.cpp
+++ b/tests/mesh/MeshContainmentOctreeTest.cpp
@@ -69,9 +69,9 @@ int main( int argc, char * argv[] )
auto aabb = computeAABB( *mesh );
- static const mesh::TriangleMesh::Point xAxis( 1, 0, 0 );
- static const mesh::TriangleMesh::Point yAxis( 0, 1, 0 );
- static const mesh::TriangleMesh::Point zAxis( 0, 0, 1 );
+ //static const mesh::TriangleMesh::Point xAxis( 1, 0, 0 );
+ //static const mesh::TriangleMesh::Point yAxis( 0, 1, 0 );
+ //static const mesh::TriangleMesh::Point zAxis( 0, 0, 1 );
mesh::TriangleMesh::Point r = mesh::toOpenMesh( ( aabb.minCorner() - aabb.maxCorner() ).getNormalized() );
@@ -124,4 +124,4 @@ int main( int argc, char * argv[] )
int main( int argc, char * argv[] )
{
return walberla::mesh::main( argc, argv );
-}
\ No newline at end of file
+}
diff --git a/tests/mesh/MeshMarshalling.cpp b/tests/mesh/MeshMarshalling.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1ba1fcc2125ae300a457d557c83bc2ee08c4a1ff
--- /dev/null
+++ b/tests/mesh/MeshMarshalling.cpp
@@ -0,0 +1,170 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Marshalling.cpp
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include "core/debug/TestSubsystem.h"
+
+#include "mesh/pe/rigid_body/ConvexPolyhedron.h"
+#include "mesh/pe/rigid_body/ConvexPolyhedronFactory.h"
+#include "mesh/TriangleMeshes.h"
+#include "mesh/QHull.h"
+#include "mesh/pe/Types.h"
+#include "pe/rigidbody/Squirmer.h"
+#include "pe/rigidbody/UnionFactory.h"
+#include "pe/rigidbody/Union.h"
+#include "pe/communication/rigidbody/Squirmer.h"
+#include "pe/communication/DynamicMarshalling.h"
+#include "mesh/pe/communication/ConvexPolyhedron.h"
+#include "pe/rigidbody/SetBodyTypeIDs.h"
+#include "pe/Materials.h"
+
+#include <boost/tuple/tuple.hpp>
+#include <memory>
+namespace walberla {
+using namespace walberla::pe;
+using namespace walberla::pe::communication;
+
+using UnionTypeTuple = boost::tuple<mesh::pe::ConvexPolyhedron>;
+using UnionT = Union<UnionTypeTuple>;
+using UnionID = UnionT *;
+using UnionPtr = std::unique_ptr<UnionT>;
+
+typedef boost::tuple<mesh::pe::ConvexPolyhedron, UnionT> BodyTuple ;
+
+std::vector<Vector3<real_t>> generateOctahedron( const real_t radius)
+{
+
+ std::vector<Vector3<real_t>> okta( 6 );
+ for(size_t i = 0; i < 6; i++){
+ auto &p = okta[i];
+ p[i%3]=(i<3) ? radius: -radius;
+ }
+ return okta;
+}
+
+// Checks two mesh::TriangleMesh for pseudo-equality
+void checkMeshEquals(const mesh::TriangleMesh &m1, const mesh::TriangleMesh &m2){
+ // Very basic checks
+ WALBERLA_CHECK_FLOAT_EQUAL(mesh::computeVolume(m1), mesh::computeVolume(m2));
+ WALBERLA_CHECK_EQUAL(mesh::computeCentroid(m1), mesh::computeCentroid(m2));
+ WALBERLA_CHECK_EQUAL(mesh::computeInertiaTensor(m1), mesh::computeInertiaTensor(m2));
+}
+
+// Checks two convexPolyhedrons for equality
+void checkConvexPolyhedronEquals(const mesh::pe::ConvexPolyhedron &b1, const mesh::pe::ConvexPolyhedron &b2){
+ WALBERLA_CHECK_FLOAT_EQUAL(b1.getPosition(), b2.getPosition());
+ WALBERLA_CHECK_FLOAT_EQUAL(b1.getLinearVel(), b2.getLinearVel());
+ WALBERLA_CHECK_FLOAT_EQUAL(b1.getAngularVel(), b2.getAngularVel());
+ WALBERLA_CHECK_EQUAL(b1.getInertia(), b2.getInertia());
+ WALBERLA_CHECK_EQUAL(b1.getMaterial(), b2.getMaterial());
+ // Check equality of the meshes
+ checkMeshEquals(b1.getMesh(), b2.getMesh());
+ WALBERLA_CHECK_EQUAL(b1.getID(), b2.getID());
+ WALBERLA_CHECK_EQUAL(b1.getSystemID(), b2.getSystemID());
+}
+
+void testConvexPolyhedron()
+{
+ WALBERLA_LOG_INFO_ON_ROOT("*** testConvexPolyhedron ***");
+
+ // Generate mesh
+ shared_ptr< mesh::TriangleMesh > octamesh = make_shared<mesh::TriangleMesh>();
+ mesh::QHull< mesh::TriangleMesh > qhull( generateOctahedron(real_t(1.0)), octamesh );
+ qhull.run();
+
+ MaterialID iron = Material::find("iron");
+
+ mesh::pe::ConvexPolyhedron b1(759846, 1234794, Vec3(real_c(1), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), *octamesh, iron, false, true, false);
+ b1.setLinearVel(Vec3(real_c(5.2), real_c(6.3), real_c(7.4)));
+ b1.setAngularVel(Vec3(real_c(1.2), real_c(2.3), real_c(3.4)));
+
+ mpi::SendBuffer sb;
+ MarshalDynamically<BodyTuple>::execute(sb, b1);
+ mpi::RecvBuffer rb(sb);
+
+ auto bPtr = UnmarshalDynamically<BodyTuple>::execute(rb, mesh::pe::ConvexPolyhedron::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)));
+ mesh::pe::ConvexPolyhedronID b2 = static_cast<mesh::pe::ConvexPolyhedronID>(bPtr.get());
+ checkConvexPolyhedronEquals(b1, *b2);
+
+}
+
+void testUnion()
+{
+
+ WALBERLA_LOG_INFO_ON_ROOT("*** testUnion ***");
+ // Generate mesh
+ shared_ptr< mesh::TriangleMesh > octamesh = make_shared<mesh::TriangleMesh>();
+ mesh::QHull< mesh::TriangleMesh > qhull( generateOctahedron(real_t(1.0)), octamesh );
+ qhull.run();
+
+ MaterialID iron = Material::find("iron");
+
+ UnionT u1(159, 423, Vec3(real_c(1), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), false, false, false);
+ u1.add(std::make_unique<mesh::pe::ConvexPolyhedron>(753326, 1267824, Vec3(real_c(2), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), *octamesh, iron, false, true, false));
+ u1.add(std::make_unique<mesh::pe::ConvexPolyhedron>(753246, 1233424, Vec3(real_c(-1), real_c(4), real_c(-2)), Vec3(0,0,0), Quat(), *octamesh, iron, false, true, false));
+
+ u1.setLinearVel(Vec3(real_c(5.2), real_c(6.3), real_c(7.4)));
+ u1.setAngularVel(Vec3(real_c(1.2), real_c(2.3), real_c(3.4)));
+
+ mpi::SendBuffer sb;
+ MarshalDynamically<BodyTuple>::execute(sb, u1);
+ mpi::RecvBuffer rb(sb);
+
+ auto uPtr = UnmarshalDynamically<BodyTuple>::execute(rb, UnionT::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)));
+ UnionID u2 = static_cast<UnionID>(uPtr.get());
+ WALBERLA_CHECK_NOT_NULLPTR( u2 );
+
+ WALBERLA_CHECK_EQUAL(u1.size(), 2);
+ WALBERLA_CHECK_EQUAL(u1.size(), u2->size());
+ WALBERLA_CHECK_EQUAL(u1.getInertia(), u2->getInertia());
+ WALBERLA_CHECK_EQUAL(u1.getPosition(), u2->getPosition());
+ WALBERLA_CHECK_FLOAT_EQUAL(u1.getLinearVel(), u2->getLinearVel());
+ WALBERLA_CHECK_FLOAT_EQUAL(u1.getAngularVel(), u2->getAngularVel());
+
+ //getting polyhedrons of first union
+ mesh::pe::ConvexPolyhedronID p11 = static_cast<mesh::pe::ConvexPolyhedronID > (u1.begin().getBodyID());
+ mesh::pe::ConvexPolyhedronID p21 = static_cast<mesh::pe::ConvexPolyhedronID > ((++(u1.begin())).getBodyID());
+
+ //getting polyhedrons of second union
+ mesh::pe::ConvexPolyhedronID p12 = static_cast<mesh::pe::ConvexPolyhedronID > (u2->begin().getBodyID());
+ mesh::pe::ConvexPolyhedronID p22 = static_cast<mesh::pe::ConvexPolyhedronID > ((++(u2->begin())).getBodyID());
+
+ checkConvexPolyhedronEquals(*p11, *p12);
+ checkConvexPolyhedronEquals(*p21, *p22);
+
+}
+
+int main( int argc, char** argv )
+{
+ walberla::debug::enterTestMode();
+
+ walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
+
+ SetBodyTypeIDs<BodyTuple>::execute();
+ testConvexPolyhedron();
+ testUnion();
+
+ return EXIT_SUCCESS;
+}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/tests/mesh/MeshOperationsTest.cpp b/tests/mesh/MeshOperationsTest.cpp
index b3558bd306a0b911af1e497f0ef9bd3b06bb44da..91af5d0bf97f4139958dbab6adc10def7b48e743 100644
--- a/tests/mesh/MeshOperationsTest.cpp
+++ b/tests/mesh/MeshOperationsTest.cpp
@@ -47,7 +47,7 @@ void testCube()
{
MeshType mesh;
- typedef typename MeshType::Scalar Scalar;
+ using Scalar = typename MeshType::Scalar;
readAndBroadcast("cube.obj", mesh);
@@ -91,7 +91,7 @@ void testCube()
WALBERLA_CHECK_FLOAT_EQUAL( centroid[1], aabbCenter[1] );
WALBERLA_CHECK_FLOAT_EQUAL( centroid[2], aabbCenter[2] );
- Matrix3<Scalar> inertiaTensor = computeIntertiaTensor(mesh);
+ Matrix3<Scalar> inertiaTensor = computeInertiaTensor(mesh);
WALBERLA_CHECK_FLOAT_EQUAL( inertiaTensor(0,0), ( aabb.ySize() * aabb.ySize() + aabb.zSize() * aabb.zSize() ) / ( real_t(12) * aabb.volume() ) );
WALBERLA_CHECK_FLOAT_EQUAL( inertiaTensor(1,1), ( aabb.xSize() * aabb.xSize() + aabb.zSize() * aabb.zSize() ) / ( real_t(12) * aabb.volume() ) );
WALBERLA_CHECK_FLOAT_EQUAL( inertiaTensor(2,2), ( aabb.xSize() * aabb.xSize() + aabb.ySize() * aabb.ySize() ) / ( real_t(12) * aabb.volume() ) );
@@ -116,7 +116,7 @@ void testCube()
WALBERLA_CHECK_FLOAT_EQUAL( centroid[1], aabbCenter[1] );
WALBERLA_CHECK_FLOAT_EQUAL( centroid[2], aabbCenter[2] );
- inertiaTensor = computeIntertiaTensor(mesh);
+ inertiaTensor = computeInertiaTensor(mesh);
WALBERLA_CHECK_FLOAT_EQUAL( inertiaTensor(0,0), aabb.volume() * ( aabb.ySize() * aabb.ySize() + aabb.zSize() * aabb.zSize() ) / real_t(12) );
WALBERLA_CHECK_FLOAT_EQUAL( inertiaTensor(1,1), aabb.volume() * ( aabb.xSize() * aabb.xSize() + aabb.zSize() * aabb.zSize() ) / real_t(12) );
WALBERLA_CHECK_FLOAT_EQUAL( inertiaTensor(2,2), aabb.volume() * ( aabb.xSize() * aabb.xSize() + aabb.ySize() * aabb.ySize() ) / real_t(12) );
diff --git a/tests/mesh/MeshPeRaytracing.cpp b/tests/mesh/MeshPeRaytracing.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7fecb85a888036fcf3b23d7e3bdfe39240443a1a
--- /dev/null
+++ b/tests/mesh/MeshPeRaytracing.cpp
@@ -0,0 +1,129 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file MeshPeRaytracing.cpp
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include <core/debug/TestSubsystem.h>
+#include <core/logging/Logging.h>
+#include <core/mpi/Environment.h>
+
+#include <core/DataTypes.h>
+#include <core/math/Vector3.h>
+#include <mesh/pe/raytracing/Intersects.h>
+#include <mesh/pe/rigid_body/ConvexPolyhedron.h>
+#include <mesh/QHull.h>
+#include <pe/Materials.h>
+#include <pe/raytracing/Intersects.h>
+#include <pe/rigidbody/Box.h>
+
+#include <vector>
+
+namespace walberla{
+namespace mesh {
+namespace pe {
+
+int CpRayIntersectionTest(const int resolution = 10)
+{
+ using namespace walberla::math;
+ using namespace walberla::pe::raytracing;
+
+ std::vector<Vector3<real_t>> points;
+ points.emplace_back( real_t(-1), real_t(-1), real_t(-1) );
+ points.emplace_back( real_t(-1), real_t(-1), real_t( 1) );
+ points.emplace_back( real_t(-1), real_t( 1), real_t(-1) );
+ points.emplace_back( real_t(-1), real_t( 1), real_t( 1) );
+ points.emplace_back( real_t( 1), real_t(-1), real_t(-1) );
+ points.emplace_back( real_t( 1), real_t(-1), real_t( 1) );
+ points.emplace_back( real_t( 1), real_t( 1), real_t(-1) );
+ points.emplace_back( real_t( 1), real_t( 1), real_t( 1) );
+
+ shared_ptr< TriangleMesh > mesh = make_shared<TriangleMesh>();
+ mesh::QHull<TriangleMesh> qhull( points, mesh );
+ qhull.run();
+
+ const Vec3 center(1,2,3);
+
+ ConvexPolyhedron cp(0, 0, center, Vec3(0,0,0), Quat(), *mesh, Material::find("iron"), false, true, true);
+ cp.rotate(real_t(1), real_t(2), real_t(3));
+ Box bx(0, 0, center, Vec3(0,0,0), Quat(), Vec3(2,2,2), Material::find("iron"), false, true, true);
+ bx.rotate(real_t(1), real_t(2), real_t(3));
+
+ real_t dx = real_t(1.0) / static_cast<real_t>(resolution);
+ //rays pointed at center of body
+ for (int x = 0; x < resolution; ++x)
+ {
+ WALBERLA_LOG_INFO("[" << x+1 << " / " << resolution << "]" );
+ const real_t rand1 = real_c(x) * dx;
+ for (int y = 0; y < resolution; ++y)
+ {
+ const real_t rand2 = real_c(y) * dx;
+ real_t theta = real_t(2) * M_PI * rand1;
+ real_t phi = std::acos(real_t(1) - real_t(2) * rand2);
+ Vec3 dir(std::sin(phi) * std::cos(theta), std::sin(phi) * std::sin(theta), std::cos(phi));
+
+ Ray ray( center + dir*real_t(5), -dir);
+ real_t bx_t, cp_t;
+ Vec3 bx_n, cp_n;
+ WALBERLA_CHECK( intersects(&bx, ray, bx_t, bx_n) );
+ WALBERLA_CHECK( intersects(&cp, ray, cp_t, cp_n) );
+ WALBERLA_CHECK_FLOAT_EQUAL(bx_t, cp_t);
+ WALBERLA_CHECK_FLOAT_EQUAL(bx_n, cp_n);
+ }
+ }
+
+ //rays emitted form a point outside of the body
+ for (int x = 0; x < resolution; ++x)
+ {
+ WALBERLA_LOG_INFO("[" << x+1 << " / " << resolution << "]" );
+ const real_t rand1 = real_c(x) * dx;
+ for (int y = 0; y < resolution; ++y)
+ {
+ const real_t rand2 = real_c(y) * dx;
+ real_t theta = real_t(2) * M_PI * rand1;
+ real_t phi = std::acos(real_t(1) - real_t(2) * rand2);
+ Vec3 dir(std::sin(phi) * std::cos(theta), std::sin(phi) * std::sin(theta), std::cos(phi));
+
+ Ray ray( Vec3(real_t(5),real_t(5),real_t(5)), -dir);
+ real_t bx_t, cp_t;
+ Vec3 bx_n, cp_n;
+ const bool bx_intersects = intersects(&bx, ray, bx_t, bx_n);
+ const bool cp_intersects = intersects(&cp, ray, cp_t, cp_n);
+ WALBERLA_CHECK_EQUAL( bx_intersects, cp_intersects );
+ if (bx_intersects)
+ {
+ WALBERLA_CHECK_FLOAT_EQUAL(bx_t, cp_t);
+ WALBERLA_CHECK_FLOAT_EQUAL(bx_n, cp_n);
+ }
+ }
+ }
+
+ return EXIT_SUCCESS;
+}
+
+} //namespace pe
+} //namespace mesh
+} //namespace walberla
+
+int main( int argc, char * argv[] )
+{
+ walberla::debug::enterTestMode();
+ walberla::mpi::Environment mpiEnv( argc, argv );
+ walberla::mpi::MPIManager::instance()->useWorldComm();
+
+ return walberla::mesh::pe::CpRayIntersectionTest(10);
+}
diff --git a/tests/mesh/MeshVTKTest.cpp b/tests/mesh/MeshVTKTest.cpp
index ac6ecd3074bed19b2f724fe53c778b84be18584f..ce69aa0dfac5600ea5680ff26e3da9422bf4a665 100644
--- a/tests/mesh/MeshVTKTest.cpp
+++ b/tests/mesh/MeshVTKTest.cpp
@@ -33,8 +33,6 @@
#include <vector>
#include <string>
-#include <iso646.h>
-
namespace walberla {
namespace mesh {
@@ -58,7 +56,7 @@ void test( const std::string & meshFile )
for( auto it = mesh->faces_begin(); it != mesh->faces_end(); ++it )
{
mesh->status( *it ).set_tagged( b );
- b = not b;
+ b = !b;
}
mesh->request_vertex_status();
diff --git a/tests/mesh/NumericIntegrationTest.cpp b/tests/mesh/NumericIntegrationTest.cpp
index 7bbbc6f0beb992756425e638106c3dce49bf5e26..fe706b7439a48900da9436c56e239febbf9e801d 100644
--- a/tests/mesh/NumericIntegrationTest.cpp
+++ b/tests/mesh/NumericIntegrationTest.cpp
@@ -86,7 +86,7 @@ Matrix3<real_t> inertiaTensorNumeric( const ContainmentT & body, const AABB & aa
{
Vector3<real_t> pointOfReference = aabb.min() + Vector3<real_t>( real_t(0.5) * spacing );
- math::KahanAccumulator<real_t> intertiaTensor[6];
+ math::KahanAccumulator<real_t> inertiaTensor[6];
uint_t numPoints = 0;
for(grid_generator::SCIterator it( aabb, pointOfReference, spacing ); it != grid_generator::SCIterator(); ++it)
@@ -98,19 +98,19 @@ Matrix3<real_t> inertiaTensorNumeric( const ContainmentT & body, const AABB & aa
const real_t & y = p[1];
const real_t & z = p[2];
- intertiaTensor[0] += y*y + z*z;
- intertiaTensor[1] += -x*y;
- intertiaTensor[2] += -x*z;
- intertiaTensor[3] += x*x + z*z;
- intertiaTensor[4] += -y*z;
- intertiaTensor[5] += x*x + y*y;
+ inertiaTensor[0] += y*y + z*z;
+ inertiaTensor[1] += -x*y;
+ inertiaTensor[2] += -x*z;
+ inertiaTensor[3] += x*x + z*z;
+ inertiaTensor[4] += -y*z;
+ inertiaTensor[5] += x*x + y*y;
++numPoints;
}
}
- return Matrix3<real_t>( intertiaTensor[0].get(), intertiaTensor[1].get(), intertiaTensor[2].get(),
- intertiaTensor[1].get(), intertiaTensor[3].get(), intertiaTensor[4].get(),
- intertiaTensor[2].get(), intertiaTensor[4].get(), intertiaTensor[5].get() ) * (spacing * spacing * spacing);
+ return Matrix3<real_t>( inertiaTensor[0].get(), inertiaTensor[1].get(), inertiaTensor[2].get(),
+ inertiaTensor[1].get(), inertiaTensor[3].get(), inertiaTensor[4].get(),
+ inertiaTensor[2].get(), inertiaTensor[4].get(), inertiaTensor[5].get() ) * (spacing * spacing * spacing);
}
@@ -147,10 +147,10 @@ void testNumeric( const shared_ptr<MeshType> & mesh )
WALBERLA_CHECK( std::fabs( numericCentroid[0] - geometricalCentroid[0] ) < real_t(0.001) || std::fabs( real_t(1) - numericCentroid[1] / geometricalCentroid[1] ) < real_t(0.001) );
WALBERLA_CHECK( std::fabs( numericCentroid[0] - geometricalCentroid[0] ) < real_t(0.001) || std::fabs( real_t(1) - numericCentroid[2] / geometricalCentroid[2] ) < real_t(0.001) );
- WALBERLA_LOG_INFO("Computing numeric intertia tensor");
+ WALBERLA_LOG_INFO("Computing numeric inertia tensor");
Matrix3<real_t> numericTensor = inertiaTensorNumeric(*containmentOctree, aabb, spacing );
- WALBERLA_LOG_INFO("Computing geometrical intertia tensor");
- Matrix3<real_t> geometricalTensor = computeIntertiaTensor(*mesh);
+ WALBERLA_LOG_INFO("Computing geometrical inertia tensor");
+ Matrix3<real_t> geometricalTensor = computeInertiaTensor(*mesh);
WALBERLA_LOG_INFO("Numerical tensor:\n" << numericTensor << "\n" <<
"Geometrical tensor:\n" << geometricalTensor << "\n" <<
"Difference:\n" << numericTensor - geometricalTensor );
diff --git a/tests/mesh/PeVTKMeshWriterTest.cpp b/tests/mesh/PeVTKMeshWriterTest.cpp
index a765f30c4290e09240027168fd90591314c48eb4..b3b704a97a585891a7ff4a9a4d548252fd8ce44e 100644
--- a/tests/mesh/PeVTKMeshWriterTest.cpp
+++ b/tests/mesh/PeVTKMeshWriterTest.cpp
@@ -38,10 +38,12 @@
#include <core/logging/Logging.h>
#include <core/timing/TimingTree.h>
#include <core/waLBerlaBuildInfo.h>
+#include <core/math/Random.h>
#include <core/math/Utility.h>
#include <postprocessing/sqlite/SQLite.h>
#include <vtk/VTKOutput.h>
+#include <functional>
#include <random>
using namespace walberla;
@@ -53,14 +55,14 @@ typedef boost::tuple<ConvexPolyhedron, Plane> BodyTuple ;
std::vector<Vector3<real_t>> generatePointCloudCube()
{
std::vector<Vector3<real_t>> points;
- points.push_back( Vector3<real_t>( real_t(-1), real_t(-1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t(-1), real_t(-1), real_t( 1) ) );
- points.push_back( Vector3<real_t>( real_t(-1), real_t( 1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t(-1), real_t( 1), real_t( 1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t(-1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t(-1), real_t( 1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t( 1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t( 1), real_t( 1) ) );
+ points.emplace_back( real_t(-1), real_t(-1), real_t(-1) );
+ points.emplace_back( real_t(-1), real_t(-1), real_t( 1) );
+ points.emplace_back( real_t(-1), real_t( 1), real_t(-1) );
+ points.emplace_back( real_t(-1), real_t( 1), real_t( 1) );
+ points.emplace_back( real_t( 1), real_t(-1), real_t(-1) );
+ points.emplace_back( real_t( 1), real_t(-1), real_t( 1) );
+ points.emplace_back( real_t( 1), real_t( 1), real_t(-1) );
+ points.emplace_back( real_t( 1), real_t( 1), real_t( 1) );
return points;
}
@@ -75,9 +77,9 @@ std::vector<Vector3<real_t>> generatePointCloudDodecahedron()
for( auto phi : {-PHI, PHI} )
for( auto piv : {-PHI_INV, PHI_INV} )
{
- points.push_back( Vector3<real_t>( real_t( 0), real_t(piv), real_t(phi) ) );
- points.push_back( Vector3<real_t>( real_t(piv), real_t(phi), real_t( 0) ) );
- points.push_back( Vector3<real_t>( real_t(phi), real_t( 0), real_t(piv) ) );
+ points.emplace_back( real_t( 0), real_t(piv), real_t(phi) );
+ points.emplace_back( real_t(piv), real_t(phi), real_t( 0) );
+ points.emplace_back( real_t(phi), real_t( 0), real_t(piv) );
}
return points;
@@ -142,10 +144,10 @@ int main( int argc, char ** argv )
cr.setRelaxationParameter( real_t(0.7) );
cr.setGlobalLinearAcceleration( Vec3(0,0,5) );
- std::function<void(void)> syncCall = boost::bind( pe::syncNextNeighbors<BodyTuple>, boost::ref(*forest), storageID, static_cast<WcTimingTree*>(NULL), real_c(0.0), false );
+ std::function<void(void)> syncCall = std::bind( pe::syncNextNeighbors<BodyTuple>, std::ref(*forest), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
- typedef mesh::FloatPolyMesh OutputMeshType;
- typedef mesh::pe::DefaultTesselation<OutputMeshType> TesselationType;
+ using OutputMeshType = mesh::FloatPolyMesh;
+ using TesselationType = mesh::pe::DefaultTesselation<OutputMeshType>;
TesselationType tesselation;
mesh::pe::PeVTKMeshWriter<OutputMeshType, TesselationType> writer( forest, storageID, tesselation, "MeshOutput", uint_c(visSpacing) );
@@ -165,7 +167,7 @@ int main( int argc, char ** argv )
MaterialID material = createMaterial( "granular", real_t( 1.0 ), 0, static_cof, dynamic_cof, real_t( 0.5 ), 1, 1, 0, 0 );
auto simulationDomain = forest->getDomain();
- auto generationDomain = simulationDomain; // simulationDomain.getExtended(-real_c(0.5) * spacing);
+ const auto& generationDomain = simulationDomain; // simulationDomain.getExtended(-real_c(0.5) * spacing);
createPlane(*globalBodyStorage, 0, Vec3(1,0,0), simulationDomain.minCorner(), material );
createPlane(*globalBodyStorage, 0, Vec3(-1,0,0), simulationDomain.maxCorner(), material );
createPlane(*globalBodyStorage, 0, Vec3(0,1,0), simulationDomain.minCorner(), material );
@@ -190,8 +192,8 @@ int main( int argc, char ** argv )
//BoxID sp = pe::createBox( *globalBodyStorage, *forest, storageID, 0, *it, Vec3(radius), material );
mesh::pe::ConvexPolyhedronID sp = mesh::pe::createConvexPolyhedron( *globalBodyStorage, *forest, storageID, 0, *it, pointCloud, material );
Vec3 rndVel(math::realRandom<real_t>(-vMax, vMax), math::realRandom<real_t>(-vMax, vMax), math::realRandom<real_t>(-vMax, vMax));
- if (sp != NULL) sp->setLinearVel(rndVel);
- if (sp != NULL) ++numParticles;
+ if (sp != nullptr) sp->setLinearVel(rndVel);
+ if (sp != nullptr) ++numParticles;
}
}
mpi::reduceInplace(numParticles, mpi::SUM);
diff --git a/tests/mesh/QHullTest.cpp b/tests/mesh/QHullTest.cpp
index c755a46ec3fa3bb9e93f4fa3a1497e6c03c3c630..ddb4d46e51523e8f5608cf8b05f6c58d5d10ba25 100644
--- a/tests/mesh/QHullTest.cpp
+++ b/tests/mesh/QHullTest.cpp
@@ -46,12 +46,12 @@ class PointCloudDataSource : public vtk::PointDataSource
public:
PointCloudDataSource( const std::vector<Vector3<real_t>> & pointCloud ) : pointCloud_( pointCloud ) {}
- virtual std::vector< Attributes > getAttributes() const { return std::vector< Attributes >(); }
- virtual std::vector< Vector3< real_t > > getPoints() { return pointCloud_; }
- virtual void configure() {};
+ std::vector< Attributes > getAttributes() const override { return std::vector< Attributes >(); }
+ std::vector< Vector3< real_t > > getPoints() override { return pointCloud_; }
+ void configure() override {};
- virtual void push( std::ostream& /*os*/, const uint_t /*data*/, const uint_t /*point*/, const uint_t /*component*/ ) {};
- virtual void push( vtk::Base64Writer& /*b64*/, const uint_t /*data*/, const uint_t /*point*/, const uint_t /*component*/ ) {};
+ void push( std::ostream& /*os*/, const uint_t /*data*/, const uint_t /*point*/, const uint_t /*component*/ ) override {};
+ void push( vtk::Base64Writer& /*b64*/, const uint_t /*data*/, const uint_t /*point*/, const uint_t /*component*/ ) override {};
private:
std::vector<Vector3<real_t>> pointCloud_;
@@ -104,7 +104,7 @@ void test( const std::string & testName, const std::vector<Vector3<real_t>> & po
const typename MeshType::Point pointOnFace = mesh.point( *mesh.cfv_begin(fh) );
for(const auto & p : pointCloud)
{
- typedef typename MeshType::Scalar Scalar;
+ using Scalar = typename MeshType::Scalar;
WALBERLA_CHECK_LESS( (toOpenMeshNumericCast<Scalar>(p) - pointOnFace) | n, real_comparison::Epsilon<Scalar>::value,
"Point: " << p << " Face normal: " << n << " v: " << toOpenMeshNumericCast<Scalar>(p) - pointOnFace );
}
@@ -116,14 +116,14 @@ void test( const std::string & testName, const std::vector<Vector3<real_t>> & po
std::vector<Vector3<real_t>> generatePointCloudCube()
{
std::vector<Vector3<real_t>> points;
- points.push_back( Vector3<real_t>( real_t(-1), real_t(-1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t(-1), real_t(-1), real_t( 1) ) );
- points.push_back( Vector3<real_t>( real_t(-1), real_t( 1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t(-1), real_t( 1), real_t( 1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t(-1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t(-1), real_t( 1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t( 1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t( 1), real_t( 1) ) );
+ points.emplace_back( real_t(-1), real_t(-1), real_t(-1) );
+ points.emplace_back( real_t(-1), real_t(-1), real_t( 1) );
+ points.emplace_back( real_t(-1), real_t( 1), real_t(-1) );
+ points.emplace_back( real_t(-1), real_t( 1), real_t( 1) );
+ points.emplace_back( real_t( 1), real_t(-1), real_t(-1) );
+ points.emplace_back( real_t( 1), real_t(-1), real_t( 1) );
+ points.emplace_back( real_t( 1), real_t( 1), real_t(-1) );
+ points.emplace_back( real_t( 1), real_t( 1), real_t( 1) );
return points;
}
@@ -132,10 +132,10 @@ std::vector<Vector3<real_t>> generatePointCloudCube()
std::vector<Vector3<real_t>> generatePointCloudTetrahedron()
{
std::vector<Vector3<real_t>> points;
- points.push_back( Vector3<real_t>( real_t( 1), real_t( 1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t(-1), real_t(-1), real_t(-1) ) );
- points.push_back( Vector3<real_t>( real_t(-1), real_t( 1), real_t( 1) ) );
- points.push_back( Vector3<real_t>( real_t( 1), real_t(-1), real_t( 1) ) );
+ points.emplace_back( real_t( 1), real_t( 1), real_t(-1) );
+ points.emplace_back( real_t(-1), real_t(-1), real_t(-1) );
+ points.emplace_back( real_t(-1), real_t( 1), real_t( 1) );
+ points.emplace_back( real_t( 1), real_t(-1), real_t( 1) );
return points;
}
@@ -146,9 +146,9 @@ std::vector<Vector3<real_t>> generatePointCloudOctahedron()
for( auto one : {real_t(-1), real_t(1)} )
{
- points.push_back( Vector3<real_t>( one, 0, 0 ) );
- points.push_back( Vector3<real_t>( 0, one, 0 ) );
- points.push_back( Vector3<real_t>( 0, 0, one ) );
+ points.emplace_back( one, 0, 0 );
+ points.emplace_back( 0, one, 0 );
+ points.emplace_back( 0, 0, one );
}
return points;
@@ -163,9 +163,9 @@ std::vector<Vector3<real_t>> generatePointCloudIcosahedron()
for( auto one : {real_t(-1), real_t(1)} )
for( auto phi : {-PHI, PHI} )
{
- points.push_back( Vector3<real_t>( real_t( 0), real_t(one), real_t(phi) ) );
- points.push_back( Vector3<real_t>( real_t(one), real_t(phi), real_t( 0) ) );
- points.push_back( Vector3<real_t>( real_t(phi), real_t( 0), real_t(one) ) );
+ points.emplace_back( real_t( 0), real_t(one), real_t(phi) );
+ points.emplace_back( real_t(one), real_t(phi), real_t( 0) );
+ points.emplace_back( real_t(phi), real_t( 0), real_t(one) );
}
return points;
@@ -181,9 +181,9 @@ std::vector<Vector3<real_t>> generatePointCloudDodecahedron()
for( auto phi : {-PHI, PHI} )
for( auto piv : {-PHI_INV, PHI_INV} )
{
- points.push_back( Vector3<real_t>( real_t( 0), real_t(piv), real_t(phi) ) );
- points.push_back( Vector3<real_t>( real_t(piv), real_t(phi), real_t( 0) ) );
- points.push_back( Vector3<real_t>( real_t(phi), real_t( 0), real_t(piv) ) );
+ points.emplace_back( real_t( 0), real_t(piv), real_t(phi) );
+ points.emplace_back( real_t(piv), real_t(phi), real_t( 0) );
+ points.emplace_back( real_t(phi), real_t( 0), real_t(piv) );
}
return points;
diff --git a/tests/pde/CGTest.cpp b/tests/pde/CGTest.cpp
index ecc51857d222721d217d267554d5ab817517f19d..eecd1c6a2646291d7509bc1f4db3a35eab9013b3 100644
--- a/tests/pde/CGTest.cpp
+++ b/tests/pde/CGTest.cpp
@@ -43,13 +43,13 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField< real_t, 1 > PdeField_T;
-typedef stencil::D2Q5 Stencil_T;
-typedef pde::CGIteration<Stencil_T>::StencilField_T StencilField_T;
+using Stencil_T = stencil::D2Q5;
+using StencilField_T = pde::CGIteration<Stencil_T>::StencilField_T;
@@ -203,3 +203,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/JacobiTest.cpp b/tests/pde/JacobiTest.cpp
index 5d048c3638fcf3dabf7ebd69980e728559244c3b..275cbf8dfe50506986f9d3de6d3896ad82844b76 100644
--- a/tests/pde/JacobiTest.cpp
+++ b/tests/pde/JacobiTest.cpp
@@ -46,13 +46,13 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField< real_t, 1 > PdeField_T;
-typedef stencil::D2Q5 Stencil_T;
-typedef pde::Jacobi<Stencil_T>::StencilField_T StencilField_T;
+using Stencil_T = stencil::D2Q5;
+using StencilField_T = pde::Jacobi<Stencil_T>::StencilField_T;
@@ -210,3 +210,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/MGConvergenceTest.cpp b/tests/pde/MGConvergenceTest.cpp
index 0716c841c86ada98ffd584789d67ab2fe841f082..f9643a83fc02bd10ff2ab4046d8afa02e6ef0761 100644
--- a/tests/pde/MGConvergenceTest.cpp
+++ b/tests/pde/MGConvergenceTest.cpp
@@ -44,13 +44,13 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField< real_t, 1 > PdeField_T;
-typedef stencil::D3Q7 Stencil_T;
-typedef pde::VCycles<Stencil_T>::StencilField_T StencilField_T;
+using Stencil_T = stencil::D3Q7;
+using StencilField_T = pde::VCycles<Stencil_T>::StencilField_T;
@@ -506,3 +506,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
//**********************************************************************************************************************
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/MGTest.cpp b/tests/pde/MGTest.cpp
index fa08a2bf8a08a5b6df3006fe842c032a90d38f43..275a2ecc19150c0300dd96927c9254ddfd9f2da9 100644
--- a/tests/pde/MGTest.cpp
+++ b/tests/pde/MGTest.cpp
@@ -45,13 +45,13 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField< real_t, 1 > PdeField_T;
-typedef stencil::D3Q7 Stencil_T;
-typedef pde::VCycles<Stencil_T>::StencilField_T StencilField_T;
+using Stencil_T = stencil::D3Q7;
+using StencilField_T = pde::VCycles<Stencil_T>::StencilField_T;
@@ -293,4 +293,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/RBGSTest.cpp b/tests/pde/RBGSTest.cpp
index b65245d4755120f3fccc89745819b3279f2ff807..c3a922ea15176f9fc6ba0674601a683a393807c8 100644
--- a/tests/pde/RBGSTest.cpp
+++ b/tests/pde/RBGSTest.cpp
@@ -46,13 +46,13 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField< real_t, 1 > PdeField_T;
-typedef stencil::D2Q5 Stencil_T;
-typedef pde::RBGS<Stencil_T>::StencilField_T StencilField_T;
+using Stencil_T = stencil::D2Q5;
+using StencilField_T = pde::RBGS<Stencil_T>::StencilField_T;
@@ -210,3 +210,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pde/SORTest.cpp b/tests/pde/SORTest.cpp
index cf9f6f02470fcc6c35a0e0e49b306679cf9d95bc..520df1cfa8fd8eb1796f20710d640dae962d0e25 100644
--- a/tests/pde/SORTest.cpp
+++ b/tests/pde/SORTest.cpp
@@ -46,13 +46,13 @@
#include <cmath>
-using namespace walberla;
+namespace walberla {
typedef GhostLayerField< real_t, 1 > PdeField_T;
-typedef stencil::D2Q5 Stencil_T;
-typedef pde::SOR<Stencil_T>::StencilField_T StencilField_T;
+using Stencil_T = stencil::D2Q5;
+using StencilField_T = pde::SOR<Stencil_T>::StencilField_T;
@@ -212,3 +212,9 @@ int main( int argc, char** argv )
logging::Logging::printFooterOnStream();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/BodyFlags.cpp b/tests/pe/BodyFlags.cpp
index 901e85c71bf41bb6b0c4238fc8fff6aa6e550db1..dac32839193613cd8029d289ead1311c382c8cb0 100644
--- a/tests/pe/BodyFlags.cpp
+++ b/tests/pe/BodyFlags.cpp
@@ -34,11 +34,10 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
int main( int argc, char ** argv )
{
@@ -67,36 +66,36 @@ int main( int argc, char ** argv )
auto fcdID = forest->addBlockData(fcd::createGenericFCDDataHandling<BodyTuple, fcd::AnalyticCollideFunctor>(), "FCD");
//cr::DEM cr(globalStorage, forest->getBlockStorage(), storageID, ccdID, fcdID, NULL );
- cr::HCSITS cr(globalStorage, forest->getBlockStoragePointer(), storageID, ccdID, fcdID, NULL );
+ cr::HCSITS cr(globalStorage, forest->getBlockStoragePointer(), storageID, ccdID, fcdID, nullptr );
MaterialID iron = Material::find("iron");
- SphereID refGlobalSphere = new Sphere(1, 0, Vec3(9, 9, 9), Vec3(0,0,0), Quat(), 3, iron, true, false, true);
- refGlobalSphere->setLinearVel(Vec3(2,2,2));
+ Sphere refGlobalSphere(1, 0, Vec3(9, 9, 9), Vec3(0,0,0), Quat(), 3, iron, true, false, true);
+ refGlobalSphere.setLinearVel(Vec3(2,2,2));
SphereID globalSphere = createSphere( *globalStorage, forest->getBlockStorage(), storageID, 0, Vec3(9,9,9), 3, iron, true, false, true);
globalSphere->setLinearVel(Vec3(2,2,2));
- SphereID refFixedSphere = new Sphere(2, 0, Vec3(9,9,14), Vec3(0,0,0), Quat(), 3, iron, false, false, true);
+ Sphere refFixedSphere(2, 0, Vec3(9,9,14), Vec3(0,0,0), Quat(), 3, iron, false, false, true);
SphereID fixedSphere = createSphere( *globalStorage, forest->getBlockStorage(), storageID, 0, Vec3(9,9,14), 3, iron, false, false, true);
walberla::id_t fixedSphereID = 0;
- if (fixedSphere != NULL) fixedSphereID = fixedSphere->getSystemID();
+ if (fixedSphere != nullptr) fixedSphereID = fixedSphere->getSystemID();
mpi::allReduceInplace(fixedSphereID, mpi::SUM);
// synchronize particles
- syncShadowOwners<BodyTuple>( forest->getBlockForest(), storageID, NULL, real_c(0.0), true);
+ syncShadowOwners<BodyTuple>( forest->getBlockForest(), storageID, nullptr, real_c(0.0), true);
cr.setGlobalLinearAcceleration(Vec3(0, 0, real_c(-9.81)));
- checkVitalParameters(refGlobalSphere, globalSphere);
+ checkVitalParameters(&refGlobalSphere, globalSphere);
for (auto it = forest->begin(); it != forest->end(); ++it)
{
blockforest::Block& block = *(dynamic_cast<blockforest::Block*>(&(*it)));
- if (block.getAABB().intersects(refFixedSphere->getAABB()))
+ if (block.getAABB().intersects(refFixedSphere.getAABB()))
{
SphereID fixed = static_cast<SphereID> (getBody(*globalStorage, forest->getBlockStorage(), storageID, fixedSphereID));
WALBERLA_ASSERT_NOT_NULLPTR(fixed);
- checkVitalParameters(refFixedSphere,fixed);
- if (!block.getAABB().contains(refFixedSphere->getPosition()))
+ checkVitalParameters(&refFixedSphere,fixed);
+ if (!block.getAABB().contains(refFixedSphere.getPosition()))
{
WALBERLA_ASSERT(fixed->isRemote());
}
@@ -105,20 +104,20 @@ int main( int argc, char ** argv )
WALBERLA_LOG_PROGRESS_ON_ROOT("*** SIMULATION - START ***");
cr.timestep( real_c(1.0) );
- syncShadowOwners<BodyTuple>( forest->getBlockForest(), storageID, NULL, real_c(0.0), false);
+ syncShadowOwners<BodyTuple>( forest->getBlockForest(), storageID, nullptr, real_c(0.0), false);
WALBERLA_LOG_PROGRESS_ON_ROOT("*** SIMULATION - END ***");
- refGlobalSphere->setPosition(Vec3(11,11,11));
- checkVitalParameters(refGlobalSphere, globalSphere);
+ refGlobalSphere.setPosition(Vec3(11,11,11));
+ checkVitalParameters(&refGlobalSphere, globalSphere);
for (auto it = forest->begin(); it != forest->end(); ++it)
{
blockforest::Block& block = *(dynamic_cast<blockforest::Block*>(&(*it)));
- if (block.getAABB().intersects(refFixedSphere->getAABB()))
+ if (block.getAABB().intersects(refFixedSphere.getAABB()))
{
SphereID fixed = static_cast<SphereID> (getBody(*globalStorage, forest->getBlockStorage(), storageID, fixedSphereID));
WALBERLA_ASSERT_NOT_NULLPTR(fixed);
- checkVitalParameters(refFixedSphere, fixed);
- if (!block.getAABB().contains(refFixedSphere->getPosition()))
+ checkVitalParameters(&refFixedSphere, fixed);
+ if (!block.getAABB().contains(refFixedSphere.getPosition()))
{
WALBERLA_ASSERT(fixed->isRemote());
}
@@ -127,3 +126,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/BodyIterators.cpp b/tests/pe/BodyIterators.cpp
index a14fc38c543ae11787bd3ed28bda4f1ed1f1f803..e53b44a6acb633cea157ebe0f4ba9187966f4748 100644
--- a/tests/pe/BodyIterators.cpp
+++ b/tests/pe/BodyIterators.cpp
@@ -14,7 +14,7 @@
// with waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
//
//! \file BodyIterators.cpp
-//! \author Florian Schornbaum <florian.schornbaum@fau.de>
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
//
//======================================================================================================================
@@ -33,10 +33,10 @@
#include <iostream>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
int main( int argc, char **argv )
{
@@ -73,13 +73,13 @@ int main( int argc, char **argv )
uint_t sphereCount = 0;
- if (pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), storageID, 0, Vec3( real_t(25), real_t(25), real_t(50) ), 1) != NULL)
+ if (pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), storageID, 0, Vec3( real_t(25), real_t(25), real_t(50) ), 1) != nullptr)
++sphereCount;
- if (pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), storageID, 0, Vec3( real_t(99), real_t(25), real_t(50) ), 2) != NULL)
+ if (pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), storageID, 0, Vec3( real_t(99), real_t(25), real_t(50) ), 2) != nullptr)
++sphereCount;
- if (pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), storageID, 0, Vec3( real_t(101), real_t(25), real_t(50) ), 2) != NULL)
+ if (pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), storageID, 0, Vec3( real_t(101), real_t(25), real_t(50) ), 2) != nullptr)
++sphereCount;
- if (pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), storageID, 0, Vec3( real_t(125), real_t(25), real_t(50) ), 1) != NULL)
+ if (pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), storageID, 0, Vec3( real_t(125), real_t(25), real_t(50) ), 1) != nullptr)
++sphereCount;
syncShadowOwners<BodyTuple>( blocks->getBlockForest(), storageID);
@@ -150,3 +150,9 @@ int main( int argc, char **argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/BodyStorage.cpp b/tests/pe/BodyStorage.cpp
index 644f29a1c063de596a9d15081778b2bd23ef784f..73063931739512c6a0208f9fe0bde6f0e328c280 100644
--- a/tests/pe/BodyStorage.cpp
+++ b/tests/pe/BodyStorage.cpp
@@ -32,14 +32,14 @@ class Body1 : public Sphere {
public:
static int refCount;
Body1(walberla::id_t id, MaterialID matID) : Sphere(id, id, Vec3(0,0,0), Vec3(0,0,0), Quat(), 1, matID, false, true, false) {++refCount;}
- ~Body1() {--refCount;}
+ ~Body1() override {--refCount;}
};
class Body2 : public Sphere {
public:
static int refCount;
Body2(walberla::id_t id, MaterialID matID) : Sphere(id, id, Vec3(0,0,0), Vec3(0,0,0), Quat(), 1, matID, false, true, false) {++refCount;}
- ~Body2() {--refCount;}
+ ~Body2() override {--refCount;}
};
int Body1::refCount = 0;
@@ -54,18 +54,21 @@ int main( int argc, char** argv )
MaterialID iron = Material::find("iron");
{
BodyStorage storage;
- auto bd1 = new Body1(1, iron);
- auto bd2 = new Body2(2, iron);
- auto bd3 = new Body2(3, iron);
- auto bd4 = new Body2(4, iron);
+ auto bd1Ptr = std::make_unique<Body1>(1, iron);
+ auto bd2Ptr = std::make_unique<Body2>(2, iron);
+ auto bd3Ptr = std::make_unique<Body2>(3, iron);
+ auto bd4Ptr = std::make_unique<Body2>(4, iron);
+
+ auto bd2 = bd2Ptr.get();
+ auto bd3 = bd3Ptr.get();
WALBERLA_CHECK_EQUAL(Body1::refCount, 1);
WALBERLA_CHECK_EQUAL(Body2::refCount, 3);
- storage.add(bd1);
- storage.add(bd2);
- storage.add(bd3);
- storage.add(bd4);
+ storage.add(std::move(bd1Ptr));
+ storage.add(std::move(bd2Ptr));
+ storage.add(std::move(bd3Ptr));
+ storage.add(std::move(bd4Ptr));
WALBERLA_CHECK_EQUAL(storage.size(), 4);
WALBERLA_CHECK_EQUAL(Body1::refCount, 1);
diff --git a/tests/pe/CMakeLists.txt b/tests/pe/CMakeLists.txt
index b29ec6940fa922d1ee5e0e798f3afc9be1d4937a..5d5273829ffd6329e71f4f712a94fc50fd1cb8ba 100644
--- a/tests/pe/CMakeLists.txt
+++ b/tests/pe/CMakeLists.txt
@@ -16,6 +16,9 @@ waLBerla_execute_test( NAME PE_BODYITERATORS PROCESSES 2 )
waLBerla_compile_test( NAME PE_BODYSTORAGE FILES BodyStorage.cpp DEPENDS core )
waLBerla_execute_test( NAME PE_BODYSTORAGE )
+waLBerla_compile_test( NAME PE_CALLBACK FILES Callback.cpp DEPENDS blockforest core domain_decomposition )
+waLBerla_execute_test( NAME PE_CALLBACK PROCESSES 2 )
+
waLBerla_compile_test( NAME PE_CHECKVITALPARAMETERS FILES CheckVitalParameters.cpp DEPENDS core )
waLBerla_execute_test( NAME PE_CHECKVITALPARAMETERS )
@@ -94,8 +97,9 @@ set_property( TEST PE_SERIALIZEDESERIALIZE04 PROPERTY DEPENDS PE_SERIALIZEDESERI
set_property( TEST PE_SERIALIZEDESERIALIZE08 PROPERTY DEPENDS PE_SERIALIZEDESERIALIZE04 ) #serialize runs of tets to avoid i/o conflicts when running ctest with -jN
endif()
-waLBerla_compile_test( NAME PE_SHADOWCOPY FILES ShadowCopy.cpp DEPENDS core blockforest )
-waLBerla_execute_test( NAME PE_SHADOWCOPY )
+waLBerla_compile_test( NAME PE_SHADOWCOPY FILES ShadowCopy.cpp DEPENDS core blockforest domain_decomposition )
+waLBerla_execute_test( NAME PE_SHADOWCOPY_NN COMMAND $<TARGET_FILE:PE_SHADOWCOPY> )
+waLBerla_execute_test( NAME PE_SHADOWCOPY_SO COMMAND $<TARGET_FILE:PE_SHADOWCOPY> --syncShadowOwners )
waLBerla_compile_test( NAME PE_SIMPLECCD FILES SimpleCCD.cpp DEPENDS core )
waLBerla_execute_test( NAME PE_SIMPLECCD )
@@ -110,10 +114,14 @@ waLBerla_execute_test( NAME PE_SYNCHRONIZATION09 COMMAND $<TARGET_FILE:PE_SYNC
waLBerla_execute_test( NAME PE_SYNCHRONIZATION27 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATION> PROCESSES 27)
waLBerla_compile_test( NAME PE_SYNCHRONIZATIONDELETE FILES SynchronizationDelete.cpp DEPENDS core )
-waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE01 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> )
-waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE03 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES 3 LABELS longrun)
-waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE09 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES 9 LABELS longrun)
-waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE27 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES 27)
+waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE01_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> )
+waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE03_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES 3 LABELS longrun)
+waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE09_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES 9 LABELS longrun)
+waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE27_NN COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> PROCESSES 27)
+waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE01_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners )
+waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE03_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES 3 LABELS longrun)
+waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE09_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES 9 LABELS longrun)
+waLBerla_execute_test( NAME PE_SYNCHRONIZATIONDELETE27_SO COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONDELETE> --syncShadowOwners PROCESSES 27)
waLBerla_compile_test( NAME PE_SYNCHRONIZATIONLARGEBODY FILES SynchronizationLargeBody.cpp DEPENDS core )
waLBerla_execute_test( NAME PE_SYNCHRONIZATIONLARGEBODY01 COMMAND $<TARGET_FILE:PE_SYNCHRONIZATIONLARGEBODY> )
@@ -127,5 +135,8 @@ waLBerla_execute_test( NAME PE_STATICTYPEIDS )
waLBerla_compile_test( NAME PE_UNION FILES Union.cpp DEPENDS core )
waLBerla_execute_test( NAME PE_UNION )
+waLBerla_compile_test( NAME PE_RAYTRACING FILES Raytracing.cpp DEPENDS core )
+waLBerla_execute_test( NAME PE_RAYTRACING )
+
waLBerla_compile_test( NAME PE_VOLUMEINERTIA FILES VolumeInertia.cpp DEPENDS core )
waLBerla_execute_test( NAME PE_VOLUMEINERTIA CONFIGURATIONS Release RelWithDbgInfo)
diff --git a/tests/pe/Callback.cpp b/tests/pe/Callback.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7aa026672ddf177fb130e061a71d2e80ce5d3015
--- /dev/null
+++ b/tests/pe/Callback.cpp
@@ -0,0 +1,176 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file Callback.cpp
+//! \brief checks callbacks of BodyStorage
+//! \author Sebastian Eibl <sebastian.eibl@fau.de>
+//
+//======================================================================================================================
+
+#include "pe/basic.h"
+#include <pe/utility/DestroyBody.h>
+
+#include "blockforest/all.h"
+#include "core/all.h"
+#include "domain_decomposition/all.h"
+
+#include "core/debug/TestSubsystem.h"
+
+namespace walberla {
+using namespace walberla::pe;
+
+typedef boost::tuple<Sphere> BodyTypeTuple ;
+
+enum class State{ LOCALIZED0, SHADOW, MIGRATED, LOCALIZED1, REMOVED};
+State state;
+
+void addCallbackLocal(BodyID bd)
+{
+ bool shouldBeCalled = ((state == State::LOCALIZED0) && (mpi::MPIManager::instance()->worldRank() == 0)) ||
+ ((state == State::MIGRATED) && (mpi::MPIManager::instance()->worldRank() == 1));
+ WALBERLA_CHECK(shouldBeCalled);
+ WALBERLA_LOG_DEVEL("Add local body: " << bd->getSystemID() );
+}
+void removeCallbackLocal(BodyID bd)
+{
+ bool shouldBeCalled = ((state == State::MIGRATED) && (mpi::MPIManager::instance()->worldRank() == 0)) ||
+ ((state == State::REMOVED) && (mpi::MPIManager::instance()->worldRank() == 1));
+ WALBERLA_CHECK(shouldBeCalled);
+ WALBERLA_LOG_DEVEL("Remove local body: " << bd->getSystemID() );
+}
+
+void addCallbackShadow(BodyID bd)
+{
+ bool shouldBeCalled = ((state == State::SHADOW) && (mpi::MPIManager::instance()->worldRank() == 1)) ||
+ ((state == State::MIGRATED) && (mpi::MPIManager::instance()->worldRank() == 0));
+ WALBERLA_CHECK(shouldBeCalled);
+ WALBERLA_LOG_DEVEL("Add shadow body: " << bd->getSystemID() );
+}
+void removeCallbackShadow(BodyID bd)
+{
+ bool shouldBeCalled = ((state == State::MIGRATED) && (mpi::MPIManager::instance()->worldRank() == 1)) ||
+ ((state == State::LOCALIZED1) && (mpi::MPIManager::instance()->worldRank() == 0));
+ WALBERLA_CHECK(shouldBeCalled);
+ WALBERLA_LOG_DEVEL("Remove shadow body: " << bd->getSystemID() );
+}
+
+int main( int argc, char** argv )
+{
+ walberla::debug::enterTestMode();
+ walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
+
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+
+ // create blocks
+ shared_ptr< BlockForest > forest = createBlockForest( AABB(0,0,0,20,20,20), // simulation domain
+ Vector3<uint_t>(2,1,1), // blocks in each direction
+ Vector3<bool>(false, false, false) // periodicity
+ );
+
+ SetBodyTypeIDs<BodyTypeTuple>::execute();
+
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTypeTuple>(), "Storage");
+
+ for (auto& currentBlock : *forest)
+ {
+ Storage * storage = currentBlock.getData< Storage >( storageID );
+ BodyStorage& localStorage = (*storage)[0];
+ BodyStorage& shadowStorage = (*storage)[1];
+
+ localStorage.registerAddCallback( "Test", addCallbackLocal );
+ localStorage.registerRemoveCallback( "Test", removeCallbackLocal );
+
+ shadowStorage.registerAddCallback( "Test", addCallbackShadow );
+ shadowStorage.registerRemoveCallback( "Test", removeCallbackShadow );
+ }
+
+ state = State::LOCALIZED0;
+ BodyID sp = pe::createSphere(
+ *globalBodyStorage,
+ *forest,
+ storageID,
+ 99,
+ Vec3(8,5,5),
+ real_c(1.0));
+ if (sp != nullptr)
+ {
+ WALBERLA_CHECK_EQUAL( sp->getSystemID(), 1 );
+ }
+ syncNextNeighbors<BodyTypeTuple>(*forest, storageID);
+ WALBERLA_MPI_BARRIER();
+ WALBERLA_LOG_DEVEL_ON_ROOT("=== localized on block 1 ===");
+ WALBERLA_MPI_BARRIER();
+
+ state = State::SHADOW;
+ sp = getBody(*globalBodyStorage, *forest, storageID, 1);
+ if (sp != nullptr)
+ {
+ sp->setPosition( Vec3(real_t(9.5), 5, 5) );
+ }
+ syncNextNeighbors<BodyTypeTuple>(*forest, storageID);
+ WALBERLA_MPI_BARRIER();
+ WALBERLA_LOG_DEVEL_ON_ROOT("=== shadow on block 2 ===");
+ WALBERLA_MPI_BARRIER();
+
+ state = State::MIGRATED;
+ sp = getBody(*globalBodyStorage, *forest, storageID, 1);
+ if (sp != nullptr)
+ {
+ sp->setPosition( Vec3(real_t(10.5), 5, 5) );
+ }
+ syncNextNeighbors<BodyTypeTuple>(*forest, storageID);
+ WALBERLA_MPI_BARRIER();
+ WALBERLA_LOG_DEVEL_ON_ROOT("=== migrated to block 2 ===");
+ WALBERLA_MPI_BARRIER();
+
+ state = State::LOCALIZED1;
+ sp = getBody(*globalBodyStorage, *forest, storageID, 1);
+ if (sp != nullptr)
+ {
+ sp->setPosition( Vec3(real_t(11.5), 5, 5) );
+ }
+ syncNextNeighbors<BodyTypeTuple>(*forest, storageID);
+ WALBERLA_MPI_BARRIER();
+ WALBERLA_LOG_DEVEL_ON_ROOT("=== localized on block 2 ===");
+ WALBERLA_MPI_BARRIER();
+
+ state = State::REMOVED;
+ destroyBodyBySID(*globalBodyStorage, *forest, storageID, 1);
+ syncNextNeighbors<BodyTypeTuple>(*forest, storageID);
+ WALBERLA_MPI_BARRIER();
+ WALBERLA_LOG_DEVEL_ON_ROOT("=== removed ===");
+ WALBERLA_MPI_BARRIER();
+
+ for (auto& currentBlock : *forest)
+ {
+ Storage * storage = currentBlock.getData< Storage >( storageID );
+ BodyStorage& localStorage = (*storage)[0];
+ BodyStorage& shadowStorage = (*storage)[1];
+
+ localStorage.clearAddCallbacks();
+ localStorage.clearRemoveCallbacks();
+
+ shadowStorage.clearAddCallbacks();
+ shadowStorage.clearRemoveCallbacks();
+ }
+
+ return EXIT_SUCCESS;
+}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/tests/pe/Collision.cpp b/tests/pe/Collision.cpp
index 98ce1fc4a43f00854911c54a7373f0c86e50cbf8..958b4de97bf52072a8f70c723b14e694f72e512c 100644
--- a/tests/pe/Collision.cpp
+++ b/tests/pe/Collision.cpp
@@ -18,7 +18,6 @@
//
//======================================================================================================================
-#include "pe/collision/GJKEPAHelper.h"
#include "pe/fcd/AnalyticCollisionDetection.h"
#include "pe/utility/BodyCast.h"
@@ -31,6 +30,7 @@
#include "pe/rigidbody/Sphere.h"
#include "pe/rigidbody/Plane.h"
#include "pe/rigidbody/Union.h"
+#include "pe/rigidbody/UnionFactory.h"
#include "pe/rigidbody/SetBodyTypeIDs.h"
#include "pe/Types.h"
@@ -39,7 +39,7 @@
#include "core/DataTypes.h"
#include "core/math/Vector2.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using walberla::pe::fcd::analytic::collide;
@@ -125,20 +125,14 @@ void BoxTest()
std::vector<Contact> contacts;
fcd::AnalyticCollideFunctor< std::vector<Contact> > collideFunc(contacts);
- real_t penetrationDepth = real_t(0);
- Vec3 contactPoint = Vec3();
- Vec3 contactNormal = Vec3();
-
// std::vector<Contact> contacts;
// BOX <-> BOX
WALBERLA_LOG_INFO("BOX <-> BOX");
- WALBERLA_CHECK( !collideGJK(&b1, &b3, contactPoint, contactNormal, penetrationDepth) );
WALBERLA_CHECK( !collideFunc(&b1, &b3) );
// WALBERLA_LOG_WARNING("contactPoint : " << contactPoint);
// WALBERLA_LOG_WARNING("contactNormal : " << contactNormal);
// WALBERLA_LOG_WARNING("penetrationDepth: " << penetrationDepth);
- WALBERLA_CHECK( collideGJK(&b1, &b2, contactPoint, contactNormal, penetrationDepth) );
WALBERLA_CHECK( collideFunc(&b1, &b2) );
// WALBERLA_LOG_WARNING("contactPoint : " << contactPoint);
// WALBERLA_LOG_WARNING("contactNormal : " << contactNormal);
@@ -146,29 +140,24 @@ void BoxTest()
b4.setPosition( (Vec3(0,0,1) * real_t(sqrt(3)) + Vec3(0,0,1)) * 0.999);
- WALBERLA_CHECK( collideGJK(&b1, &b4, contactPoint, contactNormal, penetrationDepth) );
WALBERLA_CHECK( collideFunc(&b1, &b4) );
// WALBERLA_LOG_WARNING("contactPoint : " << contacts.back().getPosition());
// WALBERLA_LOG_WARNING("contactNormal : " << contacts.back().getNormal());
// WALBERLA_LOG_WARNING("penetrationDepth: " << contacts.back().getDistance());
b4.setPosition( (Vec3(0,0,1) * real_t(sqrt(3)) + Vec3(0,0,1)) * 1.001);
- WALBERLA_CHECK( !collideGJK(&b1, &b4, contactPoint, contactNormal, penetrationDepth) );
WALBERLA_CHECK( !collideFunc(&b1, &b4) );
b5.setPosition( (Vec3(0,0,1) * real_t(sqrt(3)) + Vec3(0,0,1)) * 0.99);
- WALBERLA_CHECK( collideGJK(&b1, &b5, contactPoint, contactNormal, penetrationDepth) );
WALBERLA_CHECK( collideFunc(&b1, &b5) );
// WALBERLA_LOG_WARNING("contactPoint : " << contacts.back().getPosition());
// WALBERLA_LOG_WARNING("contactNormal : " << contacts.back().getNormal());
// WALBERLA_LOG_WARNING("penetrationDepth: " << contacts.back().getDistance());
b5.setPosition( (Vec3(0,0,1) * real_t(sqrt(3)) + Vec3(0,0,1)) * 1.01);
- WALBERLA_CHECK( !collideGJK(&b1, &b5, contactPoint, contactNormal, penetrationDepth) );
WALBERLA_CHECK( !collideFunc(&b1, &b5) );
Sphere s1(126, 0, Vec3(real_t(1.5), real_t(1.5), real_t(1.5)), Vec3(0,0,0), Quat(), 1, iron, false, true, false);
- WALBERLA_CHECK( collideGJK(&b1, &s1, contactPoint, contactNormal, penetrationDepth) );
WALBERLA_CHECK( collideFunc(&b1, &s1) );
// WALBERLA_LOG_WARNING("contactPoint : " << contactPoint);
// WALBERLA_LOG_WARNING("contactNormal : " << contactNormal);
@@ -186,13 +175,6 @@ void CapsuleTest()
// CAPSULE <-> SPHERE
WALBERLA_LOG_INFO("CAPSULE <-> SPHERE");
- sp1.setPosition(real_t(2.9), 0, 0);
- WALBERLA_CHECK( collideGJK(&c1, &sp1, contacts) );
-// WALBERLA_LOG_WARNING("contactPoint : " << contacts.at(0).getPosition());
-// WALBERLA_LOG_WARNING("contactNormal : " << contacts.at(0).getNormal());
-// WALBERLA_LOG_WARNING("penetrationDepth: " << contacts.at(0).getDistance());
- sp1.setPosition(real_t(3.1), 0, 0);
- WALBERLA_CHECK( !collideGJK(&c1, &sp1, contacts) );
sp1.setPosition(0, real_t(1.9), 0);
WALBERLA_CHECK( collideFunc(&c1, &sp1) );
@@ -224,8 +206,6 @@ void CapsuleTest()
void CapsuleTest2()
{
- setMaxGJKIterations(10000);
- setEPATolerance(real_t(0.00000001));
const real_t static_cof ( real_t(0.1) / 2 ); // Coefficient of static friction. Roughly 0.85 with high variation depending on surface roughness for low stresses. Note: pe doubles the input coefficient of friction for material-material contacts.
const real_t dynamic_cof ( static_cof ); // Coefficient of dynamic friction. Similar to static friction for low speed friction.
MaterialID material = createMaterial( "granular", real_t( 1.0 ), 0, static_cof, dynamic_cof, real_t( 0.5 ), 1, 1, 0, 0 );
@@ -239,10 +219,6 @@ void CapsuleTest2()
WALBERLA_LOG_DEVEL( c1 );
WALBERLA_LOG_DEVEL( sp1 );
- real_t penetrationDepth = real_t(0);
- Vec3 contactPoint = Vec3();
- Vec3 contactNormal = Vec3();
-
WALBERLA_LOG_INFO("CAPSULE TEST");
Vec2 distance;
distance[0] = (sp1.getPosition() - c1.getPosition())[0];
@@ -250,36 +226,20 @@ void CapsuleTest2()
std::cout << std::setprecision(10);
WALBERLA_LOG_DEVEL("DISTANCE: " << distance.length());
- WALBERLA_LOG_DEVEL("GJK: " << getMaxGJKIterations());
- WALBERLA_LOG_DEVEL("EPA: " << getEPATolerance() );
- WALBERLA_LOG_DEVEL(" CAPSULE <-> SPHERE (GJK) ");
- WALBERLA_LOG_DEVEL( collideGJK(&c1, &sp1, contactPoint, contactNormal, penetrationDepth) );
- WALBERLA_LOG_WARNING("contactPoint : " << contactPoint);
- WALBERLA_LOG_WARNING("contactNormal : " << contactNormal);
- WALBERLA_LOG_WARNING("penetrationDepth: " << penetrationDepth);
- WALBERLA_LOG_DEVEL(" SPHERE <-> CAPSULE (GJK) ");
- WALBERLA_LOG_DEVEL( collideGJK(&sp1, &c1, contactPoint, contactNormal, penetrationDepth) );
- WALBERLA_LOG_WARNING("contactPoint : " << contactPoint);
- WALBERLA_LOG_WARNING("contactNormal : " << contactNormal);
- WALBERLA_LOG_WARNING("penetrationDepth: " << penetrationDepth);
WALBERLA_LOG_DEVEL(" SPHERE <-> CAPSULE (ANALYTICAL) ");
WALBERLA_LOG_DEVEL( collide(&sp1, &c1, contacts) );
WALBERLA_LOG_WARNING("contactPoint : " << contacts.at(0).getPosition());
WALBERLA_LOG_WARNING("contactNormal : " << contacts.at(0).getNormal());
WALBERLA_LOG_WARNING("penetrationDepth: " << contacts.at(0).getDistance());
-
}
void UnionTest()
{
- typedef Union< boost::tuple<Sphere> > UnionT;
- MaterialID iron = Material::find("iron");
+ using UnionT = Union<boost::tuple<Sphere> >;
UnionT un1(120, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), false, true, false);
UnionT un2(121, 0, Vec3(real_t(1.5),0,0), Vec3(0,0,0), Quat(), false, true, false);
- SphereID sp1 = new Sphere(123, 1, Vec3(0,0,0), Vec3(0,0,0), Quat(), 1, iron, false, true, false);
- un1.add(sp1);
- SphereID sp2 = new Sphere(124, 2, Vec3(real_t(1.5),0,0), Vec3(0,0,0), Quat(), 1, iron, false, true, false);
- un2.add(sp2);
+ auto sp1 = createSphere(&un1, 123, Vec3(0,0,0), 1);
+ auto sp2 = createSphere(&un2, 124, Vec3(real_t(1.5),0,0), 1);
std::vector<Contact> contacts;
@@ -311,3 +271,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/CollisionTobiasGJK.cpp b/tests/pe/CollisionTobiasGJK.cpp
index 2c3fa052afaa27c40dc7de3145e6999ddd13d04c..c6915d86dab50cf32b232ae63ee5bc12a3c9a55c 100644
--- a/tests/pe/CollisionTobiasGJK.cpp
+++ b/tests/pe/CollisionTobiasGJK.cpp
@@ -32,6 +32,7 @@
#include "pe/rigidbody/Sphere.h"
#include "pe/rigidbody/Plane.h"
#include "pe/rigidbody/Union.h"
+#include "pe/rigidbody/UnionFactory.h"
#include "pe/rigidbody/Ellipsoid.h"
#include "pe/rigidbody/SetBodyTypeIDs.h"
@@ -45,7 +46,7 @@
#include "pe/collision/EPA.h"
#include "pe/collision/GJK.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Box, Capsule, Plane, Sphere, Union<boost::tuple<Sphere>>, Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>>, Ellipsoid> BodyTuple ;
@@ -355,32 +356,29 @@ void UnionTest(){
Box box(179, 179, Vec3(0,0,0), Vec3(0,0,0), Quat(), Vec3(real_t(10),real_t(2), real_t(10)), iron, false, true, false);
- Union<boost::tuple<Sphere>> *unsub = new Union<boost::tuple<Sphere>>(192, 192, Vec3(0,real_t(3.8),0), Vec3(0,0,0), Quat(), false, true, false);
+ using UnionT = Union<boost::tuple<Sphere>>;
+ auto unsub = std::make_unique<UnionT>(192, 192, Vec3(0,real_t(3.8),0), Vec3(0,0,0), Quat(), false, true, false);
- Sphere sp1( 180, 180, Vec3(-3,real_t(3.8),0), Vec3(0,0,0), Quat(), real_t(3.0) , iron, false, true, false );
- Sphere sp2( 181, 181, Vec3(3,real_t(3.8),0), Vec3(0,0,0), Quat(), real_t(3.0), iron, false, true, false );
-
- Sphere sp3( 182, 182, Vec3(0,real_t(6),0), Vec3(0,0,0), Quat(), real_t(3.0), iron, false, true, false );
- unsub->add(&sp1);
- unsub->add(&sp2);
+ auto sp1 = createSphere(unsub.get(), 180, Vec3(-3,real_t(3.8),0), real_t(3.0));
+ auto sp2 = createSphere(unsub.get(), 181, Vec3(3,real_t(3.8),0), real_t(3.0));
//Create another union, and add sub union
- Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>> *un = new Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>>(193, 193, Vec3(0, 0, 0), Vec3(0,0,0), Quat(), false, true, false);
- un->add(&sp3);
- un->add(unsub);
+ Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>> un(193, 193, Vec3(0, 0, 0), Vec3(0,0,0), Quat(), false, true, false);
+ createSphere(&un, 182, Vec3(0,real_t(6),0), real_t(3.0));
+ un.add(std::move(unsub));
PossibleContacts pcs;
- pcs.push_back(std::pair<Union<boost::tuple<Sphere,Union<boost::tuple<Sphere>>>>*, Box*>(un, &box));
+ pcs.push_back(std::pair<Union<boost::tuple<Sphere,Union<boost::tuple<Sphere>>>>*, Box*>(&un, &box));
Contacts& container = testFCD.generateContacts(pcs);
WALBERLA_CHECK(container.size() == 2);
Contact &c = container.back();
WALBERLA_LOG_DEVEL( c.getDistance() << " " << c.getNormal() << " " << c.getPosition() );
if(c.getBody1()->getID() == 181) {
- checkContact( c, Contact(&sp2, &box, Vec3(real_t(3), real_t(0.9), 0), Vec3(0, 1, 0), real_t(-0.2)), Vec3(0,0,0));
+ checkContact( c, Contact(sp2, &box, Vec3(real_t(3), real_t(0.9), 0), Vec3(0, 1, 0), real_t(-0.2)), Vec3(0,0,0));
} else if (c.getBody1()->getID() == 179) {
- checkContact( c, Contact(&box, &sp2, Vec3(real_t(3), real_t(0.9), 0), Vec3(0, -1, 0), real_t(-0.2)), Vec3(0,0,0));
+ checkContact( c, Contact(&box, sp2, Vec3(real_t(3), real_t(0.9), 0), Vec3(0, -1, 0), real_t(-0.2)), Vec3(0,0,0));
} else {
WALBERLA_ABORT("Unknown ID!");
}
@@ -390,25 +388,25 @@ void UnionTest(){
c = container.back();
WALBERLA_LOG_DEVEL( c.getDistance() << " " << c.getNormal() << " " << c.getPosition() );
if(c.getBody1()->getID() == 180) {
- checkContact( c, Contact(&sp1, &box, Vec3(real_t(-3), real_t(0.9), 0), Vec3(0, 1, 0), real_t(-0.2)), Vec3(0,0,0));
+ checkContact( c, Contact(sp1, &box, Vec3(real_t(-3), real_t(0.9), 0), Vec3(0, 1, 0), real_t(-0.2)), Vec3(0,0,0));
} else if (c.getBody1()->getID() == 179) {
- checkContact( c, Contact(&box, &sp1, Vec3(real_t(-3), real_t(0.9), 0), Vec3(0, -1, 0), real_t(-0.2)), Vec3(0,0,0));
+ checkContact( c, Contact(&box, sp1, Vec3(real_t(-3), real_t(0.9), 0), Vec3(0, -1, 0), real_t(-0.2)), Vec3(0,0,0));
} else {
WALBERLA_ABORT("Unknown ID!");
}
pcs.clear();
//Vice Versa
- pcs.push_back(std::pair<Box*, Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>>* >(&box, un));
+ pcs.push_back(std::pair<Box*, Union<boost::tuple<Sphere, Union<boost::tuple<Sphere>>>>* >(&box, &un));
container = testFCD.generateContacts(pcs);
WALBERLA_CHECK(container.size() == 2);
c = container.back();
WALBERLA_LOG_DEVEL( c.getDistance() << " " << c.getNormal() << " " << c.getPosition() );
if(c.getBody1()->getID() == 181) {
- checkContact( c, Contact(&sp2, &box, Vec3(real_t(3), real_t(0.9), 0), Vec3(0, 1, 0), real_t(-0.2)), Vec3(0,0,0));
+ checkContact( c, Contact(sp2, &box, Vec3(real_t(3), real_t(0.9), 0), Vec3(0, 1, 0), real_t(-0.2)), Vec3(0,0,0));
} else if (c.getBody1()->getID() == 179) {
- checkContact( c, Contact(&box, &sp2, Vec3(real_t(3), real_t(0.9), 0), Vec3(0, -1, 0), real_t(-0.2)), Vec3(0,0,0));
+ checkContact( c, Contact(&box, sp2, Vec3(real_t(3), real_t(0.9), 0), Vec3(0, -1, 0), real_t(-0.2)), Vec3(0,0,0));
} else {
WALBERLA_ABORT("Unknown ID!");
}
@@ -417,9 +415,9 @@ void UnionTest(){
c = container.back();
WALBERLA_LOG_DEVEL( c.getDistance() << " " << c.getNormal() << " " << c.getPosition() );
if(c.getBody1()->getID() == 180) {
- checkContact( c, Contact(&sp1, &box, Vec3(real_t(-3), real_t(0.9), 0), Vec3(0, 1, 0), real_t(-0.2)), Vec3(0,0,0));
+ checkContact( c, Contact(sp1, &box, Vec3(real_t(-3), real_t(0.9), 0), Vec3(0, 1, 0), real_t(-0.2)), Vec3(0,0,0));
} else if (c.getBody1()->getID() == 179) {
- checkContact( c, Contact(&box, &sp1, Vec3(real_t(-3), real_t(0.9), 0), Vec3(0, -1, 0), real_t(-0.2)), Vec3(0,0,0));
+ checkContact( c, Contact(&box, sp1, Vec3(real_t(-3), real_t(0.9), 0), Vec3(0, -1, 0), real_t(-0.2)), Vec3(0,0,0));
} else {
WALBERLA_ABORT("Unknown ID!");
}
@@ -439,3 +437,9 @@ int main( int argc, char** argv )
UnionTest();
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/CreateWorld.cpp b/tests/pe/CreateWorld.cpp
index 6a79b5bfb59fc72618a145147c6a180c746d7d01..a31fb258434a93adf39131cec7dedf30bbdccc9b 100644
--- a/tests/pe/CreateWorld.cpp
+++ b/tests/pe/CreateWorld.cpp
@@ -28,7 +28,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -56,3 +56,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DeleteBody.cpp b/tests/pe/DeleteBody.cpp
index 64f03d42a807a89b5cce96903acf13ee7fe5220d..ea6adfbfcdf023fc14cdfeaf9911b6d0bec3acd9 100644
--- a/tests/pe/DeleteBody.cpp
+++ b/tests/pe/DeleteBody.cpp
@@ -31,10 +31,12 @@
#include "core/debug/TestSubsystem.h"
#include "core/math/Random.h"
-using namespace walberla;
+#include <functional>
+
+namespace walberla {
using namespace walberla::pe;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
int main( int argc, char** argv )
{
@@ -69,7 +71,7 @@ int main( int argc, char** argv )
SetBodyTypeIDs<BodyTuple>::execute();
auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
- Storage* firstStorage = NULL, *secondStorage = NULL;
+ Storage* firstStorage = nullptr, *secondStorage = nullptr;
for (auto it = forest->begin(); it != forest->end(); ++it)
{
IBlock & currentBlock = *it;
@@ -83,10 +85,10 @@ int main( int argc, char** argv )
std::function<void(void)> syncCall;
if (!syncShadowOwners)
{
- syncCall = boost::bind( pe::syncNextNeighbors<BodyTuple>, boost::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(NULL), real_c(0.0), false );
+ syncCall = std::bind( pe::syncNextNeighbors<BodyTuple>, std::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
} else
{
- syncCall = boost::bind( pe::syncShadowOwners<BodyTuple>, boost::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(NULL), real_c(0.0), false );
+ syncCall = std::bind( pe::syncShadowOwners<BodyTuple>, std::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
}
pe::createSphere(*globalBodyStorage, forest->getBlockStorage(), storageID, 0, Vec3(5,5,5), 2);
@@ -120,3 +122,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DestroyBody.cpp b/tests/pe/DestroyBody.cpp
index 6233d4a91b33418d3b0326e310809d2916b2de48..b2deb57fa759e8b4dc634eb70ae0b1cd703725e1 100644
--- a/tests/pe/DestroyBody.cpp
+++ b/tests/pe/DestroyBody.cpp
@@ -31,10 +31,10 @@
#include "core/debug/TestSubsystem.h"
#include "core/math/Random.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
int main( int argc, char** argv )
{
@@ -56,7 +56,7 @@ int main( int argc, char** argv )
SetBodyTypeIDs<BodyTuple>::execute();
auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
- Storage* firstStorage = NULL, *secondStorage = NULL;
+ Storage* firstStorage = nullptr, *secondStorage = nullptr;
for (auto it = forest->begin(); it != forest->end(); ++it)
{
IBlock & currentBlock = *it;
@@ -116,3 +116,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/DynamicRefinement.cpp b/tests/pe/DynamicRefinement.cpp
index 0b6e0b469563c1718a09388b6f785d56f5694789..07ce98b85b1e9cb83023a999ff5180aa67e6c596 100644
--- a/tests/pe/DynamicRefinement.cpp
+++ b/tests/pe/DynamicRefinement.cpp
@@ -24,15 +24,16 @@
#include "pe/utility/DestroyBody.h"
#include "blockforest/Initialization.h"
+#include <blockforest/loadbalancing/DynamicCurve.h>
#include "core/all.h"
#include "domain_decomposition/all.h"
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
class ReGrid
{
@@ -193,3 +194,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/tests/pe/ForceSync.cpp b/tests/pe/ForceSync.cpp
index f0901d1b7039d9082dd6ed3569af9bf364d72f40..d19422354622bf1218d7fcd31a44d181a9bcbcae 100644
--- a/tests/pe/ForceSync.cpp
+++ b/tests/pe/ForceSync.cpp
@@ -38,9 +38,8 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -98,12 +97,12 @@ int main( int argc, char ** argv )
for (auto bodyIt = localStorage.begin(); bodyIt != localStorage.end(); ++bodyIt)
{
- BodyID b = *bodyIt;
+ BodyID b = bodyIt.getBodyID();
b->addForce( Vec3(1,0,0) );
}
for (auto bodyIt = shadowStorage.begin(); bodyIt != shadowStorage.end(); ++bodyIt)
{
- BodyID b = *bodyIt;
+ BodyID b = bodyIt.getBodyID();
b->addForce( Vec3(0,1,0) );
}
}
@@ -113,9 +112,9 @@ int main( int argc, char ** argv )
SphereID sp1 = static_cast<SphereID> (getBody(*globalStorage, forest->getBlockStorage(), storageID_, id1));
SphereID sp2 = static_cast<SphereID> (getBody(*globalStorage, forest->getBlockStorage(), storageID_, id2));
- if ( (sp1 != NULL) && (!sp1->isRemote() ))
+ if ( (sp1 != nullptr) && (!sp1->isRemote() ))
WALBERLA_ASSERT_FLOAT_EQUAL(sp1->getForce(), Vec3(1,0,0));
- if ( (sp2 != NULL) && (!sp2->isRemote() ))
+ if ( (sp2 != nullptr) && (!sp2->isRemote() ))
WALBERLA_ASSERT_FLOAT_EQUAL(sp2->getForce(), Vec3(1,1,0));
// for (auto it = forest->begin(); it != forest->end(); ++it){
@@ -127,12 +126,12 @@ int main( int argc, char ** argv )
// for (auto bodyIt = localStorage.begin(); bodyIt != localStorage.end(); ++bodyIt)
// {
-// BodyID b = *bodyIt;
+// BodyID b = bodyIt.getBodyID();
// WALBERLA_LOG_DEVEL("LOCAL\n" << b << "\nForce: " << b->getForce());
// }
// for (auto bodyIt = shadowStorage.begin(); bodyIt != shadowStorage.end(); ++bodyIt)
// {
-// BodyID b = *bodyIt;
+// BodyID b = bodyIt.getBodyID();
// WALBERLA_LOG_DEVEL("SHADOW\n" << b << "\nForce: " << b->getForce());
// }
// }
@@ -141,3 +140,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/HCSITS.cpp b/tests/pe/HCSITS.cpp
index c5e3a2d742e0d058448270ba9e285a003df6a6b5..5b8deb15585be7ba201afb9564fb67036251186d 100644
--- a/tests/pe/HCSITS.cpp
+++ b/tests/pe/HCSITS.cpp
@@ -27,7 +27,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -183,3 +183,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/HashGrids.cpp b/tests/pe/HashGrids.cpp
index a1790653be79c8c55fb3a8edab2b760371948bcb..7d83456a0e735ceb88689e12feacfe74cda1a8ad 100644
--- a/tests/pe/HashGrids.cpp
+++ b/tests/pe/HashGrids.cpp
@@ -31,7 +31,7 @@
#include "core/debug/TestSubsystem.h"
#include "core/math/Random.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -66,7 +66,7 @@ int main( int argc, char** argv )
auto sccdID = forest->addBlockData(ccd::createSimpleCCDDataHandling( globalBodyStorage, storageID ), "SCCD");
auto hccdID = forest->addBlockData(ccd::createHashGridsDataHandling( globalBodyStorage, storageID ), "HCCD");
auto fcdID = forest->addBlockData(fcd::createGenericFCDDataHandling<BodyTuple, fcd::AnalyticCollideFunctor>(), "FCD");
- cr::PlainIntegrator cr(globalBodyStorage, forest->getBlockStoragePointer(), storageID, NULL);
+ cr::PlainIntegrator cr(globalBodyStorage, forest->getBlockStoragePointer(), storageID, nullptr);
pe::createPlane( *globalBodyStorage, 0, Vec3(0, +1, 0), Vec3(5, 0,5), iron);
pe::createPlane( *globalBodyStorage, 0, Vec3(0, -1, 0), Vec3(5,30,5), iron);
@@ -107,7 +107,7 @@ int main( int argc, char** argv )
{
SphereID sp = pe::createSphere(*globalBodyStorage, forest->getBlockStorage(), storageID, i,
Vec3(math::realRandom<real_t>(real_c(0), real_c(30)), math::realRandom<real_t>(real_c(0), real_c(30)), math::realRandom<real_t>(real_c(0), real_c(30))), real_c(0.4));
- if (sp != NULL) sp->setLinearVel(Vec3(math::realRandom<real_t>(-dv, dv), math::realRandom<real_t>(-dv, dv), math::realRandom<real_t>(-dv, dv)));
+ if (sp != nullptr) sp->setLinearVel(Vec3(math::realRandom<real_t>(-dv, dv), math::realRandom<real_t>(-dv, dv), math::realRandom<real_t>(-dv, dv)));
}
pe::createSphere(*globalBodyStorage, forest->getBlockStorage(), storageID, 999999999,
@@ -115,7 +115,8 @@ int main( int argc, char** argv )
iron, true, false, true);
syncShadowOwners<BodyTuple>( forest->getBlockForest(), storageID);
- for (int step=0; step < 100; ++step){
+ for (int step=0; step < 100; ++step)
+ {
cr( real_c(0.1) );
syncShadowOwners<BodyTuple>( forest->getBlockForest(), storageID);
@@ -146,3 +147,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/LoadFromConfig.cpp b/tests/pe/LoadFromConfig.cpp
index 69ccad26cceb2e37ac1bd51801a098dde157dfb8..7e3236205412c41c87016d69a628a790c72c6a89 100644
--- a/tests/pe/LoadFromConfig.cpp
+++ b/tests/pe/LoadFromConfig.cpp
@@ -30,7 +30,7 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
int main( int argc, char ** argv )
@@ -40,7 +40,7 @@ int main( int argc, char ** argv )
Environment env(argc, argv);
//! [Load Config]
auto cfg = env.config();
- if (cfg == NULL) WALBERLA_ABORT("No config specified!");
+ if (cfg == nullptr) WALBERLA_ABORT("No config specified!");
const Config::BlockHandle configBlock = cfg->getBlock( "LoadFromConfig" );
//! [Load Config]
@@ -77,3 +77,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Marshalling.cpp b/tests/pe/Marshalling.cpp
index 30da9d3be10fbad20a2e545dbfa915a85a988ac0..8eaa11069bffe325b3f747e6ab3c1e1519fbc77a 100644
--- a/tests/pe/Marshalling.cpp
+++ b/tests/pe/Marshalling.cpp
@@ -34,18 +34,21 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using namespace walberla::pe::communication;
-typedef boost::tuple<Sphere> UnionTypeTuple;
-typedef Union< UnionTypeTuple > UnionT;
-typedef UnionT* UnionID;
+using UnionTypeTuple = boost::tuple<Sphere>;
+using UnionT = Union<UnionTypeTuple>;
+using UnionID = UnionT *;
+using UnionPtr = std::unique_ptr<UnionT>;
typedef boost::tuple<Box, Capsule, Sphere, Squirmer, UnionT, Ellipsoid> BodyTuple ;
void testBox()
{
+ WALBERLA_LOG_INFO_ON_ROOT("*** testBox ***");
+
MaterialID iron = Material::find("iron");
Box b1(759846, 1234794, Vec3(real_c(1), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), Vec3(1,2,3), iron, false, true, false);
@@ -56,7 +59,8 @@ void testBox()
MarshalDynamically<BodyTuple>::execute(sb, b1);
mpi::RecvBuffer rb(sb);
- BoxID b2 = static_cast<BoxID> (UnmarshalDynamically<BodyTuple>::execute(rb, Box::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100))));
+ auto bPtr = UnmarshalDynamically<BodyTuple>::execute(rb, Box::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)));
+ BoxID b2 = static_cast<BoxID>(bPtr.get());
WALBERLA_CHECK_FLOAT_EQUAL(b1.getPosition(), b2->getPosition());
WALBERLA_CHECK_FLOAT_EQUAL(b1.getLinearVel(), b2->getLinearVel());
@@ -68,6 +72,8 @@ void testBox()
void testCapsule()
{
+ WALBERLA_LOG_INFO_ON_ROOT("*** testCapsule ***");
+
MaterialID iron = Material::find("iron");
Capsule c1(759846, 1234794, Vec3(real_c(1), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), 5, 7, iron, false, false, false);
@@ -78,7 +84,8 @@ void testCapsule()
MarshalDynamically<BodyTuple>::execute(sb, c1);
mpi::RecvBuffer rb(sb);
- CapsuleID c2 = static_cast<CapsuleID> (UnmarshalDynamically<BodyTuple>::execute(rb, Capsule::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100))));
+ auto cPtr = UnmarshalDynamically<BodyTuple>::execute(rb, Capsule::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)));
+ CapsuleID c2 = static_cast<CapsuleID> (cPtr.get());
WALBERLA_CHECK_FLOAT_EQUAL(c1.getPosition(), c2->getPosition());
WALBERLA_CHECK_FLOAT_EQUAL(c1.getLinearVel(), c2->getLinearVel());
@@ -91,6 +98,8 @@ void testCapsule()
void testSphere()
{
+ WALBERLA_LOG_INFO_ON_ROOT("*** testSphere ***");
+
MaterialID iron = Material::find("iron");
Sphere s1(759846, 1234794, Vec3(real_c(1), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), 5, iron, false, false, false);
@@ -101,7 +110,8 @@ void testSphere()
MarshalDynamically<BodyTuple>::execute(sb, s1);
mpi::RecvBuffer rb(sb);
- SphereID s2 = static_cast<SphereID> (UnmarshalDynamically<BodyTuple>::execute(rb, Sphere::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100))));
+ auto sPtr = UnmarshalDynamically<BodyTuple>::execute(rb, Sphere::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)));
+ SphereID s2 = static_cast<SphereID> (sPtr.get());
WALBERLA_CHECK_FLOAT_EQUAL(s1.getPosition(), s2->getPosition());
WALBERLA_CHECK_FLOAT_EQUAL(s1.getLinearVel(), s2->getLinearVel());
@@ -113,6 +123,8 @@ void testSphere()
void testSquirmer()
{
+ WALBERLA_LOG_INFO_ON_ROOT("*** testSquirmer ***");
+
MaterialID iron = Material::find("iron");
Squirmer s1(759846, 1234794, Vec3(real_c(1), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), real_c(5), real_c(0.1), real_c(4.93), iron, false, false, false);
@@ -123,7 +135,8 @@ void testSquirmer()
MarshalDynamically<BodyTuple>::execute(sb, s1);
mpi::RecvBuffer rb(sb);
- SquirmerID s2 = static_cast<SquirmerID> (UnmarshalDynamically<BodyTuple>::execute(rb, Squirmer::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100))));
+ auto sPtr = UnmarshalDynamically<BodyTuple>::execute(rb, Squirmer::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)));
+ SquirmerID s2 = static_cast<SquirmerID> (sPtr.get());
WALBERLA_CHECK_FLOAT_EQUAL(s1.getSquirmerVelocity(), s2->getSquirmerVelocity());
WALBERLA_CHECK_FLOAT_EQUAL(s1.getSquirmerBeta(), s2->getSquirmerBeta());
@@ -131,6 +144,8 @@ void testSquirmer()
void testEllipsoid()
{
+ WALBERLA_LOG_INFO_ON_ROOT("*** testEllipsoid ***");
+
MaterialID iron = Material::find("iron");
Ellipsoid e1(759847, 1234795, Vec3(real_c(1), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), Vec3(3,1,5), iron, false, false, false);
@@ -141,7 +156,8 @@ void testEllipsoid()
MarshalDynamically<BodyTuple>::execute(sb, e1);
mpi::RecvBuffer rb(sb);
- EllipsoidID e2 = static_cast<EllipsoidID> (UnmarshalDynamically<BodyTuple>::execute(rb, Ellipsoid::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100))));
+ auto ePtr = UnmarshalDynamically<BodyTuple>::execute(rb, Ellipsoid::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)));
+ EllipsoidID e2 = static_cast<EllipsoidID>(ePtr.get());
WALBERLA_CHECK_FLOAT_EQUAL(e1.getPosition(), e2->getPosition());
WALBERLA_CHECK_FLOAT_EQUAL(e1.getLinearVel(), e2->getLinearVel());
@@ -153,6 +169,7 @@ void testEllipsoid()
void testUnion()
{
+ WALBERLA_LOG_INFO_ON_ROOT("*** testUnion ***");
UnionT u1(159, 423, Vec3(real_c(1), real_c(2), real_c(3)), Vec3(0,0,0), Quat(), false, false, false);
SphereID s11 = createSphere< UnionTypeTuple >(&u1, 1234794, Vec3(real_c(1), real_c(2), real_c(3)), 2);
SphereID s21 = createSphere< UnionTypeTuple >(&u1, 4567789, Vec3(real_c(3), real_c(2), real_c(3)), real_c(1.5));
@@ -163,15 +180,16 @@ void testUnion()
MarshalDynamically<BodyTuple>::execute(sb, u1);
mpi::RecvBuffer rb(sb);
- UnionID u2 = static_cast<UnionID> (UnmarshalDynamically<BodyTuple>::execute(rb, UnionT::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100))));
+ auto uPtr = UnmarshalDynamically<BodyTuple>::execute(rb, UnionT::getStaticTypeID(), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)), math::AABB(Vec3(-100,-100,-100), Vec3(100,100,100)));
+ UnionID u2 = static_cast<UnionID>(uPtr.get());
WALBERLA_CHECK_NOT_NULLPTR( u2 );
WALBERLA_CHECK_EQUAL(u1.size(), 2);
WALBERLA_CHECK_EQUAL(u1.size(), u2->size());
//getting spheres of second union
- SphereID s12 = static_cast<SphereID> (*(u2->begin()));
- SphereID s22 = static_cast<SphereID> (*(++(u2->begin())));
+ SphereID s12 = static_cast<SphereID> (u2->begin().getBodyID());
+ SphereID s22 = static_cast<SphereID> ((++(u2->begin())).getBodyID());
WALBERLA_CHECK_UNEQUAL( s12, s22 );
WALBERLA_CHECK_FLOAT_EQUAL( s11->getPosition(), s12->getPosition());
@@ -206,3 +224,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/MinMaxRefinement.cpp b/tests/pe/MinMaxRefinement.cpp
index 3c13d4cfbc7fc6aa974a9cb6f0688e98d813965c..34cde5d21c9f9c5ef4b2e84cb2246b9cc5c722df 100644
--- a/tests/pe/MinMaxRefinement.cpp
+++ b/tests/pe/MinMaxRefinement.cpp
@@ -47,7 +47,7 @@
#include <limits>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -201,3 +201,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/ParMetis.cpp b/tests/pe/ParMetis.cpp
index e35a8cb2336015a2f6aa3f925a1c4a74c9ed263b..3314d98a2c0b5d8d343f6876a5826b88e7cdae57 100644
--- a/tests/pe/ParMetis.cpp
+++ b/tests/pe/ParMetis.cpp
@@ -21,6 +21,7 @@
#include "pe/utility/CreateWorld.h"
#include <blockforest/loadbalancing/DynamicParMetis.h>
+#include <core/debug/TestSubsystem.h>
#include <core/Environment.h>
#include <core/logging/Logging.h>
#include <core/math/Sample.h>
@@ -45,8 +46,8 @@ class MetisAssignmentFunctor
{
public:
- typedef blockforest::DynamicParMetisBlockInfo PhantomBlockWeight;
- typedef blockforest::DynamicParMetisBlockInfoPackUnpack PhantomBlockWeightPackUnpackFunctor;
+ using PhantomBlockWeight = blockforest::DynamicParMetisBlockInfo;
+ using PhantomBlockWeightPackUnpackFunctor = blockforest::DynamicParMetisBlockInfoPackUnpack;
void operator()( std::vector< std::pair< const PhantomBlock *, walberla::any > > & blockData, const PhantomBlockForest & )
{
@@ -129,7 +130,7 @@ int main( int argc, char ** argv )
walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
walberla::MPIManager::instance()->useWorldComm();
- std::vector<std::string> algs = {"PART_GEOM", "PART_GEOM_KWAY", "PART_KWAY", "PART_ADAPTIVE_REPART", "REFINE_KWAY"};
+ std::vector<std::string> algs = {"PART_GEOM", "PART_GEOM_KWAY", "PART_KWAY", "ADAPTIVE_REPART", "REFINE_KWAY"};
std::vector<std::string> wtu = {"NO_WEIGHTS", "EDGE_WEIGHTS", "VERTEX_WEIGHTS", "BOTH_WEIGHTS"};
std::vector<std::string> es = {"EDGES_FROM_FOREST", "EDGES_FROM_EDGE_WEIGHTS"};
diff --git a/tests/pe/ParallelEquivalence.cpp b/tests/pe/ParallelEquivalence.cpp
index 6a211cd6739ad9613e682832b7269d9d5184531a..a8fd5bffe87a2fe0afdbe1de42eb6e43e5679550 100644
--- a/tests/pe/ParallelEquivalence.cpp
+++ b/tests/pe/ParallelEquivalence.cpp
@@ -36,9 +36,8 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
int runs = 1000;
@@ -105,7 +104,7 @@ void sim(shared_ptr< StructuredBlockForest > forest, std::vector<BodyData>& res,
}
auto fcdID_ = forest->addBlockData(fcd::createGenericFCDDataHandling<BodyTuple, fcd::AnalyticCollideFunctor>(), "FCD");
- cr::DEM cr( globalStorage, forest->getBlockStoragePointer(), storageID_, ccdID_, fcdID_, NULL);
+ cr::DEM cr( globalStorage, forest->getBlockStoragePointer(), storageID_, ccdID_, fcdID_, nullptr);
// auto vtkOutput_ = make_shared<DefaultBodyVTKOutput>(storageID_, *forest) ;
// auto vtkWriter_ = vtk::createVTKOutput_PointData(vtkOutput_, "Bodies", 1);
@@ -133,7 +132,7 @@ void sim(shared_ptr< StructuredBlockForest > forest, std::vector<BodyData>& res,
SphereID sp = pe::createSphere( *globalStorage, forest->getBlockStorage(), storageID_,
++counter, Vec3(real_c(x) + real_c(0.5), real_c(y) + real_c(0.5), real_c(z) + real_c(0.5)), real_c(0.3));
Vec3 randVel = Vec3(math::realRandom<real_t>(-dv, dv), math::realRandom<real_t>(-dv, dv), math::realRandom<real_t>(-dv, dv));
- if (sp != NULL) sp->setLinearVel(randVel);
+ if (sp != nullptr) sp->setLinearVel(randVel);
}
WALBERLA_CHECK_EQUAL(globalStorage->size(), 6);
@@ -157,8 +156,8 @@ void sim(shared_ptr< StructuredBlockForest > forest, std::vector<BodyData>& res,
BodyStorage& localStorage = (*storage)[0];
for (auto bodyIt = localStorage.begin(); bodyIt != localStorage.end(); ++bodyIt)
{
- BodyID b = *bodyIt;
- res.push_back(BodyData(b->getID(), b->getPosition(), b->getLinearVel()));
+ BodyID b = bodyIt.getBodyID();
+ res.emplace_back(b->getID(), b->getPosition(), b->getLinearVel());
}
}
mpi::SendBuffer sendBuf;
@@ -173,7 +172,7 @@ void sim(shared_ptr< StructuredBlockForest > forest, std::vector<BodyData>& res,
res.clear();
while (!recvBuf.isEmpty())
{
- res.push_back( BodyData(recvBuf) );
+ res.emplace_back(recvBuf );
}
forest.reset();
@@ -321,3 +320,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/PeDocumentationSnippets.cpp b/tests/pe/PeDocumentationSnippets.cpp
index 4cf46e2f8b0be31450f3900261a9e5bdcd53650d..d9b3396bbb6125b44133861571b632fb30d642e0 100644
--- a/tests/pe/PeDocumentationSnippets.cpp
+++ b/tests/pe/PeDocumentationSnippets.cpp
@@ -43,13 +43,13 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
//! [Definition of Union Types]
typedef boost::tuple<Box, Capsule, Sphere> UnionTypeTuple;
-typedef Union< UnionTypeTuple > UnionT;
-typedef UnionT* UnionID;
+using UnionT = Union<UnionTypeTuple>;
+using UnionID = UnionT *;
//! [Definition of Union Types]
//! [Definition BodyTypeTuple]
@@ -97,14 +97,14 @@ int main( int argc, char ** argv )
// simulation. The function returns a handle to the newly created box, which can
// be used to for instance rotate the box around the global y-axis.
BoxID box = createBox( *globalBodyStorage, forest->getBlockStorage(), storageID, 1, Vec3(2,3,4), Vec3(2.5,2.5,2.5) );
- if (box != NULL)
+ if (box != nullptr)
box->rotate( 0.0, real_c(math::PI/3.0), 0.0 );
//! [Create a Box]
//! [Create a Capsule]
// Create a capsule and rotate it after successfull creation.
CapsuleID capsule = createCapsule( *globalBodyStorage, forest->getBlockStorage(), storageID, 1, Vec3(2,3,4), real_t(1), real_t(1) );
- if (capsule != NULL)
+ if (capsule != nullptr)
capsule->rotate( 0.0, real_c(math::PI/3.0), 0.0 );
//! [Create a Capsule]
@@ -117,14 +117,14 @@ int main( int argc, char ** argv )
//! [Create a Sphere]
// Create a sphere and rotate it after successfull creation.
SphereID sphere = createSphere( *globalBodyStorage, forest->getBlockStorage(), storageID, 1, Vec3(2,3,4), real_t(1) );
- if (sphere != NULL)
+ if (sphere != nullptr)
sphere->rotate( 0.0, real_c(math::PI/3.0), 0.0 );
//! [Create a Sphere]
//! [Create a Union]
// Create a union and add a box, capsule and sphere.
UnionID un = createUnion<UnionTypeTuple>( *globalBodyStorage, forest->getBlockStorage(), storageID, 1, Vec3(2,3,4) );
- if (un != NULL)
+ if (un != nullptr)
{
createBox ( un, 1, Vec3(2,3,4), Vec3(2.5,2.5,2.5) );
createCapsule( un, 1, Vec3(3,3,4), real_t(1), real_t(1) );
@@ -134,3 +134,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Raytracing.cpp b/tests/pe/Raytracing.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..16b27ed20d69970f5e814be74adf8b4b92648004
--- /dev/null
+++ b/tests/pe/Raytracing.cpp
@@ -0,0 +1,918 @@
+#include <pe/basic.h>
+#include "pe/utility/BodyCast.h"
+
+#include "pe/Materials.h"
+
+#include "pe/rigidbody/Box.h"
+#include "pe/rigidbody/Capsule.h"
+#include "pe/rigidbody/Sphere.h"
+#include "pe/rigidbody/Plane.h"
+#include "pe/rigidbody/Union.h"
+#include "pe/rigidbody/Ellipsoid.h"
+
+#include "pe/rigidbody/SetBodyTypeIDs.h"
+#include "pe/Types.h"
+
+#include "core/debug/TestSubsystem.h"
+#include "core/DataTypes.h"
+#include <core/math/Random.h>
+#include "core/math/Vector3.h"
+
+#include <pe/raytracing/Ray.h>
+#include <pe/raytracing/Intersects.h>
+#include <pe/raytracing/Raytracer.h>
+#include <pe/raytracing/Color.h>
+#include <pe/raytracing/ShadingFunctions.h>
+
+#include <pe/ccd/HashGrids.h>
+#include "pe/rigidbody/BodyStorage.h"
+#include <core/timing/TimingTree.h>
+
+#include <pe/utility/GetBody.h>
+
+#include <sstream>
+#include <tuple>
+
+namespace walberla {
+using namespace walberla::pe;
+using namespace walberla::pe::raytracing;
+
+typedef boost::tuple<Box, Plane, Sphere, Capsule, Ellipsoid> BodyTuple ;
+
+void SphereIntersectsTest()
+{
+ MaterialID iron = Material::find("iron");
+ Sphere sp1(123, 1, Vec3(3,3,3), Vec3(0,0,0), Quat(), 2, iron, false, true, false);
+ real_t t;
+ Vec3 n;
+
+ // ray through the center
+ Ray ray1(Vec3(3,-5,3), Vec3(0,1,0));
+ WALBERLA_LOG_INFO("RAY -> SPHERE");
+
+ WALBERLA_CHECK(intersects(&sp1, ray1, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(6));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(0));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(-1));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0));
+
+ // ray tangential
+ Ray ray2(Vec3(3,-5,3), Vec3(0,7.5,real_t(std::sqrt(real_t(15))/real_t(2))).getNormalized());
+ WALBERLA_CHECK(intersects(&sp1, ray2, t, n));
+
+ // sphere behind ray origin
+ Sphere sp2(123, 1, Vec3(3,-8,3), Vec3(0,0,0), Quat(), 2, iron, false, true, false);
+ WALBERLA_CHECK(!intersects(&sp2, ray1, t, n));
+
+ // sphere around ray origin
+ Sphere sp3(123, 1, Vec3(3,-5,3), Vec3(0,0,0), Quat(), 2, iron, false, true, false);
+ WALBERLA_CHECK(intersects(&sp3, ray1, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(2));
+}
+
+void PlaneIntersectsTest() {
+ MaterialID iron = Material::find("iron");
+ // plane with center 3,3,3 and parallel to y-z plane
+ Plane pl1(1, 1, Vec3(3, 3, 3), Vec3(1, 0, 0), real_t(1.0), iron);
+
+ Ray ray1(Vec3(-5,3,3), Vec3(1,0,0));
+ real_t t;
+ Vec3 n;
+
+ WALBERLA_LOG_INFO("RAY -> PLANE");
+ WALBERLA_CHECK(intersects(&pl1, ray1, t, n), "ray through center did not hit");
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(8), "distance between ray and plane is incorrect");
+
+ Ray ray2(Vec3(-5,3,3), Vec3(1,0,-1).getNormalized());
+ WALBERLA_CHECK(intersects(&pl1, ray2, t, n), "ray towards random point on plane didn't hit");
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(sqrt(real_t(128))), "distance between ray and plane is incorrect");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(-1), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0), "incorrect normal calculated");
+
+ Plane pl1neg(1, 1, Vec3(3, 3, 3), Vec3(-1, 0, 0), real_t(1.0), iron);
+ WALBERLA_CHECK(intersects(&pl1neg, ray2, t, n), "ray towards random point on plane didn't hit");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(-1), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0), "incorrect normal calculated");
+
+ Ray ray3(Vec3(-5,3,3), Vec3(-1,0,0).getNormalized());
+ Plane pl5(1, 1, Vec3(-7, 3, 3), Vec3(1, 0, 0), real_t(1.0), iron);
+ WALBERLA_CHECK(intersects(&pl5, ray3, t, n), "ray towards random point on plane didn't hit");
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(2), "distance between ray and plane is incorrect");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(1), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0), "incorrect normal calculated");
+
+ // plane with center 3,3,3 and parallel to x-z plane
+ Plane pl2(1, 1, Vec3(3, 3, 3), Vec3(0, 1, 0), real_t(1.0), iron);
+ WALBERLA_CHECK(!intersects(&pl2, ray1, t, n), "ray parallel to plane shouldnt hit");
+
+ // plane with center -10,3,3 and parallel to y-z plane
+ Plane pl4(1, 1, Vec3(-10, 3, 3), Vec3(1, 0, 0), real_t(1.0), iron);
+ WALBERLA_CHECK(!intersects(&pl4, ray1, t, n), "ray hit plane behind origin");
+
+ Plane pl6(1, 1, Vec3(3, 3, 0), Vec3(-1, 0, 0), real_t(1.0), iron);
+ Ray ray4(Vec3(0,0,5), Vec3(1, 0, -1).getNormalized());
+ WALBERLA_CHECK(intersects(&pl6, ray4, t, n), "ray didnt hit");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(-1), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0), "incorrect normal calculated");
+}
+
+void BoxIntersectsTest() {
+ WALBERLA_LOG_INFO("RAY -> BOX");
+
+ MaterialID iron = Material::find("iron");
+ real_t t;
+ Vec3 n;
+
+ Box box1(127, 5, Vec3(0, -15, 0), Vec3(0, 0, 0), Quat(), Vec3(10, 10, 10), iron, false, true, false);
+ Ray ray1(Vec3(3,-5,3), Vec3(0,1,0));
+ WALBERLA_CHECK(!intersects(&box1, ray1, t, n));
+
+ Box box2(128, 5, Vec3(0, -2, 0), Vec3(0, 0, 0), Quat(), Vec3(10, 10, 10), iron, false, true, false);
+ WALBERLA_CHECK(intersects(&box2, ray1, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(t, real_t(8), real_t(1e-7));
+
+ Box box3(128, 5, Vec3(0, 5, 0), Vec3(0, 0, 0), Quat(), Vec3(10, 10, 10), iron, false, true, false);
+ WALBERLA_CHECK(intersects(&box3, ray1, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(5));
+
+ Ray ray6(Vec3(-8,5,0), Vec3(1,0,0));
+ WALBERLA_CHECK(intersects(&box3, ray6, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(3));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(-1), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0), "incorrect normal calculated");
+
+ Ray ray7(Vec3(8,5,0), Vec3(-1,0,0));
+ WALBERLA_CHECK(intersects(&box3, ray7, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(3));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(1), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0), "incorrect normal calculated");
+
+ // ray origin within box
+ Ray ray2(Vec3(-2,0,0), Vec3(1,0,1).getNormalized());
+ WALBERLA_CHECK(intersects(&box3, ray2, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(t, real_t(7.0710), real_t(1e-4));
+
+ Ray ray3(Vec3(3,-5,3), Vec3(2, real_t(-1.5), real_t(0.5)).getNormalized());
+ Box box4(128, 5, Vec3(0, 8, 0), Vec3(0, 0, 0), Quat(), Vec3(10, 10, 10), iron, false, true, false);
+ WALBERLA_CHECK(!intersects(&box4, ray3, t, n));
+
+ Ray ray4(Vec3(3,-5,3), Vec3(-2, 3, real_t(0.5)).getNormalized());
+ WALBERLA_CHECK(intersects(&box4, ray4, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(t, real_t(9.7068), real_t(1e-4));
+
+ Box box5(128, 5, Vec3(4, 0, 0), Vec3(0, 0, 0), Quat(), Vec3(4, 4, 4), iron, false, true, false);
+ box5.rotate(0,0,math::M_PI/4);
+ Ray ray5(Vec3(0,1.5,0), Vec3(1,0,0));
+ WALBERLA_CHECK(intersects(&box5, ray5, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(t, real_t(2.67157), real_t(1e-4));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(n[0], real_t(-0.707107), real_t(1e-5), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(n[1], real_t(0.707107), real_t(1e-5), "incorrect normal calculated");
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0), "incorrect normal calculated");
+}
+
+void AABBIntersectsTest() {
+ WALBERLA_LOG_INFO("RAY -> AABB");
+
+ Ray ray1(Vec3(-5,5,5), Vec3(1,0,0));
+ real_t t;
+
+ AABB aabb(0,0,0,
+ 10,10,10);
+
+ WALBERLA_CHECK(intersects(aabb, ray1, t));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(5));
+
+ WALBERLA_CHECK(intersects(aabb, ray1, t, 1.0));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(4));
+
+ Ray ray2(Vec3(-5,5,10.5), Vec3(1,0,0)); // ray shooting over aabb, but within padding passed to intersects
+ WALBERLA_CHECK(intersects(aabb, ray1, t, 1.0));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(4));
+}
+
+void CapsuleIntersectsTest() {
+ MaterialID iron = Material::find("iron");
+ real_t t;
+ Vec3 n;
+
+ Capsule cp1(0, 0, Vec3(2,3,3), Vec3(0,0,0), Quat(), real_t(2), real_t(2), iron, false, true, false);
+
+ // ray through the center
+ Ray ray1(Vec3(3,-5,3), Vec3(0,1,0));
+ WALBERLA_LOG_INFO("RAY -> CAPSULE");
+
+ WALBERLA_CHECK(intersects(&cp1, ray1, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(6));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(0));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(-1));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0));
+
+ Ray ray2(Vec3(-5,3,3), Vec3(1,0,0));
+ WALBERLA_CHECK(intersects(&cp1, ray2, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(4));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(-1));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0));
+}
+
+void EllipsoidTest() {
+ WALBERLA_LOG_INFO("RAY -> ELLIPSOID");
+
+ MaterialID iron = Material::find("iron");
+ real_t t;
+ Vec3 n;
+
+ Ellipsoid el1(0,0, Vec3(2,3,3), Vec3(0,0,0), Quat(), Vec3(2,3,1), iron, false, true, false);
+
+ Ray ray1(Vec3(-2,3,3), Vec3(1,0,0).getNormalized());
+ WALBERLA_CHECK(intersects(&el1, ray1, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(2));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(-1));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(0));
+
+ Ray ray2(Vec3(2,3,0), Vec3(0,0,-1).getNormalized());
+ WALBERLA_CHECK(!intersects(&el1, ray2, t, n));
+
+ Ray ray3(Vec3(2,3,5), Vec3(0,0,-1).getNormalized());
+ WALBERLA_CHECK(intersects(&el1, ray3, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL(t, real_t(1));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[0], real_t(0));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[1], real_t(0));
+ WALBERLA_CHECK_FLOAT_EQUAL(n[2], real_t(1));
+
+ Ray ray4(Vec3(-2,real_t(2),real_t(2)), Vec3(1,real_t(0),real_t(0.5)).getNormalized());
+ WALBERLA_CHECK(intersects(&el1, ray4, t, n));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(t, real_t(2.36809), real_t(1e-5));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(n[0], real_t(-0.78193), real_t(1e-5));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(n[1], real_t(-0.62324), real_t(1e-5));
+ WALBERLA_CHECK_FLOAT_EQUAL_EPSILON(n[2], real_t(0.012265), real_t(1e-5));
+}
+
+ShadingParameters customBodyToShadingParams(const BodyID body) {
+ if (body->getID() == 10) {
+ return greenShadingParams(body).makeGlossy(30);
+ } else if (body->getID() == 7) {
+ return greenShadingParams(body).makeGlossy(10);
+ } else if (body->getID() == 9) {
+ return darkGreyShadingParams(body).makeGlossy(50);
+ } else if (body->getID() == 3) {
+ return redShadingParams(body).makeGlossy(200);
+ } else {
+ return defaultBodyTypeDependentShadingParams(body);
+ }
+}
+
+void RaytracerTest(Raytracer::Algorithm raytracingAlgorithm = Raytracer::RAYTRACE_HASHGRIDS, walberla::uint8_t antiAliasFactor = 1) {
+ WALBERLA_LOG_INFO("Raytracer");
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+ shared_ptr<BlockForest> forest = createBlockForest(AABB(0,0,0,10,10,10), Vector3<uint_t>(1,1,1), Vector3<bool>(false, false, false));
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto ccdID = forest->addBlockData(ccd::createHashGridsDataHandling( globalBodyStorage, storageID ), "CCD");
+
+ Lighting lighting(Vec3(0, 5, 8), // 8, 5, 9.5 gut für ebenen, 0,5,8
+ Color(1, 1, 1), //diffuse
+ Color(1, 1, 1), //specular
+ Color(real_t(0.4), real_t(0.4), real_t(0.4))); //ambient
+ Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
+ size_t(640), size_t(480),
+ real_t(49.13), antiAliasFactor,
+ Vec3(-5,5,5), Vec3(-1,5,5), Vec3(0,0,1), //-5,5,5; -1,5,5
+ lighting,
+ Color(real_t(0.2), real_t(0.2), real_t(0.2)),
+ customBodyToShadingParams);
+
+ MaterialID iron = Material::find("iron");
+
+ //PlaneID xNegPlane = createPlane(*globalBodyStorage, 0, Vec3(-1,0,0), Vec3(5,0,0), iron);
+ // xNegPlane obstructs only the top left sphere and intersects some objects
+
+ //PlaneID xNegPlaneClose = createPlane(*globalBodyStorage, 0, Vec3(-1,0,0), Vec3(1,0,0), iron);
+
+ // Test Scene v1 - Spheres, (rotated) boxes, confining walls, tilted plane in right bottom back corner
+ createPlane(*globalBodyStorage, 0, Vec3(0,-1,0), Vec3(0,10,0), iron); // left wall
+ createPlane(*globalBodyStorage, 0, Vec3(0,1,0), Vec3(0,0,0), iron); // right wall
+ createPlane(*globalBodyStorage, 0, Vec3(0,0,1), Vec3(0,0,0), iron); // floor
+ createPlane(*globalBodyStorage, 0, Vec3(0,0,-1), Vec3(0,0,10), iron); // ceiling
+ createPlane(*globalBodyStorage, 0, Vec3(-1,0,0), Vec3(10,0,0), iron); // back wall
+ createPlane(*globalBodyStorage, 0, Vec3(1,0,0), Vec3(0,0,0), iron); // front wall, should not get rendered
+
+ createPlane(*globalBodyStorage, 0, Vec3(-1,1,1), Vec3(8,2,2), iron); // tilted plane in right bottom back corner
+
+ createSphere(*globalBodyStorage, *forest, storageID, 2, Vec3(6,real_t(9.5),real_t(9.5)), real_t(0.5));
+ createSphere(*globalBodyStorage, *forest, storageID, 3, Vec3(4,real_t(5.5),5), real_t(1));
+ createSphere(*globalBodyStorage, *forest, storageID, 6, Vec3(3,real_t(8.5),5), real_t(1));
+ BoxID box = createBox(*globalBodyStorage, *forest, storageID, 7, Vec3(5,real_t(6.5),5), Vec3(2,4,3));
+ if (box != nullptr) box->rotate(0,math::M_PI/4,math::M_PI/4);
+ createBox(*globalBodyStorage, *forest, storageID, 8, Vec3(5,1,8), Vec3(2,2,2));
+ // Test scene v1 end
+
+ // Test scene v2 additions start
+ createBox(*globalBodyStorage, *forest, storageID, 9, Vec3(9,9,5), Vec3(1,1,10));
+ createCapsule(*globalBodyStorage, *forest, storageID, 10, Vec3(3, 9, 1), real_t(0.5), real_t(7), iron);
+ CapsuleID capsule = createCapsule(*globalBodyStorage, *forest, storageID, 11, Vec3(7, real_t(3.5), real_t(7.5)), real_t(1), real_t(2), iron);
+ if (capsule != nullptr) capsule->rotate(0,math::M_PI/3,math::M_PI/4-math::M_PI/8);
+ // Test scene v2 end
+
+ // Test scene v3 additions start
+ EllipsoidID ellipsoid = createEllipsoid(*globalBodyStorage, *forest, storageID, 12, Vec3(6,2,real_t(2.5)), Vec3(3,2,real_t(1.2)));
+ ellipsoid->rotate(0, math::M_PI/real_t(6), 0);
+ // Test scene v3 end
+
+ //raytracer.setTBufferOutputDirectory("tbuffer");
+ //raytracer.setTBufferOutputEnabled(true);
+ raytracer.setImageOutputEnabled(true);
+ //raytracer.setLocalImageOutputEnabled(true);
+
+ raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
+ raytracer.generateImage<BodyTuple>(0);
+}
+
+ShadingParameters customSpheresBodyToShadingParams(const BodyID body) {
+ if (body->getTypeID() == Plane::getStaticTypeID()) {
+ return greyShadingParams(body);
+ }
+
+ switch (body->getID()) {
+ case 0:
+ return blueShadingParams(body).makeGlossy(1);
+ case 1:
+ return blueShadingParams(body).makeGlossy(10);
+ case 2:
+ return blueShadingParams(body).makeGlossy(30);
+ case 3:
+ return blueShadingParams(body).makeGlossy(80);
+ case 4:
+ return whiteShadingParams(body);
+ case 5:
+ return lightGreyShadingParams(body);
+ case 6:
+ return greyShadingParams(body);
+ case 7:
+ return darkGreyShadingParams(body);
+ case 8:
+ return blackShadingParams(body).makeGlossy(100);
+ case 9:
+ return redShadingParams(body);
+ case 10:
+ return blueShadingParams(body);
+ case 11:
+ return violetShadingParams(body);
+ case 12:
+ return greenShadingParams(body);
+ case 13:
+ return greenShadingParams(body).makeGlossy(30);
+ case 14:
+ return blueShadingParams(body).makeGlossy(1000);
+ default:
+ return lightGreyShadingParams(body);
+ }
+}
+
+void RaytracerSpheresTestScene(Raytracer::Algorithm raytracingAlgorithm = Raytracer::RAYTRACE_HASHGRIDS, walberla::uint8_t antiAliasFactor = 1) {
+ WALBERLA_LOG_INFO("Raytracer Spheres Scene");
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+ shared_ptr<BlockForest> forest = createBlockForest(AABB(0,0,0,10,10,10), Vector3<uint_t>(1,1,1), Vector3<bool>(false, false, false));
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto ccdID = forest->addBlockData(ccd::createHashGridsDataHandling( globalBodyStorage, storageID ), "CCD");
+
+ Lighting lighting(Vec3(0, 5, 8), // 8, 5, 9.5 gut für ebenen, 0,5,8
+ Color(1, 1, 1), //diffuse
+ Color(1, 1, 1), //specular
+ Color(real_t(0.4), real_t(0.4), real_t(0.4))); //ambient
+ Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
+ size_t(640), size_t(480),
+ real_t(49.13), antiAliasFactor,
+ Vec3(-5,5,5), Vec3(-1,5,5), Vec3(0,0,1), //-5,5,5; -1,5,5
+ lighting,
+ Color(real_t(0.2),real_t(0.2),real_t(0.2)),
+ customSpheresBodyToShadingParams);
+
+ MaterialID iron = Material::find("iron");
+
+ createPlane(*globalBodyStorage, 0, Vec3(0,-1,0), Vec3(0,10,0), iron); // left wall
+ createPlane(*globalBodyStorage, 0, Vec3(0,1,0), Vec3(0,0,0), iron); // right wall
+ createPlane(*globalBodyStorage, 0, Vec3(0,0,1), Vec3(0,0,0), iron); // floor
+ createPlane(*globalBodyStorage, 0, Vec3(0,0,-1), Vec3(0,0,10), iron); // ceiling
+ createPlane(*globalBodyStorage, 0, Vec3(-1,0,0), Vec3(10,0,0), iron); // back wall
+ createPlane(*globalBodyStorage, 0, Vec3(1,0,0), Vec3(0,0,0), iron); // front wall, should not get rendered
+
+ walberla::id_t id=0;
+ for (int j=0; j<4; j++) {
+ for (int i=0; i<4; i++) {
+ createSphere(*globalBodyStorage, *forest, storageID, id, Vec3(6,real_c(i+1)*real_t(2),real_c(j+1)*real_t(2)), real_t(0.9));
+ id++;
+ }
+ }
+
+ raytracer.setImageOutputEnabled(true);
+
+ raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
+ raytracer.generateImage<BodyTuple>(1);
+}
+
+ShadingParameters customHashGridsBodyToShadingParams(const BodyID body) {
+ if (body->getTypeID() == Sphere::getStaticTypeID()) {
+ return yellowShadingParams(body);
+ }
+
+ return defaultBodyTypeDependentShadingParams(body);
+}
+
+
+void HashGridsTest(Raytracer::Algorithm raytracingAlgorithm, walberla::uint8_t antiAliasFactor,
+ size_t boxes, size_t capsules, size_t spheres, size_t numberOfViews = 1,
+ real_t boxLenMin = real_t(0.1), real_t boxLenMax = real_t(0.2), bool boxRotation = false,
+ real_t capRadiusMin = real_t(0.1), real_t capRadiusMax = real_t(0.2), real_t capLenMin = real_t(0.1), real_t capLenMax = real_t(0.3),
+ real_t sphereRadiusMin = real_t(0.1), real_t sphereRadiusMax = real_t(0.3)) {
+ WALBERLA_LOG_INFO("Generating " << boxes << " boxes, " << capsules << " capsules and " << spheres << " spheres");
+
+ using namespace walberla::pe::ccd;
+ WcTimingTree tt;
+ tt.start("Setup");
+
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+ shared_ptr<BlockForest> forest = createBlockForest(AABB(0,0,0,4,4,4), Vector3<uint_t>(2,3,1), Vector3<bool>(false, false, false));
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto ccdID = forest->addBlockData(ccd::createHashGridsDataHandling(globalBodyStorage, storageID), "CCD");
+
+ const AABB& forestAABB = forest->getDomain();
+
+ bool removeUnproblematic = false;
+ std::vector<walberla::id_t> problematicBodyIDs = {165, 5, 31}; //{50, 44, 66, 155, 170, 51};
+ std::vector<walberla::id_t> bodySIDs;
+
+ // generate bodies for test
+ std::vector<BodyID> bodies;
+ for (size_t i = 0; i < boxes; i++) {
+ real_t len = math::realRandom(boxLenMin, boxLenMax); //0.2 0.5
+ real_t x = math::realRandom(forestAABB.xMin(), forestAABB.xMax());
+ real_t y = math::realRandom(forestAABB.yMin(), forestAABB.yMax());
+ real_t z = math::realRandom(forestAABB.zMin(), forestAABB.zMax());
+ walberla::id_t id = walberla::id_t(i);
+ BoxID box_ = createBox(*globalBodyStorage, *forest, storageID, id, Vec3(x, y, z), Vec3(len, len, len));
+ WALBERLA_CHECK(box_ != nullptr);
+ if (boxRotation) {
+ box_->rotate(0, math::realRandom(real_t(0), real_t(1))*math::M_PI, math::realRandom(real_t(0), real_t(1))*math::M_PI);
+ }
+ bodies.push_back(box_);
+ bodySIDs.push_back(box_->getSystemID());
+ }
+
+ for (size_t i = 0; i < capsules; i++) {
+ real_t len = math::realRandom(capLenMin, capLenMax); // 0.2 0.5
+ real_t radius = math::realRandom(capRadiusMin, capRadiusMax);
+ real_t x = math::realRandom(forestAABB.xMin(), forestAABB.xMax());
+ real_t y = math::realRandom(forestAABB.yMin(), forestAABB.yMax());
+ real_t z = math::realRandom(forestAABB.zMin(), forestAABB.zMax());
+ walberla::id_t id = walberla::id_t(boxes+i);
+ CapsuleID capsule = createCapsule(*globalBodyStorage, *forest, storageID, id, Vec3(x, y, z), radius, len);
+ WALBERLA_CHECK(capsule != nullptr);
+ capsule->rotate(0, math::realRandom(real_t(0), real_t(1))*math::M_PI, math::realRandom(real_t(0), real_t(1))*math::M_PI);
+ bodies.push_back(capsule);
+ bodySIDs.push_back(capsule->getSystemID());
+ }
+
+ for (size_t i = 0; i < spheres; i++) {
+ real_t radius = math::realRandom(sphereRadiusMin, sphereRadiusMax); // 0.2 0.3
+ real_t x = math::realRandom(forestAABB.xMin(), forestAABB.xMax());
+ real_t y = math::realRandom(forestAABB.yMin(), forestAABB.yMax());
+ real_t z = math::realRandom(forestAABB.zMin(), forestAABB.zMax());
+ walberla::id_t id = walberla::id_t(boxes+capsules+i);
+ SphereID sphere = createSphere(*globalBodyStorage, *forest, storageID, id, Vec3(x, y, z), radius);
+ WALBERLA_CHECK(sphere != nullptr);
+ bodies.push_back(sphere);
+ bodySIDs.push_back(sphere->getSystemID());
+ }
+
+ for (auto blockIt = forest->begin(); blockIt != forest->end(); ++blockIt) {
+ ccd::HashGrids* hashgrids = blockIt->getData<ccd::HashGrids>(ccdID);
+ hashgrids->update();
+ for (auto bodyIt = LocalBodyIterator::begin(*blockIt, storageID); bodyIt != LocalBodyIterator::end(); ++bodyIt) {
+ if (removeUnproblematic && std::find(problematicBodyIDs.begin(), problematicBodyIDs.end(), bodyIt->getID()) == problematicBodyIDs.end()) {
+ bodyIt->setPosition(-100, -100, -100);
+ }
+ }
+ }
+
+ MaterialID iron = Material::find("iron");
+ createPlane(*globalBodyStorage, 0, Vec3(0,-1,0), Vec3(0,forestAABB.yMax(),0), iron); // left wall
+ createPlane(*globalBodyStorage, 0, Vec3(0,1,0), Vec3(0,forestAABB.yMin(),0), iron); // right wall
+ createPlane(*globalBodyStorage, 0, Vec3(0,0,1), Vec3(0,0,forestAABB.zMin()), iron); // floor
+ createPlane(*globalBodyStorage, 0, Vec3(0,0,-1), Vec3(0,0,forestAABB.zMax()), iron); // ceiling
+ createPlane(*globalBodyStorage, 0, Vec3(-1,0,0), Vec3(forestAABB.xMax(),0,0), iron); // back wall
+ createPlane(*globalBodyStorage, 0, Vec3(1,0,0), Vec3(forestAABB.xMin(),0,0), iron); // front wall, should not get rendered
+
+
+ std::vector<std::tuple<Vec3, Vec3, Vec3>> viewVectors;
+
+ // y up, in negative z direction
+ viewVectors.emplace_back(Vec3(2, real_t(2.1), 7),
+ Vec3(real_t(2.1), 2, 4),
+ Vec3(0,1,0));
+ // y up, in positive z direction
+ viewVectors.emplace_back(Vec3(2, 2, -3),
+ Vec3(2, real_t(2.1), real_t(0.1)),
+ Vec3(0,1,0));
+ // x up, in positive z direction
+ viewVectors.emplace_back(Vec3(2, 2, -3),
+ Vec3(2, real_t(2.1), real_t(0.1)),
+ Vec3(1,0,0));
+ // y and x up, in positive z direction
+ viewVectors.emplace_back(Vec3(2, 2, -3),
+ Vec3(2, real_t(2.1), real_t(0.1)),
+ Vec3(1,1,0));
+ // y and x up, in negative z direction
+ viewVectors.emplace_back(Vec3(2, 2, 6.5),
+ Vec3(real_t(2.1), real_t(2.1), 4),
+ Vec3(real_t(0.5),1,0));
+ // z up, in positive x direction
+ viewVectors.emplace_back(Vec3(-3, 2, real_t(1.9)),
+ Vec3(0, real_t(2.1), 2),
+ Vec3(0,0,1));
+ // z up, in negative x direction
+ viewVectors.emplace_back(Vec3(7, 2, real_t(1.9)),
+ Vec3(4, real_t(2.1), 2),
+ Vec3(0,0,1));
+ // z and y up, in negative x direction
+ viewVectors.emplace_back(Vec3(7, 2, real_t(1.9)),
+ Vec3(4, real_t(2.1), 2),
+ Vec3(0,1,1));
+ // z and x up, in negative y direction
+ viewVectors.emplace_back(Vec3(2, 6, real_t(1.9)),
+ Vec3(real_t(2.3), 4, 2),
+ Vec3(1,0,1));
+ // z up, in positive y direction
+ viewVectors.emplace_back(Vec3(2, real_t(-3.6), real_t(1.9)),
+ Vec3(real_t(2.3), 0, real_t(2.1)),
+ Vec3(0,0,1));
+
+ Lighting lighting0(Vec3(forestAABB.xSize()/real_t(2)+1, forestAABB.ySize()/real_t(2),
+ real_t(2)*forestAABB.zMax()+2), // 8, 5, 9.5 gut für ebenen, 0,5,8
+ Color(1, 1, 1), //diffuse
+ Color(1, 1, 1), //specular
+ Color(real_t(0.4), real_t(0.4), real_t(0.4))); //ambient
+ tt.stop("Setup");
+
+ size_t i = 0;
+ for (auto& vector: viewVectors) {
+ if (i == numberOfViews) {
+ break;
+ }
+
+ Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
+ size_t(640), size_t(480),
+ real_t(49.13), antiAliasFactor,
+ std::get<0>(vector),
+ std::get<1>(vector),
+ std::get<2>(vector),
+ lighting0,
+ Color(real_t(0.2),real_t(0.2),real_t(0.2)),
+ customHashGridsBodyToShadingParams);
+ raytracer.setImageOutputEnabled(true);
+ raytracer.setFilenameTimestepWidth(12);
+ WALBERLA_LOG_INFO("output #" << i << " to: " << (boxes*100000000 + capsules*10000 + spheres) << " in " << raytracer.getImageOutputDirectory());
+ raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
+ raytracer.generateImage<BodyTuple>(boxes*100000000 + capsules*10000 + spheres, &tt);
+ i++;
+ }
+
+ auto temp = tt.getReduced();
+ WALBERLA_ROOT_SECTION() {
+ std::cout << temp;
+ }
+}
+
+ShadingParameters customArtifactsBodyToShadingParams(const BodyID body) {
+ if (body->getTypeID() == Box::getStaticTypeID()) {
+ return lightGreyShadingParams(body);
+ }
+ return defaultShadingParams(body);
+}
+
+void raytraceArtifactsForest(Raytracer::Algorithm raytracingAlgorithm, walberla::uint8_t antiAliasFactor,
+ const shared_ptr<BlockStorage> forest, const BlockDataID storageID,
+ const shared_ptr<BodyStorage> globalBodyStorage,
+ const BlockDataID ccdID,
+ const Vec3& cameraPosition, const Vec3& lookAtPoint, const Vec3& upVector,
+ size_t numberOfBoxes, walberla::uint8_t timestepWidth) {
+ WcTimingTree tt;
+
+ Lighting lighting(cameraPosition,
+ Color(1, 1, 1), //diffuse
+ Color(1, 1, 1), //specular
+ Color(real_t(0.4), real_t(0.4), real_t(0.4))); //ambient
+
+ Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
+ size_t(640), size_t(480),
+ real_t(49.13), antiAliasFactor,
+ cameraPosition,
+ lookAtPoint,
+ upVector,
+ lighting,
+ Color(real_t(0.2),real_t(0.2),real_t(0.2)),
+ customArtifactsBodyToShadingParams);
+ raytracer.setImageOutputEnabled(true);
+ raytracer.setFilenameTimestepWidth(timestepWidth);
+ raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
+ WALBERLA_LOG_INFO("output to: " << numberOfBoxes << " in " << raytracer.getImageOutputDirectory());
+ raytracer.generateImage<BodyTuple>(numberOfBoxes, &tt);
+
+ auto temp = tt.getReduced();
+ WALBERLA_ROOT_SECTION() {
+ std::cout << temp;
+ }
+}
+
+void HashGridsArtifactsTest(Raytracer::Algorithm raytracingAlgorithm, walberla::uint8_t antiAliasFactor,
+ size_t boxes, real_t boxLenMin = real_t(0.1), real_t boxLenMax = real_t(0.2)) {
+ WALBERLA_LOG_INFO_ON_ROOT("HashGrids Artifacts Test - In negative Z direction");
+
+ WALBERLA_LOG_INFO(" Generating " << boxes << " boxes");
+
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+ shared_ptr<BlockForest> forest = createBlockForest(AABB(0,0,0,4,4,4), Vector3<uint_t>(1,1,1), Vector3<bool>(false, false, false));
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto ccdID = forest->addBlockData(ccd::createHashGridsDataHandling(globalBodyStorage, storageID), "CCD");
+
+ const AABB& forestAABB = forest->getDomain();
+
+ // generate bodies for test
+ for (size_t i = 0; i < boxes; i++) {
+ real_t len = math::realRandom(boxLenMin, boxLenMax); //0.2 0.5
+ real_t x_min = math::realRandom(forestAABB.xMin()+len/real_t(2), forestAABB.xMax());
+ real_t y_min = math::realRandom(forestAABB.yMin()+len/real_t(2), forestAABB.yMax());
+ real_t z_min = math::realRandom(forestAABB.zMin()+len/real_t(2), forestAABB.zMax());
+ if (i%5 == 0) {
+ x_min = forestAABB.xMax() - math::realRandom(len/real_t(2), len);
+ } else if (i%5 == 1){
+ x_min = forestAABB.xMin() + math::realRandom(real_t(0), len/real_t(2));
+ } else if (i%5 == 2){
+ y_min = forestAABB.yMax() - math::realRandom(len/real_t(2), len);
+ } else if (i%5 == 3){
+ y_min = forestAABB.yMin() + math::realRandom(real_t(0), len/real_t(2));
+ } else if (i%5 == 4){
+ z_min = forestAABB.zMin() + math::realRandom(real_t(0), len/real_t(2));
+ }
+ walberla::id_t id = walberla::id_t(i);
+ BoxID box_ = createBox(*globalBodyStorage, *forest, storageID, id, Vec3(x_min, y_min, z_min), Vec3(len, len, len));
+ WALBERLA_CHECK(box_ != nullptr);
+ }
+
+ raytraceArtifactsForest(raytracingAlgorithm, antiAliasFactor,
+ forest, storageID, globalBodyStorage, ccdID,
+ Vec3(2, 2, 7), Vec3(2, 2, 4), Vec3(0,1,0),
+ boxes, 3);
+}
+
+void HashGridsFromNegativeArtifactsTest(Raytracer::Algorithm raytracingAlgorithm, walberla::uint8_t antiAliasFactor,
+ size_t boxes, real_t boxLenMin = real_t(0.1), real_t boxLenMax = real_t(0.2)) {
+ WALBERLA_LOG_INFO_ON_ROOT("HashGrids Artifacts Test - In positive Z direction");
+
+ WALBERLA_LOG_INFO_ON_ROOT(" Generating " << boxes << " boxes");
+
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+ shared_ptr<BlockForest> forest = createBlockForest(AABB(0,0,0,4,4,4), Vector3<uint_t>(1,1,1), Vector3<bool>(false, false, false));
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto ccdID = forest->addBlockData(ccd::createHashGridsDataHandling(globalBodyStorage, storageID), "CCD");
+
+ const AABB& forestAABB = forest->getDomain();
+
+ // generate bodies for test
+ std::vector<BodyID> bodies;
+ for (size_t i = 0; i < boxes; i++) {
+ real_t len = math::realRandom(boxLenMin, boxLenMax); //0.2 0.5
+ real_t x_min = math::realRandom(forestAABB.xMin()+len/real_t(2), forestAABB.xMax());
+ real_t y_min = math::realRandom(forestAABB.yMin()+len/real_t(2), forestAABB.yMax());
+ real_t z_min = math::realRandom(forestAABB.zMin()+len/real_t(2), forestAABB.zMax());
+
+ if (i%5 == 0) {
+ x_min = forestAABB.xMax() - math::realRandom(len/real_t(2), len);
+ } else if (i%5 == 1){
+ x_min = forestAABB.xMin() + math::realRandom(real_t(0), len/real_t(2));
+ } else if (i%5 == 2){
+ y_min = forestAABB.yMax() - math::realRandom(len/real_t(2), len);
+ } else if (i%5 == 3){
+ y_min = forestAABB.yMin() + math::realRandom(real_t(0), len/real_t(2));
+ } else if (i%5 == 4){
+ z_min = forestAABB.zMax() - math::realRandom(len/real_t(2), len);
+ }
+
+ //real_t z_min = len+0.1;
+ walberla::id_t id = walberla::id_t(i);
+ BoxID box_ = createBox(*globalBodyStorage, *forest, storageID, id, Vec3(x_min, y_min, z_min), Vec3(len, len, len));
+ WALBERLA_CHECK(box_ != nullptr);
+ }
+
+ raytraceArtifactsForest(raytracingAlgorithm, antiAliasFactor,
+ forest, storageID, globalBodyStorage, ccdID,
+ Vec3(2, 2, -3), Vec3(2, 2, 0), Vec3(0,1,0),
+ boxes, 4);
+}
+
+void HashGridsFromNegativeXArtifactsTest(Raytracer::Algorithm raytracingAlgorithm, walberla::uint8_t antiAliasFactor,
+ size_t boxes, real_t boxLenMin = real_t(0.1), real_t boxLenMax = real_t(0.2)) {
+ WALBERLA_LOG_INFO_ON_ROOT("HashGrids Artifacts Test - In positive X direction");
+ WALBERLA_LOG_INFO_ON_ROOT(" Generating " << boxes << " boxes");
+
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+ shared_ptr<BlockForest> forest = createBlockForest(AABB(0,0,0,4,4,4), Vector3<uint_t>(1,1,1), Vector3<bool>(false, false, false));
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto ccdID = forest->addBlockData(ccd::createHashGridsDataHandling(globalBodyStorage, storageID), "CCD");
+
+ const AABB& forestAABB = forest->getDomain();
+
+ // generate bodies for test
+ for (size_t i = 0; i < boxes; i++) {
+ real_t len = math::realRandom(boxLenMin, boxLenMax); //0.2 0.5
+ real_t x_min = math::realRandom(forestAABB.xMin()+len/real_t(2), forestAABB.xMax());
+ real_t y_min = math::realRandom(forestAABB.yMin()+len/real_t(2), forestAABB.yMax());
+ real_t z_min = math::realRandom(forestAABB.zMin()+len/real_t(2), forestAABB.zMax());
+
+ if (i%5 == 0) {
+ z_min = forestAABB.zMax() - math::realRandom(len/real_t(2), len);
+ } else if (i%5 == 1){
+ z_min = forestAABB.zMin() + math::realRandom(real_t(0), len/real_t(2));
+ } else if (i%5 == 2){
+ y_min = forestAABB.yMax() - math::realRandom(len/real_t(2), len);
+ } else if (i%5 == 3){
+ y_min = forestAABB.yMin() + math::realRandom(real_t(0), len/real_t(2));
+ } else if (i%5 == 4){
+ x_min = forestAABB.xMax() - math::realRandom(len/real_t(2), len);
+ }
+
+ //real_t z_min = len+0.1;
+ walberla::id_t id = walberla::id_t(i);
+ BoxID box_ = createBox(*globalBodyStorage, *forest, storageID, id, Vec3(x_min, y_min, z_min), Vec3(len, len, len));
+ WALBERLA_CHECK(box_ != nullptr);
+ }
+
+ raytraceArtifactsForest(raytracingAlgorithm, antiAliasFactor,
+ forest, storageID, globalBodyStorage, ccdID,
+ Vec3(-3, 2, 2), Vec3(0, 2, 2), Vec3(0,0,1),
+ boxes, 6);
+}
+
+
+Vec3 minCornerToGpos(const Vec3& minCorner, real_t lengths) {
+ return minCorner + Vec3(lengths/2, lengths/2, lengths/2);
+}
+
+void HashGridsTestScene(Raytracer::Algorithm raytracingAlgorithm = Raytracer::RAYTRACE_HASHGRIDS, walberla::uint8_t antiAliasFactor = 1) {
+ WALBERLA_LOG_INFO_ON_ROOT("HashGrids Test Scene");
+
+ shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
+ shared_ptr<BlockForest> forest = createBlockForest(AABB(0,0,0,8,8,8), Vector3<uint_t>(1,1,1), Vector3<bool>(false, false, false));
+ auto storageID = forest->addBlockData(createStorageDataHandling<BodyTuple>(), "Storage");
+ auto ccdID = forest->addBlockData(ccd::createHashGridsDataHandling(globalBodyStorage, storageID), "CCD");
+
+ const AABB& forestAABB = forest->getDomain();
+
+ std::vector<BodyID> bodies;
+
+ // create bodies
+ size_t id = 0;
+ real_t len = real_t(0.6);
+
+ real_t x_min = 0, y_min = 0;
+ len = real_t(1.2);
+ real_t gap = real_t(0.4);
+
+ // cubes on z = 0 plane
+ for (int i = 0; ; ++i) {
+ x_min = forestAABB.xMin() + real_c(i)*(gap+len);
+ if (x_min > forestAABB.max(0)) {
+ break;
+ }
+ for (int j = 0; ; ++j) {
+ y_min = forestAABB.yMin() + real_c(j)*(gap+len);
+ if (y_min > forestAABB.max(1)) {
+ break;
+ }
+
+ bodies.push_back(createBox(*globalBodyStorage, *forest, storageID, ++id, minCornerToGpos(Vec3(x_min, y_min, 0), len), Vec3(len, len, len)));
+ }
+ }
+
+ //cubes on z = max plane
+ for (int i = 0; ; ++i) {
+ x_min = forestAABB.xMin() + real_c(i)*(gap+len);
+ if (x_min > forestAABB.max(0)) {
+ break;
+ }
+ for (int j = 0; ; ++j) {
+ y_min = forestAABB.yMin() + real_c(j)*(gap+len);
+ if (y_min > forestAABB.max(1)) {
+ break;
+ }
+
+ bodies.push_back(createBox(*globalBodyStorage, *forest, storageID, ++id, minCornerToGpos(Vec3(x_min, y_min, forestAABB.zMax()-len), len), Vec3(len, len, len)));
+ }
+ }
+
+ std::vector<std::tuple<Vec3, Vec3, Vec3>> viewVectors;
+
+ // in negative x direction -> cubes to the right
+ viewVectors.emplace_back(Vec3(15,4,4),
+ Vec3(8,4,4),
+ Vec3(0,1,0));
+ // in negative x direction and negative z direction, up vector in y direction -> cubes from the right tilted
+ viewVectors.emplace_back(Vec3(12,4,8),
+ Vec3(6,4,2),
+ Vec3(0,1,0));
+ // in negative x direction and negative z direction, up vector in negative y direction
+ viewVectors.emplace_back(Vec3(12,4,8),
+ Vec3(6,4,2),
+ Vec3(0,-1,0));
+ // in positive x direction
+ viewVectors.emplace_back(Vec3(-7,4,4),
+ Vec3(0,4,4),
+ Vec3(0,1,0));
+ // in negative x direction
+ viewVectors.emplace_back(Vec3(4,4,15),
+ Vec3(4,4,8),
+ Vec3(0,1,0));
+
+ WcTimingTree tt;
+
+ Lighting lighting(Vec3(1,2,15),
+ Color(1, 1, 1), //diffuse
+ Color(1, 1, 1), //specular
+ Color(real_t(0.4), real_t(0.4), real_t(0.4))); //ambient
+
+ int i = 0;
+ for (auto& vector: viewVectors) {
+ Raytracer raytracer(forest, storageID, globalBodyStorage, ccdID,
+ size_t(640), size_t(480),
+ real_t(49.13), antiAliasFactor,
+ std::get<0>(vector),
+ std::get<1>(vector),
+ std::get<2>(vector),
+ lighting,
+ Color(real_t(0.2),real_t(0.2),real_t(0.2)));
+
+ raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
+ raytracer.setImageOutputEnabled(true);
+ raytracer.setFilenameTimestepWidth(1);
+ WALBERLA_LOG_INFO("output to: " << i << " in " << raytracer.getImageOutputDirectory());
+ raytracer.setRaytracingAlgorithm(raytracingAlgorithm);
+ raytracer.generateImage<BodyTuple>(size_t(i), &tt);
+
+ auto temp = tt.getReduced();
+ WALBERLA_ROOT_SECTION() {
+ std::cout << temp;
+ }
+
+ i++;
+ }
+}
+
+int main( int argc, char** argv )
+{
+ walberla::debug::enterTestMode();
+ walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
+ SetBodyTypeIDs<BodyTuple>::execute();
+ math::seedRandomGenerator( static_cast<unsigned int>(1337 * mpi::MPIManager::instance()->worldRank()) );
+
+ SphereIntersectsTest();
+ PlaneIntersectsTest();
+ BoxIntersectsTest();
+ AABBIntersectsTest();
+ CapsuleIntersectsTest();
+ EllipsoidTest();
+
+ const Raytracer::Algorithm algorithm = Raytracer::RAYTRACE_COMPARE_BOTH_STRICTLY;
+ const walberla::uint8_t antiAliasFactor = 1;
+ RaytracerTest(algorithm, antiAliasFactor);
+ RaytracerSpheresTestScene(algorithm, antiAliasFactor);
+ HashGridsTestScene(algorithm, antiAliasFactor);
+
+ if (argc >= 2 && strcmp(argv[1], "--longrun") == 0) {
+ HashGridsTest(algorithm, antiAliasFactor,
+ 50, 30, 130,
+ 10);
+ HashGridsTest(algorithm, antiAliasFactor,
+ 60, 60, 3,
+ 1,
+ real_t(0.1), real_t(0.3), true,
+ real_t(0.1), real_t(0.2), real_t(0.1), real_t(0.2),
+ real_t(0.5), real_t(0.6));
+ HashGridsArtifactsTest(algorithm, antiAliasFactor, 750, real_t(0.2), real_t(0.3));
+ HashGridsFromNegativeArtifactsTest(algorithm, antiAliasFactor, 750, real_t(0.2), real_t(0.3));
+ HashGridsFromNegativeXArtifactsTest(algorithm, antiAliasFactor, 750, real_t(0.2), real_t(0.3));
+ }
+
+ return EXIT_SUCCESS;
+}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
diff --git a/tests/pe/Refinement.cpp b/tests/pe/Refinement.cpp
index cb64385b6b755302933c2c5a50d4988d66f1f5e9..361cc322e069680d7911be277e5f3042bece498a 100644
--- a/tests/pe/Refinement.cpp
+++ b/tests/pe/Refinement.cpp
@@ -40,7 +40,7 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
typedef boost::tuple<Sphere, Plane> BodyTuple ;
@@ -141,7 +141,7 @@ int main( int argc, char ** argv )
auto fcdID = forest->addBlockData(fcd::createGenericFCDDataHandling<BodyTuple, fcd::AnalyticCollideFunctor>(), "FCD");
//cr::DEM cr(globalStorage, forest->getBlockStorage(), storageID, ccdID, fcdID, NULL );
- cr::HCSITS cr(globalStorage, forest->getBlockStoragePointer(), storageID, ccdID, fcdID, NULL );
+ cr::HCSITS cr(globalStorage, forest->getBlockStoragePointer(), storageID, ccdID, fcdID, nullptr );
auto vtkOutput = make_shared<DefaultBodyVTKOutput>(storageID, forest->getBlockStorage()) ;
auto vtkWriter = vtk::createVTKOutput_PointData(vtkOutput, "Bodies", 1, "vtk", "simulation_step", false, false);
@@ -186,3 +186,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/RigidBody.cpp b/tests/pe/RigidBody.cpp
index 58926892dfa4786e5baaa3a9413bbf04df96390c..f72d9ce0b5d82597fe72a36d60744edb79f4c2d2 100644
--- a/tests/pe/RigidBody.cpp
+++ b/tests/pe/RigidBody.cpp
@@ -28,7 +28,7 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
void move( BodyStorage& storage, real_t dt )
@@ -39,10 +39,6 @@ void move( BodyStorage& storage, real_t dt )
WALBERLA_ASSERT( it->checkInvariants(), "Invalid capsule state detected" );
WALBERLA_ASSERT( !it->hasSuperBody(), "Invalid superordinate body detected" );
- // Resetting the contact node and removing all attached contacts
-// it->resetNode();
- it->clearContacts();
-
// Moving the capsule according to the acting forces (don't move a sleeping body)
if( it->isAwake() ) {
if( !it->hasInfiniteMass() ) {
@@ -86,10 +82,10 @@ void move( BodyStorage& storage, real_t dt )
void checkRotationFunctions()
{
MaterialID iron = Material::find("iron");
- auto sp1 = shared_ptr<Sphere>( new Sphere(0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), 1, iron, false, true, false) );
- auto sp2 = shared_ptr<Sphere>( new Sphere(0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), 1, iron, false, true, false) );
- auto sp3 = shared_ptr<Sphere>( new Sphere(0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), 1, iron, false, true, false) );
- auto sp4 = shared_ptr<Sphere>( new Sphere(0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), 1, iron, false, true, false) );
+ auto sp1 = std::make_shared<Sphere>( 0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
+ auto sp2 = std::make_shared<Sphere>( 0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
+ auto sp3 = std::make_shared<Sphere>( 0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
+ auto sp4 = std::make_shared<Sphere>( 0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
sp1->rotate( 1, 0, 0, math::M_PI * real_t(0.5));
sp1->rotate( 0, 1, 0, math::M_PI * real_t(0.5));
@@ -125,7 +121,7 @@ void checkRotationFunctions()
void checkPointFunctions()
{
MaterialID iron = Material::find("iron");
- auto sp1 = shared_ptr<Sphere>( new Sphere(0, 0, Vec3(10,10,10), Vec3(0,0,0), Quat(), 1, iron, false, true, false) );
+ auto sp1 = std::make_shared<Sphere>( 0, 0, Vec3(10,10,10), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
WALBERLA_CHECK( sp1->containsPoint( 10, 10, 10 ) );
WALBERLA_CHECK( sp1->containsPoint( real_c(10.9), 10, 10 ) );
@@ -152,8 +148,8 @@ int main( int argc, char** argv )
MaterialID iron = Material::find("iron");
BodyStorage storage;
- SphereID sphere = new Sphere(0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), 1, iron, false, true, false);
- storage.add(sphere);
+ SpherePtr spPtr = std::make_unique<Sphere>(0, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false);
+ SphereID sphere = static_cast<SphereID>(&storage.add(std::move(spPtr)));
Vec3 x0 = Vec3(-2,2,0);
Vec3 v0 = Vec3(-1,-1,1);
@@ -174,4 +170,12 @@ int main( int argc, char** argv )
checkRotationFunctions();
checkPointFunctions();
+
+ return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SerializeDeserialize.cpp b/tests/pe/SerializeDeserialize.cpp
index 47e30000a79045a29094abbf62fa3c667538b41e..9d92831a20d50d36b370f671a91946bc8029ecb2 100644
--- a/tests/pe/SerializeDeserialize.cpp
+++ b/tests/pe/SerializeDeserialize.cpp
@@ -34,10 +34,10 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
void createDump()
{
@@ -145,3 +145,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SetBodyTypeIDs.cpp b/tests/pe/SetBodyTypeIDs.cpp
index 9e99059b24d2fb962f788ff9697130c836dbcf57..6cc5999945b74729741aaf0feb62c9a0df2a13f3 100644
--- a/tests/pe/SetBodyTypeIDs.cpp
+++ b/tests/pe/SetBodyTypeIDs.cpp
@@ -38,7 +38,7 @@ namespace pe {
class Base{
public:
Base(id_t const typeID) : typeID_(typeID) {}
- virtual ~Base() {}
+ virtual ~Base() = default;
id_t getTypeID() const { return typeID_;}
private:
id_t typeID_;
diff --git a/tests/pe/ShadowCopy.cpp b/tests/pe/ShadowCopy.cpp
index cbd4958e34ede91c698393f37f42633925f15abc..bf3f39c921ad7878366d02b4454e2b2ae1f32540 100644
--- a/tests/pe/ShadowCopy.cpp
+++ b/tests/pe/ShadowCopy.cpp
@@ -19,6 +19,7 @@
//======================================================================================================================
#include "pe/basic.h"
+#include "pe/rigidbody/UnionFactory.h"
#include "pe/utility/GetBody.h"
#include "pe/utility/DestroyBody.h"
@@ -28,10 +29,12 @@
#include "core/debug/TestSubsystem.h"
-using namespace walberla;
+#include <functional>
+
+namespace walberla {
using namespace walberla::pe;
-typedef Union< boost::tuple<Sphere> > UnionT;
+using UnionT = Union<boost::tuple<Sphere> >;
typedef boost::tuple<Sphere, UnionT> BodyTuple ;
int main( int argc, char** argv )
@@ -39,6 +42,19 @@ int main( int argc, char** argv )
walberla::debug::enterTestMode();
walberla::MPIManager::instance()->initializeMPI( &argc, &argv );
+ bool syncShadowOwners = false;
+ for( int i = 1; i < argc; ++i )
+ {
+ if( std::strcmp( argv[i], "--syncShadowOwners" ) == 0 ) syncShadowOwners = true;
+ }
+ if (syncShadowOwners)
+ {
+ WALBERLA_LOG_DEVEL("running with syncShadowOwners");
+ } else
+ {
+ WALBERLA_LOG_DEVEL("running with syncNextNeighbour");
+ }
+
shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage>();
// create blocks
@@ -61,14 +77,14 @@ int main( int argc, char** argv )
// logging::Logging::instance()->setFileLogLevel(logging::Logging::DETAIL);
// logging::Logging::instance()->includeLoggingToFile("ShadowCopy");
- bool syncShadowOwners = false;
+
std::function<void(void)> syncCall;
if (!syncShadowOwners)
{
- syncCall = boost::bind( pe::syncNextNeighbors<BodyTuple>, boost::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(NULL), real_c(0.0), false );
+ syncCall = std::bind( pe::syncNextNeighbors<BodyTuple>, std::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
} else
{
- syncCall = boost::bind( pe::syncShadowOwners<BodyTuple>, boost::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(NULL), real_c(0.0), false );
+ syncCall = std::bind( pe::syncShadowOwners<BodyTuple>, std::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
}
WALBERLA_LOG_PROGRESS_ON_ROOT( " *** SPHERE *** ");
@@ -92,13 +108,27 @@ int main( int argc, char** argv )
WALBERLA_CHECK_FLOAT_EQUAL( sp->getRadius(), real_t(1.2) );
destroyBodyBySID( *globalBodyStorage, forest->getBlockStorage(), storageID, sid );
+ WALBERLA_LOG_PROGRESS_ON_ROOT( " *** SPHERE AT BLOCK EDGE *** ");
+ sp = pe::createSphere(
+ *globalBodyStorage,
+ forest->getBlockStorage(),
+ storageID,
+ 999999999,
+ Vec3(0,2,2),
+ real_c(1.2));
+ sid = sp->getSystemID();
+ syncCall();
+ sp = static_cast<SphereID> (getBody( *globalBodyStorage, forest->getBlockStorage(), storageID, sid, StorageSelect::LOCAL ));
+ sp->setPosition(real_c(-1)*std::numeric_limits<real_t>::epsilon(),2,2);
+ syncCall();
+ sp = static_cast<SphereID> (getBody( *globalBodyStorage, forest->getBlockStorage(), storageID, sid, StorageSelect::LOCAL ));
+ WALBERLA_CHECK_NOT_NULLPTR(sp);
+ destroyBodyBySID( *globalBodyStorage, forest->getBlockStorage(), storageID, sid );
+
WALBERLA_LOG_PROGRESS_ON_ROOT( " *** UNION *** ");
- MaterialID iron = Material::find("iron");
UnionT* un = createUnion< boost::tuple<Sphere> >( *globalBodyStorage, forest->getBlockStorage(), storageID, 0, Vec3(2,2,2) );
- SphereID sp1 = new Sphere( 10, 0, Vec3(real_t(4.9),2,2), Vec3(0,0,0), Quat(), real_t(1) , iron, false, true, false );
- SphereID sp2 = new Sphere( 11, 0, Vec3(3,2,2) , Vec3(0,0,0), Quat(), real_t(1.5), iron, false, true, false );
- un->add(sp1);
- un->add(sp2);
+ auto sp1 = createSphere(un, 10, Vec3(real_t(4.9),2,2), real_t(1));
+ auto sp2 = createSphere(un, 11, Vec3(3,2,2), real_t(1.5));
un->setPosition( Vec3( real_t(4.9), 2, 2) );
auto relPosSp1 = sp1->getRelPosition();
auto relPosSp2 = sp2->getRelPosition();
@@ -111,8 +141,8 @@ int main( int argc, char** argv )
syncCall();
un = static_cast<UnionT*> (getBody( *globalBodyStorage, forest->getBlockStorage(), storageID, sid, StorageSelect::LOCAL ));
- sp1 = static_cast<SphereID> (*(un->begin()));
- sp2 = static_cast<SphereID> (*(++(un->begin())));
+ sp1 = static_cast<SphereID> (un->begin().getBodyID());
+ sp2 = static_cast<SphereID> ((++(un->begin())).getBodyID());
WALBERLA_CHECK_NOT_NULLPTR(sp1);
WALBERLA_CHECK_NOT_NULLPTR(sp2);
WALBERLA_CHECK_EQUAL( sp1->getTypeID(), Sphere::getStaticTypeID() );
@@ -150,8 +180,8 @@ int main( int argc, char** argv )
posUnion = Vec3(real_t(0.9),2,2);
un = static_cast<UnionT*> (getBody( *globalBodyStorage, forest->getBlockStorage(), storageID, sid, StorageSelect::LOCAL ));
- sp1 = static_cast<SphereID> (*(un->begin()));
- sp2 = static_cast<SphereID> (*(++(un->begin())));
+ sp1 = static_cast<SphereID> (un->begin().getBodyID());
+ sp2 = static_cast<SphereID> ((++(un->begin())).getBodyID());
WALBERLA_CHECK_NOT_NULLPTR(sp1);
WALBERLA_CHECK_NOT_NULLPTR(sp2);
WALBERLA_CHECK_EQUAL( sp1->getTypeID(), Sphere::getStaticTypeID() );
@@ -173,3 +203,9 @@ int main( int argc, char** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SimpleCCD.cpp b/tests/pe/SimpleCCD.cpp
index 3bb6539082b84879307701ad0ceccc08a782bf48..b1388dab5846c876b419940148acd58a6dc6583f 100644
--- a/tests/pe/SimpleCCD.cpp
+++ b/tests/pe/SimpleCCD.cpp
@@ -33,10 +33,10 @@
#include "core/debug/TestSubsystem.h"
#include "core/math/Random.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
int main( int argc, char** argv )
{
@@ -60,7 +60,7 @@ int main( int argc, char** argv )
math::seedRandomGenerator(1337);
for (uint_t i = 0; i < 100; ++i)
- storage[0].add( new Sphere(UniqueID<Sphere>::createGlobal(), 0, Vec3( math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10))), Vec3(0,0,0), Quat(), 1, iron, false, false, false) );
+ storage[0].add( std::make_unique<Sphere>(UniqueID<Sphere>::createGlobal(), 0, Vec3( math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10))), Vec3(0,0,0), Quat(), real_t(1), iron, false, false, false) );
sccd.generatePossibleContacts();
@@ -70,7 +70,7 @@ int main( int argc, char** argv )
WALBERLA_LOG_DEVEL( s_fcd.getContacts().size() );
- BodyID bd = *(storage[0].begin() + 5);
+ BodyID bd = (storage[0].begin() + 5).getBodyID();
storage[0].remove( bd );
sccd.generatePossibleContacts();
@@ -84,14 +84,14 @@ int main( int argc, char** argv )
bs.clear();
- bs.add( new Sphere(UniqueID<Sphere>::createGlobal(), 0, Vec3( math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10))), Vec3(0,0,0), Quat(), 1, iron, false, false, false) );
+ bs.add( std::make_unique<Sphere>(UniqueID<Sphere>::createGlobal(), 0, Vec3( math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10))), Vec3(0,0,0), Quat(), real_t(1), iron, false, false, false) );
WcTimingPool pool;
for (int runs = 0; runs < 10; ++runs)
{
auto oldSize = bs.size();
for (uint_t i = 0; i < oldSize; ++i)
- bs.add( new Sphere(UniqueID<Sphere>::createGlobal(), 0, Vec3( math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10))), Vec3(0,0,0), Quat(), 0.5, iron, false, false, false) );
+ bs.add( std::make_unique<Sphere>(UniqueID<Sphere>::createGlobal(), 0, Vec3( math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10)), math::realRandom(real_c(0), real_c(10))), Vec3(0,0,0), Quat(), real_t(0.5), iron, false, false, false) );
pool["SCCD"].start();
sccd.generatePossibleContacts();
pool["SCCD"].end();
@@ -107,4 +107,12 @@ int main( int argc, char** argv )
WALBERLA_LOG_DEVEL_ON_ROOT(bs.size() << "\t" << pool["SCCD"].last() << "\t" << pool["HG"].last() << "\t" << sccd.getPossibleContacts().size() << "\t" << hg.getPossibleContacts().size() << "\t" << hg.active());
//std::cout << pool << std::endl;
}
+
+ return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SyncEquivalence.cpp b/tests/pe/SyncEquivalence.cpp
index c311e1d6728ebd00a11b86451b0a8b208ef94d33..f15dcd4c7bfa47bb74c1c77c3afd456ce0874a39 100644
--- a/tests/pe/SyncEquivalence.cpp
+++ b/tests/pe/SyncEquivalence.cpp
@@ -40,11 +40,11 @@
#include "python_coupling/CreateConfig.h"
#include "python_coupling/PythonCallback.h"
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
using namespace walberla::timing;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
struct BodyData
{
@@ -115,7 +115,7 @@ void createSimulation(math::AABB& simulationDomain,
info.ccdID = info.forest->addBlockData(ccd::createHashGridsDataHandling( info.globalBodyStorage, info.storageID ), "CCD");
info.fcdID = info.forest->addBlockData(fcd::createGenericFCDDataHandling<BodyTuple, fcd::AnalyticCollideFunctor>(), "FCD");
- info.cr = shared_ptr<cr::ICR>(new cr::HCSITS(info.globalBodyStorage, info.forest->getBlockStoragePointer(), info.storageID, info.ccdID, info.fcdID) );
+ info.cr = std::make_shared<cr::HCSITS>(info.globalBodyStorage, info.forest->getBlockStoragePointer(), info.storageID, info.ccdID, info.fcdID );
int numParticles = int_c(0);
@@ -126,8 +126,8 @@ void createSimulation(math::AABB& simulationDomain,
{
SphereID sp = pe::createSphere( *(info.globalBodyStorage.get()), info.forest->getBlockStorage(), info.storageID, static_cast<walberla::id_t>(mpi::MPIManager::instance()->worldRank() * 1000000 + numParticles), *it, radius);
Vec3 rndVel(math::realRandom<real_t>(-vMax, vMax, generator), math::realRandom<real_t>(-vMax, vMax, generator), math::realRandom<real_t>(-vMax, vMax, generator));
- if (sp != NULL) sp->setLinearVel(rndVel);
- if (sp != NULL) ++numParticles;
+ if (sp != nullptr) sp->setLinearVel(rndVel);
+ if (sp != nullptr) ++numParticles;
}
}
WALBERLA_LOG_INFO_ON_ROOT(numParticles << " particles created on root");
@@ -227,7 +227,7 @@ int main( int argc, char ** argv )
WALBERLA_CHECK_EQUAL(shadowOwnersIt1->blockID_, shadowOwnersIt2->blockID_);
}
- checkVitalParameters( static_cast<SphereID>(*bodyIt1), static_cast<SphereID>(*bodyIt2) );
+ checkVitalParameters( static_cast<SphereID>(bodyIt1.getBodyID()), static_cast<SphereID>(bodyIt2.getBodyID()) );
}
}
@@ -235,3 +235,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Synchronization.cpp b/tests/pe/Synchronization.cpp
index c8ad534ffe4d84a832ba4e4986eacc1e62d72501..646e6d2390fafa8066033ff23dee1a3467962ded 100644
--- a/tests/pe/Synchronization.cpp
+++ b/tests/pe/Synchronization.cpp
@@ -33,13 +33,12 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
-void checkSphere(StructuredBlockForest& forest, BlockDataID storageID, walberla::id_t sid, SphereID ref, const Vec3& newPos)
+void checkSphere(StructuredBlockForest& forest, BlockDataID storageID, walberla::id_t sid, Sphere& ref, const Vec3& newPos)
{
for (auto it = forest.begin(); it != forest.end(); ++it)
{
@@ -47,37 +46,37 @@ void checkSphere(StructuredBlockForest& forest, BlockDataID storageID, walberla:
Storage& storage = *(block.getData<Storage>(storageID));
BodyStorage& shadowStorage = storage[1];
- if (block.getAABB().contains( ref->getPosition() ))
+ if (block.getAABB().contains( ref.getPosition() ))
{
- WALBERLA_CHECK_EQUAL( storage[StorageType::LOCAL].size(), 1, "pos: " << ref->getPosition() << "\nradius: " << ref->getRadius() << "\ndomain: " << block.getAABB() );
- WALBERLA_CHECK_EQUAL( shadowStorage.size(), 0, "pos: " << ref->getPosition() << "\nradius: " << ref->getRadius() << "\ndomain: " << block.getAABB() );
- SphereID bd = static_cast<SphereID> (*(storage[StorageType::LOCAL].find( sid )));
+ WALBERLA_CHECK_EQUAL( storage[StorageType::LOCAL].size(), 1, "pos: " << ref.getPosition() << "\nradius: " << ref.getRadius() << "\ndomain: " << block.getAABB() );
+ WALBERLA_CHECK_EQUAL( shadowStorage.size(), 0, "pos: " << ref.getPosition() << "\nradius: " << ref.getRadius() << "\ndomain: " << block.getAABB() );
+ SphereID bd = static_cast<SphereID> (storage[StorageType::LOCAL].find( sid ).getBodyID());
WALBERLA_CHECK_NOT_NULLPTR(bd);
- checkVitalParameters(bd, ref);
+ checkVitalParameters(bd, &ref);
WALBERLA_LOG_DEVEL("#shadows: " << bd->MPITrait.sizeShadowOwners() << " #block states set: " << bd->MPITrait.getBlockStateSize() << "\nowner domain: " << block.getAABB() << "\nowner: " << bd->MPITrait.getOwner());
bd->setPosition( newPos );
- } else if (forest.periodicIntersect(block.getAABB(), ref->getAABB()) )
+ } else if (forest.periodicIntersect(block.getAABB(), ref.getAABB()) )
{
- WALBERLA_CHECK_EQUAL( storage[StorageType::LOCAL].size(), 0, "pos: " << ref->getPosition() << "\nradius: " << ref->getRadius() << "\ndomain: " << block.getAABB() );
- WALBERLA_CHECK_EQUAL( shadowStorage.size(), 1, "pos: " << ref->getPosition() << "\nradius: " << ref->getRadius() << "\ndomain: " << block.getAABB() );
- SphereID bd = static_cast<SphereID> (*(shadowStorage.find( sid )));
+ WALBERLA_CHECK_EQUAL( storage[StorageType::LOCAL].size(), 0, "pos: " << ref.getPosition() << "\nradius: " << ref.getRadius() << "\ndomain: " << block.getAABB() );
+ WALBERLA_CHECK_EQUAL( shadowStorage.size(), 1, "pos: " << ref.getPosition() << "\nradius: " << ref.getRadius() << "\ndomain: " << block.getAABB() );
+ SphereID bd = static_cast<SphereID> (shadowStorage.find( sid ).getBodyID());
WALBERLA_CHECK_NOT_NULLPTR(bd);
- auto backupPos =ref->getPosition();
- auto correctedPos = ref->getPosition();
+ auto backupPos =ref.getPosition();
+ auto correctedPos = ref.getPosition();
pe::communication::correctBodyPosition(forest.getDomain(), block.getAABB().center(), correctedPos);
- ref->setPosition(correctedPos);
- checkVitalParameters(bd, ref);
- ref->setPosition(backupPos);
+ ref.setPosition(correctedPos);
+ checkVitalParameters(bd, &ref);
+ ref.setPosition(backupPos);
} else
{
- WALBERLA_CHECK_EQUAL( storage[StorageType::LOCAL].size(), 0, "pos: " << ref->getPosition() << "\nradius: " << ref->getRadius() << "\ndomain: " << block.getAABB() );
- WALBERLA_CHECK_EQUAL( shadowStorage.size(), 0, "pos: " << ref->getPosition() << "\nradius: " << ref->getRadius() << "\ndomain: " << block.getAABB() );
+ WALBERLA_CHECK_EQUAL( storage[StorageType::LOCAL].size(), 0, "pos: " << ref.getPosition() << "\nradius: " << ref.getRadius() << "\ndomain: " << block.getAABB() );
+ WALBERLA_CHECK_EQUAL( shadowStorage.size(), 0, "pos: " << ref.getPosition() << "\nradius: " << ref.getRadius() << "\ndomain: " << block.getAABB() );
}
}
- WALBERLA_LOG_PROGRESS("checked pos: " << ref->getPosition() << " | new pos: " << newPos);
+ WALBERLA_LOG_PROGRESS("checked pos: " << ref.getPosition() << " | new pos: " << newPos);
auto temp = newPos;
forest.mapToPeriodicDomain(temp);
- ref->setPosition(temp);
+ ref.setPosition(temp);
}
int main( int argc, char ** argv )
@@ -117,15 +116,15 @@ int main( int argc, char ** argv )
MaterialID iron = Material::find("iron");
walberla::id_t sid = 123;
- SphereID refSphere = new Sphere(1, 0, Vec3(15, 15, 15), Vec3(0,0,0), Quat(), 3, iron, false, true, false);
- refSphere->setLinearVel(4, 5, 6);
- refSphere->setAngularVel( 1, 2, 3);
+ Sphere refSphere(1, 0, Vec3(15, 15, 15), Vec3(0,0,0), Quat(), 3, iron, false, true, false);
+ refSphere.setLinearVel(4, 5, 6);
+ refSphere.setAngularVel( 1, 2, 3);
Vec3 gpos = Vec3(15, 15, 15);
SphereID sphere = createSphere( globalStorage, forest->getBlockStorage(), storageID, 0, gpos, 3);
int sphereRank = -1;
- if (sphere != NULL)
+ if (sphere != nullptr)
{
sphere->setLinearVel(4, 5, 6);
sphere->setAngularVel( 1, 2, 3);
@@ -487,3 +486,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SynchronizationDelete.cpp b/tests/pe/SynchronizationDelete.cpp
index fb40078fd1e4b121b02684800cf22d7c7537a2c0..6b649c29872b57ce376a60c089a259ff0ad385dd 100644
--- a/tests/pe/SynchronizationDelete.cpp
+++ b/tests/pe/SynchronizationDelete.cpp
@@ -33,11 +33,10 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
void integrate(StructuredBlockForest& forest, BlockDataID storageID, const real_t dt)
{
@@ -61,6 +60,19 @@ int main( int argc, char ** argv )
// logging::Logging::instance()->setFileLogLevel( logging::Logging::DETAIL );
// logging::Logging::instance()->includeLoggingToFile("SyncLog");
+ bool syncShadowOwners = false;
+ for( int i = 1; i < argc; ++i )
+ {
+ if( std::strcmp( argv[i], "--syncShadowOwners" ) == 0 ) syncShadowOwners = true;
+ }
+ if (syncShadowOwners)
+ {
+ WALBERLA_LOG_DEVEL("running with syncShadowOwners");
+ } else
+ {
+ WALBERLA_LOG_DEVEL("running with syncNextNeighbour");
+ }
+
shared_ptr<BodyStorage> globalBodyStorage = make_shared<BodyStorage> ();
// create blocks
@@ -92,7 +104,7 @@ int main( int argc, char ** argv )
if ((fabs(x) > 0.1) || (fabs(y) > 0.1) || (fabs(z) > 0.1))
{
SphereID sp = createSphere( *globalBodyStorage, forest->getBlockStorage(), storageID, 0, Vec3(15,15,15), 3);
- if (sp != NULL) sp->setLinearVel(Vec3(x, y, z));
+ if (sp != nullptr) sp->setLinearVel(Vec3(x, y, z));
}
}
@@ -109,8 +121,17 @@ int main( int argc, char ** argv )
}
}
+ std::function<void(void)> syncCall;
+ if (!syncShadowOwners)
+ {
+ syncCall = std::bind( pe::syncNextNeighbors<BodyTuple>, std::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
+ } else
+ {
+ syncCall = std::bind( pe::syncShadowOwners<BodyTuple>, std::ref(forest->getBlockForest()), storageID, static_cast<WcTimingTree*>(nullptr), real_c(0.0), false );
+ }
+
for (int i = 0; i < 500; ++i){
- syncNextNeighbors<BodyTuple>(forest->getBlockForest(), storageID);
+ syncCall();
integrate(*forest, storageID, real_c(0.1));
}
@@ -126,3 +147,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/SynchronizationLargeBody.cpp b/tests/pe/SynchronizationLargeBody.cpp
index ab7123da2b10ac22081e798867e8584315fdc9d7..3846a2b55a9b61606c152f082a6f34af3cf46abb 100644
--- a/tests/pe/SynchronizationLargeBody.cpp
+++ b/tests/pe/SynchronizationLargeBody.cpp
@@ -32,11 +32,10 @@
#include <boost/tuple/tuple.hpp>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
-typedef boost::tuple<Sphere> BodyTuple ;
+using BodyTuple = boost::tuple<Sphere> ;
// checkSphere without dx
void checkSphere(StructuredBlockForest& forest, BlockDataID storageID, walberla::id_t sid, SphereID ref, const Vec3& newPos)
@@ -51,7 +50,7 @@ void checkSphere(StructuredBlockForest& forest, BlockDataID storageID, walberla:
{
WALBERLA_CHECK_EQUAL( storage[StorageType::LOCAL].size(), 1 );
WALBERLA_CHECK_EQUAL( shadowStorage.size(), 0 );
- SphereID bd = static_cast<SphereID> (*(storage[0].find( sid )));
+ SphereID bd = static_cast<SphereID> (storage[0].find( sid ).getBodyID());
WALBERLA_CHECK_NOT_NULLPTR(bd);
checkVitalParameters(bd, ref);
bd->setPosition( newPos );
@@ -59,7 +58,7 @@ void checkSphere(StructuredBlockForest& forest, BlockDataID storageID, walberla:
{
WALBERLA_CHECK_EQUAL( storage[0].size(), 0 );
WALBERLA_CHECK_EQUAL( shadowStorage.size(), 1 );
- SphereID bd = static_cast<SphereID> (*(shadowStorage.find( sid )));
+ SphereID bd = static_cast<SphereID> (shadowStorage.find( sid ).getBodyID());
WALBERLA_CHECK_NOT_NULLPTR(bd);
auto backupPos =ref->getPosition();
auto correctedPos = ref->getPosition();
@@ -92,7 +91,7 @@ void checkSphere(StructuredBlockForest& forest, BlockDataID storageID, walberla:
{
WALBERLA_CHECK_EQUAL( storage[StorageType::LOCAL].size(), 1 );
WALBERLA_CHECK_EQUAL( shadowStorage.size(), 0 );
- SphereID bd = static_cast<SphereID> (*(storage[0].find( sid )));
+ SphereID bd = static_cast<SphereID> (storage[0].find( sid ).getBodyID());
WALBERLA_CHECK_NOT_NULLPTR(bd);
checkVitalParameters(bd, ref);
bd->setPosition( newPos );
@@ -100,7 +99,7 @@ void checkSphere(StructuredBlockForest& forest, BlockDataID storageID, walberla:
{
WALBERLA_CHECK_EQUAL( storage[0].size(), 0 );
WALBERLA_CHECK_EQUAL( shadowStorage.size(), 1, "ref_sphere: " << ref << "\n" << block.getAABB() );
- SphereID bd = static_cast<SphereID> (*(shadowStorage.find( sid )));
+ SphereID bd = static_cast<SphereID> (shadowStorage.find( sid ).getBodyID());
WALBERLA_CHECK_NOT_NULLPTR(bd);
auto backupPos =ref->getPosition();
auto correctedPos = ref->getPosition();
@@ -161,17 +160,17 @@ int main( int argc, char ** argv )
walberla::id_t sid = 123;
Vec3 gpos = Vec3(3.5, 3.5, 3.5);
const real_t r = real_c(1.6);
- SphereID refSphere = new Sphere(1, 0, gpos, Vec3(0,0,0), Quat(), r, iron, false, true, false);
- refSphere->setLinearVel(4, 5, 6);
- refSphere->setAngularVel( 1, 2, 3);
+ Sphere refSphere(1, 0, gpos, Vec3(0,0,0), Quat(), r, iron, false, true, false);
+ refSphere.setLinearVel(4, 5, 6);
+ refSphere.setAngularVel( 1, 2, 3);
SphereID sphere = createSphere( *globalStorage, forest->getBlockStorage(), storageID, 0, gpos, r);
walberla::id_t sphereID = 789456123;
- if (sphere != NULL) sphereID = sphere->getSystemID();
+ if (sphere != nullptr) sphereID = sphere->getSystemID();
int sphereRank = -1;
- if (sphere != NULL)
+ if (sphere != nullptr)
{
sphere->setLinearVel(4, 5, 6);
sphere->setAngularVel( 1, 2, 3);
@@ -203,20 +202,20 @@ int main( int argc, char ** argv )
for (int i = 0; i < 21; ++i)
{
syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID);
- Vec3 pos = refSphere->getPosition() + delta;
+ Vec3 pos = refSphere.getPosition() + delta;
if (!forest->getDomain().contains( pos, real_c(0.5) ))
forest->mapToPeriodicDomain(pos);
- checkSphere(*forest, storageID, sid, refSphere, pos);
+ checkSphere(*forest, storageID, sid, &refSphere, pos);
}
}
WALBERLA_LOG_PROGRESS("TEST WITHOUT DX ... finished");
//test with dx
real_t dx = real_c(0.5);
- syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, NULL, dx);
- syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, NULL, dx);
- syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, NULL, dx);
- syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, NULL, dx);
+ syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, nullptr, dx);
+ syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, nullptr, dx);
+ syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, nullptr, dx);
+ syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, nullptr, dx);
for (auto dir = stencil::D3Q27::beginNoCenter(); dir != stencil::D3Q27::end(); ++dir)
{
@@ -224,19 +223,19 @@ int main( int argc, char ** argv )
Vec3 delta = Vec3( real_c(dir.cx()), real_c(dir.cy()), real_c(dir.cz()) ) / real_c(3.0);
for (int i = 0; i < 21; ++i)
{
- syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, NULL, dx);
- Vec3 pos = refSphere->getPosition() + delta;
+ syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, nullptr, dx);
+ Vec3 pos = refSphere.getPosition() + delta;
if (!forest->getDomain().contains( pos, real_c(0.5) ))
forest->mapToPeriodicDomain(pos);
- checkSphere(*forest, storageID, sid, refSphere, pos, dx);
+ checkSphere(*forest, storageID, sid, &refSphere, pos, dx);
}
}
- syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, NULL, dx);
+ syncShadowOwners<BodyTuple>(forest->getBlockForest(), storageID, nullptr, dx);
WALBERLA_LOG_PROGRESS("TEST WITH DX ... finished");
sphere = static_cast<SphereID> (getBody(*globalStorage, forest->getBlockStorage(), storageID, sphereID));
- if (sphere != NULL)
+ if (sphere != nullptr)
{
// WALBERLA_LOG_DEVEL("pos: " << sphere->getPosition());
// WALBERLA_LOG_DEVEL("aabb: " << sphere->getAABB());
@@ -253,3 +252,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/Union.cpp b/tests/pe/Union.cpp
index 6cd0aec53e1e26b978b0085a67a04ae74b15fc0e..91db8412e917ffb127d1432d8524a7c25a9526d6 100644
--- a/tests/pe/Union.cpp
+++ b/tests/pe/Union.cpp
@@ -25,6 +25,7 @@
#include "pe/basic.h"
#include "pe/rigidbody/Union.h"
+#include "pe/rigidbody/UnionFactory.h"
#include "pe/ccd/SimpleCCDDataHandling.h"
#include "pe/synchronization/SyncNextNeighbors.h"
#include "pe/vtk/BodyVtkOutput.h"
@@ -40,11 +41,10 @@
#include <algorithm>
#include <vector>
-using namespace walberla;
+namespace walberla {
using namespace walberla::pe;
-using namespace walberla::blockforest;
-typedef Union< boost::tuple<Sphere> > UnionType ;
+using UnionType = Union<boost::tuple<Sphere> > ;
typedef boost::tuple<Sphere, Plane, UnionType> BodyTuple ;
void SnowManFallingOnPlane()
@@ -75,12 +75,9 @@ void SnowManFallingOnPlane()
createPlane( *globalBodyStorage, 0, Vec3(0,0,1), Vec3(0,0,0) );
- MaterialID iron = Material::find("iron");
- UnionType* un = createUnion< boost::tuple<Sphere> >( *globalBodyStorage, forest->getBlockStorage(), storageID, 0, Vec3(5,5,5) );
- SphereID sp1 = new Sphere( 10, 0, Vec3(5,5,1), Vec3(0,0,0), Quat(), real_t(1) , iron, false, true, false );
- SphereID sp2 = new Sphere( 11, 0, Vec3(real_t(6.7),5,real_t(1.2)), Vec3(0,0,0), Quat(), real_t(1.1), iron, false, true, false );
- un->add(sp1);
- un->add(sp2);
+ UnionType* un = createUnion< boost::tuple<Sphere> >( *globalBodyStorage, forest->getBlockStorage(), storageID, 0, Vec3(5,5,5) );
+ auto sp1 = createSphere(un, 10, Vec3(5,5,1), real_t(1));
+ auto sp2 = createSphere(un, 11, Vec3(real_t(6.7),5,real_t(1.2)), real_t(1.1));
auto distance = (sp1->getPosition() - sp2->getPosition()).length();
@@ -106,14 +103,15 @@ void ImpulsCarryover()
{
MaterialID iron = Material::find("iron");
- UnionType* un = new Union< boost::tuple<Sphere> >(12, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), false, true, false);
- SphereID sp1 = new Sphere( 10, 0, Vec3( 1,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
- SphereID sp2 = new Sphere( 11, 0, Vec3(-1,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
+ auto un = std::make_unique<UnionType>(12, 0, Vec3(0,0,0), Vec3(0,0,0), Quat(), false, true, false);
+ auto sp1 = std::make_unique<Sphere>( 10, 0, Vec3( 1,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
+ auto sp2 = std::make_unique<Sphere>( 11, 0, Vec3(-1,0,0), Vec3(0,0,0), Quat(), real_t(1), iron, false, true, false );
+
sp1->setLinearVel(Vec3(0,real_c(+1),0));
sp2->setLinearVel(Vec3(0,real_c(-1),0));
- un->add(sp1);
- un->add(sp2);
+ un->add( std::move(sp1) );
+ un->add( std::move(sp2) );
WALBERLA_CHECK_FLOAT_EQUAL( un->getPosition(), Vec3(0,0,0) );
WALBERLA_CHECK_FLOAT_EQUAL( un->getLinearVel(), Vec3(0,0,0) );
@@ -133,3 +131,9 @@ int main( int argc, char ** argv )
return EXIT_SUCCESS;
}
+} // namespace walberla
+
+int main( int argc, char* argv[] )
+{
+ return walberla::main( argc, argv );
+}
\ No newline at end of file
diff --git a/tests/pe/VolumeInertia.cpp b/tests/pe/VolumeInertia.cpp
index becd6ddd37b8fbd8380d4bf20def053a6b40b1c4..6deebadad13baf8921848700e28170d483b9cada 100644
--- a/tests/pe/VolumeInertia.cpp
+++ b/tests/pe/VolumeInertia.cpp
@@ -36,7 +36,7 @@ void calcNumeric( const ContainmentT & body, const AABB & aabb, const real_t spa
uint_t volume = 0;
math::KahanAccumulator<real_t> centroid[3];
- math::KahanAccumulator<real_t> intertiaTensor[6];
+ math::KahanAccumulator<real_t> inertiaTensor[6];
uint_t numPoints = 0;
for(grid_generator::SCIterator it( aabb, pointOfReference, spacing ); it != grid_generator::SCIterator(); ++it)
@@ -57,12 +57,12 @@ void calcNumeric( const ContainmentT & body, const AABB & aabb, const real_t spa
const real_t & y = p[1];
const real_t & z = p[2];
- intertiaTensor[0] += y*y + z*z;
- intertiaTensor[1] += -x*y;
- intertiaTensor[2] += -x*z;
- intertiaTensor[3] += x*x + z*z;
- intertiaTensor[4] += -y*z;
- intertiaTensor[5] += x*x + y*y;
+ inertiaTensor[0] += y*y + z*z;
+ inertiaTensor[1] += -x*y;
+ inertiaTensor[2] += -x*z;
+ inertiaTensor[3] += x*x + z*z;
+ inertiaTensor[4] += -y*z;
+ inertiaTensor[5] += x*x + y*y;
++numPoints;
}
}
@@ -71,9 +71,9 @@ void calcNumeric( const ContainmentT & body, const AABB & aabb, const real_t spa
auto dm = dV * Material::getDensity( body.getMaterial() );
outVolume = real_c(volume) * dV;
outCOM = Vec3( centroid[0].get(), centroid[1].get(), centroid[2].get() ) / real_c(numPoints);
- outInertia = Mat3( intertiaTensor[0].get(), intertiaTensor[1].get(), intertiaTensor[2].get(),
- intertiaTensor[1].get(), intertiaTensor[3].get(), intertiaTensor[4].get(),
- intertiaTensor[2].get(), intertiaTensor[4].get(), intertiaTensor[5].get() ) * dm;
+ outInertia = Mat3( inertiaTensor[0].get(), inertiaTensor[1].get(), inertiaTensor[2].get(),
+ inertiaTensor[1].get(), inertiaTensor[3].get(), inertiaTensor[4].get(),
+ inertiaTensor[2].get(), inertiaTensor[4].get(), inertiaTensor[5].get() ) * dm;
}
int main( int argc, char ** argv )
diff --git a/tests/pe_coupling/CMakeLists.txt b/tests/pe_coupling/CMakeLists.txt
index 1803b3090ccc1f744a4b1711a81ac3b8732d2828..81fc07d822a0453b9b12454a07508c646fe0aa42 100644
--- a/tests/pe_coupling/CMakeLists.txt
+++ b/tests/pe_coupling/CMakeLists.txt
@@ -156,3 +156,23 @@ waLBerla_execute_test( NAME SphereWallCollisionBehaviorDPMFuncTest COMMAND $<TAR
waLBerla_compile_test( FILES discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp DEPENDS blockforest pe timeloop )
waLBerla_execute_test( NAME HinderedSettlingDynamicsDPMFuncTest COMMAND $<TARGET_FILE:HinderedSettlingDynamicsDPM> --funcTest PROCESSES 4 LABELS longrun CONFIGURATIONS RelWithDbgInfo )
+
+###################################################################################################
+# Geometry tests
+###################################################################################################
+
+waLBerla_compile_test( FILES geometry/PeIntersectionRatioTest.cpp DEPENDS pe )
+waLBerla_execute_test( NAME PeIntersectionRatioTest COMMAND $<TARGET_FILE:PeIntersectionRatioTest> PROCESSES 1 )
+
+###################################################################################################
+# Utility tests
+###################################################################################################
+
+waLBerla_compile_test( FILES utility/BodiesForceTorqueContainerTest.cpp DEPENDS blockforest pe timeloop )
+waLBerla_execute_test( NAME BodiesForceTorqueContainerTest COMMAND $<TARGET_FILE:BodiesForceTorqueContainerTest> PROCESSES 1 )
+waLBerla_execute_test( NAME BodiesForceTorqueContainerParallelTest COMMAND $<TARGET_FILE:BodiesForceTorqueContainerTest> PROCESSES 3 )
+
+waLBerla_compile_test( FILES utility/PeSubCyclingTest.cpp DEPENDS blockforest pe timeloop )
+waLBerla_execute_test( NAME PeSubCyclingTest COMMAND $<TARGET_FILE:PeSubCyclingTest> PROCESSES 1 )
+waLBerla_execute_test( NAME PeSubCyclingParallelTest COMMAND $<TARGET_FILE:PeSubCyclingTest> PROCESSES 3 )
+
diff --git a/tests/pe_coupling/discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp b/tests/pe_coupling/discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp
index d9fd267079e1b78d322a80ff1e7afdd1aabc3755..80d152379546eb88a70eca1ed23cead805b32466 100644
--- a/tests/pe_coupling/discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp
+++ b/tests/pe_coupling/discrete_particle_methods/HinderedSettlingDynamicsDPM.cpp
@@ -29,6 +29,8 @@
#include "core/grid_generator/SCIterator.h"
#include "core/logging/all.h"
+#include <domain_decomposition/SharedSweep.h>
+
#include "field/AddToStorage.h"
#include "field/communication/PackInfo.h"
#include "field/distributors/all.h"
@@ -44,6 +46,7 @@
#include "vtk/VTKOutput.h"
+#include <functional>
#include <vector>
#include <iomanip>
#include <iostream>
@@ -74,19 +77,19 @@ const uint_t FieldGhostLayers( 1 );
typedef GhostLayerField< Matrix3<real_t>, 1 > TensorField_T;
typedef GhostLayerField< Vector3<real_t>, 1 > Vec3Field_T;
typedef GhostLayerField< real_t, 1 > ScalarField_T;
-typedef lbm::force_model::GuoField< Vec3Field_T > ForceModel_T;
+using ForceModel_T = lbm::force_model::GuoField<Vec3Field_T>;
typedef lbm::D3Q19< lbm::collision_model::SRTField<ScalarField_T>, false, ForceModel_T > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
// boundary handling
typedef lbm::NoSlip< LatticeModel_T, flag_t > NoSlip_T;
-typedef boost::tuples::tuple< NoSlip_T > BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<NoSlip_T>;
typedef BoundaryHandling<FlagField_T, Stencil_T, BoundaryConditions_T> BoundaryHandling_T;
typedef boost::tuple<pe::Plane, pe::Sphere> BodyTypeTuple ;
@@ -272,7 +275,7 @@ uint_t createSpheresRandomly( StructuredBlockForest & forest, pe::BodyStorage &
pe::SphereID sp = pe::createSphere( globalBodyStorage, forest.getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( xParticle, yParticle, zParticle ), diameter * real_t(0.5), material );
- if( sp != NULL )
+ if( sp != nullptr )
{
sp->setLinearVel(Vector3<real_t>(real_t(0),real_t(0),initialZVelocity));
}
@@ -301,7 +304,7 @@ uint_t createSphereLattice( StructuredBlockForest & forest, pe::BodyStorage & gl
{
pe::SphereID sp = pe::createSphere( globalBodyStorage, forest.getBlockStorage(), bodyStorageID, 0, *it, diameter * real_t(0.5), material );
- if( sp != NULL )
+ if( sp != nullptr )
{
sp->setLinearVel(Vector3<real_t>(real_t(0),real_t(0),initialZVelocity));
++numSpheres;
@@ -557,7 +560,7 @@ class DummySweep
{
public:
DummySweep( )
- {}
+ = default;
void operator()(IBlock * const /*block*/)
{}
@@ -851,7 +854,7 @@ int main( int argc, char **argv )
// connect to pe
const real_t overlap = real_t( 1.5 ) * dx;
- auto syncCall = boost::bind( pe::syncNextNeighbors<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ auto syncCall = std::bind( pe::syncNextNeighbors<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
shared_ptr<CollisionPropertiesEvaluator> collisionPropertiesEvaluator = walberla::make_shared<CollisionPropertiesEvaluator>( *cr );
// create the spheres
@@ -1147,7 +1150,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::NearestNeighborFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -1155,7 +1158,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
} else if (interpol == Interpolation::IKernel) {
if (dist == Distribution::DNearestNeighbor) {
@@ -1165,7 +1168,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::KernelFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -1173,7 +1176,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
} else if (interpol == Interpolation::ITrilinear) {
if (dist == Distribution::DNearestNeighbor) {
@@ -1183,7 +1186,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::TrilinearFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -1191,7 +1194,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
}
@@ -1211,7 +1214,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1219,7 +1222,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::IKernel )
@@ -1230,7 +1233,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1238,7 +1241,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::ITrilinear )
@@ -1249,7 +1252,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1257,7 +1260,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
@@ -1271,7 +1274,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1279,7 +1282,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::IKernel )
@@ -1290,7 +1293,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1298,7 +1301,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::ITrilinear )
@@ -1309,7 +1312,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1317,7 +1320,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
@@ -1327,15 +1330,15 @@ int main( int argc, char **argv )
{
if( useLubricationCorrection )
{
- typedef pe_coupling::LubricationCorrection LE_T;
+ using LE_T = pe_coupling::LubricationCorrection;
shared_ptr<LE_T> lubEval = make_shared<LE_T>( blocks, globalBodyStorage, bodyStorageID, viscosity, lubricationCutOffDistance );
- lubricationEvaluationFunction = boost::bind(&LE_T::operator(), lubEval);
+ lubricationEvaluationFunction = std::bind(&LE_T::operator(), lubEval);
}
else
{
- typedef pe_coupling::discrete_particle_methods::LubricationForceEvaluator LE_T;
+ using LE_T = pe_coupling::discrete_particle_methods::LubricationForceEvaluator;
shared_ptr<LE_T> lubEval = make_shared<LE_T>( blocks, globalBodyStorage, bodyStorageID, viscosity, lubricationCutOffDistance );
- lubricationEvaluationFunction = boost::bind(&LE_T::operator(), lubEval);
+ lubricationEvaluationFunction = std::bind(&LE_T::operator(), lubEval);
}
} else {
lubricationEvaluationFunction = emptyFunction;
@@ -1343,7 +1346,7 @@ int main( int argc, char **argv )
// function to evaluate the mean fluid velocity
- std::function<Vector3<real_t> ()> evaluateMeanFluidVelocity = boost::bind(getGNSMeanFluidVelocity, blocks, pdfFieldID, svfFieldID, domainVolume);
+ std::function<Vector3<real_t> ()> evaluateMeanFluidVelocity = std::bind(getGNSMeanFluidVelocity, blocks, pdfFieldID, svfFieldID, domainVolume);
//////////////////////////////
diff --git a/tests/pe_coupling/discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp b/tests/pe_coupling/discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp
index 5ec32af40e6dc4dae10443bdb2f31f1bd01c791f..2cbdd76dc50ff5df1d5ae15dfe98a02fcbeb4c6a 100644
--- a/tests/pe_coupling/discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp
+++ b/tests/pe_coupling/discrete_particle_methods/SphereWallCollisionBehaviorDPM.cpp
@@ -28,6 +28,8 @@
#include "core/grid_generator/SCIterator.h"
+#include <domain_decomposition/SharedSweep.h>
+
#include "field/AddToStorage.h"
#include "field/communication/PackInfo.h"
#include "field/distributors/all.h"
@@ -44,6 +46,7 @@
#include "vtk/VTKOutput.h"
#include <vector>
+#include <functional>
#include <iomanip>
#include <iostream>
#include <random>
@@ -73,19 +76,19 @@ const uint_t FieldGhostLayers( 1 );
typedef GhostLayerField< Matrix3<real_t>, 1 > TensorField_T;
typedef GhostLayerField< Vector3<real_t>, 1 > Vec3Field_T;
typedef GhostLayerField< real_t, 1 > ScalarField_T;
-typedef lbm::force_model::GuoField< Vec3Field_T > ForceModel_T;
+using ForceModel_T = lbm::force_model::GuoField<Vec3Field_T>;
typedef lbm::D3Q19< lbm::collision_model::SRTField<ScalarField_T>, false, ForceModel_T > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
// boundary handling
typedef lbm::NoSlip< LatticeModel_T, flag_t > NoSlip_T;
-typedef boost::tuples::tuple< NoSlip_T > BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<NoSlip_T>;
typedef BoundaryHandling<FlagField_T, Stencil_T, BoundaryConditions_T> BoundaryHandling_T;
typedef boost::tuple<pe::Plane, pe::Sphere> BodyTypeTuple ;
@@ -698,7 +701,7 @@ int main( int argc, char **argv )
// connect to pe
const real_t overlap = real_t( 1.5 ) * dx;
- auto syncCall = boost::bind( pe::syncNextNeighbors<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ auto syncCall = std::bind( pe::syncNextNeighbors<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create the sphere
const real_t restitutionCoeff = real_t(0.97);
@@ -943,7 +946,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::NearestNeighborFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -951,7 +954,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
} else if (interpol == Interpolation::IKernel) {
if (dist == Distribution::DNearestNeighbor) {
@@ -961,7 +964,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::KernelFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -969,7 +972,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
} else if (interpol == Interpolation::ITrilinear) {
if (dist == Distribution::DNearestNeighbor) {
@@ -979,7 +982,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
} else if (dist == Distribution::DKernel) {
typedef pe_coupling::discrete_particle_methods::InteractionForceEvaluator<FlagField_T, field::TrilinearFieldInterpolator, field::KernelDistributor> IFE_T;
shared_ptr<IFE_T> forceEvaluatorPtr = make_shared<IFE_T>(blocks, dragForceFieldID, bodyStorageID,
@@ -987,7 +990,7 @@ int main( int argc, char **argv )
velocityFieldID, svfFieldID,
pressureGradientFieldID, dragCorrelationFunction,
viscosity);
- dragAndPressureForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ dragAndPressureForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
}
@@ -1007,7 +1010,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1015,7 +1018,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::IKernel )
@@ -1026,7 +1029,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1034,7 +1037,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::ITrilinear )
@@ -1045,7 +1048,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1053,7 +1056,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, liftForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
velocityFieldID, velocityCurlFieldID, liftCorrelationFunction,
viscosity );
- liftForceEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ liftForceEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
@@ -1068,7 +1071,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1076,7 +1079,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::IKernel )
@@ -1087,7 +1090,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1095,7 +1098,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
else if( interpol == Interpolation::ITrilinear )
@@ -1106,7 +1109,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
else if( dist == Distribution::DKernel )
{
@@ -1114,7 +1117,7 @@ int main( int argc, char **argv )
shared_ptr< IFE_T > forceEvaluatorPtr = make_shared< IFE_T > ( blocks, amForceFieldID, bodyStorageID, flagFieldID, Fluid_Flag,
timeDerivativeVelocityFieldID, addedMassCorrelationFunction,
bodyVelocityTimeDerivativeEvaluator );
- addedMassEvaluationFunction = boost::bind(&IFE_T::operator(), forceEvaluatorPtr);
+ addedMassEvaluationFunction = std::bind(&IFE_T::operator(), forceEvaluatorPtr);
}
}
@@ -1124,15 +1127,15 @@ int main( int argc, char **argv )
{
if( useLubricationCorrection )
{
- typedef pe_coupling::LubricationCorrection LE_T;
+ using LE_T = pe_coupling::LubricationCorrection;
shared_ptr<LE_T> lubEval = make_shared<LE_T>( blocks, globalBodyStorage, bodyStorageID, viscosity, lubricationCutOffDistance );
- lubricationEvaluationFunction = boost::bind(&LE_T::operator(), lubEval);
+ lubricationEvaluationFunction = std::bind(&LE_T::operator(), lubEval);
}
else
{
- typedef pe_coupling::discrete_particle_methods::LubricationForceEvaluator LE_T;
+ using LE_T = pe_coupling::discrete_particle_methods::LubricationForceEvaluator;
shared_ptr<LE_T> lubEval = make_shared<LE_T>( blocks, globalBodyStorage, bodyStorageID, viscosity, lubricationCutOffDistance );
- lubricationEvaluationFunction = boost::bind(&LE_T::operator(), lubEval);
+ lubricationEvaluationFunction = std::bind(&LE_T::operator(), lubEval);
}
} else {
lubricationEvaluationFunction = emptyFunction;
diff --git a/tests/pe_coupling/geometry/PeIntersectionRatioTest.cpp b/tests/pe_coupling/geometry/PeIntersectionRatioTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..1ad423385b1bfc256c0812296e80151b50772a01
--- /dev/null
+++ b/tests/pe_coupling/geometry/PeIntersectionRatioTest.cpp
@@ -0,0 +1,160 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file PeIntersectionRatioTest.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "core/DataTypes.h"
+#include "core/Environment.h"
+#include "core/debug/TestSubsystem.h"
+#include "core/math/all.h"
+
+#include "pe/rigidbody/Ellipsoid.h"
+#include "pe/rigidbody/Plane.h"
+#include "pe/rigidbody/Sphere.h"
+#include "pe/rigidbody/SetBodyTypeIDs.h"
+#include "pe/Materials.h"
+
+#include "pe_coupling/geometry/PeIntersectionRatio.h"
+
+namespace pe_intersection_ratio_test
+{
+
+///////////
+// USING //
+///////////
+
+using namespace walberla;
+
+typedef boost::tuple<pe::Sphere, pe::Plane, pe::Ellipsoid> BodyTypeTuple;
+
+/*!\brief TODO
+ */
+//////////
+// MAIN //
+//////////
+int main( int argc, char **argv )
+{
+ debug::enterTestMode();
+
+ mpi::Environment env( argc, argv );
+
+ pe::SetBodyTypeIDs<BodyTypeTuple>::execute(); //important to be able to compare static body types in intersection function!
+
+ const real_t epsilon( real_t(1e-5) );
+
+ walberla::id_t sid = 0;
+ walberla::id_t uid = 0;
+
+ Vector3<real_t> rPos( real_t(0));
+ Vector3<real_t> rotationAngles( real_t(0));
+ Quaternion<real_t> quat( rotationAngles );
+ pe::MaterialID material = pe::Material::find("iron");
+
+
+ ////////////
+ // SPHERE //
+ ////////////
+ {
+ Vector3<real_t> bodyPos(real_t(1), real_t(0), real_t(0));
+ real_t radius = real_t(1);
+
+ pe::Sphere sphere(++sid, ++uid, bodyPos, rPos, quat, radius, material, false, false, false);
+
+ pe::RigidBody & rb = sphere; // otherwise not the pe_coupling/geometry version is matched
+
+ Vector3<real_t> pos1(real_t(-0.5), real_t(0), real_t(0));
+ Vector3<real_t> dir1(real_t(1), real_t(0), real_t(0));
+ real_t delta1 = walberla::lbm::intersectionRatio(rb, pos1, dir1, epsilon );
+ WALBERLA_CHECK_FLOAT_EQUAL(delta1, real_t(0.5), "Intersection ratio with sphere wrong!");
+
+ Vector3<real_t> pos2(real_t(1), real_t(1), real_t(1));
+ Vector3<real_t> dir2(real_t(0), -real_t(1), -real_t(1));
+ real_t delta2 = walberla::lbm::intersectionRatio(rb, pos2, dir2, epsilon );
+ WALBERLA_CHECK_FLOAT_EQUAL(delta2, (std::sqrt(2) - real_t(1)) / std::sqrt(2), "Intersection ratio with sphere wrong!");
+ }
+
+ ///////////
+ // PLANE //
+ ///////////
+ {
+ Vector3<real_t> bodyPos(real_t(1), real_t(0), real_t(0));
+ Vector3<real_t> bodyNormal(real_t(0), real_t(1), real_t(1));
+
+ bodyNormal = bodyNormal.getNormalized();
+
+ pe::Plane plane(++sid, ++uid, bodyPos, bodyNormal, bodyPos * bodyNormal, material);
+
+ pe::RigidBody & rb = plane; // otherwise not the pe_coupling/geometry version is matched
+
+ Vector3<real_t> pos1(real_t(1), real_t(0.5), real_t(0.5));
+ Vector3<real_t> dir1(real_t(0), -real_t(1), -real_t(1));
+ real_t delta1 = walberla::lbm::intersectionRatio(rb, pos1, dir1, epsilon );
+ WALBERLA_CHECK_FLOAT_EQUAL(delta1, real_t(0.5), "Intersection ratio with plane wrong!");
+
+ Vector3<real_t> dir2(real_t(0), real_t(0), -real_t(2));
+ real_t delta2 = walberla::lbm::intersectionRatio(rb, pos1, dir2, epsilon );
+ WALBERLA_CHECK_FLOAT_EQUAL(delta2, real_t(0.5), "Intersection ratio with plane wrong!");
+
+ Vector3<real_t> dir3(real_t(0), -real_t(3), real_t(0));
+ real_t delta3 = walberla::lbm::intersectionRatio(rb, pos1, dir3, epsilon );
+ WALBERLA_CHECK_FLOAT_EQUAL(delta3, real_t(1)/real_t(3), "Intersection ratio with plane wrong!");
+ }
+
+ ///////////////
+ // ELLIPSOID //
+ ///////////////
+ {
+ Vector3<real_t> bodyPos(real_t(1), real_t(0), real_t(0));
+ Vector3<real_t> semiAxes1(real_t(1), real_t(1), real_t(1));
+
+ pe::Ellipsoid ellip1(++sid, ++uid, bodyPos, rPos, quat, semiAxes1, material, false, false, false);
+
+ pe::RigidBody & rb1 = ellip1; // otherwise not the pe_coupling/geometry version is matched
+
+ Vector3<real_t> pos1(real_t(-0.5), real_t(0), real_t(0));
+ Vector3<real_t> dir1(real_t(1), real_t(0), real_t(0));
+ real_t delta1 = walberla::lbm::intersectionRatio(rb1, pos1, dir1, epsilon );
+ WALBERLA_CHECK_FLOAT_EQUAL(delta1, real_t(0.5), "Intersection ratio with ellipsoid wrong!");
+
+ Vector3<real_t> pos2(real_t(1), real_t(1), real_t(1));
+ Vector3<real_t> dir2(real_t(0), -real_t(1), -real_t(1));
+ real_t delta2 = walberla::lbm::intersectionRatio(rb1, pos2, dir2, epsilon );
+ WALBERLA_CHECK_FLOAT_EQUAL(delta2, (std::sqrt(2) - real_t(1)) / std::sqrt(2), "Intersection ratio with ellipsoid wrong!");
+
+ Vector3<real_t> semiAxes2(real_t(2), real_t(0.5), real_t(2));
+ pe::Ellipsoid ellip2(++sid, ++uid, bodyPos, rPos, quat, semiAxes2, material, false, false, false);
+
+ pe::RigidBody & rb2 = ellip2; // otherwise not the pe_coupling/geometry version is matched
+
+ Vector3<real_t> pos3(real_t(1), real_t(1), real_t(0));
+ Vector3<real_t> dir3(real_t(0), real_t(-1), real_t(0));
+ real_t delta3 = walberla::lbm::intersectionRatio(rb2, pos3, dir3, epsilon );
+ WALBERLA_CHECK_FLOAT_EQUAL(delta3, real_t(0.5), "Intersection ratio with ellipsoid wrong!");
+
+ }
+
+ return 0;
+
+}
+
+} //namespace pe_intersection_ratio_test
+
+int main( int argc, char **argv ){
+ pe_intersection_ratio_test::main(argc, argv);
+}
diff --git a/tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp b/tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp
index 4133741c77ebb5f7bf427b77ad096f0ab0c2ea33..c7ac8a324c6d82134bd1153e9e6cb284a7908801 100644
--- a/tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/BodyAtBlockBoarderCheck.cpp
@@ -21,6 +21,8 @@
#include "blockforest/Initialization.h"
#include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
#include "boundary/all.h"
@@ -64,6 +66,7 @@
#include <vector>
#include <iomanip>
#include <iostream>
+#include <functional>
namespace body_at_block_boarder_check
{
@@ -76,23 +79,23 @@ using namespace walberla;
using walberla::uint_t;
// PDF field, flag field & body field
-typedef lbm::D3Q19< lbm::collision_model::TRT > LatticeModel_T;
+using LatticeModel_T = lbm::D3Q19<lbm::collision_model::TRT>;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
const uint_t FieldGhostLayers = 4;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
// boundary handling
typedef pe_coupling::SimpleBB< LatticeModel_T, FlagField_T > MO_T;
-typedef boost::tuples::tuple< MO_T > BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<MO_T>;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple ;
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
///////////
// FLAGS //
@@ -132,7 +135,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( AABB domainAABB
uint_c(domainAABB.zMax()) / blockSizeInCells[2] );
AABB refinementBox( domainAABB.xMin(), domainAABB.yMin(), domainAABB.zMin(), domainAABB.xMax() * real_c(0.5), domainAABB.yMax(), domainAABB.zMax() );
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, numberOfLevels, refinementBox ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, numberOfLevels, refinementBox ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( domainAABB, numberOfCoarseBlocksPerDirection[0], numberOfCoarseBlocksPerDirection[1], numberOfCoarseBlocksPerDirection[2], true, true, true );
@@ -281,18 +284,18 @@ int main( int argc, char **argv )
// connect to pe
const real_t overlap = real_c( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
auto sphereMaterialID = pe::createMaterial( "sphereMat", real_c(1) , real_c(0.3), real_c(0.2), real_c(0.2), real_c(0.24), real_c(200), real_c(200), real_c(0), real_c(0) );
// create two spheres: one which overlaps with a block boundary and one inside the block
pe::Vec3 referenceVelocity( real_c(0.1), real_c(0), real_c(0) );
auto sphereAtBorder = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_c(31), real_c(31), real_c(31) ), radius, sphereMaterialID );
- if( sphereAtBorder != NULL )
+ if( sphereAtBorder != nullptr )
{
sphereAtBorder->setLinearVel( referenceVelocity );
}
auto sphereInInner = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_c(7), real_c(7), real_c(7) ), radius, sphereMaterialID );
- if( sphereInInner != NULL )
+ if( sphereInInner != nullptr )
{
sphereInInner->setLinearVel( referenceVelocity );
}
@@ -314,7 +317,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field", FieldGhostLayers );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf, FieldGhostLayers );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf, FieldGhostLayers );
// add boundary handling & initialize outer domain boundaries
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(
diff --git a/tests/pe_coupling/momentum_exchange_method/BodyMappingTest.cpp b/tests/pe_coupling/momentum_exchange_method/BodyMappingTest.cpp
index 0c527317c58a43c8eab8b835e59772bd9df3042c..695b8740056f5cc91835f302c2816a2c53b67441 100644
--- a/tests/pe_coupling/momentum_exchange_method/BodyMappingTest.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/BodyMappingTest.cpp
@@ -60,15 +60,15 @@ using namespace walberla;
using walberla::uint_t;
// PDF field, flag field & body field
-typedef lbm::D3Q19< lbm::collision_model::SRT > LatticeModel_T;
+using LatticeModel_T = lbm::D3Q19<lbm::collision_model::SRT>;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
const uint_t FieldGhostLayers = 1;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
// boundary handling
@@ -77,7 +77,7 @@ typedef pe_coupling::SimpleBB< LatticeModel_T, FlagField_T > MO_T;
typedef boost::tuples::tuple< NoSlip_T, MO_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple ;
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
///////////
// FLAGS //
@@ -457,7 +457,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field", FieldGhostLayers );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf, FieldGhostLayers );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf, FieldGhostLayers );
// add boundary handling
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(MyBoundaryHandling( flagFieldID, pdfFieldID, bodyFieldID ), "boundary handling" );
@@ -504,7 +504,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionInsideBlock, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectRegularBodies );
@@ -517,7 +517,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
/////////////////////
@@ -529,7 +529,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionInsideBlock, radius, sphereMaterialID, true, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectGlobalBodies );
@@ -542,7 +542,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////
@@ -554,7 +554,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionInsideBlock, radius, sphereMaterialID, false, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectFixedBodies );
@@ -567,7 +567,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
}
//////////////////////////////////
@@ -583,7 +583,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtBlockBoarder, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectRegularBodies );
@@ -596,7 +596,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
/////////////////////
@@ -608,7 +608,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtBlockBoarder, radius, sphereMaterialID, true, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectGlobalBodies );
@@ -621,7 +621,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////
@@ -633,7 +633,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtBlockBoarder, radius, sphereMaterialID, false, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectFixedBodies );
@@ -646,7 +646,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
}
/////////////////////////////////////
@@ -662,7 +662,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtPeriodicBoarder, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectRegularBodies );
@@ -675,7 +675,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
/////////////////////
@@ -693,7 +693,7 @@ int main( int argc, char **argv )
pe::SphereID sp2 = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtPeriodicBoarderCopy, radius, sphereMaterialID, true, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectGlobalBodies );
@@ -707,7 +707,7 @@ int main( int argc, char **argv )
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp2->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////
@@ -719,7 +719,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtPeriodicBoarder, radius, sphereMaterialID, false, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
pe_coupling::mapBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, NoSlip_Flag, pe_coupling::selectFixedBodies );
@@ -732,7 +732,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
}
//////////////////////////
@@ -752,7 +752,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionInsideBlock, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectRegularBodies );
@@ -766,7 +766,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////////
@@ -778,7 +778,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionInsideBlock, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) regularBodyMapper(&(*blockIt));
@@ -792,7 +792,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
/////////////////////
@@ -804,7 +804,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionInsideBlock, radius, sphereMaterialID, true, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectGlobalBodies );
@@ -818,7 +818,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////////
@@ -830,7 +830,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionInsideBlock, radius, sphereMaterialID, true, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) globalBodyMapper(&(*blockIt));
@@ -844,7 +844,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////
@@ -856,7 +856,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionInsideBlock, radius, sphereMaterialID, false, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectFixedBodies );
@@ -870,7 +870,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
}
//////////////////////////////////
@@ -886,7 +886,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtBlockBoarder, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectRegularBodies );
@@ -900,7 +900,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////////
@@ -912,7 +912,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtBlockBoarder, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) regularBodyMapper(&(*blockIt));
@@ -926,7 +926,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
/////////////////////
@@ -938,7 +938,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtBlockBoarder, radius, sphereMaterialID, true, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectGlobalBodies );
@@ -952,7 +952,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////////
@@ -964,7 +964,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtBlockBoarder, radius, sphereMaterialID, true, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) globalBodyMapper(&(*blockIt));
@@ -978,7 +978,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////
@@ -990,7 +990,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtBlockBoarder, radius, sphereMaterialID, false, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectFixedBodies );
@@ -1004,7 +1004,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
}
/////////////////////////////////////
@@ -1020,7 +1020,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtPeriodicBoarder, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectRegularBodies );
@@ -1034,7 +1034,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////////
@@ -1046,7 +1046,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtPeriodicBoarder, radius, sphereMaterialID, false, true, false);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) regularBodyMapper(&(*blockIt));
@@ -1060,7 +1060,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
/////////////////////
@@ -1078,7 +1078,7 @@ int main( int argc, char **argv )
pe::SphereID sp2 = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtPeriodicBoarderCopy, radius, sphereMaterialID, true, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectGlobalBodies );
@@ -1093,7 +1093,7 @@ int main( int argc, char **argv )
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp2->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, false);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, false);
}
//////////////////
@@ -1105,7 +1105,7 @@ int main( int argc, char **argv )
pe::SphereID sp = pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
positionAtPeriodicBoarder, radius, sphereMaterialID, false, false, true);
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
pe_coupling::mapMovingBodies< BoundaryHandling_T >(*blocks, boundaryHandlingID, bodyStorageID, *globalBodyStorage, bodyFieldID, MO_Flag, pe_coupling::selectFixedBodies );
@@ -1119,7 +1119,7 @@ int main( int argc, char **argv )
WALBERLA_LOG_DEVEL(testIdentifier << " - ended");
pe::destroyBodyBySID(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, sp->getSystemID());
- pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(NULL), overlap, true);
+ pe::syncNextNeighbors<BodyTypeTuple>(blocks->getBlockForest(), bodyStorageID, static_cast<WcTimingTree *>(nullptr), overlap, true);
}
diff --git a/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEM.cpp b/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEM.cpp
index c1d3d69a0964a5d187d79d9304497c00d4bf4ce6..caa0987ed52d9bb2e03b6ffd6618dbe7063e81d1 100644
--- a/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEM.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEM.cpp
@@ -76,14 +76,14 @@ using walberla::uint_t;
using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
-typedef lbm::force_model::LuoConstant ForceModel_T;
+using ForceModel_T = lbm::force_model::LuoConstant;
typedef lbm::D3Q19< lbm::collision_model::TRT, false, ForceModel_T, 1> LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 1;
@@ -96,7 +96,7 @@ typedef pe_coupling::CurvedQuadratic< LatticeModel_T, FlagField_T > MO_MR_T;
typedef boost::tuples::tuple< MO_BB_T, MO_CLI_T, MO_MR_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple ;
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
///////////
// FLAGS //
@@ -480,7 +480,7 @@ int main( int argc, char **argv )
// synchronize often enough for large bodies
for( uint_t i = 0; i < XBlocks / 2; ++i)
- pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, NULL, overlap);
+ pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, nullptr, overlap);
///////////////////////
// ADD DATA TO BLOCKS //
@@ -502,7 +502,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field" );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
// add boundary handling & initialize outer domain boundaries
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(
diff --git a/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEMRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEMRefinement.cpp
index a084604c75313af11681480e13bc5ba1d11fcaba..f940ae03303270c35832b1cd2c4ef16ddc95515f 100644
--- a/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEMRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/DragForceSphereMEMRefinement.cpp
@@ -21,6 +21,8 @@
#include "blockforest/Initialization.h"
#include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
#include "boundary/all.h"
@@ -67,6 +69,7 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
#include <vector>
#include <iomanip>
#include <iostream>
@@ -85,13 +88,13 @@ using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false, lbm::force_model::SimpleConstant, 1> LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
const uint_t FieldGhostLayers = 4;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
// boundary handling
@@ -101,7 +104,7 @@ typedef pe_coupling::CurvedLinear < LatticeModel_T, FlagField_T > MO_CLI_T;
typedef boost::tuples::tuple< MO_BB_T, MO_CLI_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple ;
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
///////////
// FLAGS //
@@ -165,7 +168,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( const Setup & s
// initialize SetupBlockForest = determine domain decomposition
SetupBlockForest sforest;
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, setup.levels, setup.radius * real_c(2), setup.length ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, setup.levels, setup.radius * real_c(2), setup.length ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( AABB( real_c(0), real_c(0), real_c(0), setup.length, setup.length, setup.length ),
@@ -521,7 +524,7 @@ int main( int argc, char **argv )
// synchronize often enough for large bodies
for( uint_t i = 0; i < std::max( uint_c(1), XBlocks / uint_c(2) ) * ( uint_t(1) << ( setup.levels - uint_t(1) ) ); ++i)
- pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, NULL, overlap);
+ pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, nullptr, overlap);
///////////////////////
// ADD DATA TO BLOCKS //
@@ -539,7 +542,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field", FieldGhostLayers );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf, FieldGhostLayers );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf, FieldGhostLayers );
// add boundary handling & initialize outer domain boundaries
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(
diff --git a/tests/pe_coupling/momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp
index 27626a2e5d93b95e14850edf93265aebfd06bca5..2afeebd2d7d60a9653250e6f8bd38c2d4ae57382 100644
--- a/tests/pe_coupling/momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/GlobalBodyAsBoundaryMEMStaticRefinement.cpp
@@ -21,6 +21,8 @@
#include "blockforest/Initialization.h"
#include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
#include "boundary/all.h"
@@ -60,6 +62,8 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
+
namespace global_body_as_boundary_mem_static_refinement
{
@@ -76,11 +80,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 4;
@@ -88,10 +92,10 @@ const uint_t FieldGhostLayers = 4;
// boundary handling
typedef pe_coupling::SimpleBB< LatticeModel_T, FlagField_T > MO_SBB_T;
-typedef boost::tuples::tuple< MO_SBB_T > BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<MO_SBB_T>;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
-typedef boost::tuple< pe::Plane > BodyTypeTuple;
+using BodyTypeTuple = boost::tuple<pe::Plane>;
///////////
// FLAGS //
@@ -163,7 +167,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( const AABB & do
WALBERLA_LOG_INFO_ON_ROOT(" - refinement box: " << refinementBox);
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, numberOfLevels, refinementBox ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, numberOfLevels, refinementBox ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( domainAABB, numberOfCoarseBlocksPerDirection[0], numberOfCoarseBlocksPerDirection[1], numberOfCoarseBlocksPerDirection[2], false, false, false );
@@ -377,7 +381,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field", FieldGhostLayers );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf, FieldGhostLayers );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf, FieldGhostLayers );
// add boundary handling
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >( MyBoundaryHandling( flagFieldID, pdfFieldID, bodyFieldID ), "boundary handling" );
diff --git a/tests/pe_coupling/momentum_exchange_method/LubricationCorrectionMEM.cpp b/tests/pe_coupling/momentum_exchange_method/LubricationCorrectionMEM.cpp
index d0d021395ac9fdebda1baca45cb0bc78b13449ae..0f4dbd3fecab43b90f7a5c12601bdb9beb3f16e0 100644
--- a/tests/pe_coupling/momentum_exchange_method/LubricationCorrectionMEM.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/LubricationCorrectionMEM.cpp
@@ -52,11 +52,14 @@
#include "timeloop/SweepTimeloop.h"
#include "pe/basic.h"
+#include "pe/utility/Distance.h"
#include "pe_coupling/mapping/all.h"
#include "pe_coupling/momentum_exchange_method/all.h"
#include "pe_coupling/utility/all.h"
+#include <functional>
+
namespace lubrication_correction_mem
{
@@ -76,11 +79,11 @@ using walberla::uint_t;
// pdf field & flag field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
const uint_t FieldGhostLayers = 1;
@@ -163,14 +166,14 @@ private:
{
for( auto curSphereIt = pe::BodyIterator::begin<pe::Sphere>( *blockIt, bodyStorageID_); curSphereIt != pe::BodyIterator::end<pe::Sphere>(); ++curSphereIt )
{
- pe::SphereID sphereI = ( *curSphereIt );
+ pe::SphereID sphereI = ( curSphereIt.getBodyID() );
if ( sphereI->getID() == id1_ )
{
for( auto blockIt2 = blocks_->begin(); blockIt2 != blocks_->end(); ++blockIt2 )
{
for( auto oSphereIt = pe::BodyIterator::begin<pe::Sphere>( *blockIt2, bodyStorageID_); oSphereIt != pe::BodyIterator::end<pe::Sphere>(); ++oSphereIt )
{
- pe::SphereID sphereJ = ( *oSphereIt );
+ pe::SphereID sphereJ = ( oSphereIt.getBodyID() );
if ( sphereJ->getID() == id2_ )
{
gap = pe::getSurfaceDistance( sphereI, sphereJ );
@@ -283,14 +286,14 @@ private:
{
for( auto curSphereIt = pe::BodyIterator::begin<pe::Sphere>( *blockIt, bodyStorageID_); curSphereIt != pe::BodyIterator::end<pe::Sphere>(); ++curSphereIt )
{
- pe::SphereID sphereI = ( *curSphereIt );
+ pe::SphereID sphereI = ( curSphereIt.getBodyID() );
if ( sphereI->getID() == id1_ )
{
for( auto globalBodyIt = globalBodyStorage_->begin(); globalBodyIt != globalBodyStorage_->end(); ++globalBodyIt)
{
if( globalBodyIt->getID() == id2_ )
{
- pe::PlaneID planeJ = static_cast<pe::PlaneID>( *globalBodyIt );
+ pe::PlaneID planeJ = static_cast<pe::PlaneID>( globalBodyIt.getBodyID() );
gap = pe::getSurfaceDistance(sphereI, planeJ);
break;
}
@@ -785,11 +788,11 @@ int main( int argc, char **argv )
auto fcdID = blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
// set up collision response, here DEM solver
- pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, NULL);
+ pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr);
// set up synchronization procedure
const real_t overlap = real_c( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create the material
const auto myMat = pe::createMaterial( "myMat", real_c(1.4), real_t(0), real_t(1), real_t(1), real_t(0), real_t(1), real_t(1), real_t(0), real_t(0) );
@@ -805,9 +808,9 @@ int main( int argc, char **argv )
// create two approaching spheres
auto sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, id1, Vector3<real_t> (real_c(50.0), real_c(64.0), real_c(64.0)), radius, myMat );
- if ( sphere != NULL ) sphere->setLinearVel( velocity);
+ if ( sphere != nullptr ) sphere->setLinearVel( velocity);
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, id2, Vector3<real_t> (real_c(78.0), real_c(64.0), real_c(64.0)), radius, myMat );
- if ( sphere != NULL ) sphere->setLinearVel(-velocity);
+ if ( sphere != nullptr ) sphere->setLinearVel(-velocity);
}
// sphere-wall test
@@ -825,7 +828,7 @@ int main( int argc, char **argv )
// <19.2,64,64> // <25.6,64,64> // <28.8,64,64> // <38.4,64,64> //1st: <41.765,64,64> // <27.205,64,64> // <20.88,64,64> (chosen s.th. last gap: 0.05 and initial s=1.1 ) // like Ding: <17,64,64>
// 6 // 8 // 9 // 12 //1st // 13.05 // 8.5 // 6.525 // like Ding: 4.25
auto sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, id1, Vector3<real_t> (real_c(38.4), real_c(64.0), real_c(64.0)), radius, myMat );
- if ( sphere != NULL ) sphere->setLinearVel( velocity);
+ if ( sphere != nullptr ) sphere->setLinearVel( velocity);
}
if ( funcTest )
@@ -838,9 +841,9 @@ int main( int argc, char **argv )
// create two approaching spheres
auto sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, id1, Vector3<real_t> (real_c( 6.0) , real_c(6.0), real_c(6.0)), radius, myMat );
- if ( sphere != NULL ) sphere->setLinearVel( velocity);
+ if ( sphere != nullptr ) sphere->setLinearVel( velocity);
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, id2, Vector3<real_t> (real_c(12.0) , real_c(6.0), real_c(6.0)), radius, myMat );
- if ( sphere != NULL ) sphere->setLinearVel( -velocity);
+ if ( sphere != nullptr ) sphere->setLinearVel( -velocity);
// set the same boundary handling as for the sphere-sphereTest
sphSphTest = true;
@@ -905,7 +908,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field" );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
// add boundary handling & initialize outer domain boundaries (moving walls on the front, back, top, and bottom plane)
BlockDataID boundaryHandlingID;
diff --git a/tests/pe_coupling/momentum_exchange_method/PeriodicParticleChannelMEM.cpp b/tests/pe_coupling/momentum_exchange_method/PeriodicParticleChannelMEM.cpp
index ef64aa7a87b345e84e5bd1390f18b008667064a7..2ecfd788de6d83a3dc1e9677f7bdba9a437095b9 100644
--- a/tests/pe_coupling/momentum_exchange_method/PeriodicParticleChannelMEM.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/PeriodicParticleChannelMEM.cpp
@@ -65,6 +65,7 @@
#include "vtk/all.h"
+#include <functional>
#include <vector>
namespace periodic_particle_channel_mem
@@ -85,11 +86,11 @@ using walberla::uint_t;
// pdf field & flag field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 1;
@@ -124,7 +125,7 @@ class VelocityCheck
{
public:
- typedef lbm::PdfField< LatticeModel_T > PdfField;
+ using PdfField = lbm::PdfField<LatticeModel_T>;
VelocityCheck( const ConstBlockDataID & pdfFieldID, const ConstBlockDataID & flagFieldID, const Set< FlagUID > & cellsToCheck,
const real_t uMax, const uint_t checkFrequency ) :
@@ -409,11 +410,11 @@ int main( int argc, char **argv )
auto fcdID = blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
// set up collision response, here DEM solver
- pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, NULL);
+ pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr);
// set up synchronization procedure
const real_t overlap = real_c( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create pe bodies
const auto material = pe::createMaterial( "granular", real_c(1.2), real_c(0.25), real_c(0.4), real_c(0.4), real_c(0.35), real_c(1.39e11), real_c(5.18e7), real_c(1.07e2), real_c(1.07e2) );
@@ -438,31 +439,31 @@ int main( int argc, char **argv )
const real_t radius = real_t(10);
auto sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(15), real_t(50), real_t(35) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(15), real_t(35), real_t(50) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(15), real_t(65), real_t(50) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(15), real_t(50), real_t(65) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(35), real_t(35), real_t(35) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(35), real_t(65), real_t(35) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(35), real_t(35), real_t(65) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(35), real_t(65), real_t(65) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, Vector3<real_t>( real_t(50), real_t(50), real_t(50) ), radius, material );
- if( sphere != NULL ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
+ if( sphere != nullptr ) sphere->setLinearVel( velocity, real_t(0), real_t(0) );
//synchronize the pe set up on all processes
syncCall();
@@ -485,7 +486,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field" );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
// add boundary handling & initialize outer domain boundaries (moving walls on the front, back, top, and bottom plane)
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(
diff --git a/tests/pe_coupling/momentum_exchange_method/SegreSilberbergMEM.cpp b/tests/pe_coupling/momentum_exchange_method/SegreSilberbergMEM.cpp
index 6ccc9f5c7d5156ba058991860ccb271ecbcbfe91..a238ce167bc2e2b17f7ad38d5faf1d4667b8bbdc 100644
--- a/tests/pe_coupling/momentum_exchange_method/SegreSilberbergMEM.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SegreSilberbergMEM.cpp
@@ -65,6 +65,8 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
+
namespace segre_silberberg_mem
{
@@ -82,11 +84,11 @@ using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false, SimpleConstant > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 1;
@@ -542,17 +544,17 @@ int main( int argc, char **argv )
auto fcdID = blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
// set up collision response, here DEM solver
- pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, NULL);
+ pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr);
// set up synchronization procedure
const real_t overlap = real_t( 1.5 ) * dx;
std::function<void(void)> syncCall;
if (!syncShadowOwners)
{
- syncCall = boost::bind( pe::syncNextNeighbors<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ syncCall = std::bind( pe::syncNextNeighbors<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
} else
{
- syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
}
// create pe bodies
@@ -566,7 +568,7 @@ int main( int argc, char **argv )
const auto sphereMaterial = pe::createMaterial( "mySphereMat", setup.rho_p , real_t(0.5), real_t(0.1), real_t(0.1), real_t(0.24), real_t(200), real_t(200), real_t(0), real_t(0) );
Vector3<real_t> position( real_c(setup.xlength) * real_t(0.5), real_c(setup.ylength) * real_t(0.5), real_c(setup.zlength) * real_t(0.5) - real_t(1) );
auto sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, position, particleRadius, sphereMaterial );
- if( sphere != NULL )
+ if( sphere != nullptr )
{
real_t height = real_t( 0.5 ) * real_c( setup.zlength );
// set sphere velocity to undisturbed fluid velocity at sphere center
@@ -599,7 +601,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field" );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
// add boundary handling & initialize outer domain boundaries
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(
@@ -670,9 +672,9 @@ int main( int argc, char **argv )
}
shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer1 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
- std::function<void(void)> storeForceTorqueInCont1 = boost::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
+ std::function<void(void)> storeForceTorqueInCont1 = std::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer2 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
- std::function<void(void)> setForceTorqueOnBodiesFromCont2 = boost::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
+ std::function<void(void)> setForceTorqueOnBodiesFromCont2 = std::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
bodiesFTContainer2->store();
diff --git a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp
index 6674cde01316e65119f1738ef249945b0614fca2..b90dcf0056803b867190b27ccae6dd2e640620ec 100644
--- a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEM.cpp
@@ -63,6 +63,8 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
+
namespace settling_sphere_mem
{
@@ -79,11 +81,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 1;
@@ -453,11 +455,11 @@ int main( int argc, char **argv )
auto fcdID = blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
// set up collision response, here DEM solver
- pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, NULL);
+ pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr);
// set up synchronization procedure
const real_t overlap = real_t( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create pe bodies
@@ -493,7 +495,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field" );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
// add boundary handling
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >( MyBoundaryHandling( flagFieldID, pdfFieldID, bodyFieldID ), "boundary handling" );
@@ -530,11 +532,11 @@ int main( int argc, char **argv )
( blocks, boundaryHandlingID, bodyStorageID, globalBodyStorage, bodyFieldID, reconstructor, FormerMO_Flag, Fluid_Flag ), "PDF Restore" );
shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer1 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
- std::function<void(void)> storeForceTorqueInCont1 = boost::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
+ std::function<void(void)> storeForceTorqueInCont1 = std::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer2 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
- std::function<void(void)> setForceTorqueOnBodiesFromCont2 = boost::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
+ std::function<void(void)> setForceTorqueOnBodiesFromCont2 = std::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
shared_ptr<pe_coupling::ForceTorqueOnBodiesScaler> forceScaler = make_shared<pe_coupling::ForceTorqueOnBodiesScaler>(blocks, bodyStorageID, real_t(1));
- std::function<void(void)> setForceScalingFactorToHalf = boost::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(0.5));
+ std::function<void(void)> setForceScalingFactorToHalf = std::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(0.5));
if( averageForceTorqueOverTwoTimSteps ) {
bodiesFTContainer2->store();
@@ -559,7 +561,7 @@ int main( int argc, char **argv )
timeloop.addFuncAfterTimeStep(setForceTorqueOnBodiesFromCont2, "Force setting");
// average the force/torque by scaling it with factor 1/2 (except in first timestep, there it is 1, which it is initially)
- timeloop.addFuncAfterTimeStep( pe_coupling::ForceTorqueOnBodiesScaler(blocks, bodyStorageID, real_t(0.5)), "Force averaging");
+ timeloop.addFuncAfterTimeStep( SharedFunctor<pe_coupling::ForceTorqueOnBodiesScaler>(forceScaler), "Force averaging");
timeloop.addFuncAfterTimeStep( setForceScalingFactorToHalf, "Force scaling adjustment" );
// swap containers
diff --git a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp
index 0e44a2e57f402bee733f69a1d9ad9b00656056cc..885e9ed5f5e9e075800de8ccaabcd9e7a4d96203 100644
--- a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMDynamicRefinement.cpp
@@ -21,6 +21,9 @@
#include "blockforest/Initialization.h"
#include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/DynamicCurve.h>
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
#include "boundary/all.h"
@@ -55,6 +58,7 @@
#include "pe/Types.h"
#include "pe/synchronization/ClearSynchronization.h"
+#include "pe_coupling/amr/all.h"
#include "pe_coupling/mapping/all.h"
#include "pe_coupling/momentum_exchange_method/all.h"
#include "pe_coupling/utility/all.h"
@@ -65,6 +69,8 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
+
namespace settling_sphere_mem_dynamic_refinement
{
@@ -81,11 +87,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 4;
@@ -110,80 +116,6 @@ const FlagUID MO_Flag( "moving obstacle" );
const FlagUID FormerMO_Flag( "former moving obstacle" );
-//////////////////////////////////////
-// DYNAMIC REFINEMENT FUNCTIONALITY //
-//////////////////////////////////////
-
-/*
- * Class to determine the minimum level a block can be.
- * For coupled LBM-PE simulations the following rules apply:
- * - a moving body will always remain on the finest block
- * - a moving body is not allowed to extend into an area with a coarser block
- * - if no moving body is present, the level can be as coarse as possible (restricted by the 2:1 rule)
- * Therefore, if a body, local or remote (due to bodies that are larger than a block), is present on any of the
- * neighboring blocks of a certain block, this block's target level is the finest level.
- * This, together with a refinement checking frequency that depends on the maximum translational body velocity,
- * ensures the above given requirements.
- */
-class LevelDeterminator
-{
-public:
-
- LevelDeterminator( const shared_ptr<pe::InfoCollection> & infoCollection, uint_t finestLevel) :
- infoCollection_( infoCollection ), finestLevel_( finestLevel)
- {}
-
- void operator()( std::vector< std::pair< const Block *, uint_t > > & minTargetLevels,
- std::vector< const Block * > &, const BlockForest & /*forest*/ )
- {
- for( auto it = minTargetLevels.begin(); it != minTargetLevels.end(); ++it )
- {
- const uint_t numberOfParticlesInDirectNeighborhood = getNumberOfLocalAndShadowBodiesInNeighborhood(it->first);
-
- uint_t currentLevelOfBlock = it->first->getLevel();
-
- uint_t targetLevelOfBlock = currentLevelOfBlock; //keep everything as it is
- if ( numberOfParticlesInDirectNeighborhood > uint_t(0) )
- {
- // set block to finest level if there are bodies nearby
- targetLevelOfBlock = finestLevel_;
- //WALBERLA_LOG_DEVEL(currentLevelOfBlock << " -> " << targetLevelOfBlock << " (" << numberOfParticlesInDirectNeighborhood << ")" );
- }
- else
- {
- // block could coarsen sicne there are no bodies nearby
- if( currentLevelOfBlock > uint_t(0) )
- targetLevelOfBlock = currentLevelOfBlock - uint_t(1);
- //WALBERLA_LOG_DEVEL(currentLevelOfBlock << " -> " << targetLevelOfBlock << " (" << numberOfParticlesInDirectNeighborhood << ")" );
- }
- it->second = targetLevelOfBlock;
- }
- }
-
-private:
- uint_t getNumberOfLocalAndShadowBodiesInNeighborhood(const Block * block)
- {
- uint_t numBodies = uint_t(0);
-
- // add bodies of current block
- const auto infoIt = infoCollection_->find(block->getId());
- numBodies += infoIt->second.numberOfLocalBodies;
- numBodies += infoIt->second.numberOfShadowBodies;
-
- // add bodies of all neighboring blocks
- for(uint_t i = 0; i < block->getNeighborhoodSize(); ++i)
- {
- BlockID neighborBlockID = block->getNeighborId(i);
- const auto infoItNeighbor = infoCollection_->find(neighborBlockID);
- numBodies += infoItNeighbor->second.numberOfLocalBodies;
- numBodies += infoItNeighbor->second.numberOfShadowBodies;
- }
- return numBodies;
- }
-
- shared_ptr<pe::InfoCollection> infoCollection_;
- uint_t finestLevel_;
-};
/////////////////////
// BLOCK STRUCTURE //
@@ -251,7 +183,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( const AABB & do
WALBERLA_LOG_INFO_ON_ROOT(" - refinement box: " << refinementBox);
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, numberOfLevels, refinementBox ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, numberOfLevels, refinementBox ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( domainAABB, numberOfCoarseBlocksPerDirection[0], numberOfCoarseBlocksPerDirection[1], numberOfCoarseBlocksPerDirection[2], false, false, false );
@@ -285,7 +217,7 @@ public:
blocks_( blocks ), flagFieldID_( flagFieldID ), pdfFieldID_( pdfFieldID ), bodyFieldID_ ( bodyFieldID )
{}
- BoundaryHandling_T * initialize( IBlock * const block );
+ BoundaryHandling_T * initialize( IBlock * const block ) override;
private:
@@ -650,11 +582,10 @@ int main( int argc, char **argv )
blockforest.reevaluateMinTargetLevelsAfterForcedRefinement( false );
blockforest.allowRefreshChangingDepth( false );
- shared_ptr<pe::InfoCollection> peInfoCollection = walberla::make_shared<pe::InfoCollection>();
-
- LevelDeterminator levelDet( peInfoCollection, finestLevel );
+ shared_ptr<pe_coupling::InfoCollection> couplingInfoCollection = walberla::make_shared<pe_coupling::InfoCollection>();
+ pe_coupling::amr::BodyPresenceLevelDetermination particlePresenceRefinement( couplingInfoCollection, finestLevel );
- blockforest.setRefreshMinTargetLevelDeterminationFunction( levelDet );
+ blockforest.setRefreshMinTargetLevelDeterminationFunction( particlePresenceRefinement );
bool curveHilbert = false;
bool curveAllGather = true;
@@ -673,11 +604,11 @@ int main( int argc, char **argv )
auto fcdID = blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
// set up collision response, here DEM solver
- pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, NULL);
+ pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr);
// set up synchronization procedure
const real_t overlap = real_t( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create pe bodies
@@ -713,7 +644,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field", FieldGhostLayers );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf, FieldGhostLayers );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf, FieldGhostLayers );
// add boundary handling & initialize outer domain boundaries
BlockDataID boundaryHandlingID = blocks->addBlockData( make_shared< MyBoundaryHandling >( blocks, flagFieldID, pdfFieldID, bodyFieldID ),
@@ -728,12 +659,12 @@ int main( int argc, char **argv )
// force averaging functionality
shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer1 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
- std::function<void(void)> storeForceTorqueInCont1 = boost::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
+ std::function<void(void)> storeForceTorqueInCont1 = std::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer2 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
- std::function<void(void)> setForceTorqueOnBodiesFromCont2 = boost::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
+ std::function<void(void)> setForceTorqueOnBodiesFromCont2 = std::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
shared_ptr<pe_coupling::ForceTorqueOnBodiesScaler> forceScaler = make_shared<pe_coupling::ForceTorqueOnBodiesScaler>(blocks, bodyStorageID, real_t(0.5));
- std::function<void(void)> setForceScalingFactorToOne = boost::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(1));
- std::function<void(void)> setForceScalingFactorToHalf = boost::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(0.5));
+ std::function<void(void)> setForceScalingFactorToOne = std::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(1));
+ std::function<void(void)> setForceScalingFactorToHalf = std::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(0.5));
if( averageForceTorqueOverTwoTimSteps ) {
bodiesFTContainer2->store();
@@ -868,7 +799,7 @@ int main( int argc, char **argv )
if( i % refinementCheckFrequency == 0)
{
auto & forest = blocks->getBlockForest();
- pe::createWithNeighborhood(forest, bodyStorageID, *peInfoCollection);
+ pe_coupling::createWithNeighborhood<BoundaryHandling_T>(forest, boundaryHandlingID, bodyStorageID, ccdID, fcdID, numPeSubCycles, *couplingInfoCollection);
uint_t stampBefore = blocks->getBlockForest().getModificationStamp();
blocks->refresh();
diff --git a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
index 391ab7b8947bd32cc518760d4fc726c96ceae4c6..3cf8bf5fd8b8ee09e99f7455045ed437a287a376 100644
--- a/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SettlingSphereMEMStaticRefinement.cpp
@@ -21,6 +21,8 @@
#include "blockforest/Initialization.h"
#include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
#include "boundary/all.h"
@@ -63,6 +65,8 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
+
namespace settling_sphere_mem_static_refinement
{
@@ -79,11 +83,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 4;
@@ -170,7 +174,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( const AABB & do
WALBERLA_LOG_INFO_ON_ROOT(" - refinement box: " << refinementBox);
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, numberOfLevels, refinementBox ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, numberOfLevels, refinementBox ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( domainAABB, numberOfCoarseBlocksPerDirection[0], numberOfCoarseBlocksPerDirection[1], numberOfCoarseBlocksPerDirection[2], false, false, false );
@@ -540,11 +544,11 @@ int main( int argc, char **argv )
auto fcdID = blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
// set up collision response, here DEM solver
- pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, NULL);
+ pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr);
// set up synchronization procedure
const real_t overlap = real_t( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create pe bodies
@@ -582,7 +586,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field", FieldGhostLayers );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf, FieldGhostLayers );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf, FieldGhostLayers );
// add boundary handling
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >( MyBoundaryHandling( flagFieldID, pdfFieldID, bodyFieldID ), "boundary handling" );
@@ -595,11 +599,11 @@ int main( int argc, char **argv )
// force averaging functionality
shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer1 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
- std::function<void(void)> storeForceTorqueInCont1 = boost::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
+ std::function<void(void)> storeForceTorqueInCont1 = std::bind(&pe_coupling::BodiesForceTorqueContainer::store, bodiesFTContainer1);
shared_ptr<pe_coupling::BodiesForceTorqueContainer> bodiesFTContainer2 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
- std::function<void(void)> setForceTorqueOnBodiesFromCont2 = boost::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
+ std::function<void(void)> setForceTorqueOnBodiesFromCont2 = std::bind(&pe_coupling::BodiesForceTorqueContainer::setOnBodies, bodiesFTContainer2);
shared_ptr<pe_coupling::ForceTorqueOnBodiesScaler> forceScaler = make_shared<pe_coupling::ForceTorqueOnBodiesScaler>(blocks, bodyStorageID, real_t(1));
- std::function<void(void)> setForceScalingFactorToHalf = boost::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(0.5));
+ std::function<void(void)> setForceScalingFactorToHalf = std::bind(&pe_coupling::ForceTorqueOnBodiesScaler::resetScalingFactor,forceScaler,real_t(0.5));
if( averageForceTorqueOverTwoTimSteps ) {
bodiesFTContainer2->store();
@@ -632,7 +636,7 @@ int main( int argc, char **argv )
refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(setForceTorqueOnBodiesFromCont2), "Force setting", finestLevel);
// average the force/torque by scaling it with factor 1/2 (except in first timestep, there it is 1, which it is initially)
- refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(pe_coupling::ForceTorqueOnBodiesScaler(blocks, bodyStorageID, real_t(0.5))), "Force averaging", finestLevel);
+ refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(SharedFunctor<pe_coupling::ForceTorqueOnBodiesScaler>(forceScaler)), "Force averaging", finestLevel);
refinementTimestep->addPostStreamVoidFunction(lbm::refinement::FunctorWrapper(setForceScalingFactorToHalf), "Force scaling adjustment", finestLevel);
// swap containers
diff --git a/tests/pe_coupling/momentum_exchange_method/SquirmerTest.cpp b/tests/pe_coupling/momentum_exchange_method/SquirmerTest.cpp
index 82fd1093713a0421ace63341e6a65225b41f2534..adca4508693a8a5802c3ea3a5fa883ad00bef304 100644
--- a/tests/pe_coupling/momentum_exchange_method/SquirmerTest.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/SquirmerTest.cpp
@@ -66,6 +66,7 @@
#include "lbm/vtk/Velocity.h"
#include "vtk/VTKOutput.h"
+#include <functional>
namespace squirmer
{
@@ -79,14 +80,14 @@ using namespace walberla;
using walberla::uint_t;
// PDF field, flag field & body field
-typedef lbm::force_model::None ForceModel_T;
+using ForceModel_T = lbm::force_model::None;
typedef lbm::D3Q19<lbm::collision_model::TRT, false, ForceModel_T> LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField<LatticeModel_T> PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField<flag_t> FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField<pe::BodyID, 1> PeBodyField_T;
const uint_t FieldGhostLayers = 1;
@@ -94,10 +95,10 @@ const uint_t FieldGhostLayers = 1;
// boundary handling
typedef pe_coupling::SimpleBB<LatticeModel_T, FlagField_T> MO_BB_T;
-typedef boost::tuples::tuple<MO_BB_T> BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<MO_BB_T>;
typedef BoundaryHandling<FlagField_T, Stencil_T, BoundaryConditions_T> BoundaryHandling_T;
-typedef boost::tuple<pe::Squirmer> BodyTypeTuple;
+using BodyTypeTuple = boost::tuple<pe::Squirmer>;
///////////
// FLAGS //
@@ -289,9 +290,9 @@ int main(int argc, char **argv) {
return EXIT_FAILURE;
}
- std::function<void(void)> syncCall = boost::bind(pe::syncShadowOwners<BodyTypeTuple>,
- boost::ref(blocks->getBlockForest()), bodyStorageID,
- static_cast<WcTimingTree *>(NULL), overlap, false);
+ std::function<void(void)> syncCall = std::bind(pe::syncShadowOwners<BodyTypeTuple>,
+ std::ref(blocks->getBlockForest()), bodyStorageID,
+ static_cast<WcTimingTree *>(nullptr), overlap, false);
const auto myMat = pe::createMaterial("myMat", real_c(1), real_t(0), real_t(1), real_t(1), real_t(0), real_t(1),
real_t(1), real_t(0), real_t(0));
@@ -324,7 +325,7 @@ int main(int argc, char **argv) {
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>(blocks, "flag field");
// add body field
- BlockDataID bodyFieldID = field::addToStorage<PeBodyField_T>(blocks, "body field", NULL, field::zyxf);
+ BlockDataID bodyFieldID = field::addToStorage<PeBodyField_T>(blocks, "body field", nullptr, field::zyxf);
// add boundary handling & initialize outer domain boundaries
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData<BoundaryHandling_T>(
@@ -419,7 +420,7 @@ int main(int argc, char **argv) {
auto b2 = beta * b1;
auto e = q.rotate(up).getNormalized();
auto radius = R;
- auto squirmer_pos = position;
+ const auto& squirmer_pos = position;
real_t abs_tolerance = real_c(0.0026);
real_t rel_tolerance = real_c(0.10);
diff --git a/tests/pe_coupling/momentum_exchange_method/TaylorCouetteFlowMEM.cpp b/tests/pe_coupling/momentum_exchange_method/TaylorCouetteFlowMEM.cpp
index e6d43a5d0039a43d1aee67b9723f95d971e0b4de..0205b4695a0eeff177c2d6a00f5acac3ac8c6315 100644
--- a/tests/pe_coupling/momentum_exchange_method/TaylorCouetteFlowMEM.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/TaylorCouetteFlowMEM.cpp
@@ -57,6 +57,8 @@
#include "vtk/all.h"
+#include <functional>
+
namespace taylor_coette_flow_mem
{
@@ -75,18 +77,18 @@ using walberla::uint_t;
// pdf field & flag field
typedef lbm::D3Q19< lbm::collision_model::TRT, false > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 1;
typedef pe_coupling::CurvedLinear< LatticeModel_T, FlagField_T > MO_T;
-typedef boost::tuples::tuple< MO_T > BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<MO_T>;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
typedef boost::tuple< pe::Capsule, pe::CylindricalBoundary > BodyTypeTuple;
@@ -303,7 +305,7 @@ int main( int argc, char **argv )
// set up synchronization procedure
const real_t overlap = real_t( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create pe bodies
const auto material = pe::createMaterial( "granular", real_t(1.2), real_t(0.25), real_t(0.4), real_t(0.4), real_t(0.35), real_t(1.39e11), real_t(5.18e7), real_t(1.07e2), real_t(1.07e2) );
@@ -331,7 +333,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field" );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
// add boundary handling & initialize outer domain boundaries (moving walls on the front, back, top, and bottom plane)
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(
diff --git a/tests/pe_coupling/momentum_exchange_method/TorqueSphereMEM.cpp b/tests/pe_coupling/momentum_exchange_method/TorqueSphereMEM.cpp
index 2ff3f3c98e779a184d5c5e51e1407df41814814f..7f43c9fd26fd49fc1453fcb677542cab9064c5b4 100644
--- a/tests/pe_coupling/momentum_exchange_method/TorqueSphereMEM.cpp
+++ b/tests/pe_coupling/momentum_exchange_method/TorqueSphereMEM.cpp
@@ -78,11 +78,11 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::TRT, false, lbm::force_model::None, 1> LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 1;
@@ -95,7 +95,7 @@ typedef pe_coupling::CurvedQuadratic< LatticeModel_T, FlagField_T > MO_MR_T;
typedef boost::tuples::tuple< MO_BB_T, MO_CLI_T, MO_MR_T > BoundaryConditions_T;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple ;
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
///////////
// FLAGS //
@@ -421,14 +421,14 @@ int main( int argc, char **argv )
// create the sphere in the middle of the domain
Vector3<real_t> position (real_c(setup.length) * real_c(0.5));
auto sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, position, setup.radius );
- if ( sphere != NULL )
+ if ( sphere != nullptr )
{
sphere->setAngularVel( real_c(0), setup.angularVel, real_c(0) );
}
// synchronize often enough for large bodies
for( uint_t i = 0; i < XBlocks / 2; ++i)
- pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, NULL, overlap);
+ pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, nullptr, overlap);
///////////////////////
@@ -452,7 +452,7 @@ int main( int argc, char **argv )
BlockDataID flagFieldID = field::addFlagFieldToStorage<FlagField_T>( blocks, "flag field" );
// add body field
- BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", NULL, field::zyxf );
+ BlockDataID bodyFieldID = field::addToStorage<BodyField_T>( blocks, "body field", nullptr, field::zyxf );
// add boundary handling & initialize outer domain boundaries
BlockDataID boundaryHandlingID = blocks->addStructuredBlockData< BoundaryHandling_T >(
diff --git a/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSM.cpp b/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSM.cpp
index 1547b5baa773303c0002aa8779127d5cecc4e711..fb92b0c68975877bf00a5066acd6ce08735113ba 100644
--- a/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSM.cpp
+++ b/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSM.cpp
@@ -76,19 +76,19 @@ using walberla::uint_t;
using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
-typedef lbm::force_model::LuoConstant ForceModel_T;
+using ForceModel_T = lbm::force_model::LuoConstant;
typedef lbm::D3Q19< lbm::collision_model::SRT, false, ForceModel_T, 1> LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef std::pair< pe::BodyID, real_t > BodyAndVolumeFraction_T;
typedef GhostLayerField< std::vector< BodyAndVolumeFraction_T >, 1 > BodyAndVolumeFractionField_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple ;
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
///////////
// FLAGS //
@@ -415,7 +415,7 @@ int main( int argc, char **argv )
// synchronize often enough for large bodies
for( uint_t i = 0; i < XBlocks / 2; ++i)
- pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, NULL, overlap);
+ pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, nullptr, overlap);
///////////////////////
// ADD DATA TO BLOCKS //
diff --git a/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp b/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp
index f29f7d650c9e0bbd02ada920f48b4dd2cde1efee..58add3e2404c162f19f653552033e1be81a322ea 100644
--- a/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp
+++ b/tests/pe_coupling/partially_saturated_cells_method/DragForceSpherePSMRefinement.cpp
@@ -21,6 +21,8 @@
#include "blockforest/Initialization.h"
#include "blockforest/communication/UniformBufferedScheme.h"
+#include <blockforest/loadbalancing/StaticCurve.h>
+#include <blockforest/SetupBlockForest.h>
#include "boundary/all.h"
@@ -67,6 +69,7 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
#include <vector>
#include <iomanip>
#include <iostream>
@@ -85,22 +88,22 @@ using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::SRT, false, lbm::force_model::SimpleConstant, 1> LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
const uint_t FieldGhostLayers = 4;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef std::pair< pe::BodyID, real_t > BodyAndVolumeFraction_T;
typedef GhostLayerField< std::vector< BodyAndVolumeFraction_T >, 1 > BodyAndVolumeFractionField_T;
typedef lbm::NoSlip< LatticeModel_T, flag_t > NoSlip_T;
-typedef boost::tuples::tuple< NoSlip_T > BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<NoSlip_T>;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple ;
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
///////////
// FLAGS //
@@ -185,7 +188,7 @@ static shared_ptr< StructuredBlockForest > createBlockStructure( const Setup & s
// initialize SetupBlockForest = determine domain decomposition
SetupBlockForest sforest;
- sforest.addRefinementSelectionFunction( boost::bind( refinementSelection, _1, setup.levels, setup.radius * real_c(2), real_c(setup.length) ) );
+ sforest.addRefinementSelectionFunction( std::bind( refinementSelection, std::placeholders::_1, setup.levels, setup.radius * real_c(2), real_c(setup.length) ) );
sforest.addWorkloadMemorySUIDAssignmentFunction( workloadAndMemoryAssignment );
sforest.init( AABB( real_c(0), real_c(0), real_c(0), real_c(setup.length), real_c(setup.length), real_c(setup.length) ),
@@ -526,7 +529,7 @@ int main( int argc, char **argv )
// synchronize often enough for large bodies
for( uint_t i = 0; i < std::max( uint_c(1), XBlocks / uint_c(2) ) * ( uint_t(1) << ( setup.levels - uint_t(1) ) ); ++i)
- pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, NULL, overlap);
+ pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, nullptr, overlap);
///////////////////////
// ADD DATA TO BLOCKS //
diff --git a/tests/pe_coupling/partially_saturated_cells_method/SegreSilberbergPSM.cpp b/tests/pe_coupling/partially_saturated_cells_method/SegreSilberbergPSM.cpp
index 7e0ad3250d28b0cb1f219bbae034dfdc77e817e2..46f2a10e4fbc83242bd90a2b1510a4425543a090 100644
--- a/tests/pe_coupling/partially_saturated_cells_method/SegreSilberbergPSM.cpp
+++ b/tests/pe_coupling/partially_saturated_cells_method/SegreSilberbergPSM.cpp
@@ -64,6 +64,9 @@
#include "field/vtk/all.h"
#include "lbm/vtk/all.h"
+#include <functional>
+#include <memory>
+
namespace segre_silberberg_psm
{
@@ -81,11 +84,11 @@ using lbm::force_model::SimpleConstant;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::SRT, false, SimpleConstant > LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef GhostLayerField< pe::BodyID, 1 > BodyField_T;
const uint_t FieldGhostLayers = 1;
@@ -95,7 +98,7 @@ typedef GhostLayerField< std::vector< BodyAndVolumeFraction_T >, 1 > BodyAndVolu
// boundary handling
typedef lbm::NoSlip< LatticeModel_T, flag_t > NoSlip_T;
-typedef boost::tuples::tuple< NoSlip_T > BoundaryConditions_T;
+using BoundaryConditions_T = boost::tuples::tuple<NoSlip_T>;
typedef BoundaryHandling< FlagField_T, Stencil_T, BoundaryConditions_T > BoundaryHandling_T;
typedef boost::tuple< pe::Sphere, pe::Plane > BodyTypeTuple;
@@ -498,11 +501,11 @@ int main( int argc, char **argv )
auto fcdID = blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
// set up collision response, here DEM solver
- pe::cr::DEM cr( globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, NULL );
+ pe::cr::DEM cr( globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr );
// set up synchronization procedure
const real_t overlap = real_c( 1.5 ) * dx;
- std::function<void(void)> syncCall = boost::bind( pe::syncShadowOwners<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(NULL), overlap, false );
+ std::function<void(void)> syncCall = std::bind( pe::syncShadowOwners<BodyTypeTuple>, std::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
// create pe bodies
@@ -515,7 +518,7 @@ int main( int argc, char **argv )
const auto sphereMaterial = pe::createMaterial( "mySphereMat", setup.rho_p , real_c(0.5), real_c(0.1), real_c(0.1), real_c(0.24), real_c(200), real_c(200), real_c(0), real_c(0) );
Vector3<real_t> position( real_c(setup.xlength) * real_c(0.5), real_c(setup.ylength) * real_c(0.5), real_c(setup.zlength) * real_c(0.5) - real_c(1) );
auto sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, position, particleRadius, sphereMaterial );
- if( sphere != NULL )
+ if( sphere != nullptr )
{
real_t height = real_c( 0.5 ) * real_c( setup.zlength );
// set sphere velocity to undisturbed fluid velocity at sphere center
@@ -630,8 +633,8 @@ int main( int argc, char **argv )
timeloop.addFuncAfterTimeStep( pe_coupling::TimeStep( blocks, bodyStorageID, cr, syncCall, dt_pe, pe_interval ), "pe Time Step" );
// check for convergence of the particle position
- shared_ptr< SteadyStateCheck > check = shared_ptr< SteadyStateCheck >( new SteadyStateCheck( &timeloop, &setup, blocks, bodyStorageID,
- fileIO, SC1W1, SC2W1, SC3W1, SC1W2, SC2W2, SC3W2 ) );
+ shared_ptr< SteadyStateCheck > check = std::make_shared< SteadyStateCheck >( &timeloop, &setup, blocks, bodyStorageID,
+ fileIO, SC1W1, SC2W1, SC3W1, SC1W2, SC2W2, SC3W2 );
timeloop.addFuncAfterTimeStep( SharedFunctor< SteadyStateCheck >( check ), "steady state check" );
if( vtkIO )
diff --git a/tests/pe_coupling/partially_saturated_cells_method/TorqueSpherePSM.cpp b/tests/pe_coupling/partially_saturated_cells_method/TorqueSpherePSM.cpp
index f91b5566e82396466744845bae224e5028e769a6..64114c43e0f76a36da85962123e6ca71074fb144 100644
--- a/tests/pe_coupling/partially_saturated_cells_method/TorqueSpherePSM.cpp
+++ b/tests/pe_coupling/partially_saturated_cells_method/TorqueSpherePSM.cpp
@@ -77,16 +77,16 @@ using walberla::uint_t;
// PDF field, flag field & body field
typedef lbm::D3Q19< lbm::collision_model::SRT, false, lbm::force_model::None, 1> LatticeModel_T;
-typedef LatticeModel_T::Stencil Stencil_T;
-typedef lbm::PdfField< LatticeModel_T > PdfField_T;
+using Stencil_T = LatticeModel_T::Stencil;
+using PdfField_T = lbm::PdfField<LatticeModel_T>;
-typedef walberla::uint8_t flag_t;
-typedef FlagField< flag_t > FlagField_T;
+using flag_t = walberla::uint8_t;
+using FlagField_T = FlagField<flag_t>;
typedef std::pair< pe::BodyID, real_t > BodyAndVolumeFraction_T;
typedef GhostLayerField< std::vector< BodyAndVolumeFraction_T >, 1 > BodyAndVolumeFractionField_T;
-typedef boost::tuple<pe::Sphere> BodyTypeTuple ;
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
///////////
// FLAGS //
@@ -355,14 +355,14 @@ int main( int argc, char **argv )
// create the sphere in the middle of the domain
Vector3<real_t> position (real_c(setup.length) * real_c(0.5));
auto sphere = pe::createSphere( *globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0, position, setup.radius );
- if ( sphere != NULL )
+ if ( sphere != nullptr )
{
sphere->setAngularVel( real_c(0), setup.angularVel, real_c(0) );
}
// synchronize often enough for large bodies
for( uint_t i = 0; i < XBlocks / 2; ++i)
- pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, NULL, overlap);
+ pe::syncShadowOwners<BodyTypeTuple>( blocks->getBlockForest(), bodyStorageID, nullptr, overlap);
///////////////////////
diff --git a/tests/pe_coupling/utility/BodiesForceTorqueContainerTest.cpp b/tests/pe_coupling/utility/BodiesForceTorqueContainerTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..bf84cbe06f2dafcd9b732505913ab2fd1da4efdf
--- /dev/null
+++ b/tests/pe_coupling/utility/BodiesForceTorqueContainerTest.cpp
@@ -0,0 +1,487 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file BodiesForceTorqueContainerTest.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "blockforest/Initialization.h"
+
+#include "core/DataTypes.h"
+#include "core/Environment.h"
+#include "core/debug/TestSubsystem.h"
+#include "core/math/all.h"
+
+#include "pe/basic.h"
+#include "pe/utility/DestroyBody.h"
+
+#include <pe_coupling/utility/all.h>
+
+namespace force_torque_container_test
+{
+
+///////////
+// USING //
+///////////
+
+using namespace walberla;
+
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
+
+
+/*!\brief Test cases for the force torque container provided by the coupling module
+ *
+ * Spheres at different positions are created and force(s) and torque(s) are applied.
+ * Then, they are store in the container and reset on the body.
+ * Then, in some cases, the sphere is moved to cross block borders, and the stored forces/torques are reapplied by the container again.
+ * The obtained force/torque values are compared against the originally set (and thus expected) values.
+ */
+//////////
+// MAIN //
+//////////
+int main( int argc, char **argv )
+{
+ debug::enterTestMode();
+
+ mpi::Environment env( argc, argv );
+
+ // uncomment to have logging
+ //logging::Logging::instance()->setLogLevel(logging::Logging::LogLevel::DETAIL);
+
+ const real_t dx = real_t(1);
+ const real_t radius = real_t(5);
+
+ ///////////////////////////
+ // DATA STRUCTURES SETUP //
+ ///////////////////////////
+
+ Vector3<uint_t> blocksPerDirection(uint_t(3), uint_t(1), uint_t(1));
+ Vector3<uint_t> cellsPerBlock(uint_t(20), uint_t(20), uint_t(20));
+ Vector3<bool> periodicity(true, false, false);
+
+ // create fully periodic domain with refined blocks
+ auto blocks = blockforest::createUniformBlockGrid( blocksPerDirection[0], blocksPerDirection[1], blocksPerDirection[2],
+ cellsPerBlock[0], cellsPerBlock[1], cellsPerBlock[2],
+ dx,
+ 0, false, false,
+ periodicity[0], periodicity[1], periodicity[2],
+ false );
+
+
+ // pe body storage
+ pe::SetBodyTypeIDs<BodyTypeTuple>::execute();
+ shared_ptr<pe::BodyStorage> globalBodyStorage = make_shared<pe::BodyStorage>();
+ auto bodyStorageID = blocks->addBlockData(pe::createStorageDataHandling<BodyTypeTuple>(), "Storage");
+ auto sphereMaterialID = pe::createMaterial( "sphereMat", real_t(1) , real_t(0.3), real_t(0.2), real_t(0.2), real_t(0.24), real_t(200), real_t(200), real_t(0), real_t(0) );
+
+ // pe coupling
+ const real_t overlap = real_t( 1.5 ) * dx;
+ std::function<void(void)> syncCall = std::bind( pe::syncNextNeighbors<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
+
+ // sphere positions for test scenarios
+ Vector3<real_t> positionInsideBlock(real_t(10), real_t(10), real_t(10));
+ Vector3<real_t> positionAtBlockBorder(real_t(19.5), real_t(10), real_t(10));
+ Vector3<real_t> positionAtBlockBorderUpdated(real_t(20.5), real_t(10), real_t(10));
+
+ Vector3<real_t> positionAtBlockBorder2(real_t(20) + radius + overlap - real_t(0.5), real_t(10), real_t(10));
+ Vector3<real_t> positionAtBlockBorderUpdated2(real_t(20) + radius + overlap + real_t(0.5), real_t(10), real_t(10));
+
+
+ Vector3<real_t> testForce(real_t(2), real_t(1), real_t(0));
+ Vector3<real_t> torqueOffset = Vector3<real_t>(real_t(1), real_t(0), real_t(0));
+
+ pe_coupling::ForceTorqueOnBodiesResetter resetter(blocks, bodyStorageID);
+ shared_ptr<pe_coupling::BodiesForceTorqueContainer> container1 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
+ shared_ptr<pe_coupling::BodiesForceTorqueContainer> container2 = make_shared<pe_coupling::BodiesForceTorqueContainer>(blocks, bodyStorageID);
+ pe_coupling::BodyContainerSwapper containerSwapper(container1, container2);
+
+ //////////////////
+ // Inside block //
+ //////////////////
+ {
+ std::string testIdentifier("Test: sphere inside block");
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - started");
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ positionInsideBlock, radius, sphereMaterialID, false, true, false);
+
+ syncCall();
+
+ uint_t applicationCounter( 0 );
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ ++applicationCounter;
+ auto pos = bodyIt->getPosition();
+ bodyIt->addForceAtPos(testForce, pos+torqueOffset);
+ }
+ }
+ mpi::allReduceInplace(applicationCounter, mpi::SUM);
+
+ container1->store();
+
+ resetter();
+
+ containerSwapper();
+
+ container2->setOnBodies();
+
+ Vector3<real_t> expectedForce = applicationCounter * testForce;
+ Vector3<real_t> expectedTorque = applicationCounter * ( torqueOffset % testForce );
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting force: " << expectedForce);
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting torque: " << expectedTorque);
+
+ Vector3<real_t> actingForce(real_t(0));
+ Vector3<real_t> actingTorque(real_t(0));
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ actingForce += bodyIt->getForce();
+ actingTorque += bodyIt->getTorque();
+
+ }
+ }
+
+ mpi::allReduceInplace(actingForce[0], mpi::SUM);
+ mpi::allReduceInplace(actingForce[1], mpi::SUM);
+ mpi::allReduceInplace(actingForce[2], mpi::SUM);
+
+ mpi::allReduceInplace(actingTorque[0], mpi::SUM);
+ mpi::allReduceInplace(actingTorque[1], mpi::SUM);
+ mpi::allReduceInplace(actingTorque[2], mpi::SUM);
+
+ WALBERLA_ROOT_SECTION()
+ {
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[0], expectedForce[0], "Mismatch in force0");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[1], expectedForce[1], "Mismatch in force1");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[2], expectedForce[2], "Mismatch in force2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[0], expectedTorque[0], "Mismatch in torque0");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[1], expectedTorque[1], "Mismatch in torque1");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[2], expectedTorque[2], "Mismatch in torque2");
+ }
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ container1->clear();
+ container2->clear();
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - ended");
+
+ }
+
+ /////////////////////
+ // At block border //
+ /////////////////////
+ {
+ std::string testIdentifier("Test: sphere at block border");
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - started");
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ positionAtBlockBorder, radius, sphereMaterialID, false, true, false);
+
+ syncCall();
+
+ uint_t applicationCounter( 0 );
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ ++applicationCounter;
+ auto pos = bodyIt->getPosition();
+ bodyIt->addForceAtPos(testForce, pos+torqueOffset);
+ }
+ }
+ mpi::allReduceInplace(applicationCounter, mpi::SUM);
+
+ container1->store();
+
+ resetter();
+
+ containerSwapper();
+
+ container2->setOnBodies();
+
+ Vector3<real_t> expectedForce = applicationCounter * testForce;
+ Vector3<real_t> expectedTorque = applicationCounter * ( torqueOffset % testForce );
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting force: " << expectedForce);
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting torque: " << expectedTorque);
+
+ Vector3<real_t> actingForce(real_t(0));
+ Vector3<real_t> actingTorque(real_t(0));
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ actingForce += bodyIt->getForce();
+ actingTorque += bodyIt->getTorque();
+ }
+ }
+
+ mpi::allReduceInplace(actingForce[0], mpi::SUM);
+ mpi::allReduceInplace(actingForce[1], mpi::SUM);
+ mpi::allReduceInplace(actingForce[2], mpi::SUM);
+
+ mpi::allReduceInplace(actingTorque[0], mpi::SUM);
+ mpi::allReduceInplace(actingTorque[1], mpi::SUM);
+ mpi::allReduceInplace(actingTorque[2], mpi::SUM);
+
+ WALBERLA_ROOT_SECTION()
+ {
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[0], expectedForce[0], "Mismatch in force0");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[1], expectedForce[1], "Mismatch in force1");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[2], expectedForce[2], "Mismatch in force2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[0], expectedTorque[0], "Mismatch in torque0");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[1], expectedTorque[1], "Mismatch in torque1");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[2], expectedTorque[2], "Mismatch in torque2");
+ }
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ container1->clear();
+ container2->clear();
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - ended");
+
+ }
+
+ ///////////////////////////////////////////
+ // At block border with updated position //
+ ///////////////////////////////////////////
+ {
+ std::string testIdentifier("Test: sphere at block border with updated position");
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - started");
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ positionAtBlockBorder, radius, sphereMaterialID, false, true, false);
+
+ syncCall();
+
+ uint_t applicationCounter( 0 );
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ ++applicationCounter;
+ auto pos = bodyIt->getPosition();
+ bodyIt->addForceAtPos(testForce, pos+torqueOffset);
+ }
+ }
+ mpi::allReduceInplace(applicationCounter, mpi::SUM);
+
+ container1->store();
+
+ resetter();
+
+ containerSwapper();
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) {
+ for (auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt) {
+ bodyIt->setPosition(positionAtBlockBorderUpdated);
+ }
+ }
+ syncCall();
+
+ container2->setOnBodies();
+
+ Vector3<real_t> expectedForce = applicationCounter * testForce;
+ Vector3<real_t> expectedTorque = applicationCounter * ( torqueOffset % testForce );
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting force: " << expectedForce);
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting torque: " << expectedTorque);
+
+ Vector3<real_t> actingForce(real_t(0));
+ Vector3<real_t> actingTorque(real_t(0));
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ actingForce += bodyIt->getForce();
+ actingTorque += bodyIt->getTorque();
+ }
+ }
+
+ mpi::allReduceInplace(actingForce[0], mpi::SUM);
+ mpi::allReduceInplace(actingForce[1], mpi::SUM);
+ mpi::allReduceInplace(actingForce[2], mpi::SUM);
+
+ mpi::allReduceInplace(actingTorque[0], mpi::SUM);
+ mpi::allReduceInplace(actingTorque[1], mpi::SUM);
+ mpi::allReduceInplace(actingTorque[2], mpi::SUM);
+
+ WALBERLA_ROOT_SECTION()
+ {
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[0], expectedForce[0], "Mismatch in force0");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[1], expectedForce[1], "Mismatch in force1");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[2], expectedForce[2], "Mismatch in force2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[0], expectedTorque[0], "Mismatch in torque0");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[1], expectedTorque[1], "Mismatch in torque1");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[2], expectedTorque[2], "Mismatch in torque2");
+ }
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ container1->clear();
+ container2->clear();
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - ended");
+
+ }
+
+ /////////////////////////////////////////////
+ // At block border with updated position 2 //
+ /////////////////////////////////////////////
+ {
+ std::string testIdentifier("Test: sphere at block border with updated position 2");
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - started");
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ positionAtBlockBorder2, radius, sphereMaterialID, false, true, false);
+
+ syncCall();
+
+ uint_t applicationCounter( 0 );
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ ++applicationCounter;
+ auto pos = bodyIt->getPosition();
+ bodyIt->addForceAtPos(testForce, pos+torqueOffset);
+ }
+ }
+ mpi::allReduceInplace(applicationCounter, mpi::SUM);
+
+ container1->store();
+
+ resetter();
+
+ containerSwapper();
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt ) {
+ for (auto bodyIt = pe::LocalBodyIterator::begin(*blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt) {
+ bodyIt->setPosition(positionAtBlockBorderUpdated2);
+ }
+ }
+ syncCall();
+
+ container2->setOnBodies();
+
+ --applicationCounter; // sphere has vanished from one block
+
+ // in this case, the complete force can no longer be applied onto the body since the part from the block
+ // from which the body vanished is lost
+
+ // HOWEVER: this case will never appear in a coupled simulation since NO FORCE will be acting a body
+ // that is about to vanish from a block since it will not be mapped to the block from which it will vanish
+
+ // If you are expecting a different behavior, you need to change the container mechanism by first all-reducing the
+ // forces/torques to all processes/blocks that know this body such that every process/block has
+ // the full information and then the process/block that owns this body sets the complete force
+
+ Vector3<real_t> expectedForce = applicationCounter * testForce;
+ Vector3<real_t> expectedTorque = applicationCounter * ( torqueOffset % testForce );
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting force: " << expectedForce);
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting torque: " << expectedTorque);
+
+ Vector3<real_t> actingForce(real_t(0));
+ Vector3<real_t> actingTorque(real_t(0));
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ actingForce += bodyIt->getForce();
+ actingTorque += bodyIt->getTorque();
+ }
+ }
+
+ mpi::allReduceInplace(actingForce[0], mpi::SUM);
+ mpi::allReduceInplace(actingForce[1], mpi::SUM);
+ mpi::allReduceInplace(actingForce[2], mpi::SUM);
+
+ mpi::allReduceInplace(actingTorque[0], mpi::SUM);
+ mpi::allReduceInplace(actingTorque[1], mpi::SUM);
+ mpi::allReduceInplace(actingTorque[2], mpi::SUM);
+
+ WALBERLA_ROOT_SECTION()
+ {
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[0], expectedForce[0], "Mismatch in force0");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[1], expectedForce[1], "Mismatch in force1");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingForce[2], expectedForce[2], "Mismatch in force2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[0], expectedTorque[0], "Mismatch in torque0");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[1], expectedTorque[1], "Mismatch in torque1");
+ WALBERLA_CHECK_FLOAT_EQUAL(actingTorque[2], expectedTorque[2], "Mismatch in torque2");
+ }
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ container1->clear();
+ container2->clear();
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - ended");
+
+ }
+
+ return 0;
+
+}
+
+} //namespace force_torque_container_test
+
+int main( int argc, char **argv ){
+ force_torque_container_test::main(argc, argv);
+}
diff --git a/tests/pe_coupling/utility/PeSubCyclingTest.cpp b/tests/pe_coupling/utility/PeSubCyclingTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..54268c11156242574e34042fa850566fa465c78a
--- /dev/null
+++ b/tests/pe_coupling/utility/PeSubCyclingTest.cpp
@@ -0,0 +1,455 @@
+//======================================================================================================================
+//
+// This file is part of waLBerla. waLBerla 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.
+//
+// waLBerla 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 waLBerla (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>.
+//
+//! \file PeSubCyclingTest.cpp
+//! \ingroup pe_coupling
+//! \author Christoph Rettinger <christoph.rettinger@fau.de>
+//
+//======================================================================================================================
+
+#include "blockforest/Initialization.h"
+
+#include "core/DataTypes.h"
+#include "core/Environment.h"
+#include "core/debug/TestSubsystem.h"
+#include "core/math/all.h"
+
+#include "pe/basic.h"
+#include "pe/utility/DestroyBody.h"
+#include "pe/cr/DEM.h"
+
+#include <pe_coupling/utility/all.h>
+
+namespace pe_sub_cycling_test
+{
+
+///////////
+// USING //
+///////////
+
+using namespace walberla;
+
+using BodyTypeTuple = boost::tuple<pe::Sphere> ;
+
+/*!\brief test case to check functionality of sub cycling in the pe time step provided by the coupling module
+ *
+ * During this time step, currently acting forces/torques on a body are kept constant.
+ *
+ * This test first computes the resulting position offset as well as the linear and rotational velocity after a
+ * certain force has been applied to a sphere when using several 'real' pe time steps and re-applying the force 10 times.
+ *
+ * It then checks the pe time step sub-cycling functionality of the coupling module by creating same-sized spheres
+ * at different locations and applying the same force. But this time, 10 sub-cycles are carried out.
+ * As a result, the same position offset and velocities must be obtained as in the regular case.
+ *
+ */
+//////////
+// MAIN //
+//////////
+int main( int argc, char **argv )
+{
+ debug::enterTestMode();
+
+ mpi::Environment env( argc, argv );
+
+ // uncomment to have logging
+ //logging::Logging::instance()->setLogLevel(logging::Logging::LogLevel::DETAIL);
+
+ const real_t dx = real_t(1);
+ const real_t radius = real_t(5);
+
+ ///////////////////////////
+ // DATA STRUCTURES SETUP //
+ ///////////////////////////
+
+ Vector3<uint_t> blocksPerDirection(uint_t(3), uint_t(1), uint_t(1));
+ Vector3<uint_t> cellsPerBlock(uint_t(20), uint_t(20), uint_t(20));
+ Vector3<bool> periodicity(true, false, false);
+
+ // create fully periodic domain with refined blocks
+ auto blocks = blockforest::createUniformBlockGrid( blocksPerDirection[0], blocksPerDirection[1], blocksPerDirection[2],
+ cellsPerBlock[0], cellsPerBlock[1], cellsPerBlock[2],
+ dx,
+ 0, false, false,
+ periodicity[0], periodicity[1], periodicity[2],
+ false );
+
+
+ // pe body storage
+ pe::SetBodyTypeIDs<BodyTypeTuple>::execute();
+ shared_ptr<pe::BodyStorage> globalBodyStorage = make_shared<pe::BodyStorage>();
+ auto bodyStorageID = blocks->addBlockData(pe::createStorageDataHandling<BodyTypeTuple>(), "Storage");
+ auto sphereMaterialID = pe::createMaterial( "sphereMat", real_t(1) , real_t(0.3), real_t(0.2), real_t(0.2), real_t(0.24), real_t(200), real_t(200), real_t(0), real_t(0) );
+
+ auto ccdID = blocks->addBlockData(pe::ccd::createHashGridsDataHandling( globalBodyStorage, bodyStorageID ), "CCD");
+ auto fcdID = blocks->addBlockData(pe::fcd::createGenericFCDDataHandling<BodyTypeTuple, pe::fcd::AnalyticCollideFunctor>(), "FCD");
+ pe::cr::DEM cr(globalBodyStorage, blocks->getBlockStoragePointer(), bodyStorageID, ccdID, fcdID, nullptr);
+
+ // set up synchronization procedure
+ const real_t overlap = real_t( 1.5 ) * dx;
+ std::function<void(void)> syncCall = std::bind( pe::syncNextNeighbors<BodyTypeTuple>, boost::ref(blocks->getBlockForest()), bodyStorageID, static_cast<WcTimingTree*>(nullptr), overlap, false );
+
+
+ // sphere positions for test scenarios
+ Vector3<real_t> positionInsideBlock(real_t(10), real_t(10), real_t(10));
+ Vector3<real_t> positionAtBlockBorder(real_t(19.9), real_t(10), real_t(10));
+ Vector3<real_t> positionAtBlockBorder2(real_t(20) + radius + overlap - real_t(0.1), real_t(10), real_t(10));
+
+ Vector3<real_t> testForce(real_t(2), real_t(1), real_t(0));
+ Vector3<real_t> torqueOffset = Vector3<real_t>(real_t(1), real_t(0), real_t(0));
+
+ uint_t peSubCycles( 10 );
+ real_t dtPe( real_t(10) );
+ real_t dtPeSubCycle = dtPe / real_c(peSubCycles);
+
+ pe_coupling::TimeStep timestep(blocks, bodyStorageID, cr, syncCall, dtPe, peSubCycles);
+
+ // evaluate how far the sphere will travel with a specific force applied which is the reference distance for later
+ // (depends on the chosen time integrator in the DEM and thus can not generally be computed a priori here)
+
+ Vector3<real_t> expectedPosOffset(real_t(0));
+ Vector3<real_t> expectedLinearVel(real_t(0));
+ Vector3<real_t> expectedAngularVel(real_t(0));
+ {
+
+ const Vector3<real_t>& startPos = positionInsideBlock;
+
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ startPos, radius, sphereMaterialID, false, true, false);
+
+ for( uint_t t = 0; t < peSubCycles; ++t )
+ {
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->addForceAtPos(testForce, bodyIt->getPosition() + torqueOffset);
+ }
+ }
+ cr.timestep(dtPeSubCycle);
+ syncCall();
+ }
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ expectedPosOffset = bodyIt->getPosition() - startPos;
+ expectedLinearVel = bodyIt->getLinearVel();
+ expectedAngularVel = bodyIt->getAngularVel();
+ }
+ }
+
+ mpi::allReduceInplace(expectedPosOffset[0], mpi::SUM);
+ mpi::allReduceInplace(expectedPosOffset[1], mpi::SUM);
+ mpi::allReduceInplace(expectedPosOffset[2], mpi::SUM);
+ mpi::allReduceInplace(expectedLinearVel[0], mpi::SUM);
+ mpi::allReduceInplace(expectedLinearVel[1], mpi::SUM);
+ mpi::allReduceInplace(expectedLinearVel[2], mpi::SUM);
+ mpi::allReduceInplace(expectedAngularVel[0], mpi::SUM);
+ mpi::allReduceInplace(expectedAngularVel[1], mpi::SUM);
+ mpi::allReduceInplace(expectedAngularVel[2], mpi::SUM);
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting position offset: " << expectedPosOffset);
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting linear vel: " << expectedLinearVel);
+ WALBERLA_LOG_DEVEL_ON_ROOT(" - expecting angular vel: " << expectedAngularVel);
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ }
+
+ //////////////////
+ // Inside block //
+ //////////////////
+ {
+ std::string testIdentifier("Test: sphere inside block");
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - started");
+
+ const Vector3<real_t>& startPos = positionInsideBlock;
+
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ startPos, radius, sphereMaterialID, false, true, false);
+
+ syncCall();
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ auto pos = bodyIt->getPosition();
+ bodyIt->addForceAtPos(testForce, pos+torqueOffset);
+ }
+ }
+
+ timestep();
+
+
+ Vector3<real_t> curPosOffset(real_t(0));
+ Vector3<real_t> curLinearVel(real_t(0));
+ Vector3<real_t> curAngularVel(real_t(0));
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ curPosOffset = bodyIt->getPosition() - startPos;
+ curLinearVel = bodyIt->getLinearVel();
+ curAngularVel = bodyIt->getAngularVel();
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[0], expectedPosOffset[0], "Mismatch in posOffset0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[1], expectedPosOffset[1], "Mismatch in posOffset1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[2], expectedPosOffset[2], "Mismatch in posOffset2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[0], expectedLinearVel[0], "Mismatch in linearVel0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[1], expectedLinearVel[1], "Mismatch in linearVel1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[2], expectedLinearVel[2], "Mismatch in linearVel2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[0], expectedAngularVel[0], "Mismatch in angularVel0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[1], expectedAngularVel[1], "Mismatch in angularVel1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[2], expectedAngularVel[2], "Mismatch in angularVel2");
+
+
+ }
+ }
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - ended");
+
+ }
+
+ ///////////////////////
+ // At block border 1 //
+ ///////////////////////
+ {
+ std::string testIdentifier("Test: sphere at block border 1");
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - started");
+
+ const Vector3<real_t>& startPos = positionAtBlockBorder;
+
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ startPos, radius, sphereMaterialID, false, true, false);
+
+ syncCall();
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ auto pos = bodyIt->getPosition();
+ bodyIt->addForceAtPos(testForce, pos+torqueOffset);
+ }
+ }
+
+ timestep();
+
+
+ Vector3<real_t> curPosOffset(real_t(0));
+ Vector3<real_t> curLinearVel(real_t(0));
+ Vector3<real_t> curAngularVel(real_t(0));
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ curPosOffset = bodyIt->getPosition() - startPos;
+ curLinearVel = bodyIt->getLinearVel();
+ curAngularVel = bodyIt->getAngularVel();
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[0], expectedPosOffset[0], "Mismatch in posOffset0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[1], expectedPosOffset[1], "Mismatch in posOffset1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[2], expectedPosOffset[2], "Mismatch in posOffset2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[0], expectedLinearVel[0], "Mismatch in linearVel0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[1], expectedLinearVel[1], "Mismatch in linearVel1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[2], expectedLinearVel[2], "Mismatch in linearVel2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[0], expectedAngularVel[0], "Mismatch in angularVel0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[1], expectedAngularVel[1], "Mismatch in angularVel1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[2], expectedAngularVel[2], "Mismatch in angularVel2");
+
+ }
+ }
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - ended");
+
+ }
+
+ ////////////////////////////
+ // At block border 1, mod //
+ ////////////////////////////
+ {
+ std::string testIdentifier("Test: sphere at block border 1 mod");
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - started");
+
+ const Vector3<real_t>& startPos = positionAtBlockBorder;
+
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ startPos, radius, sphereMaterialID, false, true, false);
+
+ syncCall();
+
+ // also add on shadow copy, but only half of it to have same total force/torque
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ auto pos = bodyIt->getPosition();
+ bodyIt->addForceAtPos(real_t(0.5)*testForce, pos+torqueOffset);
+ }
+ }
+
+ timestep();
+
+
+ Vector3<real_t> curPosOffset(real_t(0));
+ Vector3<real_t> curLinearVel(real_t(0));
+ Vector3<real_t> curAngularVel(real_t(0));
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ curPosOffset = bodyIt->getPosition() - startPos;
+ curLinearVel = bodyIt->getLinearVel();
+ curAngularVel = bodyIt->getAngularVel();
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[0], expectedPosOffset[0], "Mismatch in posOffset0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[1], expectedPosOffset[1], "Mismatch in posOffset1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[2], expectedPosOffset[2], "Mismatch in posOffset2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[0], expectedLinearVel[0], "Mismatch in linearVel0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[1], expectedLinearVel[1], "Mismatch in linearVel1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[2], expectedLinearVel[2], "Mismatch in linearVel2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[0], expectedAngularVel[0], "Mismatch in angularVel0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[1], expectedAngularVel[1], "Mismatch in angularVel1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[2], expectedAngularVel[2], "Mismatch in angularVel2");
+
+ }
+ }
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - ended");
+
+ }
+
+ ///////////////////////
+ // At block border 2 //
+ ///////////////////////
+ {
+ std::string testIdentifier("Test: sphere at block border 2");
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - started");
+
+ const Vector3<real_t>& startPos = positionAtBlockBorder2;
+
+ pe::createSphere(*globalBodyStorage, blocks->getBlockStorage(), bodyStorageID, 0,
+ startPos, radius, sphereMaterialID, false, true, false);
+
+ syncCall();
+
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ auto pos = bodyIt->getPosition();
+ bodyIt->addForceAtPos(testForce, pos+torqueOffset);
+ }
+ }
+
+ timestep();
+
+
+ Vector3<real_t> curPosOffset(real_t(0));
+ Vector3<real_t> curLinearVel(real_t(0));
+ Vector3<real_t> curAngularVel(real_t(0));
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::LocalBodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::LocalBodyIterator::end(); ++bodyIt )
+ {
+ curPosOffset = bodyIt->getPosition() - startPos;
+ curLinearVel = bodyIt->getLinearVel();
+ curAngularVel = bodyIt->getAngularVel();
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[0], expectedPosOffset[0], "Mismatch in posOffset0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[1], expectedPosOffset[1], "Mismatch in posOffset1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curPosOffset[2], expectedPosOffset[2], "Mismatch in posOffset2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[0], expectedLinearVel[0], "Mismatch in linearVel0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[1], expectedLinearVel[1], "Mismatch in linearVel1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curLinearVel[2], expectedLinearVel[2], "Mismatch in linearVel2");
+
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[0], expectedAngularVel[0], "Mismatch in angularVel0");
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[1], expectedAngularVel[1], "Mismatch in angularVel1");
+ WALBERLA_CHECK_FLOAT_EQUAL(curAngularVel[2], expectedAngularVel[2], "Mismatch in angularVel2");
+
+ }
+ }
+
+ // clean up
+ for( auto blockIt = blocks->begin(); blockIt != blocks->end(); ++blockIt )
+ {
+ for( auto bodyIt = pe::BodyIterator::begin( *blockIt, bodyStorageID); bodyIt != pe::BodyIterator::end(); ++bodyIt )
+ {
+ bodyIt->markForDeletion();
+ }
+ }
+ syncCall();
+
+ WALBERLA_LOG_DEVEL_ON_ROOT(testIdentifier << " - ended");
+
+ }
+
+ return 0;
+
+}
+
+} //namespace pe_sub_cycling_test
+
+int main( int argc, char **argv ){
+ pe_sub_cycling_test::main(argc, argv);
+}
diff --git a/tests/postprocessing/SQLiteTest.cpp b/tests/postprocessing/SQLiteTest.cpp
index 98d97e1beb2d6c3e588ac9cc0d24ea58341e4ab6..547bd12e9b2c3a07548a68ca7001c508fb5f8885 100644
--- a/tests/postprocessing/SQLiteTest.cpp
+++ b/tests/postprocessing/SQLiteTest.cpp
@@ -24,13 +24,11 @@
#include "postprocessing/sqlite/SQLite.h"
-using namespace walberla;
-
int main( int argc, char ** argv )
{
- debug::enterTestMode();
- mpi::Environment walberlaEnv( argc, argv );
+ walberla::debug::enterTestMode();
+ walberla::mpi::Environment walberlaEnv( argc, argv );
std::map<std::string, std::string> strColumns;
std::map<std::string, int> intColumns;
@@ -42,7 +40,7 @@ int main( int argc, char ** argv )
strColumns["property2"] = "value2";
strColumns["property3"] = "value3";
intColumns["i"] = int(i);
- postprocessing::storeRunInSqliteDB( "dbFile.sqlite", intColumns, strColumns );
+ walberla::postprocessing::storeRunInSqliteDB( "dbFile.sqlite", intColumns, strColumns );
}
for( int i=0; i< 100; ++i )
@@ -51,7 +49,7 @@ int main( int argc, char ** argv )
strColumns["property2"] = "value2";
strColumns["property3"] = "value3";
largeColumns["i"] = 4294967297 + i;
- postprocessing::storeRunInSqliteDB( "dbFile.sqlite", largeColumns, strColumns );
+ walberla::postprocessing::storeRunInSqliteDB( "dbFile.sqlite", largeColumns, strColumns );
}
return 0;
diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..db4ad89267a86e777e93ffe895423a4a92527656
--- /dev/null
+++ b/utilities/CMakeLists.txt
@@ -0,0 +1 @@
+waLBerla_link_files_to_builddir( filterCompileCommands.py )
diff --git a/utilities/filterCompileCommands.py b/utilities/filterCompileCommands.py
new file mode 100755
index 0000000000000000000000000000000000000000..3b0a08e7f932c224ce36d3845425937fadc08057
--- /dev/null
+++ b/utilities/filterCompileCommands.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+import json
+import sys
+
+def compileCommandSelector(x):
+ return not (("extern" in x["file"]) or ("tests" in x["file"]))
+
+if __name__ == "__main__":
+ if (len(sys.argv) != 2):
+ print("usage: ./filterCompileCommands.py compile_commands.json")
+ exit(-1)
+
+ filename = sys.argv[1]
+ print("loading compile commands file: {}".format(filename))
+
+ fin = open(filename, "r")
+ cc = json.load(fin)
+ fin.close()
+
+ print("compile commands read: {}".format(len(cc)))
+
+ cc_filtered = list( filter(compileCommandSelector, cc) )
+
+ print("compile commands filtered: {}".format(len(cc_filtered)))
+
+ fout = open(filename, "w")
+ json.dump(cc_filtered, fout)
+ fout.close()