From 8f23f31a6bbede229f72d4ced220b9341cb337a9 Mon Sep 17 00:00:00 2001 From: peters <peters@irmb.tu-bs.de> Date: Thu, 29 Apr 2021 10:12:46 +0200 Subject: [PATCH] Add new constants header with namespace. --- src/basics/Core/RealConstants.h | 432 +++++++++--------- src/basics/Core/VectorTypes.h | 3 +- .../VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu | 5 +- src/gpu/VirtualFluids_GPU/GPU/CP27.cu | 4 +- .../VirtualFluids_GPU/GPU/Calc2ndMoments27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/Cascade27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu | 4 +- .../VirtualFluids_GPU/GPU/Cumulant27chim.cu | 4 +- .../VirtualFluids_GPU/GPU/Cumulant_F3_27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/DragLift27.cu | 4 +- .../GPU/EnstrophyAnalyzer.cu | 4 +- .../VirtualFluids_GPU/GPU/ExchangeData27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/Init27.cu | 4 +- .../GPU/KineticEnergyAnalyzer.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/NoSlipBCs27.cu | 6 +- src/gpu/VirtualFluids_GPU/GPU/Particles.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/Random.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu | 4 +- .../VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu | 4 +- .../VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu | 4 +- .../VirtualFluids_GPU/GPU/SchlafferBCs27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/SetForcing27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu | 4 +- .../VirtualFluids_GPU/GPU/ThinWallBCs27.cu | 4 +- .../VirtualFluids_GPU/GPU/VelocityBCs27.cu | 4 +- .../VirtualFluids_GPU/GPU/WaleCumulant27.cu | 4 +- src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu | 4 +- .../Kernel/ChimeraTransformation.h | 4 +- .../Mod27/ADComp27/ADComp27_Device.cu | 4 +- .../Mod7/ADComp7/ADComp7_Device.cu | 4 +- .../Mod27/ADIncomp27/ADIncomp27_Device.cu | 4 +- .../Mod7/ADIncomp7/ADIncomp7_Device.cu | 4 +- .../Compressible/BGK/BGKCompSP27_Device.cu | 4 +- .../BGKPlus/BGKPlusCompSP27_Device.cu | 4 +- .../Cascade/CascadeCompSP27_Device.cu | 4 +- .../Cumulant/CumulantCompSP27_Device.cu | 4 +- .../CumulantAll4CompSP27_Device.cu | 6 +- .../CumulantK15/CumulantK15Comp_Device.cu | 6 +- .../CumulantK15BulkComp_Device.cu | 6 +- .../CumulantK15SpongeComp_Device.cu | 4 +- .../CumulantK17/CumulantK17Comp_Device.cu | 6 +- .../CumulantK17BulkComp_Device.cu | 4 +- .../CumulantK17CompChim_Device.cu | 4 +- .../CumulantK18/CumulantK18Comp_Device.cu | 4 +- .../CumulantK20/CumulantK20Comp_Device.cu | 4 +- .../Compressible/MRT/MRTCompSP27_Device.cu | 4 +- .../BGK/BGKIncompSP27_Device.cu | 4 +- .../BGKPlus/BGKPlusIncompSP27_Device.cu | 4 +- .../Cascade/CascadeIncompSP27_Device.cu | 4 +- .../Cumulant1hIncompSP27_Device.cu | 6 +- .../CumulantIsoIncompSP27_Device.cu | 6 +- .../CumulantK15/CumulantK15Incomp_Device.cu | 4 +- .../MRT/MRTIncompSP27_Device.cu | 4 +- .../PMCumulantOneCompSP27_Device.cu | 4 +- .../CumulantK15/WaleCumulantK15Comp_Device.cu | 4 +- .../WaleBySoniMalavCumulantK15Comp_Device.cu | 4 +- .../CumulantK17/WaleCumulantK17Comp_Device.cu | 4 +- .../WaleCumulantK17DebugComp_Device.cu | 4 +- .../InitCompAD27/InitCompAD27_Device.cu | 4 +- .../InitCompAD7/InitCompAD7_Device.cu | 4 +- .../InitCompSP27/InitCompSP27_Device.cu | 4 +- .../InitF3/InitF3_Device.cu | 4 +- .../InitIncompAD27/InitIncompAD27_Device.cu | 4 +- .../InitIncompAD7/InitIncompAD7_Device.cu | 4 +- .../InitSP27/InitSP27_Device.cu | 4 +- src/lbm/constants/NumericConstants.h | 230 ++++++++++ 69 files changed, 653 insertions(+), 291 deletions(-) create mode 100644 src/lbm/constants/NumericConstants.h diff --git a/src/basics/Core/RealConstants.h b/src/basics/Core/RealConstants.h index d353a341c..91fe0ec0c 100644 --- a/src/basics/Core/RealConstants.h +++ b/src/basics/Core/RealConstants.h @@ -1,223 +1,223 @@ -#ifndef REAL_CONSTANT_H -#define REAL_CONSTANT_H +// #ifndef REAL_CONSTANT_H +// #define REAL_CONSTANT_H -#ifdef VF_DOUBLE_ACCURACY -#define c1o2 0.5 -#define c3o2 1.5 -#define c1o3 0.333333333333333 -#define c2o3 0.666666666666667 -#define c1o4 0.25 -#define c3o4 0.75 -#define c1o6 0.166666666666667 -#define c1o7 0.142857142857143 -#define c1o8 0.125 -#define c1o9 0.111111111111111 -#define c2o9 0.222222222222222 -#define c4o9 0.444444444444444 -#define c1o10 0.1 -#define c1o12 0.083333333333333 -#define c1o16 0.0625 -#define c3o16 0.1875 -#define c9o16 0.5625 -#define c1o18 0.055555555555556 -#define c1o20 0.05 -#define c19o20 0.95 -#define c21o20 1.05 -#define c1o24 0.041666666666667 -#define c1o27 0.037037037037037 -#define c3o32 0.09375 -#define c4o32 0.125 -#define c1o36 0.027777777777778 -#define c1o48 0.020833333333333 -#define c1o64 0.015625 -#define c3o64 0.046875 -#define c9o64 0.140625 -#define c27o64 0.421875 -#define c1o66 0.015151515151515 -#define c1o72 0.013888888888889 -#define c1o264 0.003787878787879 -#define c8o27 0.296296296296296 -#define c2o27 0.074074074074074 -#define c1o54 0.018518518518519 -#define c1o100 0.01 -#define c99o100 0.99 -#define c1o126 0.007936507936508 -#define c1o216 0.004629629629630 -#define c5o4 1.25 -#define c9o4 2.25 -#define c5o2 2.5 -#define c9o2 4.5 +// #ifdef VF_DOUBLE_ACCURACY +// #define c1o2 0.5 +// #define c3o2 1.5 +// #define c1o3 0.333333333333333 +// #define c2o3 0.666666666666667 +// #define c1o4 0.25 +// #define c3o4 0.75 +// #define c1o6 0.166666666666667 +// #define c1o7 0.142857142857143 +// #define c1o8 0.125 +// #define c1o9 0.111111111111111 +// #define c2o9 0.222222222222222 +// #define c4o9 0.444444444444444 +// #define c1o10 0.1 +// #define c1o12 0.083333333333333 +// #define c1o16 0.0625 +// #define c3o16 0.1875 +// #define c9o16 0.5625 +// #define c1o18 0.055555555555556 +// #define c1o20 0.05 +// #define c19o20 0.95 +// #define c21o20 1.05 +// #define c1o24 0.041666666666667 +// #define c1o27 0.037037037037037 +// #define c3o32 0.09375 +// #define c4o32 0.125 +// #define c1o36 0.027777777777778 +// #define c1o48 0.020833333333333 +// #define c1o64 0.015625 +// #define c3o64 0.046875 +// #define c9o64 0.140625 +// #define c27o64 0.421875 +// #define c1o66 0.015151515151515 +// #define c1o72 0.013888888888889 +// #define c1o264 0.003787878787879 +// #define c8o27 0.296296296296296 +// #define c2o27 0.074074074074074 +// #define c1o54 0.018518518518519 +// #define c1o100 0.01 +// #define c99o100 0.99 +// #define c1o126 0.007936507936508 +// #define c1o216 0.004629629629630 +// #define c5o4 1.25 +// #define c9o4 2.25 +// #define c5o2 2.5 +// #define c9o2 4.5 -#define c0o1 0. -#define c1o1 1. -#define c2o1 2. -#define c3o1 3. -#define c4o1 4. -#define c5o1 5. -#define c6o1 6. -#define c7o1 7. -#define c8o1 8. -#define c9o1 9. -#define c10o1 10. -#define c11o1 11. -#define c12o1 12. -#define c13o1 13. -#define c14o1 14. -#define c15o1 15. -#define c16o1 16. -#define c17o1 17. -#define c18o1 18. -#define c21o1 21. -#define c24o1 24. -#define c25o1 25. -#define c26o1 26. -#define c27o1 27. -#define c28o1 28. -#define c29o1 29. -#define c30o1 30. -#define c32o1 32. -#define c33o1 33. -#define c34o1 34. -#define c36o1 36. -#define c40o1 40. -#define c42o1 42. -#define c46o1 46. -#define c48o1 48. -#define c50o1 50. -#define c52o1 52. -#define c54o1 54. -#define c56o1 56. -#define c64o1 64. -#define c66o1 66. -#define c68o1 68. -#define c69o1 69. -#define c72o1 72. -#define c84o1 84. -#define c88o1 88. -#define c96o1 96. -#define c100o1 100.0 -#define c130o1 130.0 -#define c152o1 152.0 -#define c166o1 166.0 -#define c195o1 195.0 -#define c216o1 216.0 -#define c264o1 264.0 -#define c290o1 290.0 -#define c367o1 367.0 +// #define c0o1 0. +// #define c1o1 1. +// #define c2o1 2. +// #define c3o1 3. +// #define c4o1 4. +// #define c5o1 5. +// #define c6o1 6. +// #define c7o1 7. +// #define c8o1 8. +// #define c9o1 9. +// #define c10o1 10. +// #define c11o1 11. +// #define c12o1 12. +// #define c13o1 13. +// #define c14o1 14. +// #define c15o1 15. +// #define c16o1 16. +// #define c17o1 17. +// #define c18o1 18. +// #define c21o1 21. +// #define c24o1 24. +// #define c25o1 25. +// #define c26o1 26. +// #define c27o1 27. +// #define c28o1 28. +// #define c29o1 29. +// #define c30o1 30. +// #define c32o1 32. +// #define c33o1 33. +// #define c34o1 34. +// #define c36o1 36. +// #define c40o1 40. +// #define c42o1 42. +// #define c46o1 46. +// #define c48o1 48. +// #define c50o1 50. +// #define c52o1 52. +// #define c54o1 54. +// #define c56o1 56. +// #define c64o1 64. +// #define c66o1 66. +// #define c68o1 68. +// #define c69o1 69. +// #define c72o1 72. +// #define c84o1 84. +// #define c88o1 88. +// #define c96o1 96. +// #define c100o1 100.0 +// #define c130o1 130.0 +// #define c152o1 152.0 +// #define c166o1 166.0 +// #define c195o1 195.0 +// #define c216o1 216.0 +// #define c264o1 264.0 +// #define c290o1 290.0 +// #define c367o1 367.0 -#define Op0000002 0.0000002 -#define c10eM30 1e-30 -#define c10eM10 1e-10 -#define smallSingle 0.0000000002 +// #define Op0000002 0.0000002 +// #define c10eM30 1e-30 +// #define c10eM10 1e-10 +// #define smallSingle 0.0000000002 -#else -#define c1o2 0.5f -#define c3o2 1.5f -#define c1o3 (1.0f / 3.0f) -#define c2o3 (2.0f / 3.0f) -#define c1o4 0.25f -#define c3o4 0.75f -#define c1o6 (1.0f / 6.0f) -#define c1o7 (1.0f / 7.0f) -#define c1o8 0.125f -#define c1o9 (1.0f / 9.0f) -#define c2o9 (2.0f / 9.0f) -#define c4o9 (4.0f / 9.0f) -#define c1o10 0.1f -#define c1o12 (1.0f / 12.0f) -#define c1o16 0.0625f -#define c3o16 0.1875f -#define c9o16 0.5625f -#define c1o18 (1.0f / 18.0f) -#define c1o20 0.05f -#define c19o20 0.95f -#define c21o20 1.05f -#define c1o24 (1.0f / 24.0f) -#define c1o27 (1.0f / 27.0f) -#define c3o32 0.09375f -#define c4o32 0.125f -#define c1o36 (1.0f / 36.0f) -#define c1o48 (1.0f / 48.0f) -#define c1o64 0.015625f -#define c3o64 0.046875f -#define c9o64 0.140625f -#define c27o64 0.421875f -#define c1o66 (1.0f / 66.0f) -#define c1o72 (1.0f / 72.0f) -#define c1o264 (1.0f / 264.0f) -#define c8o27 (8.0f / 27.0f) -#define c2o27 (2.0f / 27.0f) -#define c1o54 (1.0f / 54.0f) -#define c1o100 0.01f -#define c99o100 0.99f -#define c1o126 (1.0f / 126.0f) -#define c1o216 (1.0f / 216.0f) -#define c5o4 1.25f -#define c9o4 2.25f -#define c5o2 2.5f -#define c9o2 4.5f +// #else +// #define c1o2 0.5f +// #define c3o2 1.5f +// #define c1o3 (1.0f / 3.0f) +// #define c2o3 (2.0f / 3.0f) +// #define c1o4 0.25f +// #define c3o4 0.75f +// #define c1o6 (1.0f / 6.0f) +// #define c1o7 (1.0f / 7.0f) +// #define c1o8 0.125f +// #define c1o9 (1.0f / 9.0f) +// #define c2o9 (2.0f / 9.0f) +// #define c4o9 (4.0f / 9.0f) +// #define c1o10 0.1f +// #define c1o12 (1.0f / 12.0f) +// #define c1o16 0.0625f +// #define c3o16 0.1875f +// #define c9o16 0.5625f +// #define c1o18 (1.0f / 18.0f) +// #define c1o20 0.05f +// #define c19o20 0.95f +// #define c21o20 1.05f +// #define c1o24 (1.0f / 24.0f) +// #define c1o27 (1.0f / 27.0f) +// #define c3o32 0.09375f +// #define c4o32 0.125f +// #define c1o36 (1.0f / 36.0f) +// #define c1o48 (1.0f / 48.0f) +// #define c1o64 0.015625f +// #define c3o64 0.046875f +// #define c9o64 0.140625f +// #define c27o64 0.421875f +// #define c1o66 (1.0f / 66.0f) +// #define c1o72 (1.0f / 72.0f) +// #define c1o264 (1.0f / 264.0f) +// #define c8o27 (8.0f / 27.0f) +// #define c2o27 (2.0f / 27.0f) +// #define c1o54 (1.0f / 54.0f) +// #define c1o100 0.01f +// #define c99o100 0.99f +// #define c1o126 (1.0f / 126.0f) +// #define c1o216 (1.0f / 216.0f) +// #define c5o4 1.25f +// #define c9o4 2.25f +// #define c5o2 2.5f +// #define c9o2 4.5f -#define c0o1 0.f -#define c1o1 1.f -#define c2o1 2.f -#define c3o1 3.f -#define c4o1 4.f -#define c5o1 5.f -#define c6o1 6.f -#define c7o1 7.f -#define c8o1 8.f -#define c9o1 9.f -#define c10o1 10.f -#define c11o1 11.f -#define c12o1 12.f -#define c13o1 13.f -#define c14o1 14.f -#define c15o1 15.f -#define c16o1 16.f -#define c17o1 17.f -#define c18o1 18.f -#define c21o1 21.f -#define c24o1 24.f -#define c25o1 25.f -#define c26o1 26.f -#define c27o1 27.f -#define c28o1 28.f -#define c29o1 29.f -#define c30o1 30.f -#define c32o1 32.f -#define c33o1 33.f -#define c34o1 34.f -#define c36o1 36.f -#define c40o1 40.f -#define c42o1 42.f -#define c46o1 46.f -#define c48o1 48.f -#define c50o1 50.f -#define c52o1 52.f -#define c54o1 54.f -#define c56o1 56.f -#define c64o1 64.f -#define c66o1 66.f -#define c68o1 68.f -#define c69o1 69.f -#define c72o1 72.f -#define c84o1 84.f -#define c88o1 88.f -#define c96o1 96.f -#define c100o1 100.0f -#define c130o1 130.0f -#define c152o1 152.0f -#define c166o1 166.0f -#define c195o1 195.0f -#define c216o1 216.0f -#define c264o1 264.0f -#define c290o1 290.0f -#define c367o1 367.0f +// #define c0o1 0.f +// #define c1o1 1.f +// #define c2o1 2.f +// #define c3o1 3.f +// #define c4o1 4.f +// #define c5o1 5.f +// #define c6o1 6.f +// #define c7o1 7.f +// #define c8o1 8.f +// #define c9o1 9.f +// #define c10o1 10.f +// #define c11o1 11.f +// #define c12o1 12.f +// #define c13o1 13.f +// #define c14o1 14.f +// #define c15o1 15.f +// #define c16o1 16.f +// #define c17o1 17.f +// #define c18o1 18.f +// #define c21o1 21.f +// #define c24o1 24.f +// #define c25o1 25.f +// #define c26o1 26.f +// #define c27o1 27.f +// #define c28o1 28.f +// #define c29o1 29.f +// #define c30o1 30.f +// #define c32o1 32.f +// #define c33o1 33.f +// #define c34o1 34.f +// #define c36o1 36.f +// #define c40o1 40.f +// #define c42o1 42.f +// #define c46o1 46.f +// #define c48o1 48.f +// #define c50o1 50.f +// #define c52o1 52.f +// #define c54o1 54.f +// #define c56o1 56.f +// #define c64o1 64.f +// #define c66o1 66.f +// #define c68o1 68.f +// #define c69o1 69.f +// #define c72o1 72.f +// #define c84o1 84.f +// #define c88o1 88.f +// #define c96o1 96.f +// #define c100o1 100.0f +// #define c130o1 130.0f +// #define c152o1 152.0f +// #define c166o1 166.0f +// #define c195o1 195.0f +// #define c216o1 216.0f +// #define c264o1 264.0f +// #define c290o1 290.0f +// #define c367o1 367.0f -#define Op0000002 0.0000002f -#define c10eM30 1e-30 -#define c10eM10 1e-10 -#define smallSingle 0.0000000002f -#endif +// #define Op0000002 0.0000002f +// #define c10eM30 1e-30 +// #define c10eM10 1e-10 +// #define smallSingle 0.0000000002f +// #endif -#endif \ No newline at end of file +// #endif \ No newline at end of file diff --git a/src/basics/Core/VectorTypes.h b/src/basics/Core/VectorTypes.h index 3109112b2..226ab7c55 100644 --- a/src/basics/Core/VectorTypes.h +++ b/src/basics/Core/VectorTypes.h @@ -17,10 +17,9 @@ #include "basics_export.h" #include "DataTypes.h" -#include "RealConstants.h" struct BASICS_EXPORT Vec3 { - real x{ c0o1 }, y{ c0o1 }, z{ c0o1 }; + real x{ 0. }, y{ 0. }, z{ 0. }; __host__ __device__ Vec3(real x, real y, real z) : x(x), y(y), z(z) {} Vec3() = default; diff --git a/src/gpu/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu index 6e67ecda7..0643e59cc 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/AdvecDiffBCs27.cu @@ -1,7 +1,10 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" + +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void QADPress7( int inx, diff --git a/src/gpu/VirtualFluids_GPU/GPU/CP27.cu b/src/gpu/VirtualFluids_GPU/GPU/CP27.cu index afaf110ad..289152f17 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/CP27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/CP27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void CalcCP27(real* DD, diff --git a/src/gpu/VirtualFluids_GPU/GPU/Calc2ndMoments27.cu b/src/gpu/VirtualFluids_GPU/GPU/Calc2ndMoments27.cu index 2e0a0e489..337e518c7 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Calc2ndMoments27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Calc2ndMoments27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu b/src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu index 69c0b8859..ce3082817 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/CalcMac27.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void LBCalcMac27( real* vxD, diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cascade27.cu b/src/gpu/VirtualFluids_GPU/GPU/Cascade27.cu index 0301d8588..5c3a12551 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Cascade27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Cascade27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu index 0da46c500..14c9b77ed 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu index b6d77f648..bb34a11a7 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant27chim.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" diff --git a/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu b/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu index 6b2323336..876348232 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Cumulant_F3_27.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" ///////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/GPU/DragLift27.cu b/src/gpu/VirtualFluids_GPU/GPU/DragLift27.cu index f48d6a2a5..7fb12d177 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/DragLift27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/DragLift27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void DragLiftPost27( real* DD, diff --git a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu index 5380ce071..a020d3dfd 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/EnstrophyAnalyzer.cu @@ -18,7 +18,9 @@ #include "Parameter/Parameter.h" // includes, kernels #include "GPU/GPU_Kernels.cuh" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; __global__ void enstrophyKernel ( real* veloX, real* veloY, real* veloZ, real* rho, uint* neighborX, uint* neighborY, uint* neighborZ, uint* neighborWSB, uint* geo, real* enstrophy, uint* isFluid, uint size_Mat ); diff --git a/src/gpu/VirtualFluids_GPU/GPU/ExchangeData27.cu b/src/gpu/VirtualFluids_GPU/GPU/ExchangeData27.cu index 8ff384a9c..980b39042 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ExchangeData27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ExchangeData27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void getSendFsPost27(real* DD, diff --git a/src/gpu/VirtualFluids_GPU/GPU/Init27.cu b/src/gpu/VirtualFluids_GPU/GPU/Init27.cu index c428913b8..7b3426b01 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Init27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Init27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void LBInit27( int myid, diff --git a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu index e6e5c9b11..42e424062 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/KineticEnergyAnalyzer.cu @@ -19,7 +19,9 @@ #include "Parameter/Parameter.h" // includes, kernels #include "GPU/GPU_Kernels.cuh" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; __global__ void kineticEnergyKernel (real* vx, real* vy, real* vz, real* rho, uint* neighborX, uint* neighborY, uint* neighborZ, uint* neighborWSB, uint* geo, real* kineticEnergy, uint* isFluid, uint size_Mat); diff --git a/src/gpu/VirtualFluids_GPU/GPU/NoSlipBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/NoSlipBCs27.cu index 72f105542..9c8392ff0 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/NoSlipBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/NoSlipBCs27.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void QDevice3rdMomentsComp27( int inx, @@ -2428,7 +2430,7 @@ extern "C" __global__ void QDevice27(int inx, real cu_sq=c3o2*(vx1*vx1+vx2*vx2+vx3*vx3); - //böser lecktest + //b�ser lecktest //q = q_dirE[k]; // if (q>=zero && q<=one) // { diff --git a/src/gpu/VirtualFluids_GPU/GPU/Particles.cu b/src/gpu/VirtualFluids_GPU/GPU/Particles.cu index f81d3f4e8..a286434d8 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Particles.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Particles.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu index 149daf632..4d647cdd1 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/PressBCs27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void QInflowScaleByPressDevice27( real* rhoBC, diff --git a/src/gpu/VirtualFluids_GPU/GPU/Random.cu b/src/gpu/VirtualFluids_GPU/GPU/Random.cu index dae40e1b4..702021f81 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/Random.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/Random.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //random numbers #include <curand.h> #include <curand_kernel.h> diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu index 43f06fb0f..8be2edf3e 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF27.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////// extern "C" __global__ void scaleCF_0817_comp_27( real* DC, diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu index 0b4c4aae6..5bafb27d2 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleCF_F3_27.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////// extern "C" __global__ void scaleCF_comp_D3Q27F3_2018(real* DC, diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu index 4b085a7d6..06d5086cc 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleFC27.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////// extern "C" __global__ void scaleFC_0817_comp_27( real* DC, diff --git a/src/gpu/VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu b/src/gpu/VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu index 3cccd8cb1..efb0bf523 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ScaleFC_F3_27.cu @@ -8,7 +8,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////// extern "C" __global__ void scaleFC_comp_D3Q27F3_2018(real* DC, diff --git a/src/gpu/VirtualFluids_GPU/GPU/SchlafferBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/SchlafferBCs27.cu index 8fa1ff3a1..9a28050cd 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/SchlafferBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/SchlafferBCs27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void PressSchlaff27(real* rhoBC, diff --git a/src/gpu/VirtualFluids_GPU/GPU/SetForcing27.cu b/src/gpu/VirtualFluids_GPU/GPU/SetForcing27.cu index fe8d74439..baad61888 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/SetForcing27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/SetForcing27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void GetVeloforForcing27( real* DD, diff --git a/src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu index 30540769f..fc792a2c3 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/SlipBCs27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void QSlipDevice27(real* DD, diff --git a/src/gpu/VirtualFluids_GPU/GPU/ThinWallBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/ThinWallBCs27.cu index 78e6f08dc..715a94cbf 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/ThinWallBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/ThinWallBCs27.cu @@ -9,7 +9,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ///////////////////////////////////////////////////////////////////////// extern "C" __global__ void QVelDeviceCompThinWallsPartOne27( diff --git a/src/gpu/VirtualFluids_GPU/GPU/VelocityBCs27.cu b/src/gpu/VirtualFluids_GPU/GPU/VelocityBCs27.cu index f3288175c..e7f25874d 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/VelocityBCs27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/VelocityBCs27.cu @@ -9,7 +9,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////////// extern "C" __global__ void QVelDeviceCompPlusSlip27(int inx, diff --git a/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu b/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu index d39e229c4..e911a716c 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/WaleCumulant27.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" diff --git a/src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu b/src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu index 44319be27..20ef490ce 100644 --- a/src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu +++ b/src/gpu/VirtualFluids_GPU/GPU/WallFunction.cu @@ -1,7 +1,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; ////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/Kernel/ChimeraTransformation.h b/src/gpu/VirtualFluids_GPU/Kernel/ChimeraTransformation.h index 40fab9d72..f7822d63f 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/ChimeraTransformation.h +++ b/src/gpu/VirtualFluids_GPU/Kernel/ChimeraTransformation.h @@ -1,7 +1,9 @@ #ifndef CHIMERA_TRANSFORMATION_H #define CHIMERA_TRANSFORMATION_H -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; //////////////////////////////////////////////////////////////////////////////// //! \brief forward chimera transformation \ref forwardInverseChimeraWithK diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Compressible/Mod27/ADComp27/ADComp27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Compressible/Mod27/ADComp27/ADComp27_Device.cu index 34c71db68..3ad149064 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Compressible/Mod27/ADComp27/ADComp27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Compressible/Mod27/ADComp27/ADComp27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_KERNEL_AD_COMP_27(real diffusivity, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Compressible/Mod7/ADComp7/ADComp7_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Compressible/Mod7/ADComp7/ADComp7_Device.cu index 15ecdd476..d5de82af5 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Compressible/Mod7/ADComp7/ADComp7_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Compressible/Mod7/ADComp7/ADComp7_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_AD_Comp_7(real diffusivity, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod27/ADIncomp27/ADIncomp27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod27/ADIncomp27/ADIncomp27_Device.cu index 0daf75c0a..d9586b2eb 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod27/ADIncomp27/ADIncomp27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod27/ADIncomp27/ADIncomp27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_AD_Incomp_27(real diffusivity, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod7/ADIncomp7/ADIncomp7_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod7/ADIncomp7/ADIncomp7_Device.cu index 43d02e0f1..7ae4535d0 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod7/ADIncomp7/ADIncomp7_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/AdvectionDiffusion/Incompressible/Mod7/ADIncomp7/ADIncomp7_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_AD_Incomp_7(real diffusivity, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGK/BGKCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGK/BGKCompSP27_Device.cu index 717007d84..c40397041 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGK/BGKCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGK/BGKCompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGKPlus/BGKPlusCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGKPlus/BGKPlusCompSP27_Device.cu index 9f2822f38..25138592c 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGKPlus/BGKPlusCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/BGKPlus/BGKPlusCompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_BGK_Plus_Comp_SP_27( diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cascade/CascadeCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cascade/CascadeCompSP27_Device.cu index d093a3202..b024c2627 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cascade/CascadeCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cascade/CascadeCompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_Cascade_Comp_SP_27(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cumulant/CumulantCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cumulant/CumulantCompSP27_Device.cu index dd5196fee..e76926b49 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cumulant/CumulantCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/Cumulant/CumulantCompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_Cum_Comp_SP_27(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantAll4/CumulantAll4CompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantAll4/CumulantAll4CompSP27_Device.cu index 99f7a4c03..599892c2f 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantAll4/CumulantAll4CompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantAll4/CumulantAll4CompSP27_Device.cu @@ -2,7 +2,9 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_Cumulant_D3Q27All4( real omega, @@ -231,7 +233,7 @@ extern "C" __global__ void LB_Kernel_Cumulant_D3Q27All4( real omega, // mfbbc-mfbba; //////////////////////////////////////////////////////////////////////////////////// // oMdrho assembler style -------> faaaaaastaaaa - // or much sloooowaaaa ... it depändssssss on sadaku + // or much sloooowaaaa ... it dep�ndssssss on sadaku real m0, m1, m2; //real oMdrho; //{ diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15/CumulantK15Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15/CumulantK15Comp_Device.cu index 4fb90b709..7349be584 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15/CumulantK15Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15/CumulantK15Comp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_CumulantK15Comp(real omega, @@ -227,7 +229,7 @@ extern "C" __global__ void LB_Kernel_CumulantK15Comp(real omega, // mfbbc-mfbba; //////////////////////////////////////////////////////////////////////////////////// // oMdrho assembler style -------> faaaaaastaaaa - // or much sloooowaaaa ... it depändssssss on sadaku + // or much sloooowaaaa ... it dep�ndssssss on sadaku real m0, m1, m2; //real oMdrho; //{ diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15Bulk/CumulantK15BulkComp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15Bulk/CumulantK15BulkComp_Device.cu index 1a0efdf8e..986e81639 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15Bulk/CumulantK15BulkComp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15Bulk/CumulantK15BulkComp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_CumulantK15BulkComp(real omega, @@ -227,7 +229,7 @@ extern "C" __global__ void LB_Kernel_CumulantK15BulkComp(real omega, // mfbbc-mfbba; //////////////////////////////////////////////////////////////////////////////////// // oMdrho assembler style -------> faaaaaastaaaa - // or much sloooowaaaa ... it depändssssss on sadaku + // or much sloooowaaaa ... it dep�ndssssss on sadaku real m0, m1, m2; real vx2; real vy2; diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15Sponge/CumulantK15SpongeComp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15Sponge/CumulantK15SpongeComp_Device.cu index 3a916bb89..c8be85d2e 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15Sponge/CumulantK15SpongeComp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK15Sponge/CumulantK15SpongeComp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_CumulantK15SpongeComp(real omegaIn, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/CumulantK17Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/CumulantK17Comp_Device.cu index 9ccd7dcb4..4c20e4655 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/CumulantK17Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17/CumulantK17Comp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" @@ -229,7 +231,7 @@ extern "C" __global__ void LB_Kernel_CumulantK17Comp(real omega, // mfbbc-mfbba; //////////////////////////////////////////////////////////////////////////////////// // oMdrho assembler style -------> faaaaaastaaaa - // or much sloooowaaaa ... it depändssssss on sadaku + // or much sloooowaaaa ... it dep�ndssssss on sadaku real m0, m1, m2; //real oMdrho; //{ diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/CumulantK17BulkComp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/CumulantK17BulkComp_Device.cu index 147b814a3..0e10a2d95 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/CumulantK17BulkComp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17Bulk/CumulantK17BulkComp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_CumulantK17BulkComp(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/CumulantK17CompChim_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/CumulantK17CompChim_Device.cu index 6b316deb8..8c95f9673 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/CumulantK17CompChim_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK17chim/CumulantK17CompChim_Device.cu @@ -33,7 +33,9 @@ /* Device code */ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "Kernel/ChimeraTransformation.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK18/CumulantK18Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK18/CumulantK18Comp_Device.cu index 2249e5857..8d5b10b1e 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK18/CumulantK18Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK18/CumulantK18Comp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_CumulantK18Comp( diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK20/CumulantK20Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK20/CumulantK20Comp_Device.cu index 9edae07fa..959a9e6d7 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK20/CumulantK20Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/CumulantK20/CumulantK20Comp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_CumulantK20Comp( diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/MRT/MRTCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/MRT/MRTCompSP27_Device.cu index 87984a4d9..9bde8228f 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/MRT/MRTCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Compressible/MRT/MRTCompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_MRT_Comp_SP_27(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/BGK/BGKIncompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/BGK/BGKIncompSP27_Device.cu index 3869fc271..138b17170 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/BGK/BGKIncompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/BGK/BGKIncompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_BGK_Incomp_SP_27(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/BGKPlus/BGKPlusIncompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/BGKPlus/BGKPlusIncompSP27_Device.cu index e82de30a7..deb8d94dc 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/BGKPlus/BGKPlusIncompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/BGKPlus/BGKPlusIncompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_BGK_Plus_Incomp_SP_27(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cascade/CascadeIncompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cascade/CascadeIncompSP27_Device.cu index 649bd0fc3..025729760 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cascade/CascadeIncompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cascade/CascadeIncompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_Cascade_Incomp_SP_27(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cumulant1hSP27/Cumulant1hIncompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cumulant1hSP27/Cumulant1hIncompSP27_Device.cu index f8f8b1ced..84bf396c4 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cumulant1hSP27/Cumulant1hIncompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/Cumulant1hSP27/Cumulant1hIncompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_Cum_1h_Incomp_SP_27(real omega, @@ -226,7 +228,7 @@ extern "C" __global__ void LB_Kernel_Cum_1h_Incomp_SP_27(real omega, // mfbbc-mfbba; //////////////////////////////////////////////////////////////////////////////////// // oMdrho assembler style -------> faaaaaastaaaa - // or much sloooowaaaa ... it depändssssss on sadaku + // or much sloooowaaaa ... it dep�ndssssss on sadaku real m0, m1, m2; //real oMdrho; //{ diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/CumulantIsoSP27/CumulantIsoIncompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/CumulantIsoSP27/CumulantIsoIncompSP27_Device.cu index 4baf5ffdd..753bb0be7 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/CumulantIsoSP27/CumulantIsoIncompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/CumulantIsoSP27/CumulantIsoIncompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_Cum_IsoTest_Incomp_SP_27(real omega, @@ -183,7 +185,7 @@ extern "C" __global__ void LB_Kernel_Cum_IsoTest_Incomp_SP_27(real omega, // mfbbc-mfbba; //////////////////////////////////////////////////////////////////////////////////// // oMdrho assembler style -------> faaaaaastaaaa - // or much sloooowaaaa ... it depändssssss on sadaku + // or much sloooowaaaa ... it dep�ndssssss on sadaku real m0, m1, m2; //real oMdrho; //{ diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/CumulantK15/CumulantK15Incomp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/CumulantK15/CumulantK15Incomp_Device.cu index 1aece7875..9c8ca3a68 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/CumulantK15/CumulantK15Incomp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/CumulantK15/CumulantK15Incomp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_CumulantK15Incomp(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/MRT/MRTIncompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/MRT/MRTIncompSP27_Device.cu index 97b5e96aa..be2b2333a 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/MRT/MRTIncompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/BasicKernels/FluidFlow/Incompressible/MRT/MRTIncompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_MRT_Incomp_SP_27(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/PorousMediaKernels/FluidFlow/Compressible/CumulantOne/PMCumulantOneCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/PorousMediaKernels/FluidFlow/Compressible/CumulantOne/PMCumulantOneCompSP27_Device.cu index 734b71e7a..2f42b7172 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/PorousMediaKernels/FluidFlow/Compressible/CumulantOne/PMCumulantOneCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/PorousMediaKernels/FluidFlow/Compressible/CumulantOne/PMCumulantOneCompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_PM_Cum_One_Comp_SP_27(real omega, diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK15/WaleCumulantK15Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK15/WaleCumulantK15Comp_Device.cu index a23d1c480..ec012bb8f 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK15/WaleCumulantK15Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK15/WaleCumulantK15Comp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_WaleCumulantK15Comp( diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK15BySoniMalav/WaleBySoniMalavCumulantK15Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK15BySoniMalav/WaleBySoniMalavCumulantK15Comp_Device.cu index 7d3e1fab7..a791e1114 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK15BySoniMalav/WaleBySoniMalavCumulantK15Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK15BySoniMalav/WaleBySoniMalavCumulantK15Comp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_WaleBySoniMalavCumulantK15Comp( diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK17/WaleCumulantK17Comp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK17/WaleCumulantK17Comp_Device.cu index 91e91bc0f..c531caffe 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK17/WaleCumulantK17Comp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK17/WaleCumulantK17Comp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_WaleCumulantK17Comp( diff --git a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK17Debug/WaleCumulantK17DebugComp_Device.cu b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK17Debug/WaleCumulantK17DebugComp_Device.cu index b0e0b6506..9d4efb2ab 100644 --- a/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK17Debug/WaleCumulantK17DebugComp_Device.cu +++ b/src/gpu/VirtualFluids_GPU/Kernel/Kernels/WaleKernels/FluidFlow/Compressible/CumulantK17Debug/WaleCumulantK17DebugComp_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Kernel_WaleCumulantK17DebugComp( diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompAD27/InitCompAD27_Device.cu b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompAD27/InitCompAD27_Device.cu index 95f912c81..dfe1ccd23 100644 --- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompAD27/InitCompAD27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompAD27/InitCompAD27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Init_Comp_AD_27(unsigned int* neighborX, diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompAD7/InitCompAD7_Device.cu b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompAD7/InitCompAD7_Device.cu index 3d518a361..6b4058f4b 100644 --- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompAD7/InitCompAD7_Device.cu +++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompAD7/InitCompAD7_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Init_Comp_AD_7(unsigned int* neighborX, diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompSP27/InitCompSP27_Device.cu b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompSP27/InitCompSP27_Device.cu index 6ecedde3d..a411f5be0 100644 --- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompSP27/InitCompSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitCompSP27/InitCompSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" #include <stdio.h> diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitF3/InitF3_Device.cu b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitF3/InitF3_Device.cu index 3024af8ba..f69224e72 100644 --- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitF3/InitF3_Device.cu +++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitF3/InitF3_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitIncompAD27/InitIncompAD27_Device.cu b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitIncompAD27/InitIncompAD27_Device.cu index 714db3eac..f304201bf 100644 --- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitIncompAD27/InitIncompAD27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitIncompAD27/InitIncompAD27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Init_Incomp_AD_27(unsigned int* neighborX, diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitIncompAD7/InitIncompAD7_Device.cu b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitIncompAD7/InitIncompAD7_Device.cu index 369abed49..3a2730c8d 100644 --- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitIncompAD7/InitIncompAD7_Device.cu +++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitIncompAD7/InitIncompAD7_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Init_Incomp_AD_7(unsigned int* neighborX, diff --git a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitSP27/InitSP27_Device.cu b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitSP27/InitSP27_Device.cu index 3d4b9790e..ad55c1752 100644 --- a/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitSP27/InitSP27_Device.cu +++ b/src/gpu/VirtualFluids_GPU/PreProcessor/PreProcessorStrategy/InitSP27/InitSP27_Device.cu @@ -1,6 +1,8 @@ #include "LBM/LB.h" #include "LBM/D3Q27.h" -#include "Core/RealConstants.h" +#include <lbm/constants/NumericConstants.h> + +using namespace vf::lbm::constant; #include "math.h" extern "C" __global__ void LB_Init_SP_27(unsigned int* neighborX, diff --git a/src/lbm/constants/NumericConstants.h b/src/lbm/constants/NumericConstants.h new file mode 100644 index 000000000..3a9035ec6 --- /dev/null +++ b/src/lbm/constants/NumericConstants.h @@ -0,0 +1,230 @@ +#ifndef REAL_CONSTANT_H +#define REAL_CONSTANT_H + + +namespace vf::lbm::constant +{ + +#ifdef VF_DOUBLE_ACCURACY +static constexpr double c1o2 = 0.5; +static constexpr double c3o2 = 1.5; +static constexpr double c1o3 = 0.333333333333333; +static constexpr double c2o3 = 0.666666666666667; +static constexpr double c1o4 = 0.25; +static constexpr double c3o4 = 0.75; +static constexpr double c1o6 = 0.166666666666667; +static constexpr double c1o7 = 0.142857142857143; +static constexpr double c1o8 = 0.125; +static constexpr double c1o9 = 0.111111111111111; +static constexpr double c2o9 = 0.222222222222222; +static constexpr double c4o9 = 0.444444444444444; +static constexpr double c1o10 = 0.1; +static constexpr double c1o12 = 0.083333333333333; +static constexpr double c1o16 = 0.0625; +static constexpr double c3o16 = 0.1875; +static constexpr double c9o16 = 0.5625; +static constexpr double c1o18 = 0.055555555555556; +static constexpr double c1o20 = 0.05; +static constexpr double c19o20 = 0.95; +static constexpr double c21o20 = 1.05; +static constexpr double c1o24 = 0.041666666666667; +static constexpr double c1o27 = 0.037037037037037; +static constexpr double c3o32 = 0.09375; +static constexpr double c4o32 = 0.125; +static constexpr double c1o36 = 0.027777777777778; +static constexpr double c1o48 = 0.020833333333333; +static constexpr double c1o64 = 0.015625; +static constexpr double c3o64 = 0.046875; +static constexpr double c9o64 = 0.140625; +static constexpr double c27o64 = 0.421875; +static constexpr double c1o66 = 0.015151515151515; +static constexpr double c1o72 = 0.013888888888889; +static constexpr double c1o264 = 0.003787878787879; +static constexpr double c8o27 = 0.296296296296296; +static constexpr double c2o27 = 0.074074074074074; +static constexpr double c1o54 = 0.018518518518519; +static constexpr double c1o100 = 0.01; +static constexpr double c99o100 = 0.99; +static constexpr double c1o126 = 0.007936507936508; +static constexpr double c1o216 = 0.004629629629630; +static constexpr double c5o4 = 1.25; +static constexpr double c9o4 = 2.25; +static constexpr double c5o2 = 2.5; +static constexpr double c9o2 = 4.5; + +static constexpr double c0o1 = 0.; +static constexpr double c1o1 = 1.; +static constexpr double c2o1 = 2.; +static constexpr double c3o1 = 3.; +static constexpr double c4o1 = 4.; +static constexpr double c5o1 = 5.; +static constexpr double c6o1 = 6.; +static constexpr double c7o1 = 7.; +static constexpr double c8o1 = 8.; +static constexpr double c9o1 = 9.; +static constexpr double c10o1 = 10.; +static constexpr double c11o1 = 11.; +static constexpr double c12o1 = 12.; +static constexpr double c13o1 = 13.; +static constexpr double c14o1 = 14.; +static constexpr double c15o1 = 15.; +static constexpr double c16o1 = 16.; +static constexpr double c17o1 = 17.; +static constexpr double c18o1 = 18.; +static constexpr double c21o1 = 21.; +static constexpr double c24o1 = 24.; +static constexpr double c25o1 = 25.; +static constexpr double c26o1 = 26.; +static constexpr double c27o1 = 27.; +static constexpr double c28o1 = 28.; +static constexpr double c29o1 = 29.; +static constexpr double c30o1 = 30.; +static constexpr double c32o1 = 32.; +static constexpr double c33o1 = 33.; +static constexpr double c34o1 = 34.; +static constexpr double c36o1 = 36.; +static constexpr double c40o1 = 40.; +static constexpr double c42o1 = 42.; +static constexpr double c46o1 = 46.; +static constexpr double c48o1 = 48.; +static constexpr double c50o1 = 50.; +static constexpr double c52o1 = 52.; +static constexpr double c54o1 = 54.; +static constexpr double c56o1 = 56.; +static constexpr double c64o1 = 64.; +static constexpr double c66o1 = 66.; +static constexpr double c68o1 = 68.; +static constexpr double c69o1 = 69.; +static constexpr double c72o1 = 72.; +static constexpr double c84o1 = 84.; +static constexpr double c88o1 = 88.; +static constexpr double c96o1 = 96.; +static constexpr double c100o1 = 10.; +static constexpr double c130o1 = 13.; +static constexpr double c152o1 = 15.; +static constexpr double c166o1 = 16.; +static constexpr double c195o1 = 19.; +static constexpr double c216o1 = 21.; +static constexpr double c264o1 = 26.; +static constexpr double c290o1 = 29.; +static constexpr double c367o1 = 36.; + +static constexpr double Op0000002 = 0.0000002; +static constexpr double c10eM30 = 1e-30; +static constexpr double c10eM10 = 1e-10; +static constexpr double smallSingle = 0.0000000002; + +#else +static constexpr float c1o2 = 0.5f; +static constexpr float c3o2 = 1.5f; +static constexpr float c1o3 = (1.0f / 3.0f); +static constexpr float c2o3 = (2.0f / 3.0f); +static constexpr float c1o4 = 0.25f; +static constexpr float c3o4 = 0.75f; +static constexpr float c1o6 = (1.0f / 6.0f); +static constexpr float c1o7 = (1.0f / 7.0f); +static constexpr float c1o8 = 0.125f; +static constexpr float c1o9 = (1.0f / 9.0f); +static constexpr float c2o9 = (2.0f / 9.0f); +static constexpr float c4o9 = (4.0f / 9.0f); +static constexpr float c1o10 = 0.1f; +static constexpr float c1o12 = (1.0f / 12.0f); +static constexpr float c1o16 = 0.0625f; +static constexpr float c3o16 = 0.1875f; +static constexpr float c9o16 = 0.5625f; +static constexpr float c1o18 = (1.0f / 18.0f); +static constexpr float c1o20 = 0.05f; +static constexpr float c19o20 = 0.95f; +static constexpr float c21o20 = 1.05f; +static constexpr float c1o24 = (1.0f / 24.0f); +static constexpr float c1o27 = (1.0f / 27.0f); +static constexpr float c3o32 = 0.09375f; +static constexpr float c4o32 = 0.125f; +static constexpr float c1o36 = (1.0f / 36.0f); +static constexpr float c1o48 = (1.0f / 48.0f); +static constexpr float c1o64 = 0.015625f; +static constexpr float c3o64 = 0.046875f; +static constexpr float c9o64 = 0.140625f; +static constexpr float c27o64 = 0.421875f; +static constexpr float c1o66 = (1.0f / 66.0f); +static constexpr float c1o72 = (1.0f / 72.0f); +static constexpr float c1o264 = (1.0f / 264.0f); +static constexpr float c8o27 = (8.0f / 27.0f); +static constexpr float c2o27 = (2.0f / 27.0f); +static constexpr float c1o54 = (1.0f / 54.0f); +static constexpr float c1o100 = 0.01f; +static constexpr float c99o100 = 0.99f; +static constexpr float c1o126 = (1.0f / 126.0f); +static constexpr float c1o216 = (1.0f / 216.0f); +static constexpr float c5o4 = 1.25f; +static constexpr float c9o4 = 2.25f; +static constexpr float c5o2 = 2.5f; +static constexpr float c9o2 = 4.5f; + +static constexpr float c0o1 = 0.f; +static constexpr float c1o1 = 1.f; +static constexpr float c2o1 = 2.f; +static constexpr float c3o1 = 3.f; +static constexpr float c4o1 = 4.f; +static constexpr float c5o1 = 5.f; +static constexpr float c6o1 = 6.f; +static constexpr float c7o1 = 7.f; +static constexpr float c8o1 = 8.f; +static constexpr float c9o1 = 9.f; +static constexpr float c10o1 = 10.f; +static constexpr float c11o1 = 11.f; +static constexpr float c12o1 = 12.f; +static constexpr float c13o1 = 13.f; +static constexpr float c14o1 = 14.f; +static constexpr float c15o1 = 15.f; +static constexpr float c16o1 = 16.f; +static constexpr float c17o1 = 17.f; +static constexpr float c18o1 = 18.f; +static constexpr float c21o1 = 21.f; +static constexpr float c24o1 = 24.f; +static constexpr float c25o1 = 25.f; +static constexpr float c26o1 = 26.f; +static constexpr float c27o1 = 27.f; +static constexpr float c28o1 = 28.f; +static constexpr float c29o1 = 29.f; +static constexpr float c30o1 = 30.f; +static constexpr float c32o1 = 32.f; +static constexpr float c33o1 = 33.f; +static constexpr float c34o1 = 34.f; +static constexpr float c36o1 = 36.f; +static constexpr float c40o1 = 40.f; +static constexpr float c42o1 = 42.f; +static constexpr float c46o1 = 46.f; +static constexpr float c48o1 = 48.f; +static constexpr float c50o1 = 50.f; +static constexpr float c52o1 = 52.f; +static constexpr float c54o1 = 54.f; +static constexpr float c56o1 = 56.f; +static constexpr float c64o1 = 64.f; +static constexpr float c66o1 = 66.f; +static constexpr float c68o1 = 68.f; +static constexpr float c69o1 = 69.f; +static constexpr float c72o1 = 72.f; +static constexpr float c84o1 = 84.f; +static constexpr float c88o1 = 88.f; +static constexpr float c96o1 = 96.f; +static constexpr float c100o1 = 100.0f; +static constexpr float c130o1 = 130.0f; +static constexpr float c152o1 = 152.0f; +static constexpr float c166o1 = 166.0f; +static constexpr float c195o1 = 195.0f; +static constexpr float c216o1 = 216.0f; +static constexpr float c264o1 = 264.0f; +static constexpr float c290o1 = 290.0f; +static constexpr float c367o1 = 367.0f; + +static constexpr float Op0000002 = 0.0000002f; +static constexpr float c10eM30 = 1e-30; +static constexpr float c10eM10 = 1e-10; +static constexpr float smallSingle = 0.0000000002f; + +#endif + +} + +#endif -- GitLab